git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@151131 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
0785091c08
commit
b44644bf37
|
@ -50,8 +50,8 @@ public class RestPoolManager implements PoolManager {
|
||||||
public String publishAlgorithm(
|
public String publishAlgorithm(
|
||||||
@QueryParam("algorithmPackageURL") String algorithmPackageURL,
|
@QueryParam("algorithmPackageURL") String algorithmPackageURL,
|
||||||
@QueryParam("targetVREToken") String targetVREToken,
|
@QueryParam("targetVREToken") String targetVREToken,
|
||||||
@QueryParam("targetVRE") String targetVRE,
|
@QueryParam("targetVRE") String targetVRE
|
||||||
@QueryParam("category") String category) throws IOException, InterruptedException {
|
/*@QueryParam("category") String category*/) throws IOException, InterruptedException {
|
||||||
Algorithm algo = AlgorithmBuilder.create(algorithmPackageURL);
|
Algorithm algo = AlgorithmBuilder.create(algorithmPackageURL);
|
||||||
return this.service.publishAlgorithm(algo, targetVREToken, targetVRE);
|
return this.service.publishAlgorithm(algo, targetVREToken, targetVRE);
|
||||||
***REMOVED***
|
***REMOVED***
|
||||||
|
@ -202,12 +202,7 @@ public class RestPoolManager implements PoolManager {
|
||||||
***REMOVED***
|
***REMOVED***
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String publishAlgorithm(String algorithmPackageURL, String targetVREToken, String targetVRE)
|
|
||||||
throws IOException, InterruptedException {
|
|
||||||
***REMOVED*** TODO Auto-generated method stub
|
|
||||||
return null;
|
|
||||||
***REMOVED***
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -40,9 +40,9 @@ public class DataminerPoolManager {
|
||||||
|
|
||||||
public String publishAlgorithm(Algorithm algo, String targetVREToken, String targetVRE) throws IOException, InterruptedException {
|
public String publishAlgorithm(Algorithm algo, String targetVREToken, String targetVRE) throws IOException, InterruptedException {
|
||||||
|
|
||||||
Cluster prodCluster = ClusterBuilder.getVRECluster(targetVREToken, targetVRE);
|
***REMOVED***Cluster prodCluster = ClusterBuilder.getVRECluster(targetVREToken, targetVRE);
|
||||||
|
|
||||||
DMPMJob job = new ProductionPublishingJob(this.svnUpdater, algo, prodCluster, targetVRE, targetVREToken);
|
DMPMJob job = new ProductionPublishingJob(this.svnUpdater, algo, /*prodCluster,*/ targetVRE, targetVREToken);
|
||||||
String id = job.start();
|
String id = job.start();
|
||||||
return id;
|
return id;
|
||||||
***REMOVED***
|
***REMOVED***
|
||||||
|
|
|
@ -10,14 +10,14 @@ import org.gcube.dataanalysis.dataminer.poolmanager.util.SVNUpdater;
|
||||||
public class ProductionPublishingJob extends DMPMJob {
|
public class ProductionPublishingJob extends DMPMJob {
|
||||||
|
|
||||||
private Algorithm algorithm;
|
private Algorithm algorithm;
|
||||||
private Cluster prodCluster;
|
***REMOVED***private Cluster prodCluster;
|
||||||
private String targetVREName;
|
private String targetVREName;
|
||||||
private String targetVREToken;
|
private String targetVREToken;
|
||||||
|
|
||||||
public ProductionPublishingJob(SVNUpdater svnUpdater, Algorithm algorithm, Cluster prodCluster, String targetVREName, String targetVREToken) {
|
public ProductionPublishingJob(SVNUpdater svnUpdater, Algorithm algorithm, /*Cluster prodCluster,*/ String targetVREName, String targetVREToken) {
|
||||||
super(svnUpdater);
|
super(svnUpdater);
|
||||||
this.algorithm = algorithm;
|
this.algorithm = algorithm;
|
||||||
this.prodCluster = prodCluster;
|
***REMOVED***this.prodCluster = prodCluster;
|
||||||
this.targetVREName = targetVREName;
|
this.targetVREName = targetVREName;
|
||||||
this.targetVREToken = targetVREToken;
|
this.targetVREToken = targetVREToken;
|
||||||
***REMOVED***
|
***REMOVED***
|
||||||
|
|
Loading…
Reference in New Issue