gCubeSystem
/
dataminer
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

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
This commit is contained in:
Giancarlo Panichi 2018-12-17 15:07:07 +00:00
parent 34d131b900
commit d3080c4052
9 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -14,6 +14,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"> <classpathentry kind="src" output="target/test-classes" path="src/test/java">

13
.project
View File

@ -5,11 +5,21 @@
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name> <name>org.eclipse.jdt.core.javabuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name> <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments> <arguments>
@ -17,7 +27,10 @@
</buildCommand> </buildCommand>
</buildSpec> </buildSpec>
<natures> <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.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

6
.settings/org.eclipse.wst.common.component Normal file
View File

@ -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>

5
.settings/org.eclipse.wst.common.project.facet.core.xml Normal file
View File

@ -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>

2
.settings/org.eclipse.wst.validation.prefs Normal file
View File

@ -0,0 +1,2 @@
disabled=06target
eclipse.preferences.version=1

3
distro/changelog.xml
View File

@ -1,4 +1,7 @@
<ReleaseNotes> <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"> <Changeset component="${groupId}.${artifactId}.1-5-2" date="2017-12-13">
<Change>added the right extension on output file</Change> <Change>added the right extension on output file</Change>
<Change>lock file created on execution</Change> <Change>lock file created on execution</Change>

2
pom.xml
View File

@ -9,7 +9,7 @@
</parent> </parent>
<groupId>org.gcube.dataanalysis</groupId> <groupId>org.gcube.dataanalysis</groupId>
<artifactId>dataminer</artifactId> <artifactId>dataminer</artifactId>
<version>1.5.5-SNAPSHOT</version> <version>1.5.6-SNAPSHOT</version>
<name>dataminer</name> <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> <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> <scm>

2
src/main/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/mapping/dataspace/DataspaceManager.java
View File

@ -464,7 +464,7 @@ public class DataspaceManager implements Runnable {
gcubeItem.setDescription(computation.operatorDescription); gcubeItem.setDescription(computation.operatorDescription);
gcubeItem.setScopes(scopes.toArray(new String[scopes.size()])); gcubeItem.setScopes(scopes.toArray(new String[scopes.size()]));
gcubeItem.setItemType(itemType); gcubeItem.setItemType(itemType);
gcubeItem.setPropertyMap(new Metadata(properties)); gcubeItem.setMetadata(new Metadata(properties));
gcubeItem.setCreator(AuthorizationProvider.instance.get().getClient().getId()); gcubeItem.setCreator(AuthorizationProvider.instance.get().getClient().getId());
computationsContainer.newGcubeItem(gcubeItem); computationsContainer.newGcubeItem(gcubeItem);

14
src/main/resources/templates/wpsCapabilitiesSkeleton.xml
View File

@ -20,7 +20,7 @@
</ows:ServiceIdentification> </ows:ServiceIdentification>
<ows:ServiceProvider> <ows:ServiceProvider>
<ows:ProviderName>D4Science</ows:ProviderName> <ows:ProviderName>D4Science</ows:ProviderName>
<ows:ProviderSite xlink:href="www.d4science.org" /> <ows:ProviderSite xlink:href="https://www.d4science.org" />
<ows:ServiceContact> <ows:ServiceContact>
<ows:IndividualName>Gianpaolo Coro</ows:IndividualName> <ows:IndividualName>Gianpaolo Coro</ows:IndividualName>
<ows:PositionName>Researcher</ows:PositionName> <ows:PositionName>Researcher</ows:PositionName>
@ -43,24 +43,24 @@
<ows:Operation name="GetCapabilities"> <ows:Operation name="GetCapabilities">
<ows:DCP> <ows:DCP>
<ows:HTTP> <ows:HTTP>
<ows:Get xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" /> <ows:Get xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
<ows:Post xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" /> <ows:Post xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
</ows:HTTP> </ows:HTTP>
</ows:DCP> </ows:DCP>
</ows:Operation> </ows:Operation>
<ows:Operation name="DescribeProcess"> <ows:Operation name="DescribeProcess">
<ows:DCP> <ows:DCP>
<ows:HTTP> <ows:HTTP>
<ows:Get xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" /> <ows:Get xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
<ows:Post xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" /> <ows:Post xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
</ows:HTTP> </ows:HTTP>
</ows:DCP> </ows:DCP>
</ows:Operation> </ows:Operation>
<ows:Operation name="Execute"> <ows:Operation name="Execute">
<ows:DCP> <ows:DCP>
<ows:HTTP> <ows:HTTP>
<ows:Get xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" /> <ows:Get xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
<ows:Post xlink:href="http://#HOST#:#PORT#/wps/WebProcessingService?" /> <ows:Post xlink:href="#PROTOCOL#://#HOST#:#PORT#/wps/WebProcessingService?" />
</ows:HTTP> </ows:HTTP>
</ows:DCP> </ows:DCP>
</ows:Operation> </ows:Operation>