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 ab633ab..0e368b8 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 @@ -286,24 +286,28 @@ public class CheckMethod ***REMOVED*** ***REMOVED***a.copyFromDmToSVN(aa); -***REMOVED*** if (a.checkMethod("dataminer1-devnext.d4science.org", "***REMOVED***"))***REMOVED*** -***REMOVED*** System.out.println("AAA");***REMOVED*** -***REMOVED*** -***REMOVED*** if (a.doesExist("/home/gcube/wps_algorithms/algorithms/RBLACKBOX.jar","Dev"))***REMOVED*** -***REMOVED*** System.out.println("BBBB"); -***REMOVED*** -***REMOVED******REMOVED*** -***REMOVED*** if (a.doesExist("/home/gcube/wps_algorithms/algorithms/RBLACKBOX_interface.jar","Dev"))***REMOVED*** -***REMOVED*** System.out.println("CCCC");***REMOVED*** -***REMOVED*** + if (a.checkMethod("dataminer-ghost-d.dev.d4science.org", "***REMOVED***"))***REMOVED*** + System.out.println("AAA");***REMOVED*** + + if (a.doesExist("/home/gcube/wps_algorithms/algorithms/WINDOWS_BLACK_BOX_EXAMPLE.jar"))***REMOVED*** + System.out.println("BBBB"); + +***REMOVED*** + if (a.doesExist("/home/gcube/wps_algorithms/algorithms/WINDOWS_BLACK_BOX_EXAMPLE_interface.jar"))***REMOVED*** + System.out.println("CCCC");***REMOVED*** + ***REMOVED*** File aa = new File("/home/gcube/wps_algorithms/algorithms/RBLACKBOX_interface.jar"); ***REMOVED*** a.copyFromDmToSVN(aa, "Dev"); - - Algorithm al = new Algorithm(); - al.setName("RBLACKBOX"); - a.deleteFiles(al); +***REMOVED***a.checkMethod("dataminer-ghost-d.dev.d4science.org", +***REMOVED*** "***REMOVED***"); + + + +***REMOVED*** Algorithm al = new Algorithm(); +***REMOVED*** al.setName("RBLACKBOX"); +***REMOVED*** a.deleteFiles(al); diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java index 00ba92d..98c0bde 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java @@ -376,7 +376,8 @@ public class SVNUpdater ***REMOVED*** public void updateAlgorithmFiles(File a) throws SVNException***REMOVED*** - this.updateAlgorithmList(this.configuration.getSVNMainAlgoRepo(), a); + ***REMOVED***this.updateAlgorithmList(this.configuration.getSVNMainAlgoRepo(), a); + this.updateAlgorithmList(this.configuration.getStageRepository(), a); ***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 5b9cf55..5bb6ec9 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 @@ -46,6 +46,15 @@ public class ServiceConfiguration ***REMOVED*** ***REMOVED*** + public String getStageRepository()***REMOVED*** + return props.getProperty("svn.stage.software.repo"); +***REMOVED*** + + public String getProdRepository()***REMOVED*** + return props.getProperty("svn.prod.software.repo"); +***REMOVED*** + + ***REMOVED***RProto ***REMOVED*** public String getSVNRProtoAlgorithmsList()***REMOVED*** @@ -311,6 +320,7 @@ public class ServiceConfiguration ***REMOVED*** ***REMOVED***System.out.println(a.getSVNMainAlgoRepo()); ***REMOVED***System.out.println(a.getSVNRProtoCRANDepsList()); System.out.println(a.getStagingHost()); + System.out.println(a.getProdRepository()); ***REMOVED***