From 9d435d4f26948c4494b41346936742abebb1c6d5 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Wed, 12 Oct 2016 14:30:52 +0000 Subject: [PATCH] minor fixes git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133146 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../grsf_publish_ws/json/input/FisheryRecord.java | 4 ++-- .../grsf_publish_ws/json/input/StockRecord.java | 4 ++-- src/main/webapp/WEB-INF/web.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 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 23acb1c..08c0de1 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 @@ -30,8 +30,8 @@ public class FisheryRecord extends Common{ @CustomField(key="Fishing area") private String fishingArea; - @JsonProperty("exploiting_stocks") - @CustomField(key="Exploiting stocks") + @JsonProperty("exploited_stocks") + @CustomField(key="Exploited stocks") private String exploitingStocks; @JsonProperty("management_entity") diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java index aa6476f..c4bb7fe 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java @@ -27,8 +27,8 @@ public class StockRecord extends Common{ @CustomField(key="Species scientific name") private String speciesScientificName; - @JsonProperty("area") - @CustomField(key="Area") + @JsonProperty("assessment_distribution_area") + @CustomField(key="Assessment distribution area") private String area; @JsonProperty("exploiting_fishery") diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d550bc7..cc9da5c 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -29,7 +29,7 @@ PendingContext - /gcube/preprod/Dorne + @@ -37,6 +37,6 @@ ConfirmedContext - /gcube/preprod/Dorne +