From cd23218da4f82d5ab5e8cd6fff77c82015dc73e5 Mon Sep 17 00:00:00 2001
From: Gabriele Giammatteo <gabriele.giammatteo@eng.it>
Date: Wed, 17 May 2017 16:28:44 +0000
Subject: [PATCH] git-svn-id:
 https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@148815
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .../poolmanager/service/DMPMJob.java          | 22 -------------------
 .../poolmanager/util/SVNUpdater.java          |  5 +++--
 .../dataminerpoolmanager/SVNTests.java        |  3 ++-
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DMPMJob.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DMPMJob.java
index 0c5f72e..ecf0540 100644
--- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DMPMJob.java
+++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DMPMJob.java
@@ -76,25 +76,3 @@ public abstract class DMPMJob {
 ***REMOVED***
 
 ***REMOVED***
-***REMOVED***	protected void updateSVNDependencies(Algorithm algo, boolean stagingVRE) throws IOException, SVNException {
-***REMOVED***		for (Dependency d : algo.getDependencies()) {
-***REMOVED***
-***REMOVED***			if (d.getType().equals("os")) {
-***REMOVED***				List<String> ls = new LinkedList<String>();
-***REMOVED***				ls.add(d.getName());
-***REMOVED***				this.svnUpdater.updateSVN((stagingVRE ? "test_": "") + "r_deb_pkgs.txt", ls);
-***REMOVED***		***REMOVED***
-***REMOVED***			if (d.getType().equals("cran")) {
-***REMOVED***				List<String> ls = new LinkedList<String>();
-***REMOVED***				ls.add(d.getName());
-***REMOVED***				this.svnUpdater.updateSVN((stagingVRE ? "test_": "") + "r_cran_pkgs.txt", ls);
-***REMOVED***		***REMOVED***
-***REMOVED***			if (d.getType().equals("github")) {
-***REMOVED***				List<String> ls = new LinkedList<String>();
-***REMOVED***				ls.add(d.getName());
-***REMOVED***				this.svnUpdater.updateSVN((stagingVRE ? "test_": "") + "r_github_pkgs.txt", ls);
-***REMOVED***		***REMOVED***
-***REMOVED***	***REMOVED***
-***REMOVED******REMOVED***
-
-***REMOVED***
diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java
index 3e538d1..9cc200b 100644
--- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java
+++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java
@@ -67,6 +67,7 @@ public class SVNUpdater {
       ***REMOVED***check if the algorithm is already in the list (match the class name)
       for(String l: lines){
         if(l.contains(algorithm.getClazz())){
+          System.out.println("Not updating algorithm list beacuse already present");
           return;
         ***REMOVED***
       ***REMOVED***
@@ -74,14 +75,14 @@ public class SVNUpdater {
       ***REMOVED***the algorithm is not in the list. Add it
       List<String> newContent = new LinkedList<>(Arrays.asList(lines));
       newContent.add(this.generateAlgorithmEntry(algorithm, targetVRE, user, env));
-      Collections.sort(newContent);
+      ***REMOVED***Collections.sort(newContent);
 
 
       final SVNDeltaGenerator deltaGenerator = new SVNDeltaGenerator();
 
       byte[] originalContents = byteArrayOutputStream.toByteArray();
 
-      final ISVNEditor commitEditor = svnRepository.getCommitEditor("update dependencies", null);
+      final ISVNEditor commitEditor = svnRepository.getCommitEditor("update algorithm list", null);
       commitEditor.openRoot(-1);
       commitEditor.openFile(file, -1);
 
diff --git a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/SVNTests.java b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/SVNTests.java
index b7c5414..53122cb 100644
--- a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/SVNTests.java
+++ b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/SVNTests.java
@@ -20,7 +20,8 @@ public class SVNTests {
     SVNUpdater svnUpdater = new SVNUpdater(new ServiceConfiguration("/home/ggiammat/tmp/dmpm.properties"));
     Algorithm algo = AlgorithmBuilder.create("http:***REMOVED***data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0", "ICHTHYOP_MODEL");
 
+    algo.setClazz(algo.getClazz() + "TEST");
 
-    svnUpdater.updateRPRotoDeps(algo);
+    svnUpdater.updateSVNRProtoAlgorithmList(algo, "/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab", "Dataminer Pool Manager", "Proto");
   ***REMOVED***
 ***REMOVED***