git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@151362 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/StagingJob.java

@@ -88,9 +88,12 @@ public class StagingJob extends DMPMJob ***REMOVED***
 
 			if (ret == 0) ***REMOVED***
 				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))) ***REMOVED***
+				if (b.checkMethod(a.getHost(env), SecurityTokenProvider.instance.get())&&(b.algoExists(this.algorithm, env))) ***REMOVED***
 
 					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 ***REMOVED***
 					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());

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/CheckMethod.java

@@ -86,7 +86,7 @@ public class CheckMethod ***REMOVED***
 	
 	
 	public boolean algoExists(Algorithm a, String env) throws Exception***REMOVED***
-		
+		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***
 	
 	
 	
+	
+	
+	
 	***REMOVED***a.copyFromDmToSVN(aa);
 	if (a.checkMethod("dataminer1-devnext.d4science.org", "***REMOVED***"))***REMOVED***
-		System.out.println("ciaocia");***REMOVED***
+		System.out.println("AAA");***REMOVED***
-***REMOVED******REMOVED***		
+		
 	if (a.doesExist("/home/gcube/wps_algorithms/algorithms/RBLACKBOX.jar","Dev"))***REMOVED***
-		System.out.println("ciao");
+		System.out.println("BBBB");
-***REMOVED******REMOVED***
-***REMOVED***	
-***REMOVED***	
-***REMOVED******REMOVED***
 	
-***REMOVED******REMOVED***
+***REMOVED***
+	if (a.doesExist("/home/gcube/wps_algorithms/algorithms/RBLACKBOX_interface.jar","Dev"))***REMOVED***
+		System.out.println("CCCC");***REMOVED***
+	
+	File aa = new File("/home/gcube/wps_algorithms/algorithms/RBLACKBOX_interface.jar");
+	a.copyFromDmToSVN(aa, "Dev");
+	
+	
+***REMOVED***
 ***REMOVED***

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/ServiceConfiguration.java

@@ -187,11 +187,11 @@ public class ServiceConfiguration ***REMOVED***
 		String a = "";
 		
 		if (env.equals("Dev"))***REMOVED***
-			a = this.getDevStagingHost(); 
+			a = this.getDevStagingHost().trim(); 
 	***REMOVED***
 		
 		if (env.equals("Prod")||(env.equals("Prod")))***REMOVED***
-			a = this.getProtoProdStagingHost(); 
+			a = this.getProtoProdStagingHost().trim(); 
 	***REMOVED***
 		return a;
 		

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