From 04867bfba0892756f63a2096f82b34289deae614 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 27 Mar 2017 16:55:23 +0000 Subject: [PATCH] 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 --- .classpath | 4 ++-- distro/changelog.xml | 7 ++++++- pom.xml | 2 +- .../dataminermanager/server/dmservice/SClient4WPS.java | 9 +++++++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.classpath b/.classpath index 5990e91..7b2753e 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -26,5 +26,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index fd9b59b..5788961 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,9 +1,14 @@ + + Fixed load balancing [ticket #7576] + Updated PortalContext [ticket #6278] Added encoded parameters in equivalent http request [ticket - #7167] + #7167] + diff --git a/pom.xml b/pom.xml index 6eb8408..ba2e1b6 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user data-miner-manager - 1.3.0-SNAPSHOT + 1.4.0-SNAPSHOT war data-miner-manager diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPS.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPS.java index 119c5ed..a20aa6d 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPS.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPS.java @@ -15,6 +15,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import net.opengis.ows.x11.OperationDocument.Operation; import net.opengis.wps.x100.CapabilitiesDocument; import net.opengis.wps.x100.ComplexDataType; import net.opengis.wps.x100.ExecuteDocument; @@ -354,6 +355,14 @@ public class SClient4WPS extends SClient { CapabilitiesDocument capabilitiesDocument = wpsClient .getWPSCaps(wpsProcessingServlet); + Operation[] operations = capabilitiesDocument.getCapabilities() + .getOperationsMetadata().getOperationArray(); + for (Operation operation : operations) { + operation.getDCPArray()[0].getHTTP().getPostArray()[0] + .setHref(wpsProcessingServlet + "?"); + + } + processesBriefs = capabilitiesDocument.getCapabilities() .getProcessOfferings().getProcessArray(); return;