From 26647516d4fcf28cc4bc2b01ef1b99e779fa6e06 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 1 Mar 2018 10:34:26 +0000
Subject: [PATCH] updated pom version at 6.18.0 starting integration with new
 ws-thredds engine [Task #11127]

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

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 26646ba..e73f48a 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -7,6 +7,15 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
+        <dependent-module archiveName="workspace-tree-widget-6.20.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="ws-thredds-sync-widget-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ws-thredds-sync-widget/ws-thredds-sync-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="ws-synchronized-module-library-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ws-synchronized-module-library/ws-synchronized-module-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="workspace"/>
   </wb-module>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 6c64175..e7e002e 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,9 +1,15 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-18-0"
+		date="2018-03-01">
+		<Change>[Task #11127] Porting to new ws-thredds engine</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-4"
-		date="2019-01-09">
-		<Change>Issue #10831, Workspace download folder tomcat temp occupation issue</Change>
+		date="2018-01-09">
+		<Change>Issue #10831, Workspace download folder tomcat temp occupation
+			issue
+		</Change>
 		<Change>[Incident #11113] Bug fixing</Change>
-	</Changeset>	
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-3"
 		date="2017-11-20">
 		<Change>Task #9758: bug fixing</Change>
diff --git a/pom.xml b/pom.xml
index b6bed20..f69a5ba 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.17.4-SNAPSHOT</version>
+	<version>6.18.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. 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 18765f0..a4714b0 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -93,14 +93,25 @@
 		<servlet-name>ckanpublisherservices</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.ckandatapublisherwidget.server.CKANPublisherServicesImpl</servlet-class>
 	</servlet>
-	
+
 	<servlet>
 		<servlet-name>imageservices</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.imagepreviewerwidget.server.ImageOrientationServicesImpl</servlet-class>
 	</servlet>
- 
+
+	<!-- wsThreddsSyncServlet -->
+	<servlet>
+		<servlet-name>wsThreddsSyncServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.widgtes.wsthreddssync.server.ThreddsWorkspaceSyncServiceImpl</servlet-class>
+	</servlet>
+
 	<!-- ###################### MAPPING ###################### -->
-	
+
+	<servlet-mapping>
+		<servlet-name>wsThreddsSyncServlet</servlet-name>
+		<url-pattern>/workspace/wsthreddssync</url-pattern>
+	</servlet-mapping>
+
 	<servlet-mapping>
 		<servlet-name>imageservices</servlet-name>
 		<url-pattern>/workspace/imageservices</url-pattern>