gCubeSystem
/
dataminer-pool-manager
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@146658 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Nunzio Andrea Galante 2017-04-06 13:17:50 +00:00
parent b36c9d6238
commit c736b2f0d3
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java
View File

@ -215,16 +215,11 @@ public class RestPoolManager implements PoolManager {
ls.add(d.getName()); ls.add(d.getName());
service.updateSVN("r_cran_pkgs.txt", ls); service.updateSVN("r_cran_pkgs.txt", ls);
***REMOVED*** ***REMOVED***
if (d.getType().equals("custom")) { if (d.getType().equals("github")) {
List<String> ls = new LinkedList<String>(); List<String> ls = new LinkedList<String>();
ls.add(d.getName()); ls.add(d.getName());
service.updateSVN("r_github_pkgs.txt", ls); service.updateSVN("r_github_pkgs.txt", ls);
***REMOVED*** ***REMOVED***
if (d.getType().equals("")) {
List<String> ls = new LinkedList<String>();
ls.add(d.getName());
service.updateSVN("r_deb_pkgs.txt", ls);
***REMOVED***
***REMOVED*** ***REMOVED***
return service.addAlgorithmToVRE(algo, ScopeProvider.instance.get()); return service.addAlgorithmToVRE(algo, ScopeProvider.instance.get());
@ -263,23 +258,18 @@ public class RestPoolManager implements PoolManager {
ls.add(d.getName()); ls.add(d.getName());
service.updateSVN("r_cran_pkgs.txt", ls); service.updateSVN("r_cran_pkgs.txt", ls);
***REMOVED*** ***REMOVED***
if (d.getType().equals("custom")) { if (d.getType().equals("github")) {
List<String> ls = new LinkedList<String>(); List<String> ls = new LinkedList<String>();
ls.add(d.getName()); ls.add(d.getName());
service.updateSVN("r_github_pkgs.txt", ls); service.updateSVN("r_github_pkgs.txt", ls);
***REMOVED*** ***REMOVED***
if (d.getType().equals("")) {
List<String> ls = new LinkedList<String>();
ls.add(d.getName());
service.updateSVN("r_deb_pkgs.txt", ls);
***REMOVED***
***REMOVED*** ***REMOVED***
return service.addAlgorithmToHost(algo, hostname); return service.addAlgorithmToHost(algo, hostname);
***REMOVED*** ***REMOVED***
private Algorithm getAlgorithm(String algorithm, String vre, String hostname, String name, String description, private Algorithm getAlgorithm(String algorithm, String vre, String hostname, String name, String description,
String category, String algorithmType, String skipJava) throws IOException, InterruptedException { 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); Algorithm algo = service.extractAlgorithm(algorithm);
if (algo.getCategory() == null) { 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.getAlgoById("ICHTHYOP_MODEL_ONE_BY_ONE@3141d3aa-5f93-409f-b6f8-9fae0a6c0ee3"));
***REMOVED*** System.out.println(aa.getAlgoFromIs()); ***REMOVED*** System.out.println(aa.getAlgoFromIs());
***REMOVED*** RestPoolManager a = new RestPoolManager();
***REMOVED*** a.addAlgorithmToVRE( RestPoolManager a = new RestPoolManager();
***REMOVED*** "http:***REMOVED***data.d4science.org/S2h1RHZGd0JpWnBjZk9qTytQTndqcDRLVHNrQUt6QjhHbWJQNStIS0N6Yz0", a.addAlgorithmToVRE(
***REMOVED*** "/gcube/devNext/NextNext", "http:***REMOVED***data.d4science.org/TVc0TW9Ud1FjYlppK0NHd2pvU0owNmRFWHE4OW4xSGNHbWJQNStIS0N6Yz0",
***REMOVED*** null, null, "test", "transducerers", "N"); "test",
null, null, "N", "transducerers", false);
***REMOVED*** a.addAlgorithmToHost( ***REMOVED*** a.addAlgorithmToHost(
***REMOVED*** "http:***REMOVED***data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0", ***REMOVED*** "http:***REMOVED***data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0",
@ -351,12 +342,12 @@ public class RestPoolManager implements PoolManager {
***REMOVED*** ***REMOVED***
***REMOVED*** ***REMOVED***
PoolManager aa = new DataminerPoolManager(); ***REMOVED*** PoolManager aa = new DataminerPoolManager();
List<String> ls = new LinkedList<String>(); ***REMOVED*** List<String> ls = new LinkedList<String>();
String afa = "test"; ***REMOVED*** String afa = "test";
ls.add(afa); ***REMOVED*** ls.add(afa);
***REMOVED***
System.out.println(aa.updateSVN("r_deb_pkgs.txt", ls)); ***REMOVED*** System.out.println(aa.updateSVN("r_deb_pkgs.txt", ls));
***REMOVED*** ***REMOVED***
@Override @Override

3
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java
View File

@ -591,10 +591,8 @@ public class DataminerPoolManager implements PoolManager {
Collections.sort(aa); Collections.sort(aa);
final SVNDeltaGenerator deltaGenerator = new SVNDeltaGenerator(); final SVNDeltaGenerator deltaGenerator = new SVNDeltaGenerator();
System.out.println("aaaa"+byteArrayOutputStream);
byte[] originalContents = byteArrayOutputStream.toByteArray(); byte[] originalContents = byteArrayOutputStream.toByteArray();
System.out.println(byteArrayOutputStream.toByteArray());
final ISVNEditor commitEditor = svnRepository.getCommitEditor("update dependencies", null); final ISVNEditor commitEditor = svnRepository.getCommitEditor("update dependencies", null);
commitEditor.openRoot(-1); commitEditor.openRoot(-1);
@ -606,7 +604,6 @@ public class DataminerPoolManager implements PoolManager {
baos.write(line.getBytes()); baos.write(line.getBytes());
baos.write("\n".getBytes()); baos.write("\n".getBytes());
***REMOVED*** ***REMOVED***
System.out.println("bbbb"+baos);
byte[] bytes = baos.toByteArray(); byte[] bytes = baos.toByteArray();
commitEditor.applyTextDelta(file,md5(originalContents)); commitEditor.applyTextDelta(file,md5(originalContents));