diff --git a/.classpath b/.classpath index daab569..50e1776 100644 --- a/.classpath +++ b/.classpath @@ -14,6 +14,7 @@ + diff --git a/.project b/.project index a0b3079..c4ad331 100644 --- a/.project +++ b/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -17,7 +27,10 @@ + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature 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 @@ + + + + + + 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 @@ + + + + + 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 @@ + + Added https support [ticket #13024] + added the right extension on output file lock file created on execution diff --git a/pom.xml b/pom.xml index f9f4a89..1173ca6 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.dataanalysis dataminer - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT dataminer An e-Infrastructure service providing state-of-the art DataMining algorithms and ecological modelling approaches under the Web Processing Service (WPS) standard. 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 @@ D4Science - + Gianpaolo Coro Researcher @@ -43,24 +43,24 @@ - - + + - - + + - - + +