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