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@146689 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Nunzio Andrea Galante 2017-04-07 13:56:40 +00:00
parent c736b2f0d3
commit 52844f2bf9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,7 +193,8 @@ public class RestPoolManager implements PoolManager {
@QueryParam("category") String category,
@DefaultValue("transducerers") @QueryParam("algorithmType") String algorithmType,
@DefaultValue("N") @QueryParam("skipJava") String skipJava,
@DefaultValue("false") @QueryParam("publish") boolean publish)
@DefaultValue("false") @QueryParam("publish") boolean publish,
@DefaultValue("false") @QueryParam("updateSVN") boolean updateSVN)
throws IOException, InterruptedException, SVNException {
Algorithm algo = this.getAlgorithm(algorithm, /*vre*/null, null, name, description, category, algorithmType, skipJava);
@ -201,8 +202,8 @@ public class RestPoolManager implements PoolManager {
if (publish) {
service.addAlgToIs(algo);
***REMOVED***
***REMOVED*** update svn
if (updateSVN){
for (Dependency d : algo.getDependencies()) {
if (d.getType().equals("os")) {
@ -220,6 +221,7 @@ public class RestPoolManager implements PoolManager {
ls.add(d.getName());
service.updateSVN("r_github_pkgs.txt", ls);
***REMOVED***
***REMOVED***
***REMOVED***
return service.addAlgorithmToVRE(algo, ScopeProvider.instance.get());
@ -236,16 +238,19 @@ public class RestPoolManager implements PoolManager {
@QueryParam("category") String category,
@DefaultValue("transducerers") @QueryParam("algorithmType") String algorithmType,
@DefaultValue("N") @QueryParam("skipJava") String skipJava,
@DefaultValue("false") @QueryParam("publish") boolean publish)
@DefaultValue("false") @QueryParam("publish") boolean publish,
@DefaultValue("false") @QueryParam("updateSVN") boolean updateSVN)
throws IOException, InterruptedException, SVNException {
Algorithm algo = this.getAlgorithm(algorithm, null, hostname, name, description, category, algorithmType,
skipJava);
***REMOVED*** publish algo
if (publish) {
service.addAlgToIs(algo);
***REMOVED***
***REMOVED*** update svn
if (updateSVN){
for (Dependency d : algo.getDependencies()) {
if (d.getType().equals("os")) {
@ -263,6 +268,7 @@ public class RestPoolManager implements PoolManager {
ls.add(d.getName());
service.updateSVN("r_github_pkgs.txt", ls);
***REMOVED***
***REMOVED***
***REMOVED***
return service.addAlgorithmToHost(algo, hostname);
***REMOVED***
@ -332,7 +338,7 @@ public class RestPoolManager implements PoolManager {
a.addAlgorithmToVRE(
"http:***REMOVED***data.d4science.org/TVc0TW9Ud1FjYlppK0NHd2pvU0owNmRFWHE4OW4xSGNHbWJQNStIS0N6Yz0",
"test",
null, null, "N", "transducerers", false);
null, null, "N", "transducerers", true, false);
***REMOVED*** a.addAlgorithmToHost(
***REMOVED*** "http:***REMOVED***data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0",
@ -392,7 +398,6 @@ public class RestPoolManager implements PoolManager {
return null;
***REMOVED***
@Override
public List<String> updateSVN(String file, List<String> ldep) throws SVNException {