group_vars/dataminer_prototypes_ghost/dataminer_prototypes_ghost.yml added new scopes

group_vars/dm_pool_manager_proto/dm_pool_manager_proto.yml added new scopes
	   group_vars/smartgears_workspace/smartgears_workspace.yml added appender
	   ../library/roles/ansible_ppa/tasks/ansible-packages.yml added some cache options to ansible package task
	   ../library/roles/smartgears/dm_pool_manager/defaults/main.yml upgrade service version
	   ../library/roles/smartgears/dm_pool_manager/tasks/main.yml commented task for installing service.properties file
	   ../library/roles/smartgears/home_library/defaults/main.yml upgrade version
	   ../library/roles/smartgears/smartgears/defaults/main.yml upgrade version
	   ../library/roles/smartgears/tabular_data/defaults/main.yml upgrade version

Merge branch 'master' of gitorious.research-infrastructures.eu:infrastructure-management/ansible-playbooks

smartgears/catalina-app-conf/tasks/main.yml

@@ -0,0 +1,17 @@
+---
+- block:
+    - name: Install the catalina webapp configurations
+      template: src=catalina-app-conf.xml.j2 dest={{ smartgears_instance_path }}/conf/Catalina/localhost/{{ item.app_name }}.xml
+      with_items: '{{ catalina_apps_conf }}'
+      when: ( item.state | default(True) )
+
+    - name: Remove the catalina webapp configurations
+      file: dest={{ smartgears_instance_path }}/conf/Catalina/localhost/{{ item.app_name }}.xml state=absent
+      with_items: '{{ catalina_apps_conf }}'
+      when: ( not item.state | default(True) )
+
+  become: True
+  become_user: '{{ smartgears_user }}'
+  when: catalina_apps_conf is defined
+  tags: [ 'smartgears', 'tomcat', 'catalina_apps' ]
+  

smartgears/catalina-app-conf/templates/catalina-app-conf.xml.j2

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Context reloadable="true">
+    <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
+          virtualClasspath="{{ smartgears_instance_path }}/webapps/{{ item.app_name }}/WEB-INF/lib/plugins/{{ item.plugin_name }}/*.jar"/>    
+</Context>
+

smartgears/sis_geotk_dt_plugin/defaults/main.yml

@@ -9,3 +9,5 @@ sis_geotk_dt_plugin_extension: jar
 sis_geotk_dt_plugin_classifier: jar-with-dependencies
 sis_geotk_dt_plugin_file: '{{ sis_geotk_dt_plugin_name }}-{{ sis_geotk_dt_plugin_version }}-jar-with-dependencies.{{ sis_geotk_dt_plugin_extension }}'
 
+catalina_apps_conf:
+  - { app_name: '{{ data_trasfer_service_name }}', plugin_name: '{{ sis_geotk_dt_plugin_name }}' }

smartgears/sis_geotk_dt_plugin/meta/main.yml

@@ -0,0 +1,4 @@
+---
+dependencies:
+  - role: '../library/roles/smartgears/catalina-app-conf'
+

smartgears/sis_geotk_dt_plugin/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - block:
     - name: Remove the old Sis geotk data transfer plugin 
-      shell: rm -f {{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/{{ sis_geotk_dt_plugin_name }}-*-jar-with-dependencies.jar
+      file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=absent
       
   become: True
   become_user: '{{ smartgears_user }}'
@@ -9,18 +9,25 @@
   tags: [ 'smartgears', 'sis_geotk', 'tomcat' ]
     
 - block:
-    - name: Get the Sis geotk data transfer plugin and install it inside the smart executor
+    - name: Create the plugin directory inside data transfer
+      file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=directory
+
+    - name: Get the Sis geotk data transfer plugin
       maven_artifact: artifact_id={{ sis_geotk_dt_plugin_name }} version={{ sis_geotk_dt_plugin_version | default(omit) }} group_id={{ sis_geotk_dt_plugin_group_id }} extension={{ sis_geotk_dt_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ sis_geotk_dt_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }}
       register: sis_geotk_download
 
     - name: Remove the old Sis geotk data transfer plugin 
-      shell: rm -f {{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/{{ sis_geotk_dt_plugin_name }}-*-jar-with-dependencies.jar
+      file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=absent
       when: (sis_geotk_download | changed)
 
     - name: Copy the Sis geotk data transfer plugin to its final destination
-      copy: src={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/{{ sis_geotk_dt_plugin_file }} remote_src=yes force=yes
+      copy: src={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }}/{{ sis_geotk_dt_plugin_file }} remote_src=yes
       notify: Restart smartgears
 
+    - name: Unarchive the Sis geotk data transfer plugin to expose its libraries
+      unarchive: src={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }}/ copy=no
+      when: (sis_geotk_download | changed)
+
   become: True
   become_user: '{{ smartgears_user }}'
   when: sis_geotk_dt_plugin_install