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

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/wps@151348 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Lucio Lelii 2017-07-26 15:19:57 +00:00
parent 7ef6244b86
commit 418586d8ee
4 changed files with 166 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
distro/web.xml
View File

@ -1,86 +1,57 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4"> version="2.4">
<display-name>52°North Web Processing Service, Git: 1665e1b7b2188755161d4f0f3a6acf562d0444e1 @ 2015-03-21 00:30:20</display-name> <display-name>52°North Web Processing Service, Git:
1665e1b7b2188755161d4f0f3a6acf562d0444e1 @ 2015-03-21 00:30:20
</display-name>
<description>A web processing framework supporting the OGC WPS 1.0.0 specification</description> <description>A web processing framework supporting the OGC WPS 1.0.0 specification</description>
<context-param> <context-param>
<param-name>algorithmDirectory</param-name> <param-name>algorithmDirectory</param-name>
<param-value>/home/gcube/wps_algorithms/algorithms</param-value> <param-value>/home/gcube/wps_algorithms/algorithms</param-value>
</context-param> </context-param>
<!-- security-constraint> <!-- security-constraint> <web-resource-collection> <web-resource-name>My
<web-resource-collection> JSP</web-resource-name> <url-pattern>/webAdmin/index.jsp</url-pattern> <http-method>GET</http-method>
<web-resource-name>My JSP</web-resource-name> <http-method>POST</http-method> </web-resource-collection> <auth-constraint>
<url-pattern>/webAdmin/index.jsp</url-pattern> <role-name>wpsAdmin</role-name> </auth-constraint> <user-data-constraint>
<http-method>GET</http-method> <transport-guarantee>CONFIDENTIAL</transport-guarantee> </user-data-constraint -->
<http-method>POST</http-method> <!-- /security-constraint> <login-config> <auth-method>BASIC</auth-method>
</web-resource-collection> <realm-name>Basic Authentication</realm-name> </login-config> <Security roles
<auth-constraint> referenced by this web application -->
<role-name>wpsAdmin</role-name> <!-- >security-role> <description>The role that is required to log in to
</auth-constraint> the Manager Application</description> <role-name>manager</role-name> </security-role -->
<user-data-constraint>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint-->
<!-- /security-constraint>
<login-config> <!--filter> <filter-name>CommunicationSizeLogFilter</filter-name> <filter-class>org.n52.wps.server.CommunicationSizeLogFilter</filter-class>
<auth-method>BASIC</auth-method> </filter -->
<realm-name>Basic Authentication</realm-name> <!--filter> <filter-name>CompressingFilter</filter-name> <filter-class>com.planetj.servlet.filter.compression.CompressingFilter</filter-class>
</login-config> <init-param> <param-name>debug</param-name> <param-value>false</param-value>
</init-param> <init-param> <param-name>statsEnabled</param-name> <param-value>true</param-value>
</init-param> </filter> <filter-mapping> <filter-name>CompressingFilter</filter-name>
<url-pattern>/WebProcessingService</url-pattern> </filter-mapping -->
<!-->filter-mapping> <filter-name>CommunicationSizeLogFilter</filter-name>
<url-pattern>/WebProcessingService</url-pattern> </filter-mapping -->
<Security roles referenced by this web application --> <!-- <filter> <filter-name>ResponseURLFilter</filter-name> <filter-class>org.n52.wps.server.ResponseURLFilter</filter-class>
<!-- >security-role> </filter> <filter-mapping> <filter-name>ResponseURLFilter</filter-name> <url-pattern>*</url-pattern>
<description>The role that is required to log in to the Manager Application</description> </filter-mapping> -->
<role-name>manager</role-name>
</security-role-->
<!--filter>
<filter-name>CommunicationSizeLogFilter</filter-name>
<filter-class>org.n52.wps.server.CommunicationSizeLogFilter</filter-class>
</filter-->
<!--filter>
<filter-name>CompressingFilter</filter-name>
<filter-class>com.planetj.servlet.filter.compression.CompressingFilter</filter-class>
<init-param>
<param-name>debug</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>statsEnabled</param-name>
<param-value>true</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>CompressingFilter</filter-name>
<url-pattern>/WebProcessingService</url-pattern>
</filter-mapping-->
<!-->filter-mapping>
<filter-name>CommunicationSizeLogFilter</filter-name>
<url-pattern>/WebProcessingService</url-pattern>
</filter-mapping-->
<!-- <filter>
<filter-name>ResponseURLFilter</filter-name>
<filter-class>org.n52.wps.server.ResponseURLFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ResponseURLFilter</filter-name>
<url-pattern>*</url-pattern>
</filter-mapping>-->
<servlet> <servlet>
<servlet-name>wpsServlet</servlet-name> <servlet-name>wpsServlet</servlet-name>
<servlet-class>org.gcube.data.analysis.wps.WebProcessingService</servlet-class> <servlet-class>org.gcube.data.analysis.wps.WebProcessingService</servlet-class>
<!--<servlet-class>org.n52.wps.server.WebProcessingService</servlet-class>--> <!--<servlet-class>org.n52.wps.server.WebProcessingService</servlet-class> -->
<load-on-startup>0</load-on-startup> <load-on-startup>0</load-on-startup>
<init-param> <init-param>
<param-name>wps.config.file</param-name> <param-name>wps.config.file</param-name>
<param-value>config/wps_config.xml</param-value> <param-value>config/wps_config.xml</param-value>
</init-param> </init-param>
</servlet> </servlet>
<servlet>
<servlet-name>cancelComputationServlet</servlet-name>
<servlet-class>org.gcube.data.analysis.wps.CancelComputation</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet> <servlet>
<servlet-name>retrieveResultServlet</servlet-name> <servlet-name>retrieveResultServlet</servlet-name>
<servlet-class>org.n52.wps.server.RetrieveResultServlet</servlet-class> <servlet-class>org.n52.wps.server.RetrieveResultServlet</servlet-class>
@ -94,69 +65,60 @@
<servlet-name>retrieveResultServlet</servlet-name> <servlet-name>retrieveResultServlet</servlet-name>
<url-pattern>/RetrieveResultServlet</url-pattern> <url-pattern>/RetrieveResultServlet</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>cancelComputationServlet</servlet-name>
<url-pattern>/CancelComputationServlet</url-pattern>
</servlet-mapping>
<welcome-file-list> <welcome-file-list>
<welcome-file>/index.html</welcome-file> <welcome-file>/index.html</welcome-file>
</welcome-file-list> </welcome-file-list>
<!-- 52n Security --> <!-- 52n Security -->
<context-param> <context-param>
<param-name>security.config.validation</param-name> <param-name>security.config.validation</param-name>
<param-value>false</param-value> <param-value>false</param-value>
<!--description> <!--description> disables validation of the security-config.xml this is
disables validation of the security-config.xml this is necessary necessary because the MavenProject: org.n52.wps:52n-wps-webapp:3.3.0-SNAPSHOT
because the MavenProject: org.n52.wps:52n-wps-webapp:3.3.0-SNAPSHOT @ D:\dev\GitHub4w\WPS\52n-wps-webapp\pom.xml mechanism works only if the validation is disabled. @ D:\dev\GitHub4w\WPS\52n-wps-webapp\pom.xml mechanism works only if the
</description--> validation is disabled. </description -->
</context-param> </context-param>
<filter> <filter>
<filter-name>CORS</filter-name> <filter-name>CORS</filter-name>
<filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class> <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class>
<init-param> <init-param>
<param-name>cors.allowOrigin</param-name> <param-name>cors.allowOrigin</param-name>
<param-value>*</param-value> <param-value>*</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>cors.allowGenericHttpRequests</param-name> <param-name>cors.allowGenericHttpRequests</param-name>
<param-value>true</param-value> <param-value>true</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>cors.supportedMethods</param-name> <param-name>cors.supportedMethods</param-name>
<param-value>GET, POST, HEAD, PUT, DELETE, OPTIONS</param-value> <param-value>GET, POST, HEAD, PUT, DELETE, OPTIONS</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>cors.supportedHeaders</param-name> <param-name>cors.supportedHeaders</param-name>
<param-value>*</param-value> <param-value>*</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>cors.exposedHeaders</param-name> <param-name>cors.exposedHeaders</param-name>
<param-value>*</param-value> <param-value>*</param-value>
</init-param> </init-param>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>CORS</filter-name> <filter-name>CORS</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping> </filter-mapping>
<!-- <!-- <filter> <filter-name>authn</filter-name> -->
<filter> <!-- display-name>Authentication Chain Filter</display-name -->
<filter-name>authn</filter-name> --> <!-- description> Delegates calls to AuthenticationChainFilter that is defined
<!-- display-name>Authentication Chain Filter</display-name--> in the security-config. </description -->
<!-- description> <!-- <filter-class>org.n52.security.service.config.support.SecurityConfigDelegatingServletFilter</filter-class>
Delegates calls to AuthenticationChainFilter that is defined in the security-config. </filter> <filter-mapping> <filter-name>authn</filter-name> <url-pattern>/webAdmin/*</url-pattern>
</description--> </filter-mapping> <listener> <listener-class>org.n52.security.service.config.support.SecurityConfigContextListener</listener-class>
<!-- <filter-class>org.n52.security.service.config.support.SecurityConfigDelegatingServletFilter</filter-class> </listener> -->
</filter>
<filter-mapping>
<filter-name>authn</filter-name>
<url-pattern>/webAdmin/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>org.n52.security.service.config.support.SecurityConfigContextListener</listener-class>
</listener>
-->
</web-app> </web-app>

2
src/main/java/org/gcube/data/analysis/wps/CancelComputation.java
View File

@ -23,7 +23,7 @@ public class CancelComputation extends HttpServlet {
private final static Logger LOGGER = LoggerFactory.getLogger(CancelComputation.class); private final static Logger LOGGER = LoggerFactory.getLogger(CancelComputation.class);
private static final long serialVersionUID = -268198171054599696L; private static final long serialVersionUID = -268198171054599696L;
// This is required for URL generation for response documents. // 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 // in future parameterize
//private final boolean indentXML = false; //private final boolean indentXML = false;

2
src/main/webapp/WEB-INF/README
View File

@ -25,7 +25,7 @@ no. 654119), SoBigData (grant no. 654024);
Version 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. Please see the file named "changelog.xml" in this directory for the release notes.

202
src/main/webapp/WEB-INF/web.xml
View File

@ -1,86 +1,57 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4"> version="2.4">
<display-name>52°North Web Processing Service, Git: 1665e1b7b2188755161d4f0f3a6acf562d0444e1 @ 2015-03-21 00:30:20</display-name> <display-name>52°North Web Processing Service, Git:
1665e1b7b2188755161d4f0f3a6acf562d0444e1 @ 2015-03-21 00:30:20
</display-name>
<description>A web processing framework supporting the OGC WPS 1.0.0 specification</description> <description>A web processing framework supporting the OGC WPS 1.0.0 specification</description>
<context-param> <context-param>
<param-name>algorithmDirectory</param-name> <param-name>algorithmDirectory</param-name>
<param-value>/home/gcube/wps_algorithms/algorithms</param-value> <param-value>/home/gcube/wps_algorithms/algorithms</param-value>
</context-param> </context-param>
<!-- security-constraint> <!-- security-constraint> <web-resource-collection> <web-resource-name>My
<web-resource-collection> JSP</web-resource-name> <url-pattern>/webAdmin/index.jsp</url-pattern> <http-method>GET</http-method>
<web-resource-name>My JSP</web-resource-name> <http-method>POST</http-method> </web-resource-collection> <auth-constraint>
<url-pattern>/webAdmin/index.jsp</url-pattern> <role-name>wpsAdmin</role-name> </auth-constraint> <user-data-constraint>
<http-method>GET</http-method> <transport-guarantee>CONFIDENTIAL</transport-guarantee> </user-data-constraint -->
<http-method>POST</http-method> <!-- /security-constraint> <login-config> <auth-method>BASIC</auth-method>
</web-resource-collection> <realm-name>Basic Authentication</realm-name> </login-config> <Security roles
<auth-constraint> referenced by this web application -->
<role-name>wpsAdmin</role-name> <!-- >security-role> <description>The role that is required to log in to
</auth-constraint> the Manager Application</description> <role-name>manager</role-name> </security-role -->
<user-data-constraint>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint-->
<!-- /security-constraint>
<login-config> <!--filter> <filter-name>CommunicationSizeLogFilter</filter-name> <filter-class>org.n52.wps.server.CommunicationSizeLogFilter</filter-class>
<auth-method>BASIC</auth-method> </filter -->
<realm-name>Basic Authentication</realm-name> <!--filter> <filter-name>CompressingFilter</filter-name> <filter-class>com.planetj.servlet.filter.compression.CompressingFilter</filter-class>
</login-config> <init-param> <param-name>debug</param-name> <param-value>false</param-value>
</init-param> <init-param> <param-name>statsEnabled</param-name> <param-value>true</param-value>
</init-param> </filter> <filter-mapping> <filter-name>CompressingFilter</filter-name>
<url-pattern>/WebProcessingService</url-pattern> </filter-mapping -->
<!-->filter-mapping> <filter-name>CommunicationSizeLogFilter</filter-name>
<url-pattern>/WebProcessingService</url-pattern> </filter-mapping -->
<Security roles referenced by this web application --> <!-- <filter> <filter-name>ResponseURLFilter</filter-name> <filter-class>org.n52.wps.server.ResponseURLFilter</filter-class>
<!-- >security-role> </filter> <filter-mapping> <filter-name>ResponseURLFilter</filter-name> <url-pattern>*</url-pattern>
<description>The role that is required to log in to the Manager Application</description> </filter-mapping> -->
<role-name>manager</role-name>
</security-role-->
<!--filter>
<filter-name>CommunicationSizeLogFilter</filter-name>
<filter-class>org.n52.wps.server.CommunicationSizeLogFilter</filter-class>
</filter-->
<!--filter>
<filter-name>CompressingFilter</filter-name>
<filter-class>com.planetj.servlet.filter.compression.CompressingFilter</filter-class>
<init-param>
<param-name>debug</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>statsEnabled</param-name>
<param-value>true</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>CompressingFilter</filter-name>
<url-pattern>/WebProcessingService</url-pattern>
</filter-mapping-->
<!-->filter-mapping>
<filter-name>CommunicationSizeLogFilter</filter-name>
<url-pattern>/WebProcessingService</url-pattern>
</filter-mapping-->
<!-- <filter>
<filter-name>ResponseURLFilter</filter-name>
<filter-class>org.n52.wps.server.ResponseURLFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ResponseURLFilter</filter-name>
<url-pattern>*</url-pattern>
</filter-mapping>-->
<servlet> <servlet>
<servlet-name>wpsServlet</servlet-name> <servlet-name>wpsServlet</servlet-name>
<servlet-class>org.gcube.data.analysis.wps.WebProcessingService</servlet-class> <servlet-class>org.gcube.data.analysis.wps.WebProcessingService</servlet-class>
<!--<servlet-class>org.n52.wps.server.WebProcessingService</servlet-class>--> <!--<servlet-class>org.n52.wps.server.WebProcessingService</servlet-class> -->
<load-on-startup>0</load-on-startup> <load-on-startup>0</load-on-startup>
<init-param> <init-param>
<param-name>wps.config.file</param-name> <param-name>wps.config.file</param-name>
<param-value>config/wps_config.xml</param-value> <param-value>config/wps_config.xml</param-value>
</init-param> </init-param>
</servlet> </servlet>
<servlet>
<servlet-name>cancelComputationServlet</servlet-name>
<servlet-class>org.gcube.data.analysis.wps.CancelComputation</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet> <servlet>
<servlet-name>retrieveResultServlet</servlet-name> <servlet-name>retrieveResultServlet</servlet-name>
<servlet-class>org.n52.wps.server.RetrieveResultServlet</servlet-class> <servlet-class>org.n52.wps.server.RetrieveResultServlet</servlet-class>
@ -94,69 +65,60 @@
<servlet-name>retrieveResultServlet</servlet-name> <servlet-name>retrieveResultServlet</servlet-name>
<url-pattern>/RetrieveResultServlet</url-pattern> <url-pattern>/RetrieveResultServlet</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>cancelComputationServlet</servlet-name>
<url-pattern>/CancelComputationServlet</url-pattern>
</servlet-mapping>
<welcome-file-list> <welcome-file-list>
<welcome-file>/index.html</welcome-file> <welcome-file>/index.html</welcome-file>
</welcome-file-list> </welcome-file-list>
<!-- 52n Security --> <!-- 52n Security -->
<context-param> <context-param>
<param-name>security.config.validation</param-name> <param-name>security.config.validation</param-name>
<param-value>false</param-value> <param-value>false</param-value>
<!--description> <!--description> disables validation of the security-config.xml this is
disables validation of the security-config.xml this is necessary necessary because the MavenProject: org.n52.wps:52n-wps-webapp:3.3.0-SNAPSHOT
because the MavenProject: org.n52.wps:52n-wps-webapp:3.3.0-SNAPSHOT @ D:\dev\GitHub4w\WPS\52n-wps-webapp\pom.xml mechanism works only if the validation is disabled. @ D:\dev\GitHub4w\WPS\52n-wps-webapp\pom.xml mechanism works only if the
</description--> validation is disabled. </description -->
</context-param> </context-param>
<filter> <filter>
<filter-name>CORS</filter-name> <filter-name>CORS</filter-name>
<filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class> <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class>
<init-param> <init-param>
<param-name>cors.allowOrigin</param-name> <param-name>cors.allowOrigin</param-name>
<param-value>*</param-value> <param-value>*</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>cors.allowGenericHttpRequests</param-name> <param-name>cors.allowGenericHttpRequests</param-name>
<param-value>true</param-value> <param-value>true</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>cors.supportedMethods</param-name> <param-name>cors.supportedMethods</param-name>
<param-value>GET, POST, HEAD, PUT, DELETE, OPTIONS</param-value> <param-value>GET, POST, HEAD, PUT, DELETE, OPTIONS</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>cors.supportedHeaders</param-name> <param-name>cors.supportedHeaders</param-name>
<param-value>*</param-value> <param-value>*</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>cors.exposedHeaders</param-name> <param-name>cors.exposedHeaders</param-name>
<param-value>*</param-value> <param-value>*</param-value>
</init-param> </init-param>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>CORS</filter-name> <filter-name>CORS</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping> </filter-mapping>
<!-- <!-- <filter> <filter-name>authn</filter-name> -->
<filter> <!-- display-name>Authentication Chain Filter</display-name -->
<filter-name>authn</filter-name> --> <!-- description> Delegates calls to AuthenticationChainFilter that is defined
<!-- display-name>Authentication Chain Filter</display-name--> in the security-config. </description -->
<!-- description> <!-- <filter-class>org.n52.security.service.config.support.SecurityConfigDelegatingServletFilter</filter-class>
Delegates calls to AuthenticationChainFilter that is defined in the security-config. </filter> <filter-mapping> <filter-name>authn</filter-name> <url-pattern>/webAdmin/*</url-pattern>
</description--> </filter-mapping> <listener> <listener-class>org.n52.security.service.config.support.SecurityConfigContextListener</listener-class>
<!-- <filter-class>org.n52.security.service.config.support.SecurityConfigDelegatingServletFilter</filter-class> </listener> -->
</filter>
<filter-mapping>
<filter-name>authn</filter-name>
<url-pattern>/webAdmin/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>org.n52.security.service.config.support.SecurityConfigContextListener</listener-class>
</listener>
-->
</web-app> </web-app>