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 c1784be..91ce431 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 @@ -31,9 +31,9 @@ public class DataminerPoolManager ***REMOVED*** ***REMOVED***Algorithm algo) throws IOException, InterruptedException ***REMOVED*** Cluster stagingCluster = ClusterBuilder.getStagingDataminerCluster(); - Cluster rProtoCluster = ClusterBuilder.getRProtoCluster(); + ***REMOVED***Cluster rProtoCluster = ClusterBuilder.getRProtoCluster(); - DMPMJob job = new StagingJob(this.svnUpdater, algo, stagingCluster, rProtoCluster, ScopeProvider.instance.get()); + DMPMJob job = new StagingJob(this.svnUpdater, algo, stagingCluster, /*rProtoCluster,*/ ScopeProvider.instance.get()); String id = job.start(); return id; ***REMOVED*** diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/StagingJob.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/StagingJob.java index fd18555..a44951d 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/StagingJob.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/StagingJob.java @@ -19,15 +19,15 @@ public class StagingJob extends DMPMJob ***REMOVED*** private Algorithm algorithm; private Cluster stagingCluster; - private Cluster rProtoCluster; + ***REMOVED***private Cluster rProtoCluster; private String rProtoVREName; - public StagingJob(SVNUpdater svnUpdater, Algorithm algorithm, Cluster stagingCluster, Cluster rProtoCluster, + public StagingJob(SVNUpdater svnUpdater, Algorithm algorithm, Cluster stagingCluster, /*Cluster rProtoCluster,*/ String rProtoVREName) ***REMOVED*** super(svnUpdater); this.algorithm = algorithm; this.stagingCluster = stagingCluster; - this.rProtoCluster = rProtoCluster; + ***REMOVED***this.rProtoCluster = rProtoCluster; this.rProtoVREName = rProtoVREName; ***REMOVED*** diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SendMail.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SendMail.java index 1ce14c1..7210e18 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SendMail.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SendMail.java @@ -18,7 +18,6 @@ import org.gcube.dataanalysis.executor.util.InfraRetrieval; import org.json.JSONArray; import org.json.JSONObject; -import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader.Array; public class SendMail extends StandardLocalInfraAlgorithm ***REMOVED*** @@ -45,7 +44,7 @@ public class SendMail extends StandardLocalInfraAlgorithm ***REMOVED*** ***REMOVED*** put the sender, the recipients, subject and body of the mail here subject = URLEncoder.encode(subject, "UTF-8"); body = URLEncoder.encode(body, "UTF-8"); - String requestParameters = "&sender=dataminer&recipients=" + /*this.getAdmins()*/this.username(SecurityTokenProvider.instance.get()) + "&subject=" + subject + "&body=" + String requestParameters = "&sender=dataminer&recipients=" + this.getAdmins()/*this.username(SecurityTokenProvider.instance.get())*/ + "&subject=" + subject + "&body=" + body; String response = HttpRequest.sendPostRequest(requestForMessage, requestParameters); diff --git a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/JobTest.java b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/JobTest.java index a920f6b..531f24f 100644 --- a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/JobTest.java +++ b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/JobTest.java @@ -25,8 +25,8 @@ public class JobTest ***REMOVED*** ***REMOVED***test phase Cluster stagingCluster = ClusterBuilder.getStagingDataminerCluster(); - Cluster rProtoCluster = ClusterBuilder.getRProtoCluster(); - DMPMJob job = new StagingJob(svnUpdater, algo, stagingCluster, rProtoCluster, ScopeProvider.instance.get()); + ***REMOVED***Cluster rProtoCluster = ClusterBuilder.getRProtoCluster(); + DMPMJob job = new StagingJob(svnUpdater, algo, stagingCluster, /*rProtoCluster,*/ ScopeProvider.instance.get()); job.start(); ***REMOVED***release phase