From 53d7e78a961f97aca402a3c93fa3ecab0427f90a Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 23 Apr 2020 11:27:09 +0200 Subject: [PATCH 01/32] ref 18289: the latest wps doesn't work https://support.d4science.org/issues/18289 Rebuild Snapshot --- .classpath | 10 ---------- pom.xml | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.classpath b/.classpath index 6acf3ee..3a44611 100644 --- a/.classpath +++ b/.classpath @@ -6,22 +6,12 @@ - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 908b709..e33fc51 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.gcube.data-analysis wps - 1.1.5 + 1.1.5-SNAPSHOT WPS A service implementing a WPS provider in the D4Science e-Infrastructure From 391322b14960641b72a19ea3a6c672174ee6e4ab Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 5 Jun 2020 15:40:32 +0200 Subject: [PATCH 02/32] ref 19129: DataMiner portlet still returns... https://support.d4science.org/issues/19129 Updated ExecuteResponseBuilder for support protocol option --- changelog.md | 44 +++ changelog.xml | 5 +- .../analysis/wps/ExecuteResponseBuilder.java | 293 ++++++++++-------- 3 files changed, 207 insertions(+), 135 deletions(-) create mode 100644 changelog.md diff --git a/changelog.md b/changelog.md new file mode 100644 index 0000000..042bc13 --- /dev/null +++ b/changelog.md @@ -0,0 +1,44 @@ +# Changelog + +All notable changes to this project will be documented in this file. +This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + + +## [v1-1-5] [r4.24.0] - 2020-06-05 + +### Changed + +**Fixes** + +[#19129] Updated ExecuteResponseBuilder for support protocol option + +[#18120] Updated to Git and Jenkins + + + +## [v1-1-3] - 2018-12-13 + +### Added + +**Features** + +Added https support [ticket #13024] + + + +## [v1-1-0] - 2017-09-24 + +### Added + +**Features** + +Dynamic adding, removing and updating of algorithms added + +Moved to SocialNetworkingService 2.0 + + + +## [v1-0-0] - 2017-09-01 + +First Release + diff --git a/changelog.xml b/changelog.xml index e4e1858..5f09118 100644 --- a/changelog.xml +++ b/changelog.xml @@ -1,7 +1,8 @@ - Updated to Git and Jenkins [ticket #18120] + date="2020-06-05"> + [#19129] Updated ExecuteResponseBuilder for support protocol option + [#18120] Updated to Git and Jenkins diff --git a/src/main/java/org/gcube/data/analysis/wps/ExecuteResponseBuilder.java b/src/main/java/org/gcube/data/analysis/wps/ExecuteResponseBuilder.java index cd01948..cca3510 100644 --- a/src/main/java/org/gcube/data/analysis/wps/ExecuteResponseBuilder.java +++ b/src/main/java/org/gcube/data/analysis/wps/ExecuteResponseBuilder.java @@ -1,4 +1,5 @@ package org.gcube.data.analysis.wps; + import java.io.InputStream; import java.net.Inet4Address; import java.net.UnknownHostException; @@ -19,6 +20,7 @@ import net.opengis.wps.x100.ProcessDescriptionType; import net.opengis.wps.x100.StatusType; import org.apache.xmlbeans.XmlCursor; +import org.n52.wps.ServerDocument.Server; import org.n52.wps.commons.WPSConfig; import org.n52.wps.io.data.IBBOXData; import org.n52.wps.io.data.IData; @@ -33,10 +35,24 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * WPS Execute operation response. By default, this XML document is delivered to the client in response to an Execute request. If "status" is "false" in the Execute operation request, this document is normally returned when process execution has been completed. - * If "status" in the Execute request is "true", this response shall be returned as soon as the Execute request has been accepted for processing. In this case, the same XML document is also made available as a web-accessible resource from the URL identified in the statusLocation, and the WPS server shall repopulate it once the process has completed. It may repopulate it on an ongoing basis while the process is executing. - * However, the response to an Execute request will not include this element in the special case where the output is a single complex value result and the Execute request indicates that "store" is "false". - * Instead, the server shall return the complex result (e.g., GIF image or GML) directly, without encoding it in the ExecuteResponse. If processing fails in this special case, the normal ExecuteResponse shall be sent, with the error condition indicated. This option is provided to simplify the programming required for simple clients and for service chaining. + * WPS Execute operation response. By default, this XML document is delivered to + * the client in response to an Execute request. If "status" is "false" in the + * Execute operation request, this document is normally returned when process + * execution has been completed. If "status" in the Execute request is "true", + * this response shall be returned as soon as the Execute request has been + * accepted for processing. In this case, the same XML document is also made + * available as a web-accessible resource from the URL identified in the + * statusLocation, and the WPS server shall repopulate it once the process has + * completed. It may repopulate it on an ongoing basis while the process is + * executing. However, the response to an Execute request will not include this + * element in the special case where the output is a single complex value result + * and the Execute request indicates that "store" is "false". Instead, the + * server shall return the complex result (e.g., GIF image or GML) directly, + * without encoding it in the ExecuteResponse. If processing fails in this + * special case, the normal ExecuteResponse shall be sent, with the error + * condition indicated. This option is provided to simplify the programming + * required for simple clients and for service chaining. + * * @author Timon ter Braak * */ @@ -44,7 +60,7 @@ public class ExecuteResponseBuilder { private String identifier; private DataInputsType dataInputs; - //private DocumentOutputDefinitionType[] outputDefs; + // private DocumentOutputDefinitionType[] outputDefs; private ExecuteRequest request; private ExecuteResponseDocument doc; private RawData rawDataHandler = null; @@ -53,10 +69,8 @@ public class ExecuteResponseBuilder { private Calendar creationTime; String webPath; String webStatus; - - - - public ExecuteResponseBuilder(ExecuteRequest request) throws ExceptionReport{ + + public ExecuteResponseBuilder(ExecuteRequest request) throws ExceptionReport { LOGGER.debug("Building Doc"); this.request = request; doc = ExecuteResponseDocument.Factory.newInstance(); @@ -64,46 +78,61 @@ public class ExecuteResponseBuilder { XmlCursor c = doc.newCursor(); c.toFirstChild(); c.toLastAttribute(); - c.setAttributeText(new QName(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "schemaLocation"), "http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsExecute_response.xsd"); - - String webapp = WPSConfig.getInstance().getWPSConfig().getServer().getWebappPath(); + c.setAttributeText(new QName(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "schemaLocation"), + "http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsExecute_response.xsd"); + + Server docServer = WPSConfig.getInstance().getWPSConfig().getServer(); + + String webapp = docServer.getWebappPath(); if (webapp == null) webapp = "wps"; - String host = WPSConfig.getInstance().getWPSConfig().getServer().getHostname(); + String host = docServer.getHostname(); if (host.toLowerCase().equals("localhost")) try { host = Inet4Address.getLocalHost().getHostAddress(); } catch (UnknownHostException e) { - LOGGER.error("error",e); + LOGGER.error("error", e); } - - String port = WPSConfig.getInstance().getWPSConfig().getServer().getHostport(); - LOGGER.debug("Host: " + host + " Port: " + port + " Webapp: " + webapp + " "); - webPath = "http://" + host + ":" + port + "/" + webapp + "/WebProcessingService"; - webStatus = "http://" + host + ":" + port + "/" + webapp + "/RetrieveResultServlet"; - - //statistical-manager-new.d4science.org:8080/wps/WebProcessingService?Request=GetCapabilities&Service=WPS - -// doc.getExecuteResponse().setServiceInstance(webPath+"?REQUEST=GetCapabilities&SERVICE=WPS"); + + String port = docServer.getHostport(); + + String protocol = docServer.getProtocol(); + + if (protocol == null || protocol.isEmpty()) { + LOGGER.info("Protocol not found, use https in default mode."); + protocol = "https"; + } + + LOGGER.debug("Service Config: [Protocol: {}, Host: {} , Port: {}, Webapp: {} ]", protocol, host, port, webapp); + webPath = protocol + "://" + host + ":" + port + "/" + webapp + "/WebProcessingService"; + webStatus = protocol + "://" + host + ":" + port + "/" + webapp + "/RetrieveResultServlet"; + + LOGGER.debug("WebPath: {}", webPath); + LOGGER.debug("WebStatus: {}", webStatus); + + // statistical-manager-new.d4science.org:8080/wps/WebProcessingService?Request=GetCapabilities&Service=WPS + + // doc.getExecuteResponse().setServiceInstance(webPath+"?REQUEST=GetCapabilities&SERVICE=WPS"); doc.getExecuteResponse().setServiceInstance(webPath); doc.getExecuteResponse().setLang(WebProcessingService.DEFAULT_LANGUAGE); doc.getExecuteResponse().setService("WPS"); doc.getExecuteResponse().setVersion(Request.SUPPORTED_VERSION); - + LOGGER.debug("Doc attributes set"); - + this.identifier = request.getExecute().getIdentifier().getStringValue().trim(); - LOGGER.debug("Identifier: "+identifier); + LOGGER.debug("Identifier: " + identifier); ExecuteResponse responseElem = doc.getExecuteResponse(); responseElem.addNewProcess().addNewIdentifier().setStringValue(identifier); - - LOGGER.debug("Getting description for "+identifier); - + + LOGGER.debug("Getting description for " + identifier); + description = RepositoryManager.getInstance().getProcessDescription(this.identifier); - - LOGGER.debug("Description "+description); - if(description==null){ -// throw new RuntimeException("Error while accessing the process description for "+ identifier); + + LOGGER.debug("Description " + description); + if (description == null) { + // throw new RuntimeException("Error while accessing the process + // description for "+ identifier); } responseElem.getProcess().setTitle(description.getTitle()); @@ -118,9 +147,11 @@ public class ExecuteResponseBuilder { // if status succeeded, update reponse with result if (responseElem.getStatus().isSetProcessSucceeded()) { - // the response only include dataInputs, if the property is set to true; - //if(Boolean.getBoolean(WPSConfiguration.getInstance().getProperty(WebProcessingService.PROPERTY_NAME_INCLUDE_DATAINPUTS_IN_RESPONSE))) { - if(new Boolean(WPSConfig.getInstance().getWPSConfig().getServer().getIncludeDataInputsInResponse())){ + // the response only include dataInputs, if the property is set to + // true; + // if(Boolean.getBoolean(WPSConfiguration.getInstance().getProperty(WebProcessingService.PROPERTY_NAME_INCLUDE_DATAINPUTS_IN_RESPONSE))) + // { + if (new Boolean(WPSConfig.getInstance().getWPSConfig().getServer().getIncludeDataInputsInResponse())) { dataInputs = request.getExecute().getDataInputs(); responseElem.setDataInputs(dataInputs); } @@ -130,11 +161,11 @@ public class ExecuteResponseBuilder { // Get the outputdescriptions from the algorithm OutputDescriptionType[] outputDescs = description.getProcessOutputs().getOutputArray(); - if(request.isRawData()) { + if (request.isRawData()) { OutputDefinitionType rawDataOutput = request.getExecute().getResponseForm().getRawDataOutput(); String id = rawDataOutput.getIdentifier().getStringValue(); OutputDescriptionType desc = XMLBeansHelper.findOutputByID(id, outputDescs); - if(desc.isSetComplexOutput()) { + if (desc.isSetComplexOutput()) { String encoding = ExecuteResponseBuilder.getEncoding(desc, rawDataOutput); String schema = ExecuteResponseBuilder.getSchema(desc, rawDataOutput); String responseMimeType = getMimeType(rawDataOutput); @@ -147,85 +178,89 @@ public class ExecuteResponseBuilder { String encoding = null; DomainMetadataType dataType = desc.getLiteralOutput().getDataType(); String reference = dataType != null ? dataType.getReference() : null; - generateLiteralDataOutput(id, doc, true, reference, schema, mimeType, encoding, desc.getTitle()); - } - else if (desc.isSetBoundingBoxOutput()) { + generateLiteralDataOutput(id, doc, true, reference, schema, mimeType, encoding, + desc.getTitle()); + } else if (desc.isSetBoundingBoxOutput()) { generateBBOXOutput(id, doc, true, desc.getTitle()); } return; } // Get the outputdefinitions from the clients request // For each request of output - for(int i = 0; i - [#19129] Updated ExecuteResponseBuilder for support protocol option - [#18120] Updated to Git and Jenkins + Updated ExecuteResponseBuilder for support protocol option [#19129] + Updated to Git and Jenkins [#18120] - Added https support [ticket #13024] + Added https support [#13024] From 2aecfe2a04fc3450c0271133722ac8781edb5a0f Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 10 Jun 2020 15:45:36 +0200 Subject: [PATCH 06/32] Renamed CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a0eeae..8c54feb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Fixes -- Updated ExecuteResponseBuilder for support protocol option [#19129] +- Updated ExecuteResponseBuilder for support protocol option [#19423] - Updated to Git and Jenkins [#18120] From c8608b1682c51cdc0617858888fac0300a4736de Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 10 Jun 2020 16:52:17 +0200 Subject: [PATCH 07/32] ref 19423: DataMiner - Update DataMiner Service in Dev for support https https://support.d4science.org/issues/19423 Updated for support https protocol --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c54feb..c6d193c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,5 @@ # Changelog -All notable changes to this project will be documented in this file. -This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [v1.1.5] [r4.24.0] - 2020-06-05 @@ -34,3 +32,5 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - First Release + +This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). From 2191e0387457dd9cd47ef893e8c4a1ce5177e291 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 11 Jun 2020 14:44:32 +0200 Subject: [PATCH 08/32] Updated descriptor.xml --- descriptor.xml | 1 + pom.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/descriptor.xml b/descriptor.xml index 779594a..43b4b2f 100644 --- a/descriptor.xml +++ b/descriptor.xml @@ -14,6 +14,7 @@ README.md LICENSE.md + CHANGELOG.md gcube-app.xml changelog.xml profile.xml diff --git a/pom.xml b/pom.xml index 5f47876..2ee0816 100644 --- a/pom.xml +++ b/pom.xml @@ -744,6 +744,7 @@ LICENSE.md README.md + CHANGELOG.md gcube-app.xml changelog.xml profile.xml From ceee470e7b4cc2d4e733796e03caf2347a6633ef Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 24 Jun 2020 12:03:15 +0200 Subject: [PATCH 09/32] ref 18120: org.gcube.data-analysis.wps.1-1-5 https://support.d4science.org/issues/18120 Updated for support https on repositories --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2ee0816..41dde84 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ n52-releases 52n Releases - http://52north.org/maven/repo/releases + https://52north.org/maven/repo/releases true @@ -45,17 +45,17 @@ Apache Apache repository - http://repo1.maven.org/maven2 + https://repo1.maven.org/maven2 geotools Geotools Repo - http://download.osgeo.org/webdav/geotools + https://download.osgeo.org/webdav/geotools true - true + false From 328ac6834c05048e75fcb61641841e7ad5634198 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 24 Jun 2020 16:14:25 +0200 Subject: [PATCH 10/32] Update 'pom.xml' added geosolution repo definition --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 41dde84..f572e89 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,19 @@ opengeo repository https://repo.boundlessgeo.com + + geosolutions + geosolution repository + http://maven.geo-solutions.it/ + + false + never + + + true + never + + From ef9432c914c2b2d8abe06d1f4269b3d835e31c53 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 24 Jun 2020 16:44:23 +0200 Subject: [PATCH 11/32] Added SCM to pom --- pom.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f572e89..4672d8c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,14 @@ war - + + + scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git + scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git + https://code-repo.d4science.org/gCubeSystem/${project.artifactId} + + + DataMiner WPS From b88d3407baaa06323595716e8b5aade4859eaf9e Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 7 Sep 2020 10:31:11 +0200 Subject: [PATCH 12/32] Update 'pom.xml' version increased to 1.1.6-SNAPSHOT in order to adopt the new bom for gcube-jackson integration. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4672d8c..0685309 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.gcube.data-analysis wps - 1.1.5 + 1.1.6-SNAPSHOT WPS A service implementing a WPS provider in the D4Science e-Infrastructure From ca48c34b9d134a756e2f0906e69981cf31c8acae Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 25 Sep 2020 16:25:56 +0200 Subject: [PATCH 13/32] Updated Dependency Management --- pom.xml | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 0685309..6d61962 100644 --- a/pom.xml +++ b/pom.xml @@ -15,14 +15,14 @@ war - + scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git https://code-repo.d4science.org/gCubeSystem/${project.artifactId} - - + + DataMiner WPS @@ -70,27 +70,30 @@ opengeo repository https://repo.boundlessgeo.com - - geosolutions - geosolution repository - http://maven.geo-solutions.it/ - - false - never - - - true - never - - + + geosolutions + geosolution repository + http://maven.geo-solutions.it/ + + false + never + + + true + never + + + org.gcube.distribution - maven-smartgears-bom - 2.1.0 + gcube-smartgears-bom + 2.0.0-SNAPSHOT pom import @@ -155,7 +158,7 @@ common-authorization provided - + org.gcube.core common-scope @@ -730,7 +733,7 @@ ${artifactId} - + org.apache.maven.plugins maven-war-plugin From 5f5e49f159901d84922bfa5a3b7f8cfeaa41c9b4 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 15 Oct 2020 14:59:11 +0200 Subject: [PATCH 14/32] Aggiornare 'CHANGELOG.md' Updated pom.xml for support gcube-bom-2.0.0-SNAPSHOT [#19790] --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6d193c..b058bcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [v1.1.6-SNAPSHOT] - 2020-10-15 + +### Features + +- Updated pom.xml for support gcube-bom-2.0.0-SNAPSHOT [#19790] ## [v1.1.5] [r4.24.0] - 2020-06-05 From 60fbd12103ec10230f40fcf72d7e1d8cebce2613 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 15 Oct 2020 15:00:41 +0200 Subject: [PATCH 15/32] Aggiornare 'changelog.xml' Updated pom.xml for support gcube-bom-2.0.0-SNAPSHOT [#19790] --- changelog.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.xml b/changelog.xml index 69d08f2..ee68be9 100644 --- a/changelog.xml +++ b/changelog.xml @@ -1,4 +1,8 @@ + + Updated pom.xml for support gcube-bom-2.0.0-SNAPSHOT [#19790] + Updated ExecuteResponseBuilder for support protocol option [#19129] From a4013ef423dafdde737b390f752f69f707d1dcc9 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 27 Oct 2020 12:45:05 +0100 Subject: [PATCH 16/32] Fix httpclient and httpcore to version 4.2.5 to support Ubuntu 18.04 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6d61962..45ca6fd 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,7 @@ org.apache.httpcomponents httpclient - 4.2.1 + 4.2.5 compile @@ -317,7 +317,7 @@ org.apache.httpcomponents httpcore - 4.2.1 + 4.2.5 org.apache.derby From 1caa52c10b3476759802e35d1997b36ae3e17a18 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 29 Oct 2020 15:26:34 +0100 Subject: [PATCH 17/32] Updated for release --- CHANGELOG.md | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b058bcc..f78ce4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,13 @@ # Changelog -## [v1.1.6-SNAPSHOT] - 2020-10-15 +## [v1.1.6] - 2020-10-15 ### Features - Updated pom.xml for support gcube-bom-2.0.0-SNAPSHOT [#19790] -## [v1.1.5] [r4.24.0] - 2020-06-05 +## [v1.1.5] - 2020-06-05 ### Fixes diff --git a/pom.xml b/pom.xml index 45ca6fd..ec25944 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.gcube.data-analysis wps - 1.1.6-SNAPSHOT + 1.1.6 WPS A service implementing a WPS provider in the D4Science e-Infrastructure From c324701620aaafb5278c7ee784d0f6a8374a1a39 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 2 Nov 2020 12:01:53 +0100 Subject: [PATCH 18/32] Fixed gcube-smartgears-bom version for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec25944..6205e89 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ org.gcube.distribution gcube-smartgears-bom - 2.0.0-SNAPSHOT + 2.0.0 pom import From 99366310660f75c09ddbfd1ba35fbabc73725fb8 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 11 Nov 2020 14:04:20 +0100 Subject: [PATCH 19/32] Update 'src/main/java/org/gcube/data/analysis/wps/ExecuteRequest.java' added printStackTrace on ExecuteRequest section --- src/main/java/org/gcube/data/analysis/wps/ExecuteRequest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/gcube/data/analysis/wps/ExecuteRequest.java b/src/main/java/org/gcube/data/analysis/wps/ExecuteRequest.java index 6603716..a1af846 100644 --- a/src/main/java/org/gcube/data/analysis/wps/ExecuteRequest.java +++ b/src/main/java/org/gcube/data/analysis/wps/ExecuteRequest.java @@ -624,6 +624,7 @@ public class ExecuteRequest extends Request implements IObserver { updateStatusSuccess(); } } catch (Throwable e) { + e.printStackTrace(); String errorMessage = null; if (algorithm != null && algorithm.getErrors() != null && !algorithm.getErrors().isEmpty()) { errorMessage = algorithm.getErrors().get(0); From a2d9704868e1d67848e4139e9567f82a0be370c4 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 11 Nov 2020 14:05:02 +0100 Subject: [PATCH 20/32] Update 'pom.xml' update version to 1.1.7-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6205e89..c7465a5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.gcube.data-analysis wps - 1.1.6 + 1.1.7-SNAPSHOT WPS A service implementing a WPS provider in the D4Science e-Infrastructure From 9ff0713d4d52b590dad26a4579fa614868050cde Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 11 Nov 2020 14:12:13 +0100 Subject: [PATCH 21/32] Update 'CHANGELOG.md' update changelog to 1.1.7-SNAPSHOT --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f78ce4d..2d86d96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [v1.1.7] - 2020-11-11 + +### Fix + - Added a printStackTrace in executeRequest + ## [v1.1.6] - 2020-10-15 ### Features From acf61574359144e862fe5913a6efcf261228cab3 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 11 Nov 2020 14:16:25 +0100 Subject: [PATCH 22/32] Update 'CHANGELOG.md' fixed version in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d86d96..1e772a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [v1.1.7] - 2020-11-11 +## [v1.1.7-SNAPSHOT] - 2020-11-11 ### Fix - Added a printStackTrace in executeRequest From 9d380d72dc156f67ce909a70dd430ed3a83a3213 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 11 Nov 2020 15:21:24 +0100 Subject: [PATCH 23/32] Update 'pom.xml' downgrade httpcore, httpclient to version 4.2.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c7465a5..ff30f1e 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,7 @@ org.apache.httpcomponents httpclient - 4.2.5 + 4.2.1 compile @@ -317,7 +317,7 @@ org.apache.httpcomponents httpcore - 4.2.5 + 4.2.1 org.apache.derby From 07e2e942b80e03db2701c91514b1172914f047de Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 12 Nov 2020 16:22:49 +0100 Subject: [PATCH 24/32] Updated dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ff30f1e..506e809 100644 --- a/pom.xml +++ b/pom.xml @@ -486,12 +486,12 @@ org.gcube.dataanalysis 52n-wps-server-gcube - [3.6.1-SNAPSHOT, 3.7.0-SNAPSHOT] + [3.6.2, 3.7.0-SNAPSHOT) org.gcube.dataanalysis 52n-wps-algorithm-gcube - [3.6.1-SNAPSHOT, 3.7.0-SNAPSHOT] + [3.6.2, 3.7.0-SNAPSHOT) org.n52.wps From 6fd6250c165f05cc94ddbd86f7cf3c4f4b49ce37 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Nov 2020 11:03:43 +0100 Subject: [PATCH 25/32] Update 'pom.xml' commented commons-httpclient dep --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 506e809..17acaf6 100644 --- a/pom.xml +++ b/pom.xml @@ -280,7 +280,7 @@ commons-codec 1.5 - + commons-io commons-io From 6155c4e41592276910753061ad5f0b5139ed4f38 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Nov 2020 11:33:58 +0100 Subject: [PATCH 26/32] Update 'pom.xml' upgrade httpclient httpcore to version 4.4.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 17acaf6..cd2ff34 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,7 @@ org.apache.httpcomponents httpclient - 4.2.1 + 4.4.1 compile @@ -317,7 +317,7 @@ org.apache.httpcomponents httpcore - 4.2.1 + 4.4.1 org.apache.derby From c6086027d3aa5f0ec88ef4bac23f6254bb8fbfa0 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Nov 2020 12:33:27 +0100 Subject: [PATCH 27/32] Update 'pom.xml' restored httpc* v4.2.1 accordingly with the ones declared in 52n-wps-server-gcube. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cd2ff34..17acaf6 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,7 @@ org.apache.httpcomponents httpclient - 4.4.1 + 4.2.1 compile @@ -317,7 +317,7 @@ org.apache.httpcomponents httpcore - 4.4.1 + 4.2.1 org.apache.derby From 69ec4ae366aca4aa546edb53dffa84609ca1a503 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Nov 2020 17:59:21 +0100 Subject: [PATCH 28/32] Update 'pom.xml' update httpclient httpcore to 4.2.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 17acaf6..37bd0b6 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,7 @@ org.apache.httpcomponents httpclient - 4.2.1 + 4.2.5 compile @@ -317,7 +317,7 @@ org.apache.httpcomponents httpcore - 4.2.1 + 4.2.5 org.apache.derby From 9bc315a184bff07d7a5edbff2d1f0c096aaad941 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 17 Nov 2020 18:38:00 +0100 Subject: [PATCH 29/32] Updated dependencies to fix issue #20036 --- pom.xml | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 37bd0b6..3941cf8 100644 --- a/pom.xml +++ b/pom.xml @@ -280,17 +280,9 @@ commons-codec 1.5 - + commons-io commons-io @@ -438,10 +430,18 @@ mapscript 6.0.3 + + org.n52.wps 52n-wps-io-geotools ${n52version} + + + commons-httpclient + commons-httpclient + + org.n52.wps @@ -449,10 +449,8 @@ ${n52version} + org.n52.wps 52n-wps-algorithm - - org.n52.wps - @@ -499,8 +497,8 @@ ${n52version} - 52n-wps-algorithm org.n52.wps + 52n-wps-algorithm @@ -531,8 +529,12 @@ ${n52version} - 52n-wps-algorithm org.n52.wps + 52n-wps-algorithm + + + org.n52.wps + 52n-wps-server @@ -550,6 +552,10 @@ 52n-wps-algorithm org.n52.wps + + org.n52.wps + 52n-wps-server + @@ -558,8 +564,12 @@ ${n52version} - 52n-wps-algorithm org.n52.wps + 52n-wps-algorithm + + + org.n52.wps + 52n-wps-server @@ -719,7 +729,6 @@ ch.qos.logback logback-classic - 1.1.11 From fe2dc09a56f784ec7ba8116b185addb33b7ac1d0 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 17 Nov 2020 18:52:56 +0100 Subject: [PATCH 30/32] Updated to fix dependencies issue #20036 --- pom.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 3941cf8..6e55b59 100644 --- a/pom.xml +++ b/pom.xml @@ -430,18 +430,11 @@ mapscript 6.0.3 - - + org.n52.wps 52n-wps-io-geotools ${n52version} - - - commons-httpclient - commons-httpclient - - org.n52.wps From 2e501e18edd40b5bfe16c85f4bd87552e4ff602e Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 17 Nov 2020 20:12:51 +0100 Subject: [PATCH 31/32] Updated to fix issue #20036 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6e55b59..8531918 100644 --- a/pom.xml +++ b/pom.xml @@ -297,7 +297,7 @@ org.apache.httpcomponents httpclient - 4.2.5 + 4.4.1 compile @@ -309,7 +309,7 @@ org.apache.httpcomponents httpcore - 4.2.5 + 4.4.1 org.apache.derby From 7e2df26281c369848795991265f7484f7a3fe2c8 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 18 Nov 2020 10:38:39 +0100 Subject: [PATCH 32/32] Update 'pom.xml' downgrade httpc* to version 4.2.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8531918..3d5e3ac 100644 --- a/pom.xml +++ b/pom.xml @@ -297,7 +297,7 @@ org.apache.httpcomponents httpclient - 4.4.1 + 4.2.1 compile @@ -309,7 +309,7 @@ org.apache.httpcomponents httpcore - 4.4.1 + 4.2.1 org.apache.derby