From 5dbe0f441e68589fe9815284d47bb7e01da4140b Mon Sep 17 00:00:00 2001 From: Nunzio Andrea Galante Date: Thu, 11 May 2017 16:08:17 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@148491 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../poolmanager/clients/HAProxy.java | 4 +-- .../service/DataminerPoolManager.java | 6 ++--- .../dataminer/poolmanager/util/Props.java | 27 +++++++++++++++++-- src/main/resources/service.properties | 1 + 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/HAProxy.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/HAProxy.java index e92eff5..fc3cd26 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/HAProxy.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/HAProxy.java @@ -100,8 +100,8 @@ public class HAProxy ***REMOVED*** ***REMOVED***URL stockURL = new URL("http:***REMOVED***data.d4science.org/c29KTUluTkZnRlB0WXE5NVNaZnRoR0dtYThUSmNTVlhHbWJQNStIS0N6Yz0"); ***REMOVED***System.out.println(stockURL); ***REMOVED*** dev - ***REMOVED*** URL stockURL = new - ***REMOVED*** URL("http:***REMOVED***data.d4science.org/c29KTUluTkZnRlB0WXE5NVNaZnRoR0dtYThUSmNTVlhHbWJQNStIS0N6Yz0"); + ***REMOVED***URL stockURL = new + ***REMOVED***URL("http:***REMOVED***data.d4science.org/c29KTUluTkZnRlB0WXE5NVNaZnRoR0dtYThUSmNTVlhHbWJQNStIS0N6Yz0"); BufferedReader in = new BufferedReader(new InputStreamReader(stockURL.openStream())); reader = new CSVReader(in, ','); String[] nextLine; 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 9d28b50..bd120a1 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 @@ -39,9 +39,8 @@ public class DataminerPoolManager ***REMOVED*** public DataminerPoolManager()***REMOVED*** try ***REMOVED*** - ***REMOVED***TODO: read this from configuration - this.svnUpdater = new SVNUpdater( - "https:***REMOVED***svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/RConfiguration/RPackagesManagement/"); + ***REMOVED***TODO: read this from configuration - fatto + this.svnUpdater = new SVNUpdater(new Props().getSVNrepo()); ***REMOVED*** catch (SVNException e) ***REMOVED*** e.printStackTrace(); ***REMOVED*** @@ -62,6 +61,7 @@ public class DataminerPoolManager ***REMOVED*** ***REMOVED***Algorithm algo, String targetVREToken) throws IOException, InterruptedException ***REMOVED*** Cluster cluster = new Cluster(); + SecurityTokenProvider.instance.set(targetVREToken); for (Host h : new HAProxy().listDataMinersByCluster()) ***REMOVED*** cluster.addHost(h); ***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 index 345717b..293311f 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/Props.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/Props.java @@ -27,6 +27,28 @@ public class Props ***REMOVED*** ***REMOVED*** + + public String getSVNrepo() ***REMOVED*** + Properties props = new Properties(); + java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties"); + + ***REMOVED*** loading properites from properties file + try ***REMOVED*** + props.load(input); + ***REMOVED*** catch (IOException e) ***REMOVED*** + ***REMOVED*** TODO Auto-generated catch block + e.printStackTrace(); + ***REMOVED*** + + ***REMOVED*** reading proeprty + String path = props.getProperty("SVN_REPO"); + return path; + +***REMOVED*** + + + + public String getStagingHost() ***REMOVED*** Properties props = new Properties(); java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties"); @@ -46,7 +68,8 @@ public class Props ***REMOVED*** ***REMOVED*** public static void main(String[] args) ***REMOVED*** - Props a = new Props(); - System.out.println(a.getStagingHost()); + ***REMOVED***Props a = new Props(); + System.out.println(new Props().getSVNrepo()); + ***REMOVED***System.out.println(a.getStagingHost()); ***REMOVED*** ***REMOVED*** diff --git a/src/main/resources/service.properties b/src/main/resources/service.properties index 4aa58c0..aa0b8ea 100644 --- a/src/main/resources/service.properties +++ b/src/main/resources/service.properties @@ -1,3 +1,4 @@ #YML node file STAGING_HOST: dataminer1-devnext.d4science.org +SVN_REPO: https:***REMOVED***svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/RConfiguration/RPackagesManagement/ #HAPROXY_CSV: http:***REMOVED***data.d4science.org/Yk4zSFF6V3JOSytNd3JkRDlnRFpDUUR5TnRJZEw2QjRHbWJQNStIS0N6Yz0