From f3b966bcbb5f98de1292f4c4bdf6540a627357dd Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 28 Nov 2014 17:23:26 +0000
Subject: [PATCH] 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
---
 .classpath                                  |  5 +-
 .settings/com.google.gdt.eclipse.core.prefs |  2 +-
 .settings/org.eclipse.wst.common.component  |  2 +-
 pom.xml                                     | 25 ++++--
 src/main/webapp/WEB-INF/web.xml             | 88 ++++++++++-----------
 5 files changed, 65 insertions(+), 57 deletions(-)

diff --git a/.classpath b/.classpath
index a9252d9..fa459f5 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -19,11 +19,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</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">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</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>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 3775257..d655842 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -3,6 +3,6 @@
 >>>>>>>=.r93212
 eclipse.preferences.version=1
 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
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index f85b8b2..8aae22b 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -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="/src/main/java"/>
         <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>
         </dependent-module>
 
diff --git a/pom.xml b/pom.xml
index dc86948..b2b5870 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,18 +81,21 @@
 			<version>${gwtVersion}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.gwt</groupId>
-			<artifactId>gwt-servlet</artifactId>
-			<scope>provided</scope>
-			<version>${gwtVersion}</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>com.google.gwt</groupId> -->
+<!-- 			<artifactId>gwt-codeserver</artifactId> -->
+<!-- 			<version>${gwtVersion}</version> -->
+<!-- 			<scope>provided</scope> -->
+<!-- 		</dependency> -->
 
 		<dependency>
 			<groupId>com.sencha.gxt</groupId>
-			<artifactId>gxt</artifactId>
-			<version>2.2.5</version>
+			<artifactId>gxt2.2.5-gwt2.7</artifactId>
+			<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>
 			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>guided-tour-widget</artifactId>
@@ -165,6 +168,12 @@
 			<artifactId>home-library</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>asm-all</artifactId>
+					<groupId>asm</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 91029b9..ba5f44f 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -11,17 +11,12 @@
 	</welcome-file-list>
 
 
-
 	<!-- FILE UPLOAD WIDGET -->
 	<servlet>
 		<servlet-name>uploadprogress</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadProgressServlet</servlet-class>
 	</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 -->
 	<servlet>
@@ -29,11 +24,6 @@
 		<servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadServlet</servlet-class>
 	</servlet>
 
-	<servlet-mapping>
-		<servlet-name>upload</servlet-name>
-		<url-pattern>/FileUpload/upload</url-pattern>
-	</servlet-mapping>
-
 	<servlet>
 		<servlet-name>workspacesharing</servlet-name>
 		<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>
 
-	<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-name>LocalUploadService</servlet-name>
 		<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>
 
-	<servlet-mapping>
-		<servlet-name>DownloadService</servlet-name>
-		<url-pattern>/workspace/DownloadService</url-pattern>
-	</servlet-mapping>
-
 	<!-- Servlets -->
 	<servlet>
 		<servlet-name>WorkspaceService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl</servlet-class>
 	</servlet>
 
-	<servlet-mapping>
-		<servlet-name>WorkspaceService</servlet-name>
-		<url-pattern>/workspace/WorkspaceService</url-pattern>
-	</servlet-mapping>
+	<!-- mailWisdgetServlet servlet -->
+	<servlet>
+		<servlet-name>mailWisdgetServlet</servlet-name>
+		<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>
@@ -98,17 +74,15 @@
 		<url-pattern>/workspace/ImageService</url-pattern>
 	</servlet-mapping>
 
-	<!-- mailWisdgetServlet servlet -->
-	<servlet>
-		<servlet-name>mailWisdgetServlet</servlet-name>
-		<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-mapping>
+		<servlet-name>WorkspaceService</servlet-name>
+		<url-pattern>/workspace/WorkspaceService</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>uploadprogress</servlet-name>
+		<url-pattern>/workspace/uploadprogress</url-pattern>
+	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>checkServlet</servlet-name>
 		<url-pattern>/workspace/checksession</url-pattern>
@@ -130,6 +104,30 @@
 		<url-pattern>/workspace/WorkspaceLightService</url-pattern>
 	</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-name>jUnitHostImpl</servlet-name>
 		<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>