gCubeSystem
/
data-miner-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ref 7576:DataMiner - Investigate if the wps-client-library cache dataminer service assigned for execution 

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

Fixed load balancing

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@146371 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2017-03-27 16:55:23 +00:00
parent 26ff897e81
commit 04867bfba0
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src/main/java"> <classpathentry kind="src" output="target/data-miner-manager-1.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
@ -26,5 +26,5 @@
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/data-miner-manager-1.3.0-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="output" path="target/data-miner-manager-1.4.0-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

7
distro/changelog.xml
View File

@ -1,9 +1,14 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="org.gcube.portlets-user.data-miner-manager.1-4-0"
date="2016-02-15">
<Change>Fixed load balancing [ticket #7576]</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.data-miner-manager.1-3-0" <Changeset component="org.gcube.portlets-user.data-miner-manager.1-3-0"
date="2016-02-15"> date="2016-02-15">
<Change>Updated PortalContext [ticket #6278]</Change> <Change>Updated PortalContext [ticket #6278]</Change>
<Change>Added encoded parameters in equivalent http request [ticket <Change>Added encoded parameters in equivalent http request [ticket
#7167]</Change> #7167]
</Change>
</Changeset> </Changeset>
<Changeset component="org.gcube.portlets-user.data-miner-manager.1-2-0" <Changeset component="org.gcube.portlets-user.data-miner-manager.1-2-0"
date="2016-12-01"> date="2016-12-01">

2
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>data-miner-manager</artifactId> <artifactId>data-miner-manager</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.4.0-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>data-miner-manager</name> <name>data-miner-manager</name>

9
src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPS.java
View File

@ -15,6 +15,7 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import net.opengis.ows.x11.OperationDocument.Operation;
import net.opengis.wps.x100.CapabilitiesDocument; import net.opengis.wps.x100.CapabilitiesDocument;
import net.opengis.wps.x100.ComplexDataType; import net.opengis.wps.x100.ComplexDataType;
import net.opengis.wps.x100.ExecuteDocument; import net.opengis.wps.x100.ExecuteDocument;
@ -354,6 +355,14 @@ public class SClient4WPS extends SClient {
CapabilitiesDocument capabilitiesDocument = wpsClient CapabilitiesDocument capabilitiesDocument = wpsClient
.getWPSCaps(wpsProcessingServlet); .getWPSCaps(wpsProcessingServlet);
Operation[] operations = capabilitiesDocument.getCapabilities()
.getOperationsMetadata().getOperationArray();
for (Operation operation : operations) {
operation.getDCPArray()[0].getHTTP().getPostArray()[0]
.setHref(wpsProcessingServlet + "?");
}
processesBriefs = capabilitiesDocument.getCapabilities() processesBriefs = capabilitiesDocument.getCapabilities()
.getProcessOfferings().getProcessArray(); .getProcessOfferings().getProcessArray();
return; return;