From 24fc97c02dfc8eefa0bdc163360691c45a22e706 Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Wed, 12 Oct 2016 12:49:27 +0000
Subject: [PATCH] added 'envirnoment' property to Fishery model

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133122 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../json/input/FisheryRecord.java             | 20 +++++++++++++++++--
 src/main/webapp/WEB-INF/web.xml               |  6 ++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java
index 73b5537..fff5a26 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java
@@ -62,6 +62,10 @@ public class FisheryRecord extends Common{
 	@CustomField(key="Status")
 	private Status status;
 
+	@JsonProperty("environment")
+	@CustomField(key="Environment")
+	private String environment;
+
 	public FisheryRecord() {
 		super();
 	}
@@ -77,12 +81,14 @@ public class FisheryRecord extends Common{
 	 * @param productionSystemType
 	 * @param flagState
 	 * @param fishingGear
+	 * @param status
+	 * @param environment
 	 */
 	public FisheryRecord(String fisheryName, String fisheryId,
 			String scientificName, String fishingArea, String exploitingStocks,
 			String managementEntity, String jurisdictionArea,
 			Production_System_Type productionSystemType, String flagState,
-			String fishingGear) {
+			String fishingGear, Status status, String environment) {
 		super();
 		this.fisheryName = fisheryName;
 		this.fisheryId = fisheryId;
@@ -94,6 +100,8 @@ public class FisheryRecord extends Common{
 		this.productionSystemType = productionSystemType;
 		this.flagState = flagState;
 		this.fishingGear = fishingGear;
+		this.status = status;
+		this.environment = environment;
 	}
 
 	public String getFisheryName() {
@@ -184,6 +192,14 @@ public class FisheryRecord extends Common{
 		this.status = status;
 	}
 
+	public String getEnvironment() {
+		return environment;
+	}
+
+	public void setEnvironment(String environment) {
+		this.environment = environment;
+	}
+
 	@Override
 	public String toString() {
 		return "FisheryRecord [" + super.toString() + ", fisheryName=" + fisheryName + ", fisheryId="
@@ -193,7 +209,7 @@ public class FisheryRecord extends Common{
 				+ ", jurisdictionArea=" + jurisdictionArea
 				+ ", productionSystemType=" + productionSystemType
 				+ ", flagState=" + flagState + ", fishingGear=" + fishingGear
-				+ ", status=" + status + "]";
+				+ ", status=" + status + ", environment=" + environment + "]";
 	}
 
 }
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 06ba4ab..d550bc7 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -28,13 +28,15 @@
 		<description>Scope of pending products</description>
 		<param-name>PendingContext</param-name>
 		<!-- <param-value>/d4science.research-infrastructures.eu/FARM/GRSF</param-value> -->
-		<param-value>/gcube/devNext/NextNext</param-value>
+		<!-- <param-value>/gcube/devNext/NextNext</param-value> -->
+		<param-value>/gcube/preprod/Dorne</param-value>
 	</context-param>
 
 	<context-param>
 		<description>Scope of confirmed products</description>
 		<param-name>ConfirmedContext</param-name>
 		<!-- <param-value>/d4science.research-infrastructures.eu/FARM/GRSFAccepted</param-value> -->
-		<param-value>/gcube/devNext/NextNext</param-value>
+		<!-- <param-value>/gcube/devNext/NextNext</param-value> -->
+		<param-value>/gcube/preprod/Dorne</param-value>
 	</context-param>
 </web-app>