From af6b71611deaa657728f1bbd697c36280caa84e6 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 10 May 2018 14:45:21 +0000
Subject: [PATCH] Fixed project properties

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@167395 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                                   | 1 +
 .settings/org.eclipse.wst.common.component                   | 5 ++++-
 .settings/org.eclipse.wst.common.project.facet.core.xml      | 2 +-
 .../gcube/data_catalogue/grsf_publish_ws/JJerseyTest.java    | 2 +-
 .../org/gcube/data_catalogue/grsf_publish_ws/JTests.java     | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.classpath b/.classpath
index bb7158c..031616a 100644
--- a/.classpath
+++ b/.classpath
@@ -15,6 +15,7 @@
 	<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="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 671fd1c..a3d41d4 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,7 +3,10 @@
         <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="grsf-common-library-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-common-library/grsf-common-library">
+        <dependent-module archiveName="grsf-common-library-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-common-library/grsf-common-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="ckan-util-library-2.5.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"/>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 25d173a..8650c09 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="jst.jaxrs" version="2.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="1.8"/>
 </faceted-project>
diff --git a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JJerseyTest.java b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JJerseyTest.java
index f3fa428..36074ae 100644
--- a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JJerseyTest.java
+++ b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JJerseyTest.java
@@ -36,7 +36,7 @@ public class JJerseyTest extends JerseyTest{
 		recordFishery.setAuthorContact("costantino.perciante@isti.cnr.it");
 		recordFishery.setLicense("a caso una lincense");
 		recordFishery.setDataOwner(Arrays.asList("data owner"));
-		recordFishery.setType(Fishery_Type.Fishing_Description);
+		recordFishery.setType(Fishery_Type.Other_Fishery);
 		recordFishery.setDatabaseSources(new ArrayList<Resource<Sources>>(1));
 		recordFishery.setSourceOfInformation(new ArrayList<Resource<String>>(1));
 		recordFishery.setStatus(Status.Pending);
diff --git a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java
index a5c3c9e..307ba20 100644
--- a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java
+++ b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java
@@ -52,7 +52,7 @@ public class JTests {
 	public void test() throws IllegalArgumentException, IllegalAccessException, InvocationTargetException, IntrospectionException {
 
 		FisheryRecord recordFishery = new FisheryRecord();
-		recordFishery.setType(Fishery_Type.Fishing_Description);
+		recordFishery.setType(Fishery_Type.Other_Fishery);
 		recordFishery.setDatabaseSources(new ArrayList<Resource<Sources>>());
 		recordFishery.setStatus(Status.Pending);