From c55230a2133ffb04df532d09c85612f3ed6888ff Mon Sep 17 00:00:00 2001 From: Nunzio Andrea Galante Date: Tue, 18 Jul 2017 12:58:56 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@151131 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../dataminer/poolmanager/rest/RestPoolManager.java | 11 +++-------- .../poolmanager/service/DataminerPoolManager.java | 4 ++-- .../poolmanager/service/ProductionPublishingJob.java | 6 +++--- 3 files changed, 8 insertions(+), 13 deletions(-) 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 8633c71..8af69bb 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); } @@ -202,12 +202,7 @@ public class RestPoolManager implements PoolManager { } - @Override - public String publishAlgorithm(String algorithmPackageURL, String targetVREToken, String targetVRE) - throws IOException, InterruptedException { - // TODO Auto-generated method stub - return null; - } + 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 5821f80..ba9ae4f 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); + //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; } 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 7f502fc..46d16bd 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; + //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; + //this.prodCluster = prodCluster; this.targetVREName = targetVREName; this.targetVREToken = targetVREToken; }