diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java index 55aada6..4f71f5a 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java @@ -28,7 +28,7 @@ public class ProductionPublishingJob extends DMPMJob ***REMOVED*** if (CheckPermission.apply(targetVREToken,targetVREName))***REMOVED*** - this.svnUpdater.updateProdDeps(this.algorithm); + ***REMOVED***this.svnUpdater.updateProdDeps(this.algorithm); this.svnUpdater.updateSVNProdAlgorithmList(this.algorithm, this.targetVREName, this.algorithm.getFullname(), "Prod"); 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 e653eff..42fb894 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 @@ -33,32 +33,32 @@ public class SVNUpdater ***REMOVED*** this.configuration = configuration; ***REMOVED*** - public void updateRPRotoDeps(Algorithm algorithm) ***REMOVED*** - this.updateSVN(this.configuration.getSVNRProtoOSDepsList(), algorithm.getOSDependencies()); - this.updateSVN(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getCranDependencies()); - this.updateSVN(this.configuration.getSVNRProtoGitHubDepsList(), algorithm.getGitHubDependencies()); -***REMOVED*** +***REMOVED*** public void updateRPRotoDeps(Algorithm algorithm) ***REMOVED*** +***REMOVED*** this.updateSVN(this.configuration.getSVNRProtoOSDepsList(), algorithm.getOSDependencies()); +***REMOVED*** this.updateSVN(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getCranDependencies()); +***REMOVED*** this.updateSVN(this.configuration.getSVNRProtoGitHubDepsList(), algorithm.getGitHubDependencies()); +***REMOVED******REMOVED*** public String getRProtoDependencyFile(String language) ***REMOVED*** switch (language) ***REMOVED*** case "R": return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "R-blackbox": -***REMOVED*** return ""; -***REMOVED*** case "Java": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); + case "R-blackbox": + return this.configuration.getSVNRProtoRBDepsList(); + case "Java": + return this.configuration.getSVNRProtoJavaDepsList(); case "Knime-Workflow": - return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "Linux-compiled": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "Octave": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "Python": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "Pre-Installed": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "Windows-compiled": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); + return this.configuration.getSVNRProtoKWDepsList(); + case "Linux-compiled": + return this.configuration.getSVNRProtoLinuxCompiledDepsList(); + case "Octave": + return this.configuration.getSVNRProtoOctaveDepsList(); + case "Python": + return this.configuration.getSVNRProtoPythonDepsList(); + case "Pre-Installed": + return this.configuration.getSVNRProtoPreInstalledDepsList(); + case "Windows-compiled": + return this.configuration.getSVNRProtoWCDepsList(); default: ***REMOVED*** ***REMOVED*** @@ -70,32 +70,28 @@ public class SVNUpdater ***REMOVED*** switch (language) ***REMOVED*** case "R": return this.configuration.getSVNRProdCRANDepsList(); -***REMOVED*** case "R-blackbox": -***REMOVED*** return ""; -***REMOVED*** case "Java": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "Knime-Workflow": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "Linux-compiled": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "Octave": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "Python": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "Pre-Installed": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); -***REMOVED*** case "Windows-compiled": -***REMOVED*** return this.configuration.getSVNRProtoCRANDepsList(); + case "R-blackbox": + return this.configuration.getSVNRProdRBDepsList(); + case "Java": + return this.configuration.getSVNRProdJavaDepsList(); + case "Knime-Workflow": + return this.configuration.getSVNRProdKWDepsList(); + case "Linux-compiled": + return this.configuration.getSVNRProdLinuxCompiledDepsList(); + case "Octave": + return this.configuration.getSVNRProdOctaveDepsList(); + case "Python": + return this.configuration.getSVNRProdPythonDepsList(); + case "Pre-Installed": + return this.configuration.getSVNRProdPreInstalledDepsList(); + case "Windows-compiled": + return this.configuration.getSVNRProdWCDepsList(); default: ***REMOVED*** ***REMOVED*** ***REMOVED*** - - - - public void readRPRotoDeps(Algorithm algorithm) throws SVNException ***REMOVED*** if (algorithm.getLanguage().equals("R")) ***REMOVED*** @@ -157,11 +153,11 @@ public class SVNUpdater ***REMOVED*** ***REMOVED*** ***REMOVED*** - public void updateProdDeps(Algorithm algorithm) ***REMOVED*** - this.updateSVN(this.configuration.getSVNProdOSDepsList(), algorithm.getOSDependencies()); - this.updateSVN(this.configuration.getSVNRProdCRANDepsList(), algorithm.getCranDependencies()); - this.updateSVN(this.configuration.getSVNRProdGitHubDepsList(), algorithm.getGitHubDependencies()); -***REMOVED*** +***REMOVED*** public void updateProdDeps(Algorithm algorithm) ***REMOVED*** +***REMOVED*** this.updateSVN(this.configuration.getSVNProdOSDepsList(), algorithm.getOSDependencies()); +***REMOVED*** this.updateSVN(this.configuration.getSVNRProdCRANDepsList(), algorithm.getCranDependencies()); +***REMOVED*** this.updateSVN(this.configuration.getSVNRProdGitHubDepsList(), algorithm.getGitHubDependencies()); +***REMOVED******REMOVED*** public void updateSVNRProtoAlgorithmList(Algorithm algorithm, String targetVRE, String user, String env) ***REMOVED*** this.updateSVNAlgorithmList(this.configuration.getSVNRProtoAlgorithmsList(), algorithm, targetVRE, user, env); 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 954baac..0338dc2 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 @@ -39,38 +39,95 @@ public class ServiceConfiguration ***REMOVED*** public String getSVNRepository()***REMOVED*** return props.getProperty("svn.repository"); ***REMOVED*** - + + + ***REMOVED***RProto public String getSVNRProtoAlgorithmsList()***REMOVED*** return props.getProperty("svn.rproto.algorithms-list"); ***REMOVED*** - public String getSVNRProtoOSDepsList()***REMOVED*** - return props.getProperty("svn.rproto.deps-os"); + public String getSVNRProtoLinuxCompiledDepsList()***REMOVED*** + return props.getProperty("svn.rproto.deps-linux-compiled"); ***REMOVED*** public String getSVNRProtoCRANDepsList()***REMOVED*** - return props.getProperty("svn.rproto.deps-cran"); + return props.getProperty("svn.rproto.deps-r"); ***REMOVED*** - public String getSVNRProtoGitHubDepsList()***REMOVED*** - return props.getProperty("svn.rproto.deps-github"); + public String getSVNRProtoPreInstalledDepsList()***REMOVED*** + return props.getProperty("svn.rproto.deps-pre-installed"); +***REMOVED*** + + public String getSVNRProtoRBDepsList()***REMOVED*** + return props.getProperty("svn.rproto.deps-r-blackbox"); +***REMOVED*** + + public String getSVNRProtoJavaDepsList()***REMOVED*** + return props.getProperty("svn.rproto.deps-java"); +***REMOVED*** + + public String getSVNRProtoKWDepsList()***REMOVED*** + return props.getProperty("svn.rproto.deps-knime-workflow"); +***REMOVED*** + + public String getSVNRProtoOctaveDepsList()***REMOVED*** + return props.getProperty("svn.rproto.deps-octave"); +***REMOVED*** + + public String getSVNRProtoPythonDepsList()***REMOVED*** + return props.getProperty("svn.rproto.deps-python"); +***REMOVED*** + + public String getSVNRProtoWCDepsList()***REMOVED*** + return props.getProperty("svn.rproto.deps-windows-compiled"); ***REMOVED*** + + ***REMOVED***Prod public String getSVNProdAlgorithmsList()***REMOVED*** return props.getProperty("svn.prod.algorithms-list"); ***REMOVED*** - public String getSVNProdOSDepsList()***REMOVED*** - return props.getProperty("svn.prod.deps-os"); + public String getSVNRProdLinuxCompiledDepsList()***REMOVED*** + return props.getProperty("svn.prod.deps-linux-compiled"); ***REMOVED*** public String getSVNRProdCRANDepsList()***REMOVED*** - return props.getProperty("svn.prod.deps-cran"); + return props.getProperty("svn.prod.deps-r"); ***REMOVED*** - public String getSVNRProdGitHubDepsList()***REMOVED*** - return props.getProperty("svn.prod.deps-github"); + public String getSVNRProdPreInstalledDepsList()***REMOVED*** + return props.getProperty("svn.prod.deps-pre-installed"); ***REMOVED*** + + public String getSVNRProdRBDepsList()***REMOVED*** + return props.getProperty("svn.prod.deps-r-blackbox"); +***REMOVED*** + + public String getSVNRProdJavaDepsList()***REMOVED*** + return props.getProperty("svn.prod.deps-java"); +***REMOVED*** + + public String getSVNRProdKWDepsList()***REMOVED*** + return props.getProperty("svn.prod.deps-knime-workflow"); +***REMOVED*** + + public String getSVNRProdOctaveDepsList()***REMOVED*** + return props.getProperty("svn.prod.deps-octave"); +***REMOVED*** + + public String getSVNRProdPythonDepsList()***REMOVED*** + return props.getProperty("svn.prod.deps-python"); +***REMOVED*** + + public String getSVNRProdWCDepsList()***REMOVED*** + return props.getProperty("svn.prod.deps-windows-compiled"); +***REMOVED*** + + + + + public String getCSVUrl() ***REMOVED*** return props.getProperty("HAPROXY_CSV"); diff --git a/src/main/resources/service.properties b/src/main/resources/service.properties index 498c796..5ba9775 100644 --- a/src/main/resources/service.properties +++ b/src/main/resources/service.properties @@ -7,13 +7,27 @@ SVN_REPO: https:***REMOVED***svn.d4science.research-infrastructures.eu/gcube/tru svn.repository = https:***REMOVED***svn.d4science.research-infrastructures.eu/gcube svn.rproto.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/proto/algorithms -svn.rproto.deps-os = /trunk/data-analysis/RConfiguration/RPackagesManagement/test_r_deb_pkgs.txt -svn.rproto.deps-cran = /trunk/data-analysis/RConfiguration/RPackagesManagement/test_r_cran_pkgs.txt -svn.rproto.deps-github = /trunk/data-analysis/RConfiguration/RPackagesManagement/test_r_github_pkgs.txt + +svn.rproto.deps-linux-compiled = +svn.rproto.deps-pre-installed = +svn.rproto.deps-r-blackbox = +svn.rproto.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/test_r_cran_pkgs.txt +svn.rproto.deps-java = +svn.rproto.deps-knime-workflow = +svn.rproto.deps-octave = +svn.rproto.deps-python = +svn.rproto.deps-windows-compiled = svn.prod.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms -svn.prod.deps-os = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt -svn.prod.deps-cran = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt -svn.prod.deps-github = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt + +svn.prod.deps-linux-compiled = +svn.prod.deps-pre-installed = +svn.prod.deps-r-blackbox = +svn.prod.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt +svn.prod.deps-java = +svn.prod.deps-knime-workflow = +svn.prod.deps-octave = +svn.prod.deps-python = +svn.prod.deps-windows-compiled =