diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java index 91426ee..131ee4f 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java @@ -9,6 +9,7 @@ import org.gcube.dataanalysis.dataminer.poolmanager.ansiblebridge.AnsibleBridge; import org.gcube.dataanalysis.dataminer.poolmanager.clients.HAProxy; import org.gcube.dataanalysis.dataminer.poolmanager.clients.ISClient; import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.*; +import org.gcube.dataanalysis.dataminer.poolmanager.util.Props; import org.gcube.dataanalysis.dataminer.poolmanager.util.SVNUpdater; import org.gcube.informationsystem.publisher.AdvancedScopedPublisher; import org.gcube.informationsystem.publisher.RegistryPublisherFactory; @@ -72,8 +73,9 @@ public class DataminerPoolManager { private Cluster getStagingDataminerCluster(){ Cluster cluster = new Cluster(); Host h = new Host(); + Props p = new Props(); ***REMOVED***TODO: read this from configuration or IS? - h.setName("dataminer1-devnext.d4science.org"); + h.setName(p.getStagingHost()); cluster.addHost(h); return cluster; ***REMOVED*** diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/Props.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/Props.java new file mode 100644 index 0000000..74535ce --- /dev/null +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/Props.java @@ -0,0 +1,52 @@ +package org.gcube.dataanalysis.dataminer.poolmanager.util; + +***REMOVED*** +import java.util.Properties; + +public class Props { + public static String home = System.getProperty("user.home"); + + public Props() { +***REMOVED*** + + public String getCSVUrl() { + Properties props = new Properties(); + java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties"); + + ***REMOVED*** loading properites from properties file + try { + props.load(input); + ***REMOVED*** catch (IOException e) { + ***REMOVED*** TODO Auto-generated catch block + e.printStackTrace(); + ***REMOVED*** + + ***REMOVED*** reading proeprty + String path = props.getProperty("HAPROXY_CSV"); + return path; + +***REMOVED*** + + public String getStagingHost() { + Properties props = new Properties(); + java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties"); + + ***REMOVED*** loading properites from properties file + try { + props.load(input); + ***REMOVED*** catch (IOException e) { + ***REMOVED*** TODO Auto-generated catch block + e.printStackTrace(); + ***REMOVED*** + + ***REMOVED*** reading proeprty + String path = props.getProperty("STAGING_HOST"); + return path; + +***REMOVED*** + + public static void main(String[] args) { + Props a = new Props(); + System.out.println(a.getStagingHost()); +***REMOVED*** +***REMOVED*** diff --git a/src/main/resources/service.properties b/src/main/resources/service.properties new file mode 100644 index 0000000..4aa58c0 --- /dev/null +++ b/src/main/resources/service.properties @@ -0,0 +1,3 @@ +#YML node file +STAGING_HOST: dataminer1-devnext.d4science.org +#HAPROXY_CSV: http:***REMOVED***data.d4science.org/Yk4zSFF6V3JOSytNd3JkRDlnRFpDUUR5TnRJZEw2QjRHbWJQNStIS0N6Yz0