From 33cc44b6f6cebeda19676b5806c7c4d6d9f9223d Mon Sep 17 00:00:00 2001 From: Nunzio Andrea Galante Date: Wed, 11 Oct 2017 10:18:36 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@155104 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../util/ServiceConfiguration.java | 82 ++++++++++--------- 1 file changed, 45 insertions(+), 37 deletions(-) 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 6f3bbbf..0301967 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 @@ -56,10 +56,14 @@ public class ServiceConfiguration { public String getGhostAlgoDirectory(){ - return props.getProperty("svn.algo.ghost.repo"); + return props.getProperty("svn.stage.algo.ghost.repo"); ***REMOVED*** + public String getProdGhostAlgoDirectory(){ + return props.getProperty("svn.prod.algo.ghost.repo"); +***REMOVED*** + ***REMOVED***RProto ***REMOVED*** public String getSVNRProtoAlgorithmsList(){ @@ -108,42 +112,42 @@ public class ServiceConfiguration { return props.getProperty("svn.prod.algorithms-list"); ***REMOVED*** -***REMOVED*** public String getSVNProdLinuxCompiledDepsList(){ -***REMOVED*** return props.getProperty("svn.prod.deps-linux-compiled"); -***REMOVED******REMOVED*** + public String getSVNProdLinuxCompiledDepsList(){ + return props.getProperty("svn.prod.deps-linux-compiled"); ***REMOVED*** -***REMOVED*** public String getSVNProdCRANDepsList(){ -***REMOVED*** return props.getProperty("svn.prod.deps-r"); -***REMOVED******REMOVED*** + + public String getSVNProdCRANDepsList(){ + return props.getProperty("svn.prod.deps-r"); ***REMOVED*** -***REMOVED*** public String getSVNProdPreInstalledDepsList(){ -***REMOVED*** return props.getProperty("svn.prod.deps-pre-installed"); -***REMOVED******REMOVED*** -***REMOVED*** -***REMOVED*** public String getSVNProdRBDepsList(){ -***REMOVED*** return props.getProperty("svn.prod.deps-r-blackbox"); -***REMOVED******REMOVED*** -***REMOVED*** -***REMOVED*** public String getSVNProdJavaDepsList(){ -***REMOVED*** return props.getProperty("svn.prod.deps-java"); -***REMOVED******REMOVED*** -***REMOVED*** -***REMOVED*** public String getSVNProdKWDepsList(){ -***REMOVED*** return props.getProperty("svn.prod.deps-knime-workflow"); -***REMOVED******REMOVED*** -***REMOVED*** -***REMOVED*** public String getSVNProdOctaveDepsList(){ -***REMOVED*** return props.getProperty("svn.prod.deps-octave"); -***REMOVED******REMOVED*** -***REMOVED*** -***REMOVED*** public String getSVNProdPythonDepsList(){ -***REMOVED*** return props.getProperty("svn.prod.deps-python"); -***REMOVED******REMOVED*** -***REMOVED*** -***REMOVED*** public String getSVNProdWCDepsList(){ -***REMOVED*** return props.getProperty("svn.prod.deps-windows-compiled"); -***REMOVED******REMOVED*** -***REMOVED*** + + public String getSVNProdPreInstalledDepsList(){ + return props.getProperty("svn.prod.deps-pre-installed"); +***REMOVED*** + + public String getSVNProdRBDepsList(){ + return props.getProperty("svn.prod.deps-r-blackbox"); +***REMOVED*** + + public String getSVNProdJavaDepsList(){ + return props.getProperty("svn.prod.deps-java"); +***REMOVED*** + + public String getSVNProdKWDepsList(){ + return props.getProperty("svn.prod.deps-knime-workflow"); +***REMOVED*** + + public String getSVNProdOctaveDepsList(){ + return props.getProperty("svn.prod.deps-octave"); +***REMOVED*** + + public String getSVNProdPythonDepsList(){ + return props.getProperty("svn.prod.deps-python"); +***REMOVED*** + + public String getSVNProdWCDepsList(){ + return props.getProperty("svn.prod.deps-windows-compiled"); +***REMOVED*** + ***REMOVED***PreProd @@ -263,6 +267,10 @@ public class ServiceConfiguration { ***REMOVED*** + public String getProdHost() { + return props.getProperty("PROD_GHOST"); +***REMOVED*** + ***REMOVED*** public String getProtoProdStagingHost() { ***REMOVED*** return props.getProperty("PROTO_PROD_STAGING_HOST"); ***REMOVED******REMOVED*** @@ -324,8 +332,8 @@ public class ServiceConfiguration { ***REMOVED***System.out.println(a.getCSVUrl()); ***REMOVED***System.out.println(a.getSVNMainAlgoRepo()); ***REMOVED***System.out.println(a.getSVNRProtoCRANDepsList()); - System.out.println(a.getStagingHost()); - System.out.println(a.getProdRepository()); + ***REMOVED***System.out.println(a.getProdHost()); + System.out.println(a.getSVNProdRBDepsList()); ***REMOVED***