gCubeSystem
/
wps
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of code-repo.d4science.org:gCubeSystem/wps

Browse Source
feature/23107
Lucio Lelii 3 years ago
parent 19e2c641d7 7e2df26281
commit b49789681a
4 changed files with 74 additions and 27 deletions
Show Stats Download Patch File Download Diff File

14
CHANGELOG.md
Unescape Escape View File

@ -1,8 +1,20 @@
# Changelog
## [v1.1.7-SNAPSHOT] - 2020-11-11
## [v1.1.5] [r4.24.0] - 2020-06-05
### Fix
- Added a printStackTrace in executeRequest
## [v1.1.6] - 2020-10-15
### Features
- Updated pom.xml for support gcube-bom-2.0.0-SNAPSHOT [#19790]
## [v1.1.5] - 2020-06-05
>>>>>>> 7e2df26281c369848795991265f7484f7a3fe2c8
### Fixes

4
changelog.xml
Unescape Escape View File

@ -1,4 +1,8 @@
<ReleaseNotes>
<Changeset component="org.gcube.data-analysis.wps.1-1-6"
date="2020-10-15">
<Change>Updated pom.xml for support gcube-bom-2.0.0-SNAPSHOT [#19790]</Change>
</Changeset>
<Changeset component="org.gcube.data-analysis.wps.1-1-5"
date="2020-06-05">
<Change>Updated ExecuteResponseBuilder for support protocol option [#19129]</Change>

82
pom.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.data-analysis</groupId>
<artifactId>wps</artifactId>
<version>1.1.5</version>
<version>1.1.7-SNAPSHOT</version>
<name>WPS</name>
<description>A service implementing a WPS provider in the D4Science e-Infrastructure</description>
@ -16,6 +16,13 @@
<packaging>war</packaging>
<scm>
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
</scm>
<properties>
<serviceName>DataMiner</serviceName>
<serviceClass>WPS</serviceClass>
@ -34,7 +41,7 @@
<repository>
<id>n52-releases</id>
<name>52n Releases</name>
<url>http://52north.org/maven/repo/releases</url>
<url>https://52north.org/maven/repo/releases</url>
<releases>
<enabled>true</enabled>
</releases>
@ -45,17 +52,17 @@
<repository>
<id>Apache</id>
<name>Apache repository</name>
<url>http://repo1.maven.org/maven2</url>
<url>https://repo1.maven.org/maven2</url>
</repository>
<repository>
<id>geotools</id>
<name>Geotools Repo</name>
<url>http://download.osgeo.org/webdav/geotools</url>
<url>https://download.osgeo.org/webdav/geotools</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
@ -63,14 +70,30 @@
<name>opengeo repository</name>
<url>https://repo.boundlessgeo.com</url>
</repository>
<repository>
<id>geosolutions</id>
<name>geosolution repository</name>
<url> http://maven.geo-solutions.it/ </url>
<snapshots>
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
</repository>
</repositories>
<dependencyManagement>
<!-- Old solution <dependencies> <dependency> <groupId>org.gcube.distribution</groupId>
<artifactId>maven-smartgears-bom</artifactId> <version>2.1.0</version> <type>pom</type>
<scope>import</scope> </dependency> </dependencies> -->
<dependencies>
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>maven-smartgears-bom</artifactId>
<version>2.1.0</version>
<artifactId>gcube-smartgears-bom</artifactId>
<version>2.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -122,6 +145,7 @@
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-smartgears</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.core</groupId>
@ -132,10 +156,13 @@
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>common-authorization</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-scope</artifactId>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/xml-apis/xml-apis -->
@ -253,17 +280,9 @@
<artifactId>commons-codec</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<!--dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId>
<version>3.1</version> <exclusions> <exclusion> <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId> </exclusion> </exclusions> </dependency -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@ -411,6 +430,7 @@
<artifactId>mapscript</artifactId>
<version>6.0.3</version>
</dependency>
<dependency>
<groupId>org.n52.wps</groupId>
<artifactId>52n-wps-io-geotools</artifactId>
@ -422,10 +442,8 @@
<version>${n52version}</version>
<exclusions>
<exclusion>
<groupId>org.n52.wps</groupId>
<artifactId>52n-wps-algorithm</artifactId>
<groupId>
org.n52.wps
</groupId>
</exclusion>
</exclusions>
</dependency>
@ -459,12 +477,12 @@
<dependency>
<groupId>org.gcube.dataanalysis</groupId>
<artifactId>52n-wps-server-gcube</artifactId>
<version>[3.6.1-SNAPSHOT, 3.7.0-SNAPSHOT]</version>
<version>[3.6.2, 3.7.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.dataanalysis</groupId>
<artifactId>52n-wps-algorithm-gcube</artifactId>
<version>[3.6.1-SNAPSHOT, 3.7.0-SNAPSHOT]</version>
<version>[3.6.2, 3.7.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.n52.wps</groupId>
@ -472,8 +490,8 @@
<version>${n52version}</version>
<exclusions>
<exclusion>
<artifactId>52n-wps-algorithm</artifactId>
<groupId>org.n52.wps</groupId>
<artifactId>52n-wps-algorithm</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -504,8 +522,12 @@
<version>${n52version}</version>
<exclusions>
<exclusion>
<groupId>org.n52.wps</groupId>
<artifactId>52n-wps-algorithm</artifactId>
</exclusion>
<exclusion>
<groupId>org.n52.wps</groupId>
<artifactId>52n-wps-server</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -523,6 +545,10 @@
<artifactId>52n-wps-algorithm</artifactId>
<groupId>org.n52.wps</groupId>
</exclusion>
<exclusion>
<groupId>org.n52.wps</groupId>
<artifactId>52n-wps-server</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -531,8 +557,12 @@
<version>${n52version}</version>
<exclusions>
<exclusion>
<groupId>org.n52.wps</groupId>
<artifactId>52n-wps-algorithm</artifactId>
</exclusion>
<exclusion>
<groupId>org.n52.wps</groupId>
<artifactId>52n-wps-server</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -692,7 +722,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.11</version>
</dependency>
@ -706,7 +735,7 @@
<build>
<finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
@ -740,6 +769,7 @@
<includes>
<include>LICENSE.md</include>
<include>README.md</include>
<include>CHANGELOG.md</include>
<include>gcube-app.xml</include>
<include>changelog.xml</include>
<include>profile.xml</include>

1
src/main/java/org/gcube/data/analysis/wps/ExecuteRequest.java
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save