gCubeSystem
/
dataminer-pool-manager
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

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

This commit is contained in:
Nunzio Andrea Galante 2017-10-09 16:14:23 +00:00
parent c20472bbc9
commit 58cb07dc26
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,9 +85,10 @@ public class CheckMethod ***REMOVED***
public boolean algoExists(Algorithm a/*, String env*/) throws Exception***REMOVED*** public boolean algoExists(Algorithm a/*, String env*/) throws Exception***REMOVED***
ServiceConfiguration p = new ServiceConfiguration();
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"); File file = new File(p.getGhostAlgoDirectory()+"/"+a.getName()+".jar");
File file2 = new File(p.getGhostAlgoDirectory()+"/"+a.getName()+"_interface.jar");
System.out.println("First file is located to: "+file.getPath()); System.out.println("First file is located to: "+file.getPath());
@ -115,8 +116,8 @@ public class CheckMethod ***REMOVED***
ServiceConfiguration p = new ServiceConfiguration(); ServiceConfiguration p = new ServiceConfiguration();
System.out.println("checking existing in env: " + p.getStagingHost()); System.out.println("checking existing in env: " + p.getStagingHost());
File file = new File("/home/gcube/wps_algorithms/algorithms/"+a.getName()+".jar"); File file = new File(p.getGhostAlgoDirectory()+"/"+a.getName()+".jar");
File file2 = new File("/home/gcube/wps_algorithms/algorithms/"+a.getName()+"_interface.jar"); File file2 = new File(p.getGhostAlgoDirectory()+"/"+a.getName()+"_interface.jar");
System.out.println("First file is located to: "+file.getPath()); System.out.println("First file is located to: "+file.getPath());
@ -244,12 +245,12 @@ public class CheckMethod ***REMOVED***
ChannelSftp sftp = (ChannelSftp) channel; ChannelSftp sftp = (ChannelSftp) channel;
sftp.cd("/home/gcube/wps_algorithms/algorithms/"); sftp.cd(p.getGhostAlgoDirectory());
System.out.println("REMOTE : /home/gcube/wps_algorithms/algorithms/"+a.getName()); System.out.println("REMOTE : "+p.getGhostAlgoDirectory()+"/"+a.getName());
System.out.println("LOCAL : /tmp/"+a.getName()); System.out.println("LOCAL : /tmp/"+a.getName());
sftp.get("/home/gcube/wps_algorithms/algorithms/"+a.getName(),"/tmp/"+a.getName()); sftp.get(p.getGhostAlgoDirectory()+"/"+a.getName(),"/tmp/"+a.getName());
channel.disconnect(); channel.disconnect();
session.disconnect(); session.disconnect();

6
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java
View File

@ -560,9 +560,9 @@ public class SVNUpdater ***REMOVED***
***REMOVED***to fix in next release: if the file is not present for that language in the service.properties then skip and return null list of string ***REMOVED***to fix in next release: if the file is not present for that language in the service.properties then skip and return null list of string
***REMOVED***just to uncomment the following lines ***REMOVED***just to uncomment the following lines
***REMOVED***if(file.isEmpty())***REMOVED*** if(file.isEmpty())***REMOVED***
***REMOVED***return undefined; return undefined;
***REMOVED******REMOVED*** ***REMOVED***
System.out.println("Checking dependencies list: " + file); System.out.println("Checking dependencies list: " + file);

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

@ -55,6 +55,11 @@ public class ServiceConfiguration ***REMOVED***
***REMOVED*** ***REMOVED***
public String getGhostAlgoDirectory()***REMOVED***
return props.getProperty("svn.algo.ghost.repo");
***REMOVED***
***REMOVED***RProto ***REMOVED***RProto
***REMOVED*** public String getSVNRProtoAlgorithmsList()***REMOVED*** ***REMOVED*** public String getSVNRProtoAlgorithmsList()***REMOVED***