From d3080c4052221c8e1139c9bf99796b0b84a419c5 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Mon, 17 Dec 2018 15:07:07 +0000
Subject: [PATCH] ref 13024: DataMiner - The service must support the https
 protocol

https://support.d4science.org/issues/13024

Updated DataMiner now support https

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/DataMiner@174936 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                         |  1 +
 .project                                           | 13 +++++++++++++
 .settings/org.eclipse.wst.common.component         |  6 ++++++
 .../org.eclipse.wst.common.project.facet.core.xml  |  5 +++++
 .settings/org.eclipse.wst.validation.prefs         |  2 ++
 distro/changelog.xml                               |  3 +++
 pom.xml                                            |  2 +-
 .../mapping/dataspace/DataspaceManager.java        |  2 +-
 .../templates/wpsCapabilitiesSkeleton.xml          | 14 +++++++-------
 9 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 .settings/org.eclipse.wst.common.component
 create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 .settings/org.eclipse.wst.validation.prefs

diff --git a/.classpath b/.classpath
index daab569..50e1776 100644
--- a/.classpath
+++ b/.classpath
@@ -14,6 +14,7 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
diff --git a/.project b/.project
index a0b3079..c4ad331 100644
--- a/.project
+++ b/.project
@@ -5,11 +5,21 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -17,7 +27,10 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..512a753
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="dataminer">
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+    </wb-module>
+</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..fb95c45
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 67328df..400a746 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,7 @@
 <ReleaseNotes>
+	<Changeset component="${groupId}.${artifactId}.1-5-6" date="2018-12-13">
+		<Change>Added https support [ticket #13024]</Change>
+	</Changeset>
     <Changeset component="${groupId}.${artifactId}.1-5-2" date="2017-12-13">
 		<Change>added the right extension on output file</Change>
 		<Change>lock file created on execution</Change>
diff --git a/pom.xml b/pom.xml
index f9f4a89..1173ca6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.gcube.dataanalysis</groupId>
 	<artifactId>dataminer</artifactId>
-	<version>1.5.5-SNAPSHOT</version>
+	<version>1.5.6-SNAPSHOT</version>
 	<name>dataminer</name>
 	<description>An e-Infrastructure service providing state-of-the art DataMining algorithms and ecological modelling approaches under the Web Processing Service (WPS) standard.</description>
 	<scm>
diff --git a/src/main/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/mapping/dataspace/DataspaceManager.java b/src/main/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/mapping/dataspace/DataspaceManager.java
index 5f01feb..cd2993c 100644
--- a/src/main/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/mapping/dataspace/DataspaceManager.java
+++ b/src/main/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/mapping/dataspace/DataspaceManager.java
@@ -464,7 +464,7 @@ public class DataspaceManager implements Runnable {
 		gcubeItem.setDescription(computation.operatorDescription);
 		gcubeItem.setScopes(scopes.toArray(new String[scopes.size()]));
 		gcubeItem.setItemType(itemType);
-		gcubeItem.setPropertyMap(new Metadata(properties));
+		gcubeItem.setMetadata(new Metadata(properties));
 		gcubeItem.setCreator(AuthorizationProvider.instance.get().getClient().getId());
 
 		computationsContainer.newGcubeItem(gcubeItem);
diff --git a/src/main/resources/templates/wpsCapabilitiesSkeleton.xml b/src/main/resources/templates/wpsCapabilitiesSkeleton.xml
index a183a57..8c1499f 100644
--- a/src/main/resources/templates/wpsCapabilitiesSkeleton.xml
+++ b/src/main/resources/templates/wpsCapabilitiesSkeleton.xml
@@ -20,7 +20,7 @@
 	</ows:ServiceIdentification>
 	<ows:ServiceProvider>
 		<ows:ProviderName>D4Science</ows:ProviderName>
-		<ows:ProviderSite xlink:href="www.d4science.org" />
+		<ows:ProviderSite xlink:href="https://www.d4science.org" />
 		<ows:ServiceContact>
 			<ows:IndividualName>Gianpaolo Coro</ows:IndividualName>
 			<ows:PositionName>Researcher</ows:PositionName>
@@ -43,24 +43,24 @@
 		<ows:Operation name="GetCapabilities">
 			<ows:DCP>
 				<ows:HTTP>
-					<ows:Get xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" />
-					<ows:Post xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" />
+					<ows:Get xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
+					<ows:Post xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
 				</ows:HTTP>
 			</ows:DCP>
 		</ows:Operation>
 		<ows:Operation name="DescribeProcess">
 			<ows:DCP>
 				<ows:HTTP>
-					<ows:Get xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" />
-					<ows:Post xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" />
+					<ows:Get xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
+					<ows:Post xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
 				</ows:HTTP>
 			</ows:DCP>
 		</ows:Operation>
 		<ows:Operation name="Execute">
 			<ows:DCP>
 				<ows:HTTP>
-					<ows:Get xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" />
-					<ows:Post xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" />
+					<ows:Get xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
+					<ows:Post xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
 				</ows:HTTP>
 			</ows:DCP>
 		</ows:Operation>