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 71b89fe..493f5a7 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 @@ -88,9 +88,12 @@ public class StagingJob extends DMPMJob { if (ret == 0) { this.getStatus(0); + System.out.println("1 - Checking existing in env: "+ env); + + System.out.println("2 - Checking existing in env: "+ this.env); - if (b.checkMethod(a.getHost(this.env), SecurityTokenProvider.instance.get()) - && (b.algoExists(this.algorithm, this.env))) { + + if (b.checkMethod(a.getHost(env), SecurityTokenProvider.instance.get())&&(b.algoExists(this.algorithm, env))) { System.out.println("Interface check ok!"); System.out.println("Both the files exist at the correct path!"); @@ -105,7 +108,7 @@ public class StagingJob extends DMPMJob { this.getStatus(2); sm.sendNotification(nh.getFailedSubject() + " for "+this.algorithm.getName()+ " algorithm", nh.getFailedBody( - "\n\n"+ + "\n"+ "Installation completed but DataMiner Interface not working correctly or files " + this.algorithm.getName() + ".jar and " + this.algorithm.getName() + "_interface.jar not availables at the expected path")+"\n\n"+this.buildInfo()); diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/CheckMethod.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/CheckMethod.java index ec0d591..28a37d7 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/CheckMethod.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/CheckMethod.java @@ -86,7 +86,7 @@ public class CheckMethod { public boolean algoExists(Algorithm a, String env) throws Exception{ - + System.out.println("checking existing in env: "+ env); File file = new File("/home/gcube/wps_algorithms/algorithms/"+a.getName()+".jar"); File file2 = new File("/home/gcube/wps_algorithms/algorithms/"+a.getName()+"_interface.jar"); @@ -229,16 +229,23 @@ public class CheckMethod { + + + ***REMOVED***a.copyFromDmToSVN(aa); if (a.checkMethod("dataminer1-devnext.d4science.org", "708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548")){ - System.out.println("ciaocia");***REMOVED*** -***REMOVED******REMOVED*** + System.out.println("AAA");***REMOVED*** + if (a.doesExist("/home/gcube/wps_algorithms/algorithms/RBLACKBOX.jar","Dev")){ - System.out.println("ciao"); -***REMOVED******REMOVED*** -***REMOVED*** -***REMOVED*** -***REMOVED******REMOVED*** + System.out.println("BBBB"); -***REMOVED******REMOVED*** +***REMOVED*** + if (a.doesExist("/home/gcube/wps_algorithms/algorithms/RBLACKBOX_interface.jar","Dev")){ + System.out.println("CCCC");***REMOVED*** + + File aa = new File("/home/gcube/wps_algorithms/algorithms/RBLACKBOX_interface.jar"); + a.copyFromDmToSVN(aa, "Dev"); + + +***REMOVED*** ***REMOVED*** diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/ServiceConfiguration.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/ServiceConfiguration.java index dd197f6..56d15e5 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/ServiceConfiguration.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/ServiceConfiguration.java @@ -187,11 +187,11 @@ public class ServiceConfiguration { String a = ""; if (env.equals("Dev")){ - a = this.getDevStagingHost(); + a = this.getDevStagingHost().trim(); ***REMOVED*** if (env.equals("Prod")||(env.equals("Prod"))){ - a = this.getProtoProdStagingHost(); + a = this.getProtoProdStagingHost().trim(); ***REMOVED*** return a; diff --git a/src/main/resources/service.properties b/src/main/resources/service.properties index eb00d99..ab4f6c9 100644 --- a/src/main/resources/service.properties +++ b/src/main/resources/service.properties @@ -1,6 +1,6 @@ #YML node file DEV_STAGING_HOST: dataminer1-devnext.d4science.org -PROTO_PROD_STAGING_HOST: dataminer-proto-ghost.d4science.org +PROTO_PROD_STAGING_HOST: dataminer-proto-ghost.d4science.org SVN_REPO: https:***REMOVED***svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/RConfiguration/RPackagesManagement/ #HAPROXY_CSV: http:***REMOVED***data.d4science.org/Yk4zSFF6V3JOSytNd3JkRDlnRFpDUUR5TnRJZEw2QjRHbWJQNStIS0N6Yz0