From 7dd1a03b41e0dafb0304838945091b1c11386b77 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 17 Nov 2021 11:34:47 +0100
Subject: [PATCH] #22369 Including the bug fix for Policy and LicenseID in the
 geoportal-common

---
 .classpath                                    |  6 +--
 .../com.gwtplugins.gdt.eclipse.core.prefs     |  2 +-
 .settings/org.eclipse.wst.common.component    | 50 ++++++++++++++-----
 CHANGELOG.md                                  |  5 ++
 pom.xml                                       |  2 +-
 .../server/ConvertToServiceModel.java         |  4 ++
 6 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/.classpath b/.classpath
index 75ff1cc..e619cfc 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/geoportal-data-entry-app-2.0.0/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/geoportal-data-entry-app-2.0.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/geoportal-data-entry-app-2.0.0/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/geoportal-data-entry-app-2.0.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -35,5 +35,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/geoportal-data-entry-app-2.0.0/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/geoportal-data-entry-app-2.0.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index 53eb894..384836d 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0
+lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.1-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index c342780..b922d7e 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                            	
+                                                                        	
     
     
     
@@ -14,8 +14,14 @@
     
     
     
-    <wb-module deploy-name="geoportal-data-entry-app-2.0.0-SNAPSHOT">
-                                                                                                                        		
+    
+    
+    
+    <wb-module deploy-name="geoportal-data-entry-app-2.0.1-SNAPSHOT">
+                                                                                                                                                		
+        
+        
+        
         
         
         
@@ -31,7 +37,10 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                        		
+                                                                                                                                                		
+        
+        
+        
         
         
         
@@ -47,7 +56,10 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                        		
+                                                                                                                                                		
+        
+        
+        
         
         
         
@@ -63,7 +75,10 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                        		
+                                                                                                                                                		
+        
+        
+        
         
         
         
@@ -79,10 +94,10 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="geoportal-data-common-1.2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-                                                                                                                                
+                                                                                                                                                        
+        
+        
+        
         
         
         
@@ -98,7 +113,10 @@
         
         
         <property name="context-root" value="geoportal-data-entry-app"/>
-                                                                                                                        		
+                                                                                                                                                		
+        
+        
+        
         
         
         
@@ -114,7 +132,10 @@
         
         
         <property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                        	
+                                                                                                                                                	
+    
+    
+    
     
     
     
@@ -130,7 +151,10 @@
     
     
     </wb-module>
-                                                            
+                                                                        
+
+
+
 
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ccdd19..018334a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.0.1-SNAPSHOT] - 2021-11-17
+
+- [#22369] Just to include the bug fix for Policy and LicenseID in the geoportal-common
+
+
 ## [v2.0.0] - 2021-09-29
 
 #### Enhancements
diff --git a/pom.xml b/pom.xml
index 5a3031e..a7f1e32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>geoportal-data-entry-app</artifactId>
 	<packaging>war</packaging>
-	<version>2.0.0</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<name>GeoPortal Data Entry App</name>
 	<description>The GeoPortal Data Entry App is an application to build the web forms for data entries needed to GeoNa project</description>
 	<scm>
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java
index d6ee1ac..cb19a36 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java
@@ -211,9 +211,11 @@ public class ConvertToServiceModel {
 		}
 
 		List<String> politicaDiAccessoLst = mapFields.get("Politica di accesso");
+		LOG.debug("Relazione di Scavo: Politica di accesso lst: "+politicaDiAccessoLst);
 		if (politicaDiAccessoLst != null && politicaDiAccessoLst.size() > 0) {
 			try {
 				AccessPolicy ap = AccessPolicy.valueOf(politicaDiAccessoLst.get(0));
+				LOG.debug("Relazione di Scavo: AccessPolicy: "+ap);
 				relazioneScavo.setPolicy(ap);
 			} catch (Exception e) {
 				LOG.warn("I cannot cast " + politicaDiAccessoLst.get(0) + " to " + AccessPolicy.values(), e);
@@ -222,7 +224,9 @@ public class ConvertToServiceModel {
 
 		List<String> licenzaIdList = mapFields.get("ID Licenza");
 		if (licenzaIdList != null && licenzaIdList.size() > 0) {
+			LOG.debug("Relazione di Scavo: ID Licenza lst: "+licenzaIdList);
 			relazioneScavo.setLicenseID(licenzaIdList.get(0));
+			LOG.debug("Relazione di Scavo: ID Licenza: "+relazioneScavo.getLicenseID());
 		}
 
 		// TODO