From 900d414f4ae08882b66bfd189cbaee782fb48e88 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Mon, 27 Jun 2016 15:36:37 +0200
Subject: [PATCH] library/roles/smartgears/ckan_connector: Fix the nexus URL.
 library/roles/smartgears/dataminer_app: Remove some duplicate libraries, add
 two.

---
 smartgears/ckan_connector/defaults/main.yml     |  4 ++--
 smartgears/ckan_connector/tasks/main.yml        |  5 ++---
 smartgears/dataminer_app/defaults/main.yml      | 17 ++++++++++++++++-
 .../dataminer_app/tasks/dataminer-app.yml       |  9 +++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/smartgears/ckan_connector/defaults/main.yml b/smartgears/ckan_connector/defaults/main.yml
index 730ee38..7b36849 100644
--- a/smartgears/ckan_connector/defaults/main.yml
+++ b/smartgears/ckan_connector/defaults/main.yml
@@ -2,7 +2,7 @@
 gcube_repository: 'gcube-snapshots'
 ckan_connector_plugin_install: False
 ckan_connector_ver: 1.0.0
-ckan_connector_name: 'ckan_connector-{{ ckan_connector_ver }}.war'
-ckan_connector_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}/org/gcube/data/access/{{ ckan_connector_ver}}/{{ ckan_connector_name }}'
+ckan_connector_name: 'ckan_connector-{{ ckan_connector_ver }}-20160627.090904-1.war'
+ckan_connector_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}/org/gcube/data/access/ckan_connector/{{ ckan_connector_ver}}-SNAPSHOT/{{ ckan_connector_name }}'
 ckan_connector_war_file: ckan-connector.war
 ckan_connector_user: ckan_connector
diff --git a/smartgears/ckan_connector/tasks/main.yml b/smartgears/ckan_connector/tasks/main.yml
index c3a9564..1fa412f 100644
--- a/smartgears/ckan_connector/tasks/main.yml
+++ b/smartgears/ckan_connector/tasks/main.yml
@@ -2,9 +2,8 @@
 - block:
     
     - name: Get the CKAN connector war file
-      #get_url: url={{ ckan_connector_url }} dest={{ smartgears_instance_path }}/webapps/{{ ckan_connector_war_file }}
-      copy: src={{ ckan_connector_war_file }} dest={{ smartgears_instance_path }}/webapps/{{ ckan_connector_war_file }}
-
+      get_url: url={{ ckan_connector_url }} dest={{ smartgears_instance_path }}/webapps/{{ ckan_connector_war_file }}
+      
     - name: Unpack the CKAN connector war file
       shell: mkdir {{ smartgears_instance_path }}/webapps/ckan-connector ; cd {{ smartgears_instance_path }}/webapps/ckan-connector ; jar xf {{ smartgears_instance_path }}/webapps/{{ ckan_connector_war_file }}
       args:
diff --git a/smartgears/dataminer_app/defaults/main.yml b/smartgears/dataminer_app/defaults/main.yml
index 3185288..4c12e33 100644
--- a/smartgears/dataminer_app/defaults/main.yml
+++ b/smartgears/dataminer_app/defaults/main.yml
@@ -18,14 +18,28 @@ dataminer_dataminer_jar_version_range: "[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)"
 dataminer_gcube_web_xml: "http://data.d4science.org/id?fileName=web.xml&smp-id=56615ae0e4b0158fcb561817&contentType=application%2Fxml"
 dataminer_gcube_app_xml: "http://data.d4science.org/id?fileName=gcube-app.xml&smp-id=56615ae0e4b0158fcb561815&contentType=application%2Fxml"
 
+dataminer_additional_jars_urls:
+  - 'http://data.d4science.org/dU50M0VvS1RuV2xrMXBkVER6VzVEYUtoSWhEVFdCWXFHbWJQNStIS0N6Yz0'
+  - 'http://data.d4science.org/OVd0bVZaVlpSdDFrMXBkVER6VzVEU1ZnMmcvYWFrb2tHbWJQNStIS0N6Yz0'
+
 dataminer_jars_to_remove:
-  - 52n-wps-server-3.3.2-SNAPSHOT.jar
+  - 52n-wps-client-lib-3.2.0.jar
   - 52n-wps-io-impl-3.3.1.jar
   - 52n-wps-database-3.3.1.jar
   - 52n-wps-server-3.3.1.jar
   - 52n-wps-algorithm-3.3.1.jar
   - 52n-wps-commons-3.3.1.jar
   - 52n-wps-io-3.3.1.jar
+  - 52n-wps-server-3.3.2-SNAPSHOT.jar 
+  - 52n-wps-algorithm-3.3.2-SNAPSHOT.jar
+  - 52n-wps-algorithm-3.4.0.jar
+  - 52n-wps-server-3.3.2.jar
+  - 52n-wps-server-3.4.0.jar
+  - 52n-wps-algorithm-3.4.0.jar
+  - 52n-wps-commons-3.4.0.jar
+  - 52n-wps-database-3.4.0.jar
+  - 52n-wps-io-3.4.0.jar
+  - 52n-wps-io-impl-3.4.0.jar
   - commons-beanutils-1.7.0.jar
   - dom4j-1.6.jar
   - jaxen-1.1.1.jar
@@ -37,6 +51,7 @@ dataminer_jars_to_remove:
   - spring-context-2.0.6.jar
   - spring-core-2.0.6.jar
   - registry-publisher-1.2.5-3.10.0.jar
+  
 
 dataminer_ecocfg_svn_repo: 'http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/cfg'
 
diff --git a/smartgears/dataminer_app/tasks/dataminer-app.yml b/smartgears/dataminer_app/tasks/dataminer-app.yml
index 35ebdc0..397ddb6 100644
--- a/smartgears/dataminer_app/tasks/dataminer-app.yml
+++ b/smartgears/dataminer_app/tasks/dataminer-app.yml
@@ -70,6 +70,15 @@
   when: dataminer_app_install
   tags: [ 'tomcat', 'dataminer', 'wps' ]
 
+- name: Install the 52n jars modified by D4Science
+  become: True
+  become_user: '{{ smartgears_user }}'
+  get_url: url={{ item }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_52north_webapp_name }}/WEB-INF/lib/
+  with_items: '{{ dataminer_additional_jars_urls }}'
+  notify: Restart smartgears
+  when: dataminer_app_install
+  tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_new_jars' ]
+
 - name: Remove the unwanted jars from the 52 north webapp distribution and from the org.gcube.dataanalysis dataminer dependencies
   become: True
   become_user: '{{ smartgears_user }}'