diff --git a/smartgears/dataminer_app/defaults/main.yml b/smartgears/dataminer_app/defaults/main.yml index acf76ea4..37446b54 100644 --- a/smartgears/dataminer_app/defaults/main.yml +++ b/smartgears/dataminer_app/defaults/main.yml @@ -15,6 +15,7 @@ dataminer_wps_extension: war dataminer_wps_file: '{{ dataminer_wps_name }}-{{ dataminer_wps_version }}.{{ dataminer_wps_extension }}' dataminer_wps_repository_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}' dataminer_wps_algorithms_svn: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/algorithms/ +dataminer_wps_algorithms_dest: '{{ smartgears_user_home }}/wps_algorithms/algorithms' dataminer_data_file_from_thredds: 'http://thredds.d4science.org/thredds/fileServer/public/netcdf/gebco_08_OCEANS_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc' diff --git a/smartgears/dataminer_app/tasks/dataminer-app.yml b/smartgears/dataminer_app/tasks/dataminer-app.yml index a379b509..4dd3504c 100644 --- a/smartgears/dataminer_app/tasks/dataminer-app.yml +++ b/smartgears/dataminer_app/tasks/dataminer-app.yml @@ -10,6 +10,10 @@ unarchive: copy=no src={{ smartgears_user_home }}/{{ dataminer_wps_file }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }} creates={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/WEB-INF/lib notify: Restart smartgears + - name: Install the dataminer web.xml + template: src=web.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/WEB-INF/lib/web.xml + notify: Restart smartgears + - name: Create a directory where to install the algorithms directory file: path={{ smartgears_user_home }}/wps_algorithms state=directory diff --git a/smartgears/dataminer_app/templates/algorithms-updater.j2 b/smartgears/dataminer_app/templates/algorithms-updater.j2 index f1659905..35e05716 100644 --- a/smartgears/dataminer_app/templates/algorithms-updater.j2 +++ b/smartgears/dataminer_app/templates/algorithms-updater.j2 @@ -6,14 +6,14 @@ set -o pipefail INFRA_REFERENCE={{ dataminer_infra_reference }} ADD_ALGORITHM_DIR={{ smartgears_user_home }}/algorithmInstaller ADD_ALGORITHM_PATH={{ smartgears_user_home }}/algorithmInstaller/addAlgorithm.sh -ALGORITHMS_FILE={{ smartgears_user_home }}/wps_algorithms/algorithms/${INFRA_REFERENCE}/algorithms +ALGORITHMS_FILE={{ dataminer_wps_algorithms_dest }}/${INFRA_REFERENCE}/algorithms OUT_DIR=$( mktemp -d -t algorithms-updater.XXXXXXXXXX ) ALGORITHMS_TEMP_SCRIPT=$OUT_DIR/add_algorithms LOG_DIR={{ smartgears_user_home }}/wps_algorithms_install_log/ LOG_FILE=${LOG_DIR}/algorithms_updater.log ALGORITHMS_INSTALLED_FILE=${LOG_DIR}/already_installed_algorithms.txt LOCK_FILE=${LOG_DIR}/.algorithms_updater.lock -ALGO_DIR={{ smartgears_user_home }}/wps_algorithms/algorithms +ALGO_DIR={{ dataminer_wps_algorithms_dest }} RUNNING_JOB= RUNNING_JOB_RETVAL= diff --git a/smartgears/dataminer_app/templates/web.xml.j2 b/smartgears/dataminer_app/templates/web.xml.j2 new file mode 100644 index 00000000..ced0bfbb --- /dev/null +++ b/smartgears/dataminer_app/templates/web.xml.j2 @@ -0,0 +1,124 @@ + + + 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 + {{ dataminer_wps_algorithms_dest }} + + + + + + + + + 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 + 1 + + + wpsServlet + /WebProcessingService + + + retrieveResultServlet + /RetrieveResultServlet + + + cancelComputationServlet + /CancelComputationServlet + + + /index.html + + + + + 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 + /* + + + + + + + +