From 54fa9cee82154dce9857c6f78c17ceefcaa11d45 Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Wed, 8 Mar 2017 16:09:34 +0000
Subject: [PATCH] minor fixes

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144756 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component                     | 3 ---
 .../gcube/data_catalogue/grsf_publish_ws/json/input/Base.java  | 2 +-
 .../grsf_publish_ws/services/CommonServiceUtils.java           | 2 +-
 .../grsf_publish_ws/services/GrsfPublisherFisheryService.java  | 2 +-
 .../grsf_publish_ws/services/GrsfPublisherStockService.java    | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index f5599c0..6caf699 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,9 +3,6 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <dependent-module archiveName="ckan-util-library-2.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-util-library/ckan-util-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="grsf-publisher-ws"/>
         <property name="java-output-path" value="/grsf-publisher-ws/target/classes"/>
     </wb-module>
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java
index 1f3af83..61742aa 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java
@@ -10,7 +10,7 @@ import javax.validation.constraints.Size;
 
 import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.CustomField;
 import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods;
-import org.gcube.datacatalogue.ckanutillibrary.server.models.ResourceBean;
+import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java
index 585cbaa..ca964e5 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java
@@ -23,7 +23,7 @@ import org.gcube.data_catalogue.grsf_publish_ws.json.input.TimeSeriesBean;
 import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods;
 import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Sources;
 import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Status;
-import org.gcube.datacatalogue.ckanutillibrary.server.models.ResourceBean;
+import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
index 3883f8b..df8aaf3 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
@@ -43,7 +43,7 @@ import org.gcube.data_catalogue.grsf_publish_ws.utils.threads.AssociationToGroup
 import org.gcube.data_catalogue.grsf_publish_ws.utils.threads.ManageTimeSeriesThread;
 import org.gcube.data_catalogue.grsf_publish_ws.utils.threads.WritePostCatalogueManagerThread;
 import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogue;
-import org.gcube.datacatalogue.ckanutillibrary.server.models.ResourceBean;
+import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean;
 import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
index 5ee5022..ad7c462 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
@@ -43,7 +43,7 @@ import org.gcube.data_catalogue.grsf_publish_ws.utils.threads.AssociationToGroup
 import org.gcube.data_catalogue.grsf_publish_ws.utils.threads.ManageTimeSeriesThread;
 import org.gcube.data_catalogue.grsf_publish_ws.utils.threads.WritePostCatalogueManagerThread;
 import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogue;
-import org.gcube.datacatalogue.ckanutillibrary.server.models.ResourceBean;
+import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean;
 import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg;
 import org.slf4j.LoggerFactory;