gCubeSystem
/
workspace
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade to gwt 2.7 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@101779 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2014-11-28 17:23:26 +00:00
parent a85fc6fb95
commit f3b966bcbb
5 changed files with 65 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/workspace-6.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java"> <classpathentry kind="src" output="target/workspace-6.7.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
@ -19,11 +19,12 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="/home/francesco-mangiacrapa/libraries/asm-5.0.3/lib/asm-5.0.3.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/> <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/workspace-6.7.0-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="output" path="target/workspace-6.7.1-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

2
.settings/com.google.gdt.eclipse.core.prefs
View File

@ -3,6 +3,6 @@
>>>>>>>=.r93212 >>>>>>>=.r93212
eclipse.preferences.version=1 eclipse.preferences.version=1
jarsExcludedFromWebInfLib= jarsExcludedFromWebInfLib=
lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/workspace/target/workspace-6.7.0-SNAPSHOT lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/workspace(trunk)/target/workspace-6.7.1-SNAPSHOT
warSrcDir=src/main/webapp warSrcDir=src/main/webapp
warSrcDirIsOutput=false warSrcDirIsOutput=false

2
.settings/org.eclipse.wst.common.component
View File

@ -5,7 +5,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="workspace-tree-widget-6.7.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree"> <dependent-module archiveName="workspace-tree-widget-6.7.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>

25
pom.xml
View File

@ -81,18 +81,21 @@
<version>${gwtVersion}</version> <version>${gwtVersion}</version>
</dependency> </dependency>
<dependency> <!-- <dependency> -->
<groupId>com.google.gwt</groupId> <!-- <groupId>com.google.gwt</groupId> -->
<artifactId>gwt-servlet</artifactId> <!-- <artifactId>gwt-codeserver</artifactId> -->
<scope>provided</scope> <!-- <version>${gwtVersion}</version> -->
<version>${gwtVersion}</version> <!-- <scope>provided</scope> -->
</dependency> <!-- </dependency> -->
<dependency> <dependency>
<groupId>com.sencha.gxt</groupId> <groupId>com.sencha.gxt</groupId>
<artifactId>gxt</artifactId> <artifactId>gxt2.2.5-gwt2.7</artifactId>
<version>2.2.5</version> <version>0.0.1-SNAPSHOT</version>
<scope>system</scope>
<systemPath>/home/francesco-mangiacrapa/wseclipse/gxt2.2.5-gwt2.7/target/gxt2.2.5-gwt2.7.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.portlets.widgets</groupId> <groupId>org.gcube.portlets.widgets</groupId>
<artifactId>guided-tour-widget</artifactId> <artifactId>guided-tour-widget</artifactId>
@ -165,6 +168,12 @@
<artifactId>home-library</artifactId> <artifactId>home-library</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>asm-all</artifactId>
<groupId>asm</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>

88
src/main/webapp/WEB-INF/web.xml
View File

@ -11,17 +11,12 @@
</welcome-file-list> </welcome-file-list>
<!-- FILE UPLOAD WIDGET --> <!-- FILE UPLOAD WIDGET -->
<servlet> <servlet>
<servlet-name>uploadprogress</servlet-name> <servlet-name>uploadprogress</servlet-name>
<servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadProgressServlet</servlet-class> <servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadProgressServlet</servlet-class>
</servlet> </servlet>
<servlet-mapping>
<servlet-name>uploadprogress</servlet-name>
<url-pattern>/workspace/uploadprogress</url-pattern>
</servlet-mapping>
<!-- DO NOT CHANGE - DO NOT Replace URL PATTERN HERE --> <!-- DO NOT CHANGE - DO NOT Replace URL PATTERN HERE -->
<servlet> <servlet>
@ -29,11 +24,6 @@
<servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadServlet</servlet-class> <servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadServlet</servlet-class>
</servlet> </servlet>
<servlet-mapping>
<servlet-name>upload</servlet-name>
<url-pattern>/FileUpload/upload</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>workspacesharing</servlet-name> <servlet-name>workspacesharing</servlet-name>
<servlet-class>org.gcube.portlets.widgets.workspacesharingwidget.server.WorkspaceSharingServiceImpl</servlet-class> <servlet-class>org.gcube.portlets.widgets.workspacesharingwidget.server.WorkspaceSharingServiceImpl</servlet-class>
@ -46,21 +36,6 @@
<servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class> <servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class>
</servlet> </servlet>
<servlet-mapping>
<servlet-name>UploadService</servlet-name>
<url-pattern>/workspace/UploadService</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>workspacesharing</servlet-name>
<url-pattern>/workspace/workspacesharing</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>LocalUploadService</servlet-name>
<url-pattern>/workspace/LocalUploadService</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>LocalUploadService</servlet-name> <servlet-name>LocalUploadService</servlet-name>
<servlet-class>org.gcube.portlets.user.workspace.server.LocalUploadServlet</servlet-class> <servlet-class>org.gcube.portlets.user.workspace.server.LocalUploadServlet</servlet-class>
@ -71,21 +46,22 @@
<servlet-class>org.gcube.portlets.user.workspace.server.DownloadServlet</servlet-class> <servlet-class>org.gcube.portlets.user.workspace.server.DownloadServlet</servlet-class>
</servlet> </servlet>
<servlet-mapping>
<servlet-name>DownloadService</servlet-name>
<url-pattern>/workspace/DownloadService</url-pattern>
</servlet-mapping>
<!-- Servlets --> <!-- Servlets -->
<servlet> <servlet>
<servlet-name>WorkspaceService</servlet-name> <servlet-name>WorkspaceService</servlet-name>
<servlet-class>org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl</servlet-class> <servlet-class>org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl</servlet-class>
</servlet> </servlet>
<servlet-mapping> <!-- mailWisdgetServlet servlet -->
<servlet-name>WorkspaceService</servlet-name> <servlet>
<url-pattern>/workspace/WorkspaceService</url-pattern> <servlet-name>mailWisdgetServlet</servlet-name>
</servlet-mapping> <servlet-class>org.gcube.portlets.widgets.wsmail.server.WsMailServiceImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>checkServlet</servlet-name>
<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class>
</servlet>
<servlet> <servlet>
@ -98,17 +74,15 @@
<url-pattern>/workspace/ImageService</url-pattern> <url-pattern>/workspace/ImageService</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- mailWisdgetServlet servlet --> <servlet-mapping>
<servlet> <servlet-name>WorkspaceService</servlet-name>
<servlet-name>mailWisdgetServlet</servlet-name> <url-pattern>/workspace/WorkspaceService</url-pattern>
<servlet-class>org.gcube.portlets.widgets.wsmail.server.WsMailServiceImpl</servlet-class> </servlet-mapping>
</servlet>
<servlet-mapping>
<servlet> <servlet-name>uploadprogress</servlet-name>
<servlet-name>checkServlet</servlet-name> <url-pattern>/workspace/uploadprogress</url-pattern>
<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class> </servlet-mapping>
</servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>checkServlet</servlet-name> <servlet-name>checkServlet</servlet-name>
<url-pattern>/workspace/checksession</url-pattern> <url-pattern>/workspace/checksession</url-pattern>
@ -130,6 +104,30 @@
<url-pattern>/workspace/WorkspaceLightService</url-pattern> <url-pattern>/workspace/WorkspaceLightService</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>LocalUploadService</servlet-name>
<url-pattern>/workspace/LocalUploadService</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>DownloadService</servlet-name>
<url-pattern>/workspace/DownloadService</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>UploadService</servlet-name>
<url-pattern>/workspace/UploadService</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>workspacesharing</servlet-name>
<url-pattern>/workspace/workspacesharing</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>upload</servlet-name>
<url-pattern>/FileUpload/upload</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>jUnitHostImpl</servlet-name> <servlet-name>jUnitHostImpl</servlet-name>
<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class> <servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>