Correct pom, added common-scope-maps
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@77741 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
9d504a1088
commit
bca558f119
File diff suppressed because it is too large
Load Diff
|
|
@ -5,6 +5,9 @@
|
|||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||
<dependent-module archiveName="sdmx-import-wizard-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/sdmx-import-wizard/sdmx-import-wizard">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
||||
<property name="context-root" value="tabular-data-portlet"/>
|
||||
</wb-module>
|
||||
|
|
|
|||
45
pom.xml
45
pom.xml
|
|
@ -18,7 +18,15 @@
|
|||
<name>Tabular data portlet</name>
|
||||
|
||||
<properties>
|
||||
<distroDirectory>${project.basedir}/distro</distroDirectory>
|
||||
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
|
||||
<!-- Convenience property to set the GWT version -->
|
||||
<gwtVersion>2.4.0</gwtVersion>
|
||||
<!-- To make this work on gwt-run you need to set up global env vars. on
|
||||
MacOSX edit this file /etc/launchd.conf and put "setenv GLOBUS_LOCATION /Users/massi/portal/Portal-Bundle/gCore"
|
||||
on Linux? -->
|
||||
<GLOBUS_LOCATION>${env.GLOBUS_LOCATION}</GLOBUS_LOCATION>
|
||||
<!-- GWT needs at least java 1.5 -->
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
|
|
@ -46,16 +54,13 @@
|
|||
<groupId>com.allen-sauer.gwt.log</groupId>
|
||||
<artifactId>gwt-log</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<scope>runtime</scope>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<!-- <dependency> -->
|
||||
<!-- <groupId>org.slf4j</groupId> -->
|
||||
<!-- <artifactId>slf4j-log4j12</artifactId> -->
|
||||
<!-- <scope>runtime</scope> -->
|
||||
<!-- </dependency> -->
|
||||
|
||||
<dependency>
|
||||
<groupId>ch.qos.logback</groupId>
|
||||
<artifactId>logback-classic</artifactId>
|
||||
|
|
@ -83,23 +88,29 @@
|
|||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.portlets.user</groupId>
|
||||
<artifactId>workspace-light-tree-gxt3</artifactId>
|
||||
<version>2.9.1-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<!-- <dependency> -->
|
||||
<!-- <groupId>org.gcube.portlets.user</groupId> -->
|
||||
<!-- <artifactId>workspace-light-tree-gxt3</artifactId> -->
|
||||
<!-- <version>2.9.1-SNAPSHOT</version> -->
|
||||
<!-- </dependency> -->
|
||||
<!-- WORKSPACE -->
|
||||
<dependency>
|
||||
<groupId>org.gcube.portlets.user</groupId>
|
||||
<artifactId>workspace-tree-widget</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.extjs.gxt</groupId>
|
||||
<artifactId>gxt</artifactId>
|
||||
<version>2.2.5</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.core</groupId>
|
||||
<artifactId>common-scope-maps</artifactId>
|
||||
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
|
||||
<!-- TABULAR DATA WIDGET -->
|
||||
<dependency>
|
||||
<groupId>org.gcube.portlets.user</groupId>
|
||||
|
|
@ -196,14 +207,6 @@
|
|||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<version>2.1.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>exploded</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<webappDirectory>${webappDirectory}</webappDirectory>
|
||||
</configuration>
|
||||
|
|
@ -223,4 +226,6 @@
|
|||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,9 @@ import org.gcube.portlets.user.tdw.client.TabularData;
|
|||
import org.gcube.portlets.user.tdw.client.TabularDataGridPanel;
|
||||
import org.gcube.portlets.user.tdw.client.event.FailureEvent;
|
||||
import org.gcube.portlets.user.tdw.client.event.FailureEventHandler;
|
||||
import org.gcube.portlets.user.workspace.client.AppControllerExplorer;
|
||||
import org.gcube.portlets.user.workspace.client.view.ExplorerPanel;
|
||||
import org.gcube.portlets.user.workspace.client.view.tree.AsyncTreePanel;
|
||||
|
||||
import com.allen_sauer.gwt.log.client.Log;
|
||||
import com.google.gwt.core.client.EntryPoint;
|
||||
|
|
@ -97,12 +100,13 @@ public class TabularDataPortlet implements EntryPoint {
|
|||
ContentPanel workspaceTreePanel = new ContentPanel();
|
||||
workspaceTreePanel.setHeaderVisible(false);
|
||||
|
||||
/* AppControllerExplorer workspaceTree = new AppControllerExplorer();
|
||||
AppControllerExplorer workspaceTree = new AppControllerExplorer();
|
||||
ExplorerPanel explorerPanel = workspaceTree.getPanel();
|
||||
AsyncTreePanel asyncTreePanel = explorerPanel.getAsycTreePanel();
|
||||
asyncTreePanel.setSizeTreePanel(TOOLBOX_WIDTH, TOOLBOX_HEIGHT);
|
||||
asyncTreePanel.setHeaderTreeVisible(false);
|
||||
workspaceTreePanel.add(asyncTreePanel);*/
|
||||
|
||||
workspaceTreePanel.add(asyncTreePanel);
|
||||
workspaceTreePanel.setHeaderVisible(true);
|
||||
workspaceTreePanel.setHeadingText("Workspace Tree");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,27 @@
|
|||
package org.gcube.portlets.user.td.server;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import org.gcube.application.framework.core.session.ASLSession;
|
||||
import org.gcube.application.framework.core.session.SessionManager;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
|
||||
import org.gcube.portlets.user.sdmximportwizard.server.SessionUtil;
|
||||
import org.gcube.portlets.user.td.ciw.server.CSVTDImporter;
|
||||
import org.gcube.portlets.user.td.client.rpc.TabularDataService;
|
||||
import org.gcube.portlets.user.td.importer.server.TabularDataImporterManager;
|
||||
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
|
||||
|
||||
import org.slf4j.*;
|
||||
|
||||
/**
|
||||
* The server side implementation of the RPC service.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class TabularDataServiceImpl extends RemoteServiceServlet implements TabularDataService {
|
||||
|
||||
protected static Logger logger = LoggerFactory.getLogger(SessionUtil.class);
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
|
@ -34,12 +42,31 @@ public class TabularDataServiceImpl extends RemoteServiceServlet implements Tabu
|
|||
ScopeProvider.instance.set("/gcube/devsec");
|
||||
}
|
||||
|
||||
|
||||
protected static ASLSession getAslSession(HttpSession httpSession)
|
||||
{
|
||||
String username = (String) httpSession.getAttribute(ScopeHelper.USERNAME_ATTRIBUTE);
|
||||
|
||||
if (username == null) {
|
||||
logger.warn("no user found in session, using test one");
|
||||
username = "giancarlo.panichi";
|
||||
String scope = "/gcube/devsec";
|
||||
|
||||
httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE, username);
|
||||
ASLSession session = SessionManager.getInstance().getASLSession(httpSession.getId(), username);
|
||||
session.setScope(scope);
|
||||
|
||||
return session;
|
||||
} else {
|
||||
return SessionManager.getInstance().getASLSession(httpSession.getId(), username);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public String greetServer(String input) throws IllegalArgumentException {
|
||||
|
||||
|
||||
getAslSession(this.getThreadLocalRequest().getSession());
|
||||
return "Hello";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
<!-- Other module inherits -->
|
||||
<inherits name='com.sencha.gxt.ui.GXT' />
|
||||
<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
|
||||
<!-- <inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' /> -->
|
||||
- <inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
|
||||
<inherits name="org.gcube.portlets.user.tdw.TabularDataWidget" />
|
||||
<inherits name='org.gcube.portlets.user.sdmximportwizard.sdmximportwizard' />
|
||||
<inherits name='org.gcube.portlets.user.td.ciw.csvimporterwidget' />
|
||||
<!-- <inherits name='org.gcube.portlets.user.workspace.lighttree.WorkspacePortletLightTree' /> -->
|
||||
<!-- <inherits name='org.gcube.portlets.user.workspace.lighttree.WorkspacePortletLightTree' /> -->
|
||||
|
||||
<!-- Specify the app entry point class. -->
|
||||
<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
<!-- Workspace Light Tree -->
|
||||
<servlet>
|
||||
<servlet-name>WorkspaceLightService</servlet-name>
|
||||
<servlet-class>org.gcube.portlets.user.workspace.lighttreegxt3.server.WorkspaceServiceImpl</servlet-class>
|
||||
<servlet-class>org.gcube.portlets.user.workspace.lighttree.server.WorkspaceServiceImpl</servlet-class>
|
||||
</servlet>
|
||||
|
||||
<!-- CSV Import Wizard Workspace -->
|
||||
|
|
@ -58,9 +58,33 @@
|
|||
<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.ws.server.ImportWizardWSServiceImpl</servlet-class>
|
||||
</servlet>
|
||||
|
||||
<servlet>
|
||||
<servlet-name>downloadServlet</servlet-name>
|
||||
<servlet-class>org.gcube.portlets.user.workspace.server.DownloadServlet</servlet-class>
|
||||
</servlet>
|
||||
|
||||
<servlet>
|
||||
<servlet-name>imageServlet</servlet-name>
|
||||
<servlet-class>org.gcube.portlets.user.workspace.server.ImageServlet</servlet-class>
|
||||
</servlet>
|
||||
|
||||
<servlet>
|
||||
<servlet-name>gWTWorkspaceServiceImpl</servlet-name>
|
||||
<servlet-class>org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl</servlet-class>
|
||||
</servlet>
|
||||
|
||||
|
||||
<servlet>
|
||||
<servlet-name>imageServlet</servlet-name>
|
||||
<servlet-class>org.gcube.portlets.user.workspace.server.ImageServlet</servlet-class>
|
||||
</servlet>
|
||||
|
||||
|
||||
<servlet>
|
||||
<servlet-name>uploadServlet</servlet-name>
|
||||
<servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class>
|
||||
</servlet>
|
||||
|
||||
<!-- Servlets -->
|
||||
<servlet-mapping>
|
||||
<servlet-name>tdservlet</servlet-name>
|
||||
|
|
@ -91,6 +115,11 @@
|
|||
<servlet-name>CSVImportService</servlet-name>
|
||||
<url-pattern>/tabulardataportlet/CSVImportService</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<servlet-mapping>
|
||||
<servlet-name>imageServlet</servlet-name>
|
||||
<url-pattern>/tabulardataportlet/ImageService</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<servlet-mapping>
|
||||
<servlet-name>LocalUploadServlet</servlet-name>
|
||||
|
|
@ -114,7 +143,26 @@
|
|||
<url-pattern>/tabulardataportlet/CSVImportServiceWorkspace</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<servlet-mapping>
|
||||
<servlet-name>downloadServlet</servlet-name>
|
||||
<url-pattern>/tabulardataportlet/DownloadService</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<servlet-mapping>
|
||||
<servlet-name>gWTWorkspaceServiceImpl</servlet-name>
|
||||
<url-pattern>/tabulardataportlet/WorkspaceService</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<servlet-mapping>
|
||||
<servlet-name>imageServlet</servlet-name>
|
||||
<url-pattern>/tabulardataportlet/ImageService</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<servlet-mapping>
|
||||
<servlet-name>uploadServlet</servlet-name>
|
||||
<url-pattern>/tabulardataportlet/UploadService</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<!-- Default page to serve -->
|
||||
<welcome-file-list>
|
||||
<welcome-file>TabularDataPortlet.html</welcome-file>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<launchConfiguration type="com.google.gdt.eclipse.suite.webapp">
|
||||
<stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.DevMode"/>
|
||||
<booleanAttribute key="com.google.gdt.eclipse.suiteWarArgumentProcessor.IS_WAR_FROM_PROJECT_PROPERTIES" value="true"/>
|
||||
<stringAttribute key="com.google.gwt.eclipse.core.URL" value="TabularDataPortlet.html"/>
|
||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
|
||||
<listEntry value="/tabular-data-portlet"/>
|
||||
</listAttribute>
|
||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
|
||||
<listEntry value="4"/>
|
||||
</listAttribute>
|
||||
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
|
||||
<mapEntry key="GLOBUS_LOCATION" value="${GLOBUS_LOCATION}"/>
|
||||
</mapAttribute>
|
||||
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" javaProject="tabular-data-portlet" path="1" type="4"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/tabular-data-portlet/src/main/java" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/tabular-data-portlet/src/main/resources" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/tabular-data-portlet/src/test/java" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/tabular-data-portlet/src/test/resources" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.variableClasspathEntry"> <memento path="3" variableString="${GLOBUS_LOCATION}"/> </runtimeClasspathEntry> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="tabular-data-portlet"/> </runtimeClasspathEntry> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry externalArchive="/home/giancarlo/gwt-2.4.0/gwt-dev.jar" path="3" type="2"/> "/>
|
||||
</listAttribute>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war /home/giancarlo/workspace/tabular-data-portlet/target/tabular-data-portlet-1.0.0-SNAPSHOT -remoteUI "${gwt_remote_ui_server_port}:${unique_id}" -startupUrl TabularDataPortlet.html -logLevel INFO -codeServerPort 9997 -port 8888 org.gcube.portlets.user.td.TabularDataPortlet"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-portlet"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -Dgwt.nowarn.legacy.tools"/>
|
||||
</launchConfiguration>
|
||||
Loading…
Reference in New Issue