gCubeSystem
/
dataminer-pool-manager
15
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@154948 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Nunzio Andrea Galante 2017-10-06 14:07:09 +00:00
parent f29472ed3e
commit bf370e511a
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,24 +286,28 @@ public class CheckMethod {
***REMOVED***a.copyFromDmToSVN(aa); ***REMOVED***a.copyFromDmToSVN(aa);
***REMOVED*** if (a.checkMethod("dataminer1-devnext.d4science.org", "708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548")){ if (a.checkMethod("dataminer-ghost-d.dev.d4science.org", "708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548")){
***REMOVED*** System.out.println("AAA");***REMOVED*** System.out.println("AAA");***REMOVED***
***REMOVED***
***REMOVED*** if (a.doesExist("/home/gcube/wps_algorithms/algorithms/RBLACKBOX.jar","Dev")){ if (a.doesExist("/home/gcube/wps_algorithms/algorithms/WINDOWS_BLACK_BOX_EXAMPLE.jar")){
***REMOVED*** System.out.println("BBBB"); System.out.println("BBBB");
***REMOVED***
***REMOVED******REMOVED***
***REMOVED*** if (a.doesExist("/home/gcube/wps_algorithms/algorithms/RBLACKBOX_interface.jar","Dev")){
***REMOVED*** System.out.println("CCCC");***REMOVED***
***REMOVED*** ***REMOVED***
if (a.doesExist("/home/gcube/wps_algorithms/algorithms/WINDOWS_BLACK_BOX_EXAMPLE_interface.jar")){
System.out.println("CCCC");***REMOVED***
***REMOVED*** File aa = new File("/home/gcube/wps_algorithms/algorithms/RBLACKBOX_interface.jar"); ***REMOVED*** File aa = new File("/home/gcube/wps_algorithms/algorithms/RBLACKBOX_interface.jar");
***REMOVED*** a.copyFromDmToSVN(aa, "Dev"); ***REMOVED*** a.copyFromDmToSVN(aa, "Dev");
***REMOVED***a.checkMethod("dataminer-ghost-d.dev.d4science.org",
***REMOVED*** "708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
Algorithm al = new Algorithm();
al.setName("RBLACKBOX");
a.deleteFiles(al); ***REMOVED*** Algorithm al = new Algorithm();
***REMOVED*** al.setName("RBLACKBOX");
***REMOVED*** a.deleteFiles(al);

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

@ -376,7 +376,8 @@ public class SVNUpdater {
public void updateAlgorithmFiles(File a) throws SVNException{ public void updateAlgorithmFiles(File a) throws SVNException{
this.updateAlgorithmList(this.configuration.getSVNMainAlgoRepo(), a); ***REMOVED***this.updateAlgorithmList(this.configuration.getSVNMainAlgoRepo(), a);
this.updateAlgorithmList(this.configuration.getStageRepository(), a);
***REMOVED*** ***REMOVED***

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

@ -46,6 +46,15 @@ public class ServiceConfiguration {
***REMOVED*** ***REMOVED***
public String getStageRepository(){
return props.getProperty("svn.stage.software.repo");
***REMOVED***
public String getProdRepository(){
return props.getProperty("svn.prod.software.repo");
***REMOVED***
***REMOVED***RProto ***REMOVED***RProto
***REMOVED*** public String getSVNRProtoAlgorithmsList(){ ***REMOVED*** public String getSVNRProtoAlgorithmsList(){
@ -311,6 +320,7 @@ public class ServiceConfiguration {
***REMOVED***System.out.println(a.getSVNMainAlgoRepo()); ***REMOVED***System.out.println(a.getSVNMainAlgoRepo());
***REMOVED***System.out.println(a.getSVNRProtoCRANDepsList()); ***REMOVED***System.out.println(a.getSVNRProtoCRANDepsList());
System.out.println(a.getStagingHost()); System.out.println(a.getStagingHost());
System.out.println(a.getProdRepository());
***REMOVED*** ***REMOVED***