diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java index 8cf9730..2cd8bcc 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java @@ -215,16 +215,11 @@ public class RestPoolManager implements PoolManager { ls.add(d.getName()); service.updateSVN("r_cran_pkgs.txt", ls); ***REMOVED*** - if (d.getType().equals("custom")) { + if (d.getType().equals("github")) { List ls = new LinkedList(); ls.add(d.getName()); service.updateSVN("r_github_pkgs.txt", ls); ***REMOVED*** - if (d.getType().equals("")) { - List ls = new LinkedList(); - ls.add(d.getName()); - service.updateSVN("r_deb_pkgs.txt", ls); - ***REMOVED*** ***REMOVED*** return service.addAlgorithmToVRE(algo, ScopeProvider.instance.get()); @@ -263,23 +258,18 @@ public class RestPoolManager implements PoolManager { ls.add(d.getName()); service.updateSVN("r_cran_pkgs.txt", ls); ***REMOVED*** - if (d.getType().equals("custom")) { + if (d.getType().equals("github")) { List ls = new LinkedList(); ls.add(d.getName()); service.updateSVN("r_github_pkgs.txt", ls); ***REMOVED*** - if (d.getType().equals("")) { - List ls = new LinkedList(); - ls.add(d.getName()); - service.updateSVN("r_deb_pkgs.txt", ls); - ***REMOVED*** ***REMOVED*** return service.addAlgorithmToHost(algo, hostname); ***REMOVED*** private Algorithm getAlgorithm(String algorithm, String vre, String hostname, String name, String description, String category, String algorithmType, String skipJava) throws IOException, InterruptedException { - ***REMOVED***LOGGER.debug("Adding algorithm =" + algorithm + " to VRE =" + vre); + LOGGER.debug("Adding algorithm =" + algorithm + " to VRE =" + ScopeProvider.instance.get()); Algorithm algo = service.extractAlgorithm(algorithm); if (algo.getCategory() == null) { @@ -337,11 +327,12 @@ public class RestPoolManager implements PoolManager { ***REMOVED*** System.out.println(aa.getAlgoById("ICHTHYOP_MODEL_ONE_BY_ONE@3141d3aa-5f93-409f-b6f8-9fae0a6c0ee3")); ***REMOVED*** System.out.println(aa.getAlgoFromIs()); - ***REMOVED*** RestPoolManager a = new RestPoolManager(); - ***REMOVED*** a.addAlgorithmToVRE( - ***REMOVED*** "http:***REMOVED***data.d4science.org/S2h1RHZGd0JpWnBjZk9qTytQTndqcDRLVHNrQUt6QjhHbWJQNStIS0N6Yz0", - ***REMOVED*** "/gcube/devNext/NextNext", - ***REMOVED*** null, null, "test", "transducerers", "N"); + + RestPoolManager a = new RestPoolManager(); + a.addAlgorithmToVRE( + "http:***REMOVED***data.d4science.org/TVc0TW9Ud1FjYlppK0NHd2pvU0owNmRFWHE4OW4xSGNHbWJQNStIS0N6Yz0", + "test", + null, null, "N", "transducerers", false); ***REMOVED*** a.addAlgorithmToHost( ***REMOVED*** "http:***REMOVED***data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0", @@ -351,12 +342,12 @@ public class RestPoolManager implements PoolManager { ***REMOVED*** ***REMOVED*** - PoolManager aa = new DataminerPoolManager(); - List ls = new LinkedList(); - String afa = "test"; - ls.add(afa); - - System.out.println(aa.updateSVN("r_deb_pkgs.txt", ls)); +***REMOVED*** PoolManager aa = new DataminerPoolManager(); +***REMOVED*** List ls = new LinkedList(); +***REMOVED*** String afa = "test"; +***REMOVED*** ls.add(afa); +***REMOVED*** +***REMOVED*** System.out.println(aa.updateSVN("r_deb_pkgs.txt", ls)); ***REMOVED*** @Override diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java index 8f372f1..fc2bcbf 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java @@ -591,10 +591,8 @@ public class DataminerPoolManager implements PoolManager { Collections.sort(aa); final SVNDeltaGenerator deltaGenerator = new SVNDeltaGenerator(); - System.out.println("aaaa"+byteArrayOutputStream); byte[] originalContents = byteArrayOutputStream.toByteArray(); - System.out.println(byteArrayOutputStream.toByteArray()); final ISVNEditor commitEditor = svnRepository.getCommitEditor("update dependencies", null); commitEditor.openRoot(-1); @@ -606,7 +604,6 @@ public class DataminerPoolManager implements PoolManager { baos.write(line.getBytes()); baos.write("\n".getBytes()); ***REMOVED*** - System.out.println("bbbb"+baos); byte[] bytes = baos.toByteArray(); commitEditor.applyTextDelta(file,md5(originalContents));