diff --git a/distro/web.xml b/distro/web.xml
index efa36ab..e7d0403 100644
--- a/distro/web.xml
+++ b/distro/web.xml
@@ -1,86 +1,57 @@
- 52°North Web Processing Service, Git: 1665e1b7b2188755161d4f0f3a6acf562d0444e1 @ 2015-03-21 00:30:20
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+ 52°North Web Processing Service, Git:
+ 1665e1b7b2188755161d4f0f3a6acf562d0444e1 @ 2015-03-21 00:30:20
+
A web processing framework supporting the OGC WPS 1.0.0 specification
algorithmDirectory
- /home/gcube/wps_algorithms/algorithms
+ /home/gcube/wps_algorithms/algorithms
-
-
+
+
-
- BASIC
- Basic Authentication
-
+
+
+ filter-mapping> CommunicationSizeLogFilter
+ /WebProcessingService
-
-
-
-
-
- filter-mapping>
- CommunicationSizeLogFilter
- /WebProcessingService
-
-
-
+
wpsServlet
org.gcube.data.analysis.wps.WebProcessingService
-
+
0
wps.config.file
config/wps_config.xml
+
+ cancelComputationServlet
+ org.gcube.data.analysis.wps.CancelComputation
+ 1
+
retrieveResultServlet
org.n52.wps.server.RetrieveResultServlet
@@ -94,69 +65,60 @@
retrieveResultServlet
/RetrieveResultServlet
+
+ cancelComputationServlet
+ /CancelComputationServlet
+
/index.html
-
- security.config.validation
- false
-
-
+
+ security.config.validation
+ false
+
+
-
- CORS
- com.thetransactioncompany.cors.CORSFilter
-
- cors.allowOrigin
- *
-
-
- cors.allowGenericHttpRequests
- true
-
-
- cors.supportedMethods
- GET, POST, HEAD, PUT, DELETE, OPTIONS
-
-
- cors.supportedHeaders
- *
-
-
- cors.exposedHeaders
- *
-
-
-
- CORS
- /*
-
+
+ CORS
+ com.thetransactioncompany.cors.CORSFilter
+
+ cors.allowOrigin
+ *
+
+
+ cors.allowGenericHttpRequests
+ true
+
+
+ cors.supportedMethods
+ GET, POST, HEAD, PUT, DELETE, OPTIONS
+
+
+ cors.supportedHeaders
+ *
+
+
+ cors.exposedHeaders
+ *
+
+
+
+ CORS
+ /*
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/org/gcube/data/analysis/wps/CancelComputation.java b/src/main/java/org/gcube/data/analysis/wps/CancelComputation.java
index adb626e..71bf931 100644
--- a/src/main/java/org/gcube/data/analysis/wps/CancelComputation.java
+++ b/src/main/java/org/gcube/data/analysis/wps/CancelComputation.java
@@ -23,7 +23,7 @@ public class CancelComputation extends HttpServlet {
private final static Logger LOGGER = LoggerFactory.getLogger(CancelComputation.class);
private static final long serialVersionUID = -268198171054599696L;
// This is required for URL generation for response documents.
- public final static String SERVLET_PATH = "RetrieveResultServlet";
+ public final static String SERVLET_PATH = "CancelComputationServlet";
// in future parameterize
//private final boolean indentXML = false;
diff --git a/src/main/webapp/WEB-INF/README b/src/main/webapp/WEB-INF/README
index 0649471..61fbb2e 100644
--- a/src/main/webapp/WEB-INF/README
+++ b/src/main/webapp/WEB-INF/README
@@ -25,7 +25,7 @@ no. 654119), SoBigData (grant no. 654024);
Version
--------------------------------------------------
-1.0.0-SNAPSHOT (2017-07-18)
+1.0.0-SNAPSHOT (${maven.build.timestamp})
Please see the file named "changelog.xml" in this directory for the release notes.
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index efa36ab..e7d0403 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,86 +1,57 @@
- 52°North Web Processing Service, Git: 1665e1b7b2188755161d4f0f3a6acf562d0444e1 @ 2015-03-21 00:30:20
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+ 52°North Web Processing Service, Git:
+ 1665e1b7b2188755161d4f0f3a6acf562d0444e1 @ 2015-03-21 00:30:20
+
A web processing framework supporting the OGC WPS 1.0.0 specification
algorithmDirectory
- /home/gcube/wps_algorithms/algorithms
+ /home/gcube/wps_algorithms/algorithms
-
-
+
+
-
- BASIC
- Basic Authentication
-
+
+
+ filter-mapping> CommunicationSizeLogFilter
+ /WebProcessingService
-
-
-
-
-
- filter-mapping>
- CommunicationSizeLogFilter
- /WebProcessingService
-
-
-
+
wpsServlet
org.gcube.data.analysis.wps.WebProcessingService
-
+
0
wps.config.file
config/wps_config.xml
+
+ cancelComputationServlet
+ org.gcube.data.analysis.wps.CancelComputation
+ 1
+
retrieveResultServlet
org.n52.wps.server.RetrieveResultServlet
@@ -94,69 +65,60 @@
retrieveResultServlet
/RetrieveResultServlet
+
+ cancelComputationServlet
+ /CancelComputationServlet
+
/index.html
-
- security.config.validation
- false
-
-
+
+ security.config.validation
+ false
+
+
-
- CORS
- com.thetransactioncompany.cors.CORSFilter
-
- cors.allowOrigin
- *
-
-
- cors.allowGenericHttpRequests
- true
-
-
- cors.supportedMethods
- GET, POST, HEAD, PUT, DELETE, OPTIONS
-
-
- cors.supportedHeaders
- *
-
-
- cors.exposedHeaders
- *
-
-
-
- CORS
- /*
-
+
+ CORS
+ com.thetransactioncompany.cors.CORSFilter
+
+ cors.allowOrigin
+ *
+
+
+ cors.allowGenericHttpRequests
+ true
+
+
+ cors.supportedMethods
+ GET, POST, HEAD, PUT, DELETE, OPTIONS
+
+
+ cors.supportedHeaders
+ *
+
+
+ cors.exposedHeaders
+ *
+
+
+
+ CORS
+ /*
+
-
-
-
-
+
+
+
+
\ No newline at end of file