From 03f973a7deb1b5462b3773e6da530e5a4c8fd16d Mon Sep 17 00:00:00 2001 From: Gabriele Giammatteo 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 4d7f9a4..6a03a3f 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*** -***REMOVED*** protected void updateSVNDependencies(Algorithm algo, boolean stagingVRE) throws IOException, SVNException ***REMOVED*** -***REMOVED*** for (Dependency d : algo.getDependencies()) ***REMOVED*** -***REMOVED*** -***REMOVED*** if (d.getType().equals("os")) ***REMOVED*** -***REMOVED*** List ls = new LinkedList(); -***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*** -***REMOVED*** List ls = new LinkedList(); -***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*** -***REMOVED*** List ls = new LinkedList(); -***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 232588c..34d0d91 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*** ***REMOVED***check if the algorithm is already in the list (match the class name) for(String l: lines)***REMOVED*** if(l.contains(algorithm.getClazz()))***REMOVED*** + System.out.println("Not updating algorithm list beacuse already present"); return; ***REMOVED*** ***REMOVED*** @@ -74,14 +75,14 @@ public class SVNUpdater ***REMOVED*** ***REMOVED***the algorithm is not in the list. Add it List 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 54a82f5..1a5afda 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 ***REMOVED*** 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***