From b3e282c6840c739a087626bb00eaf497ec89edbc Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Thu, 26 Jan 2017 18:22:00 +0000
Subject: [PATCH] minor fixes for grsf-manage widget support

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-ckan-datacatalog@141847 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                           |  1 -
 .settings/org.eclipse.wst.common.component           |  3 +++
 .../GCubeCkanDataCatalog.gwt.xml                     |  2 +-
 src/main/webapp/WEB-INF/web.xml                      | 12 ++++++------
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.classpath b/.classpath
index 710ed73..fd5f814 100644
--- a/.classpath
+++ b/.classpath
@@ -33,6 +33,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/grsf-manage-widget"/>
 	<classpathentry kind="output" path="target/gcube-ckan-datacatalog-1.2.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 5fe3680..21deca5 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,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="ckan-metadata-publisher-widget-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-metadata-publisher-widget/ckan-metadata-publisher-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="context-root" value="gcube-ckan-datacatalog"/>
         <property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/>
     </wb-module>
diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
index f331ddf..d8704bf 100644
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
@@ -22,7 +22,7 @@
 	<inherits
 		name='org.gcube.portlets.widgets.ckandatapublisherwidget.CKanMetadataPublisher' />
 			<inherits
-		name='org.gcube.datacatalogue.grsf_manage_widget.client.GRSFManageWidget' />
+		name='org.gcube.datacatalogue.grsf_manage_widget.GRSFManageWidget' />
 	<inherits
 		name='org.gcube.datacatalogue.ckanutillibrary.CkanUtilLibrary' />
 	<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 9252559..1357c2f 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -44,6 +44,11 @@
 		<servlet-class>org.gcube.portlets.widgets.ckandatapublisherwidget.server.CKANPublisherServicesImpl</servlet-class>
 	</servlet>
 
+	<servlet>
+		<servlet-name>grsfmanageservice</servlet-name>
+		<servlet-class>org.gcube.datacatalogue.grsf_manage_widget.server.manage.GRSFNotificationService</servlet-class>
+	</servlet>
+
 	<servlet-mapping>
 		<servlet-name>gcubeckandatacatalogservice</servlet-name>
 		<url-pattern>/gCubeCkanDataCatalog/ckandatacatalogue</url-pattern>
@@ -54,14 +59,9 @@
 		<url-pattern>/gCubeCkanDataCatalog/ckanservices</url-pattern>
 	</servlet-mapping>
 
-	<servlet>
-		<servlet-name>grsfmanageservice</servlet-name>
-		<servlet-class>org.gcube.datacatalogue.grsf_manage_widget.server.manage.GRSFNotificationService</servlet-class>
-	</servlet>
-
 	<servlet-mapping>
 		<servlet-name>grsfmanageservice</servlet-name>
-		<url-pattern>/GRSFManageWidget/ckanservices</url-pattern>
+		<url-pattern>/gCubeCkanDataCatalog/grsfmanageservice</url-pattern>
 	</servlet-mapping>
 
 	<!-- <servlet-mapping> -->