diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java index b341933..4ded20e 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java @@ -50,8 +50,8 @@ public class RestPoolManager implements PoolManager { public String publishAlgorithm( @QueryParam("algorithmPackageURL") String algorithmPackageURL, @QueryParam("targetVREToken") String targetVREToken, - @QueryParam("targetVRE") String targetVRE, - @QueryParam("category") String category) throws IOException, InterruptedException { + @QueryParam("targetVRE") String targetVRE + /*@QueryParam("category") String category*/) throws IOException, InterruptedException { Algorithm algo = AlgorithmBuilder.create(algorithmPackageURL); return this.service.publishAlgorithm(algo, targetVREToken, targetVRE); ***REMOVED*** @@ -202,12 +202,7 @@ public class RestPoolManager implements PoolManager { ***REMOVED*** - @Override - public String publishAlgorithm(String algorithmPackageURL, String targetVREToken, String targetVRE) - throws IOException, InterruptedException { - ***REMOVED*** TODO Auto-generated method stub - return null; -***REMOVED*** + diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java index 2d9b599..6bdaec8 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java @@ -40,9 +40,9 @@ public class DataminerPoolManager { 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(); return id; ***REMOVED*** diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java index 7a9638d..6c73e1f 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java @@ -10,14 +10,14 @@ import org.gcube.dataanalysis.dataminer.poolmanager.util.SVNUpdater; public class ProductionPublishingJob extends DMPMJob { private Algorithm algorithm; - private Cluster prodCluster; + ***REMOVED***private Cluster prodCluster; private String targetVREName; 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); this.algorithm = algorithm; - this.prodCluster = prodCluster; + ***REMOVED***this.prodCluster = prodCluster; this.targetVREName = targetVREName; this.targetVREToken = targetVREToken; ***REMOVED***