library/roles/smartgears/smartgears/tasks/smartgears-app.yml: Fix the container.xml installation.

library/roles/smartgears/dataminer_app: More files needed.

smartgears/dataminer_app/defaults/main.yml

@@ -45,6 +45,11 @@ dataminer_ecocfg_parallelproc_svn_repo: 'http://svn.research-infrastructures.eu/
 # Retrieve and modify in a template before each installation.
 dataminer_wps_config: 'http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/wpscfg/wps_config.xml'
 
+dataminer_configuration_jar: 'dataminer-algorithms.jar'
+dataminer_configuration_jar_url: 'http://svn.d4science.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/algorithms/{{ dataminer_configuration_jar }}'
+
+dataminer_data_file_from_thredds: 'http://thredds.d4science.org/thredds/fileServer/public/netcdf/gebco_08_OCEANS_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc'
+
 # Those packages are needed to download and configure the dataminer application
 dataminer_additional_packages:
   - subversion

smartgears/dataminer_app/tasks/dataminer-app.yml

@@ -98,7 +98,7 @@
 - name: Install the gebco_08.nc file from thredds. It is big, mostly 2GB
   become: True
   become_user: '{{ smartgears_user }}'
-  get_url: url="http://thredds.d4science.org/thredds/fileServer/public/netcdf/gebco_08_OCEANS_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc" dest={{ smartgears_instance_path }}/webapps/{{ dataminer_52north_webapp_name }}/ecocfg/gebco_08.nc
+  get_url: url={{ dataminer_data_file_from_thredds }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_52north_webapp_name }}/ecocfg/gebco_08.nc
   notify: Restart smartgears
   when: dataminer_app_install
   tags: [ 'tomcat', 'dataminer', 'wps' ]
@@ -111,3 +111,11 @@
   when: dataminer_app_install
   tags: [ 'tomcat', 'dataminer', 'wps' ]
 
+- name: Download the dataminer config jar
+  become: True
+  become_user: '{{ smartgears_user }}'
+  subversion: repo={{ dataminer_configuration_jar_url }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_52north_webapp_name }}/lib/{{ dataminer_configuration_jar }} force=yes
+  notify: Restart smartgears
+  when: dataminer_app_install
+  tags: [ 'tomcat', 'dataminer', 'wps' ]
+

smartgears/dataminer_app/templates/wps_config.xml.j2

@@ -137,7 +137,6 @@
 <Property name="Algorithm" active="true">org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.generators.BIONYM</Property>
 <Property name="Algorithm" active="true">org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.generators.LWR</Property>
 <Property name="Algorithm" active="true">org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.modellers.HSPEN</Property>
-<Property name="Algorithm" active="true">org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.CCAMLRGETSPECIES_TEST</Property>
 <Property name="Algorithm" active="true">org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.generators.ICCAT_VPA</Property>
 <Property name="Algorithm" active="true">org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.generators.CMSY</Property>
 <Property name="Algorithm" active="true">org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.modellers.FEED_FORWARD_ANN</Property>

smartgears/smartgears/tasks/smartgears-app.yml

@@ -50,7 +50,7 @@
 - name: Install the smartgears configuration file
   template: src=container.xml.j2 dest={{ smartgears_install_path }}/container.xml owner={{ item.user }} group={{ item.user }}
   with_items: '{{ tomcat_m_instances }}'
-  when: generic_worker_install is not defined
+  when: ( generic_worker_install is not defined ) or ( not generic_worker_install )
   register: containerxml_state
   notify: Restart smartgears 
   tags: [ 'smartgears', 'smartgears_conf', 'tomcat' ]