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 3ad395846a
commit ae1019f4f0
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());
service.updateSVN("r_cran_pkgs.txt", ls);
}
if (d.getType().equals("custom")) {
if (d.getType().equals("github")) {
List<String> ls = new LinkedList<String>();
ls.add(d.getName());
service.updateSVN("r_github_pkgs.txt", ls);
}
if (d.getType().equals("")) {
List<String> ls = new LinkedList<String>();
ls.add(d.getName());
service.updateSVN("r_deb_pkgs.txt", ls);
}
}
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);
}
if (d.getType().equals("custom")) {
if (d.getType().equals("github")) {
List<String> ls = new LinkedList<String>();
ls.add(d.getName());
service.updateSVN("r_github_pkgs.txt", ls);
}
if (d.getType().equals("")) {
List<String> ls = new LinkedList<String>();
ls.add(d.getName());
service.updateSVN("r_deb_pkgs.txt", ls);
}
}
return service.addAlgorithmToHost(algo, hostname);
}
private Algorithm getAlgorithm(String algorithm, String vre, String hostname, String name, String description,
String category, String algorithmType, String skipJava) throws IOException, InterruptedException {
//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 {
// System.out.println(aa.getAlgoById("ICHTHYOP_MODEL_ONE_BY_ONE@3141d3aa-5f93-409f-b6f8-9fae0a6c0ee3"));
// System.out.println(aa.getAlgoFromIs());
// RestPoolManager a = new RestPoolManager();
// a.addAlgorithmToVRE(
// "http://data.d4science.org/S2h1RHZGd0JpWnBjZk9qTytQTndqcDRLVHNrQUt6QjhHbWJQNStIS0N6Yz0",
// "/gcube/devNext/NextNext",
// null, null, "test", "transducerers", "N");
RestPoolManager a = new RestPoolManager();
a.addAlgorithmToVRE(
"http://data.d4science.org/TVc0TW9Ud1FjYlppK0NHd2pvU0owNmRFWHE4OW4xSGNHbWJQNStIS0N6Yz0",
"test",
null, null, "N", "transducerers", false);
// a.addAlgorithmToHost(
// "http://data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0",
@ -351,12 +342,12 @@ public class RestPoolManager implements PoolManager {
//
//
PoolManager aa = new DataminerPoolManager();
List<String> ls = new LinkedList<String>();
String afa = "test";
ls.add(afa);
System.out.println(aa.updateSVN("r_deb_pkgs.txt", ls));
// PoolManager aa = new DataminerPoolManager();
// List<String> ls = new LinkedList<String>();
// String afa = "test";
// ls.add(afa);
//
// System.out.println(aa.updateSVN("r_deb_pkgs.txt", ls));
}
@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);
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());
}
System.out.println("bbbb"+baos);
byte[] bytes = baos.toByteArray();
commitEditor.applyTextDelta(file,md5(originalContents));