From 3653e0886367ec0f36b19e7797bc798dd5400093 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 31 May 2016 15:38:06 +0000
Subject: [PATCH] Updated pom version to 6.13.0 Removed unused servlets from
 web.xml

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@128933 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component |  5 +--
 distro/changelog.xml                       |  4 +++
 pom.xml                                    |  6 +---
 src/main/webapp/WEB-INF/web.xml            | 40 +++++++++++-----------
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 69da3c6..cdb9db4 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,10 +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.12.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="workspace-uploader-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-uploader-TRUNK/workspace-uploader-TRUNK">
+        <dependent-module archiveName="workspace-tree-widget-6.13.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK">
             <dependency-type>uses</dependency-type>
         </dependent-module>
 
diff --git a/distro/changelog.xml b/distro/changelog.xml
index fdc79af..ef1f64e 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-13-0"
+		date="2016-05-31">
+		<Change>[Feature #4128] Migration to Liferay 6.2</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-12-0"
 		date="2016-05-16">
 		<Change>Integrated with new workspace uploader</Change>
diff --git a/pom.xml b/pom.xml
index e6e045a..3d4bf7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace</artifactId>
 	<packaging>war</packaging>
-	<version>6.12.0-SNAPSHOT</version>
+	<version>6.13.0-SNAPSHOT</version>
 	<name>gCube Workspace Portlet</name>
 	<description>
 		gCube Workspace Portlet is a web-gui to manage the gCube workspace a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs. 
@@ -79,7 +79,6 @@
 		<dependency>
 			<groupId>com.github.gwtbootstrap</groupId>
 			<artifactId>gwt-bootstrap</artifactId>
-			<version>2.3.2.0</version>
 		</dependency>
 
 		<dependency>
@@ -117,7 +116,6 @@
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<!-- END FWS -->
@@ -147,7 +145,6 @@
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>social-networking-library</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -191,7 +188,6 @@
 		<dependency>
 			<groupId>com.liferay.portal</groupId>
 			<artifactId>portal-service</artifactId>
-			<version>6.0.6</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 852085a..0487032 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -15,15 +15,15 @@
 		<servlet-class>org.gcube.portlets.widgets.workspacesharingwidget.server.WorkspaceSharingServiceImpl</servlet-class>
 	</servlet>
 
-	<servlet>
-		<servlet-name>UploadService</servlet-name>
-		<servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class>
-	</servlet>
+<!-- 	<servlet> -->
+<!-- 		<servlet-name>UploadService</servlet-name> -->
+<!-- 		<servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class> -->
+<!-- 	</servlet> -->
 
-	<servlet>
-		<servlet-name>LocalUploadService</servlet-name>
-		<servlet-class>org.gcube.portlets.user.workspace.server.LocalUploadServlet</servlet-class>
-	</servlet>
+<!-- 	<servlet> -->
+<!-- 		<servlet-name>LocalUploadService</servlet-name> -->
+<!-- 		<servlet-class>org.gcube.portlets.user.workspace.server.LocalUploadServlet</servlet-class> -->
+<!-- 	</servlet> -->
 
 	<servlet>
 		<servlet-name>DownloadService</servlet-name>
@@ -125,20 +125,20 @@
 		<url-pattern>/workspace/mailWisdgetServlet</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>LocalUploadService</servlet-name>
-		<url-pattern>/workspace/LocalUploadService</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>UploadService</servlet-name> -->
+<!-- 		<url-pattern>/workspace/UploadService</url-pattern> -->
+<!-- 	</servlet-mapping> -->
 
 	<servlet-mapping>
 		<servlet-name>workspacesharing</servlet-name>
@@ -170,10 +170,10 @@
 		<url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/ImageService</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>UploadService</servlet-name>
-		<url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/UploadService</url-pattern>
-	</servlet-mapping>
+<!-- 	<servlet-mapping> -->
+<!-- 		<servlet-name>UploadService</servlet-name> -->
+<!-- 		<url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/UploadService</url-pattern> -->
+<!-- 	</servlet-mapping> -->
 
 
 	<servlet-mapping>