git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@154344 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Nunzio Andrea Galante
parent
88759aebd2
commit
c29cfe7ee9
|
|
@ -42,7 +42,7 @@ public class RestPoolManager implements PoolManager {
|
|||
private DataminerPoolManager service = new DataminerPoolManager();
|
||||
|
||||
//@Context
|
||||
private ApplicationContext context = ContextProvider.get();
|
||||
//private ApplicationContext context = ContextProvider.get();
|
||||
|
||||
|
||||
|
||||
|
|
@ -55,8 +55,8 @@ public class RestPoolManager implements PoolManager {
|
|||
@QueryParam("category") String category,
|
||||
@QueryParam("algorithm_type") String algorithm_type) throws IOException, InterruptedException {
|
||||
Algorithm algo = AlgorithmBuilder.create(algorithmPackageURL);
|
||||
String env = context.application().getInitParameter("Environment");
|
||||
return this.service.stageAlgorithm(algo,targetVRE,category,algorithm_type,env);
|
||||
//String env = context.application().getInitParameter("Environment");
|
||||
return this.service.stageAlgorithm(algo,targetVRE,category,algorithm_type/*,env*/);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -70,8 +70,8 @@ public class RestPoolManager implements PoolManager {
|
|||
@QueryParam("category") String category,
|
||||
@QueryParam("algorithm_type") String algorithm_type) throws IOException, InterruptedException {
|
||||
Algorithm algo = AlgorithmBuilder.create(algorithmPackageURL);
|
||||
String env = context.application().getInitParameter("Environment");
|
||||
return this.service.publishAlgorithm(algo, /*targetVREToken,*/ targetVRE,category,algorithm_type,env);
|
||||
//String env = context.application().getInitParameter("Environment");
|
||||
return this.service.publishAlgorithm(algo, /*targetVREToken,*/ targetVRE,category,algorithm_type/*,env*/);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -28,23 +28,23 @@ public class DataminerPoolManager {
|
|||
}
|
||||
|
||||
|
||||
public String stageAlgorithm(Algorithm algo,String targetVRE, String category, String algorithm_type,String env) throws IOException, InterruptedException {
|
||||
public String stageAlgorithm(Algorithm algo,String targetVRE, String category, String algorithm_type/*,String env*/) throws IOException, InterruptedException {
|
||||
|
||||
Cluster stagingCluster = ClusterBuilder.getStagingDataminerCluster(env);
|
||||
Cluster stagingCluster = ClusterBuilder.getStagingDataminerCluster();
|
||||
|
||||
|
||||
//Cluster rProtoCluster = ClusterBuilder.getRProtoCluster();
|
||||
|
||||
DMPMJob job = new StagingJob(this.svnUpdater, algo, stagingCluster, /*rProtoCluster,*/ targetVRE, category, algorithm_type,env);
|
||||
DMPMJob job = new StagingJob(this.svnUpdater, algo, stagingCluster, /*rProtoCluster,*/ targetVRE, category, algorithm_type/*,env*/);
|
||||
String id = job.start();
|
||||
return id;
|
||||
}
|
||||
|
||||
public String publishAlgorithm(Algorithm algo, String targetVRE, String category, String algorithm_type, String env) throws IOException, InterruptedException {
|
||||
public String publishAlgorithm(Algorithm algo, String targetVRE, String category, String algorithm_type/*, String env*/) throws IOException, InterruptedException {
|
||||
|
||||
//Cluster prodCluster = ClusterBuilder.getVRECluster(targetVREToken, targetVRE);
|
||||
|
||||
DMPMJob job = new ProductionPublishingJob(this.svnUpdater, algo, /*prodCluster,*/ targetVRE, category, algorithm_type,env);
|
||||
DMPMJob job = new ProductionPublishingJob(this.svnUpdater, algo, /*prodCluster,*/ targetVRE, category, algorithm_type/*,env*/);
|
||||
String id = job.start();
|
||||
return id;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ public class ProductionPublishingJob extends DMPMJob {
|
|||
private String category;
|
||||
private String algorithm_type;
|
||||
//private String targetVREToken;
|
||||
private String env;
|
||||
//private String env;
|
||||
|
||||
|
||||
public ProductionPublishingJob(SVNUpdater svnUpdater, Algorithm algorithm,
|
||||
/*Cluster prodCluster,*/ String targetVREName, String category,String algorithm_type, String env) throws FileNotFoundException, UnsupportedEncodingException {
|
||||
/*Cluster prodCluster,*/ String targetVREName, String category,String algorithm_type/*, String env*/) throws FileNotFoundException, UnsupportedEncodingException {
|
||||
super(svnUpdater);
|
||||
this.algorithm = algorithm;
|
||||
//this.prodCluster = prodCluster;
|
||||
|
|
@ -34,7 +34,7 @@ public class ProductionPublishingJob extends DMPMJob {
|
|||
this.category = category;
|
||||
this.algorithm_type = algorithm_type;
|
||||
//this.targetVREToken = targetVREToken;
|
||||
this.env= env;
|
||||
//this.env= env;
|
||||
|
||||
|
||||
this.jobLogs = new File(System.getProperty("user.home") + File.separator + "dataminer-pool-manager" + File.separator + "jobs");
|
||||
|
|
@ -50,7 +50,7 @@ public class ProductionPublishingJob extends DMPMJob {
|
|||
//if (CheckPermission.apply(targetVREToken,targetVREName)){
|
||||
|
||||
//this.svnUpdater.updateProdDeps(this.algorithm);
|
||||
this.svnUpdater.updateSVNAlgorithmList(this.algorithm, this.targetVREName, this.category,this.algorithm_type, this.algorithm.getFullname(), env);
|
||||
this.svnUpdater.updateSVNProdAlgorithmList(this.algorithm, this.targetVREName, this.category,this.algorithm_type, this.algorithm.getFullname()/*, env*/);
|
||||
this.getStatus(9);
|
||||
sm.sendNotification(nh.getSuccessSubjectRelease() + " for "+this.algorithm.getName()+ " algorithm", nh.getSuccessBodyRelease("\n\n"+this.buildInfo()));
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@ public class StagingJob extends DMPMJob {
|
|||
private Cluster stagingCluster;
|
||||
// private Cluster rProtoCluster;
|
||||
private String rProtoVREName;
|
||||
private String env;
|
||||
//private String env;
|
||||
private String category;
|
||||
private String algorithm_type;
|
||||
|
||||
|
||||
public StagingJob(SVNUpdater svnUpdater, Algorithm algorithm,
|
||||
Cluster stagingCluster, /* Cluster rProtoCluster, */
|
||||
String rProtoVREName, String category, String algorithm_type, String env) throws FileNotFoundException, UnsupportedEncodingException {
|
||||
String rProtoVREName, String category, String algorithm_type/*, String env*/) throws FileNotFoundException, UnsupportedEncodingException {
|
||||
super(svnUpdater);
|
||||
this.jobLogs = new File(
|
||||
System.getProperty("user.home") + File.separator + "dataminer-pool-manager" + File.separator + "jobs");
|
||||
|
|
@ -44,7 +44,7 @@ public class StagingJob extends DMPMJob {
|
|||
this.stagingCluster = stagingCluster;
|
||||
// this.rProtoCluster = rProtoCluster;
|
||||
this.rProtoVREName = rProtoVREName;
|
||||
this.env = env;
|
||||
//this.env = env;
|
||||
this.category = category;
|
||||
this.algorithm_type = algorithm_type;
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ public class StagingJob extends DMPMJob {
|
|||
try {
|
||||
|
||||
Collection<String> undefinedDependencies = this.svnUpdater.getUndefinedDependencies(
|
||||
this.svnUpdater.getDependencyFile(this.algorithm.getLanguage(),env),
|
||||
this.svnUpdater.getDependencyFile(this.algorithm.getLanguage()/*,env*/),
|
||||
this.algorithm.getDependencies());
|
||||
|
||||
if (!undefinedDependencies.isEmpty()) {
|
||||
|
|
@ -82,7 +82,7 @@ public class StagingJob extends DMPMJob {
|
|||
}
|
||||
|
||||
//before the installation to check if the files exist
|
||||
b.deleteFiles(this.algorithm, env);;
|
||||
b.deleteFiles(this.algorithm/*, env*/);;
|
||||
|
||||
int ret = this.executeAnsibleWorker(createWorker(this.algorithm, this.stagingCluster, false, "root"));
|
||||
|
||||
|
|
@ -95,18 +95,18 @@ public class StagingJob extends DMPMJob {
|
|||
|
||||
if (ret == 0) {
|
||||
this.getStatus(0);
|
||||
System.out.println("1 - Checking existing in env: "+ env);
|
||||
//System.out.println("1 - Checking existing in env: "+ env);
|
||||
|
||||
System.out.println("2 - Checking existing in env: "+ this.env);
|
||||
//System.out.println("2 - Checking existing in env: "+ this.env);
|
||||
|
||||
|
||||
if (b.checkMethod(a.getHost(env), SecurityTokenProvider.instance.get())&&(b.algoExists(this.algorithm, env))) {
|
||||
if (b.checkMethod(a.getStagingHost(), SecurityTokenProvider.instance.get())&&(b.algoExists(this.algorithm/*, env*/))) {
|
||||
|
||||
System.out.println("Interface check ok!");
|
||||
System.out.println("Both the files exist at the correct path!");
|
||||
|
||||
this.svnUpdater.updateSVNAlgorithmList(this.algorithm, this.rProtoVREName,this.category, this.algorithm_type,
|
||||
this.algorithm.getFullname(), env);
|
||||
this.svnUpdater.updateSVNStagingAlgorithmList(this.algorithm, this.rProtoVREName,this.category, this.algorithm_type,
|
||||
this.algorithm.getFullname()/*, env*/);
|
||||
|
||||
this.getStatus(9);
|
||||
sm.sendNotification(nh.getSuccessSubject() + " for "+this.algorithm.getName()+ " algorithm", nh.getSuccessBody("\n\n"+this.buildInfo()));
|
||||
|
|
@ -163,7 +163,7 @@ public class StagingJob extends DMPMJob {
|
|||
"Algorithm details:\n"+"\n"+
|
||||
"User: "+this.algorithm.getFullname()+"\n"+
|
||||
"Algorithm name: "+this.algorithm.getName()+"\n"+
|
||||
"Staging DataMiner Host: "+ a.getHost(this.env)+"\n"+
|
||||
"Staging DataMiner Host: "+ a.getStagingHost()+"\n"+
|
||||
"Caller VRE: "+ScopeProvider.instance.get()+"\n"+
|
||||
"Target VRE: "+rProtoVREName+"\n";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,8 +84,7 @@ public class CheckMethod {
|
|||
|
||||
|
||||
|
||||
public boolean algoExists(Algorithm a, String env) throws Exception{
|
||||
System.out.println("checking existing in env: "+ env);
|
||||
public boolean algoExists(Algorithm a/*, String env*/) throws Exception{
|
||||
|
||||
File file = new File("/home/gcube/wps_algorithms/algorithms/"+a.getName()+".jar");
|
||||
File file2 = new File("/home/gcube/wps_algorithms/algorithms/"+a.getName()+"_interface.jar");
|
||||
|
|
@ -95,9 +94,9 @@ public class CheckMethod {
|
|||
System.out.println("Second file is located to: "+file2.getPath());
|
||||
|
||||
|
||||
if ((this.doesExist(file.getPath(),env)) && (this.doesExist(file2.getPath(),env))){
|
||||
this.copyFromDmToSVN(file,env);
|
||||
this.copyFromDmToSVN(file2,env);
|
||||
if ((this.doesExist(file.getPath()/*,env*/)) && (this.doesExist(file2.getPath()/*,env*/))){
|
||||
this.copyFromDmToSVN(file/*,env*/);
|
||||
this.copyFromDmToSVN(file2/*,env*/);
|
||||
|
||||
|
||||
return true;
|
||||
|
|
@ -108,13 +107,13 @@ public class CheckMethod {
|
|||
}
|
||||
|
||||
|
||||
public void deleteFiles(Algorithm a,String env) throws Exception{
|
||||
public void deleteFiles(Algorithm a/*,String env*/) throws Exception{
|
||||
JSch jsch = new JSch();
|
||||
Session session = null;
|
||||
Channel channel = null;
|
||||
ChannelSftp c = null;
|
||||
ServiceConfiguration p = new ServiceConfiguration();
|
||||
System.out.println("checking existing in env: "+ env + " " + p.getHost(env));
|
||||
System.out.println("checking existing in env: " + p.getStagingHost());
|
||||
|
||||
File file = new File("/home/gcube/wps_algorithms/algorithms/"+a.getName()+".jar");
|
||||
File file2 = new File("/home/gcube/wps_algorithms/algorithms/"+a.getName()+"_interface.jar");
|
||||
|
|
@ -130,7 +129,7 @@ public class CheckMethod {
|
|||
jsch.addIdentity(privateKey);
|
||||
System.out.println("Private Key Added.");
|
||||
|
||||
session = jsch.getSession("root", p.getHost(env));
|
||||
session = jsch.getSession("root", p.getStagingHost());
|
||||
System.out.println("session created.");
|
||||
|
||||
java.util.Properties config = new java.util.Properties();
|
||||
|
|
@ -145,7 +144,7 @@ public class CheckMethod {
|
|||
|
||||
c = (ChannelSftp) channel;
|
||||
|
||||
if(doesExist(file.getPath(),env)&&(doesExist(file2.getPath(),env))){
|
||||
if(doesExist(file.getPath()/*,env*/)&&(doesExist(file2.getPath()/*,env*/))){
|
||||
|
||||
c.rm(file.getPath());
|
||||
c.rm(file2.getPath());
|
||||
|
|
@ -163,7 +162,7 @@ public class CheckMethod {
|
|||
|
||||
|
||||
|
||||
public boolean doesExist(String path, String env) throws Exception {
|
||||
public boolean doesExist(String path/*, String env*/) throws Exception {
|
||||
JSch jsch = new JSch();
|
||||
Session session = null;
|
||||
Channel channel = null;
|
||||
|
|
@ -178,7 +177,7 @@ public class CheckMethod {
|
|||
jsch.addIdentity(privateKey);
|
||||
System.out.println("Private Key Added.");
|
||||
|
||||
session = jsch.getSession("root", p.getHost(env));
|
||||
session = jsch.getSession("root", p.getStagingHost());
|
||||
System.out.println("session created.");
|
||||
|
||||
java.util.Properties config = new java.util.Properties();
|
||||
|
|
@ -217,7 +216,7 @@ public class CheckMethod {
|
|||
|
||||
|
||||
|
||||
public void copyFromDmToSVN(File a,String env) throws Exception {
|
||||
public void copyFromDmToSVN(File a/*,String env*/) throws Exception {
|
||||
JSch jsch = new JSch();
|
||||
Session session = null;
|
||||
ServiceConfiguration sc = new ServiceConfiguration();
|
||||
|
|
@ -231,7 +230,7 @@ public class CheckMethod {
|
|||
jsch.addIdentity(privateKey);
|
||||
System.out.println("Private Key Added.");
|
||||
|
||||
session = jsch.getSession("root", p.getHost(env));
|
||||
session = jsch.getSession("root", p.getStagingHost());
|
||||
System.out.println("session created.");
|
||||
|
||||
java.util.Properties config = new java.util.Properties();
|
||||
|
|
@ -304,7 +303,7 @@ public class CheckMethod {
|
|||
|
||||
Algorithm al = new Algorithm();
|
||||
al.setName("RBLACKBOX");
|
||||
a.deleteFiles(al, "Dev");
|
||||
a.deleteFiles(al);
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,20 +13,22 @@ public class ClusterBuilder {
|
|||
|
||||
|
||||
//1. to complete
|
||||
public static Cluster getStagingDataminerCluster(String env) throws FileNotFoundException{
|
||||
public static Cluster getStagingDataminerCluster() throws FileNotFoundException{
|
||||
Cluster cluster = new Cluster();
|
||||
ServiceConfiguration p = new ServiceConfiguration();
|
||||
Host h = new Host();
|
||||
h.setName(p.getStagingHost());
|
||||
cluster.addHost(h);
|
||||
|
||||
if (env.equals("Dev")){
|
||||
h.setName(p.getDevStagingHost());
|
||||
cluster.addHost(h);
|
||||
}
|
||||
|
||||
if ((env.equals("Prod")||(env.equals("Proto")))){
|
||||
h.setName(p.getProtoProdStagingHost());
|
||||
cluster.addHost(h);
|
||||
}
|
||||
// if (env.equals("Dev")){
|
||||
// h.setName(p.getDevStagingHost());
|
||||
// cluster.addHost(h);
|
||||
// }
|
||||
//
|
||||
// if ((env.equals("Prod")||(env.equals("Proto")))){
|
||||
// h.setName(p.getProtoProdStagingHost());
|
||||
// cluster.addHost(h);
|
||||
// }
|
||||
|
||||
return cluster;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,98 +50,159 @@ public class SVNUpdater {
|
|||
|
||||
|
||||
|
||||
public String getDependencyFile(String language, String env){
|
||||
public String getDependencyFile(String language/*, String env*/){
|
||||
|
||||
String a = "";
|
||||
if (env.equals("Dev")){
|
||||
a= this.getDevDependencyFile(language);
|
||||
}
|
||||
|
||||
if (env.equals("Prod")){
|
||||
a= this.getProdDependencyFile(language);
|
||||
}
|
||||
|
||||
if (env.equals("Proto")){
|
||||
a= this.getRProtoDependencyFile(language);
|
||||
}
|
||||
// if (env.equals("Dev")){
|
||||
// a= this.getDevDependencyFile(language);
|
||||
// }
|
||||
//
|
||||
// if (env.equals("Prod")){
|
||||
// a= this.getProdDependencyFile(language);
|
||||
// }
|
||||
//
|
||||
// if (env.equals("Proto")){
|
||||
// a= this.getRProtoDependencyFile(language);
|
||||
// }
|
||||
//
|
||||
// if (env.equals("Preprod")){
|
||||
// a= this.getPreProdDependencyFile(language);
|
||||
// }
|
||||
a = this.getStagingDependencyFile(language);
|
||||
return a;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public String getRProtoDependencyFile(String language) {
|
||||
switch (language) {
|
||||
case "R":
|
||||
return this.configuration.getSVNRProtoCRANDepsList();
|
||||
case "R-blackbox":
|
||||
return this.configuration.getSVNRProtoRBDepsList();
|
||||
case "Java":
|
||||
return this.configuration.getSVNRProtoJavaDepsList();
|
||||
case "Knime-Workflow":
|
||||
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:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
// public String getRProtoDependencyFile(String language) {
|
||||
// switch (language) {
|
||||
// case "R":
|
||||
// return this.configuration.getSVNRProtoCRANDepsList();
|
||||
// case "R-blackbox":
|
||||
// return this.configuration.getSVNRProtoRBDepsList();
|
||||
// case "Java":
|
||||
// return this.configuration.getSVNRProtoJavaDepsList();
|
||||
// case "Knime-Workflow":
|
||||
// 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:
|
||||
// return null;
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
|
||||
public String getProdDependencyFile(String language) {
|
||||
switch (language) {
|
||||
case "R":
|
||||
return this.configuration.getSVNRProdCRANDepsList();
|
||||
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:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
// public String getPreProdDependencyFile(String language) {
|
||||
// switch (language) {
|
||||
// case "R":
|
||||
// return this.configuration.getSVNPreProdCRANDepsList();
|
||||
// case "R-blackbox":
|
||||
// return this.configuration.getSVNPreProdRBDepsList();
|
||||
// case "Java":
|
||||
// return this.configuration.getSVNPreProdJavaDepsList();
|
||||
// case "Knime-Workflow":
|
||||
// return this.configuration.getSVNPreProdKWDepsList();
|
||||
// case "Linux-compiled":
|
||||
// return this.configuration.getSVNPreProdLinuxCompiledDepsList();
|
||||
// case "Octave":
|
||||
// return this.configuration.getSVNPreProdOctaveDepsList();
|
||||
// case "Python":
|
||||
// return this.configuration.getSVNPreProdPythonDepsList();
|
||||
// case "Pre-Installed":
|
||||
// return this.configuration.getSVNPreProdPreInstalledDepsList();
|
||||
// case "Windows-compiled":
|
||||
// return this.configuration.getSVNPreProdWCDepsList();
|
||||
// default:
|
||||
// return null;
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// public String getProdDependencyFile(String language) {
|
||||
// switch (language) {
|
||||
// case "R":
|
||||
// return this.configuration.getSVNProdCRANDepsList();
|
||||
// case "R-blackbox":
|
||||
// return this.configuration.getSVNProdRBDepsList();
|
||||
// case "Java":
|
||||
// return this.configuration.getSVNProdJavaDepsList();
|
||||
// case "Knime-Workflow":
|
||||
// return this.configuration.getSVNProdKWDepsList();
|
||||
// case "Linux-compiled":
|
||||
// return this.configuration.getSVNProdLinuxCompiledDepsList();
|
||||
// case "Octave":
|
||||
// return this.configuration.getSVNProdOctaveDepsList();
|
||||
// case "Python":
|
||||
// return this.configuration.getSVNProdPythonDepsList();
|
||||
// case "Pre-Installed":
|
||||
// return this.configuration.getSVNProdPreInstalledDepsList();
|
||||
// case "Windows-compiled":
|
||||
// return this.configuration.getSVNProdWCDepsList();
|
||||
// default:
|
||||
// return null;
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
public String getDevDependencyFile(String language) {
|
||||
// public String getDevDependencyFile(String language) {
|
||||
// switch (language) {
|
||||
// case "R":
|
||||
// return this.configuration.getSVNDevCRANDepsList();
|
||||
// case "R-blackbox":
|
||||
// return this.configuration.getSVNDevRBDepsList();
|
||||
// case "Java":
|
||||
// return this.configuration.getSVNDevJavaDepsList();
|
||||
// case "Knime-Workflow":
|
||||
// return this.configuration.getSVNDevKWDepsList();
|
||||
// case "Linux-compiled":
|
||||
// return this.configuration.getSVNDevLinuxCompiledDepsList();
|
||||
// case "Octave":
|
||||
// return this.configuration.getSVNDevOctaveDepsList();
|
||||
// case "Python":
|
||||
// return this.configuration.getSVNDevPythonDepsList();
|
||||
// case "Pre-Installed":
|
||||
// return this.configuration.getSVNDevPreInstalledDepsList();
|
||||
// case "Windows-compiled":
|
||||
// return this.configuration.getSVNDevWCDepsList();
|
||||
// default:
|
||||
// return null;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
|
||||
|
||||
public String getStagingDependencyFile(String language) {
|
||||
switch (language) {
|
||||
case "R":
|
||||
return this.configuration.getSVNRDevCRANDepsList();
|
||||
return this.configuration.getSVNStagingCRANDepsList();
|
||||
case "R-blackbox":
|
||||
return this.configuration.getSVNRDevRBDepsList();
|
||||
return this.configuration.getSVNStagingRBDepsList();
|
||||
case "Java":
|
||||
return this.configuration.getSVNRDevJavaDepsList();
|
||||
return this.configuration.getSVNStagingJavaDepsList();
|
||||
case "Knime-Workflow":
|
||||
return this.configuration.getSVNRDevKWDepsList();
|
||||
return this.configuration.getSVNStagingKWDepsList();
|
||||
case "Linux-compiled":
|
||||
return this.configuration.getSVNRDevLinuxCompiledDepsList();
|
||||
return this.configuration.getSVNStagingLinuxCompiledDepsList();
|
||||
case "Octave":
|
||||
return this.configuration.getSVNRDevOctaveDepsList();
|
||||
return this.configuration.getSVNStagingOctaveDepsList();
|
||||
case "Python":
|
||||
return this.configuration.getSVNRDevPythonDepsList();
|
||||
return this.configuration.getSVNStagingPythonDepsList();
|
||||
case "Pre-Installed":
|
||||
return this.configuration.getSVNRDevPreInstalledDepsList();
|
||||
return this.configuration.getSVNStagingPreInstalledDepsList();
|
||||
case "Windows-compiled":
|
||||
return this.configuration.getSVNRDevWCDepsList();
|
||||
return this.configuration.getSVNStagingWCDepsList();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
|
|
@ -151,98 +212,129 @@ public class SVNUpdater {
|
|||
|
||||
|
||||
|
||||
|
||||
public void readRPRotoDeps(Algorithm algorithm) throws SVNException {
|
||||
if (algorithm.getLanguage().equals("R")) {
|
||||
this.checkIfAvaialable(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("R-blackbox")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Java")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Knime-Workflow")) {
|
||||
this.checkIfAvaialable(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Linux-compiled")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Octave")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Python")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Windows-compiled")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Pre-Installed")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
}
|
||||
|
||||
public void readProdDeps(Algorithm algorithm) throws SVNException {
|
||||
if (algorithm.getLanguage().equals("R")) {
|
||||
this.checkIfAvaialable(this.configuration.getSVNRProdCRANDepsList(), algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("R-blackbox")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Java")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Knime-Workflow")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Linux-compiled")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Octave")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Python")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Windows-compiled")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Pre-Installed")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void readRDevDeps(Algorithm algorithm) throws SVNException {
|
||||
if (algorithm.getLanguage().equals("R")) {
|
||||
this.checkIfAvaialable(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("R-blackbox")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Java")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Knime-Workflow")) {
|
||||
this.checkIfAvaialable(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Linux-compiled")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Octave")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Python")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Windows-compiled")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
if (algorithm.getLanguage().equals("Pre-Installed")) {
|
||||
this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
}
|
||||
}
|
||||
// public void readPreProdDeps(Algorithm algorithm) throws SVNException {
|
||||
// if (algorithm.getLanguage().equals("R")) {
|
||||
// this.checkIfAvaialable(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("R-blackbox")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Java")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Knime-Workflow")) {
|
||||
// this.checkIfAvaialable(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Linux-compiled")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Octave")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Python")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Windows-compiled")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Pre-Installed")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
// public void readRPRotoDeps(Algorithm algorithm) throws SVNException {
|
||||
// if (algorithm.getLanguage().equals("R")) {
|
||||
// this.checkIfAvaialable(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("R-blackbox")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Java")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Knime-Workflow")) {
|
||||
// this.checkIfAvaialable(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Linux-compiled")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Octave")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Python")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Windows-compiled")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Pre-Installed")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public void readProdDeps(Algorithm algorithm) throws SVNException {
|
||||
// if (algorithm.getLanguage().equals("R")) {
|
||||
// this.checkIfAvaialable(this.configuration.getSVNProdCRANDepsList(), algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("R-blackbox")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Java")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Knime-Workflow")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Linux-compiled")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Octave")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Python")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Windows-compiled")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Pre-Installed")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
// public void readRDevDeps(Algorithm algorithm) throws SVNException {
|
||||
// if (algorithm.getLanguage().equals("R")) {
|
||||
// this.checkIfAvaialable(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("R-blackbox")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Java")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Knime-Workflow")) {
|
||||
// this.checkIfAvaialable(this.configuration.getSVNRProtoCRANDepsList(), algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Linux-compiled")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Octave")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Python")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Windows-compiled")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// if (algorithm.getLanguage().equals("Pre-Installed")) {
|
||||
// this.checkIfAvaialable("", algorithm.getDependencies());
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
|
||||
|
|
@ -255,23 +347,31 @@ public class SVNUpdater {
|
|||
// this.updateSVN(this.configuration.getSVNRProdGitHubDepsList(), algorithm.getGitHubDependencies());
|
||||
// }
|
||||
|
||||
public void updateSVNAlgorithmList(Algorithm algorithm, String targetVRE, String category, String algorithm_type, String user, String env) {
|
||||
|
||||
if (env.equals("Dev")){
|
||||
this.updateSVNAlgorithmList(this.configuration.getSVNDevAlgorithmsList(), algorithm, targetVRE, category,algorithm_type, user, env);
|
||||
}
|
||||
|
||||
if (env.equals("Prod")){
|
||||
this.updateSVNAlgorithmList(this.configuration.getSVNProdAlgorithmsList(), algorithm, targetVRE, category, algorithm_type, user, env);
|
||||
}
|
||||
|
||||
if (env.equals("Proto")){
|
||||
this.updateSVNAlgorithmList(this.configuration.getSVNRProtoAlgorithmsList(), algorithm, targetVRE, category, algorithm_type, user, env);
|
||||
}
|
||||
}
|
||||
// public void updateSVNAlgorithmList(Algorithm algorithm, String targetVRE, String category, String algorithm_type, String user/*, String env*/) {
|
||||
//
|
||||
// if (env.equals("Dev")){
|
||||
// this.updateSVNAlgorithmList(this.configuration.getSVNDevAlgorithmsList(), algorithm, targetVRE, category,algorithm_type, user, env);
|
||||
// }
|
||||
//
|
||||
// if (env.equals("Prod")){
|
||||
// this.updateSVNAlgorithmList(this.configuration.getSVNProdAlgorithmsList(), algorithm, targetVRE, category, algorithm_type, user, env);
|
||||
// }
|
||||
//
|
||||
// if (env.equals("Proto")){
|
||||
// this.updateSVNAlgorithmList(this.configuration.getSVNRProtoAlgorithmsList(), algorithm, targetVRE, category, algorithm_type, user, env);
|
||||
// }
|
||||
//
|
||||
// if (env.equals("Preprod")){
|
||||
// this.updateSVNAlgorithmList(this.configuration.getSVNPreProdAlgorithmsList(), algorithm, targetVRE, category, algorithm_type, user, env);
|
||||
// }
|
||||
// }
|
||||
|
||||
public void updateSVNProdAlgorithmList(Algorithm algorithm, String targetVRE, String category, String algorithm_type, String user, String env) {
|
||||
this.updateSVNAlgorithmList(this.configuration.getSVNProdAlgorithmsList(), algorithm, targetVRE, category, algorithm_type, user, env);
|
||||
public void updateSVNStagingAlgorithmList(Algorithm algorithm, String targetVRE, String category, String algorithm_type, String user/*, String env*/) {
|
||||
this.updateSVNAlgorithmList(this.configuration.getSVNStagingAlgorithmsList(), algorithm, targetVRE, category, algorithm_type, user);
|
||||
}
|
||||
|
||||
public void updateSVNProdAlgorithmList(Algorithm algorithm, String targetVRE, String category, String algorithm_type, String user/*, String env*/) {
|
||||
this.updateSVNAlgorithmList(this.configuration.getSVNProdAlgorithmsList(), algorithm, targetVRE, category, algorithm_type, user);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -377,7 +477,7 @@ public class SVNUpdater {
|
|||
}
|
||||
|
||||
|
||||
public void updateSVNAlgorithmList(String file, Algorithm algorithm, String targetVRE, String category, String algorithm_type, String user, String env) {
|
||||
public void updateSVNAlgorithmList(String file, Algorithm algorithm, String targetVRE, String category, String algorithm_type, String user/*, String env*/) {
|
||||
try {
|
||||
System.out.println("Updating algorithm list: " + file);
|
||||
final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
|
||||
|
|
@ -397,7 +497,7 @@ public class SVNUpdater {
|
|||
}
|
||||
|
||||
// the algorithm is not in the list or must be overwritten cause some modification. Add it
|
||||
newContent.add(this.generateAlgorithmEntry(algorithm, targetVRE, category,algorithm_type, env));
|
||||
newContent.add(this.generateAlgorithmEntry(algorithm, targetVRE, category,algorithm_type/*, env*/));
|
||||
// Collections.sort(newContent);
|
||||
|
||||
final SVNDeltaGenerator deltaGenerator = new SVNDeltaGenerator();
|
||||
|
|
@ -432,7 +532,7 @@ public class SVNUpdater {
|
|||
}
|
||||
}
|
||||
|
||||
public String generateAlgorithmEntry(Algorithm algorithm, String targetVRE, String category, String algorithm_type,String env) throws ParseException {
|
||||
public String generateAlgorithmEntry(Algorithm algorithm, String targetVRE, String category, String algorithm_type/*,String env*/) throws ParseException {
|
||||
//Timestamp timestamp = new Timestamp(System.currentTimeMillis());
|
||||
//long unixTime = System.currentTimeMillis() / 1000L;
|
||||
|
||||
|
|
@ -440,7 +540,7 @@ public class SVNUpdater {
|
|||
sb.append(algorithm.getName() + " | ");
|
||||
sb.append(algorithm.getFullname() + " | ");
|
||||
sb.append(category + " | ");
|
||||
sb.append(env + " | ");
|
||||
//sb.append(env + " | ");
|
||||
sb.append("<notextile>./addAlgorithm.sh " + algorithm.getName() + " " + algorithm.getCategory() + " "
|
||||
+ algorithm.getClazz() + " " + targetVRE + " " + algorithm_type + " N "
|
||||
+ algorithm.getPackageURL() + " \"" + algorithm.getDescription() + "\" </notextile> | ");
|
||||
|
|
@ -454,6 +554,15 @@ public class SVNUpdater {
|
|||
// SendMail sm = new SendMail();
|
||||
// NotificationHelper nh = new NotificationHelper();
|
||||
|
||||
List<String> undefined = new LinkedList<String>();
|
||||
|
||||
//to fix in next release: if the file is not present for that language in the service.properties then skip and return null list of string
|
||||
//just to uncomment the following lines
|
||||
|
||||
//if(file.isEmpty()){
|
||||
//return undefined;
|
||||
//}
|
||||
|
||||
|
||||
System.out.println("Checking dependencies list: " + file);
|
||||
final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
|
||||
|
|
@ -464,10 +573,6 @@ public class SVNUpdater {
|
|||
validDependencies.add(l.trim());
|
||||
}
|
||||
|
||||
List<String> undefined = new LinkedList<String>();
|
||||
|
||||
|
||||
|
||||
for(Dependency d: deps){
|
||||
String depName = d.getName();
|
||||
if(!validDependencies.contains(depName)){
|
||||
|
|
|
|||
|
|
@ -48,45 +48,45 @@ public class ServiceConfiguration {
|
|||
|
||||
|
||||
//RProto
|
||||
public String getSVNRProtoAlgorithmsList(){
|
||||
return props.getProperty("svn.rproto.algorithms-list");
|
||||
}
|
||||
|
||||
public String getSVNRProtoLinuxCompiledDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-linux-compiled");
|
||||
}
|
||||
|
||||
public String getSVNRProtoCRANDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-r");
|
||||
}
|
||||
|
||||
public String getSVNRProtoPreInstalledDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-pre-installed");
|
||||
}
|
||||
|
||||
public String getSVNRProtoRBDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-r-blackbox");
|
||||
}
|
||||
|
||||
public String getSVNRProtoJavaDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-java");
|
||||
}
|
||||
|
||||
public String getSVNRProtoKWDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-knime-workflow");
|
||||
}
|
||||
|
||||
public String getSVNRProtoOctaveDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-octave");
|
||||
}
|
||||
|
||||
public String getSVNRProtoPythonDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-python");
|
||||
}
|
||||
|
||||
public String getSVNRProtoWCDepsList(){
|
||||
return props.getProperty("svn.rproto.deps-windows-compiled");
|
||||
}
|
||||
// public String getSVNRProtoAlgorithmsList(){
|
||||
// return props.getProperty("svn.rproto.algorithms-list");
|
||||
// }
|
||||
//
|
||||
// public String getSVNRProtoLinuxCompiledDepsList(){
|
||||
// return props.getProperty("svn.rproto.deps-linux-compiled");
|
||||
// }
|
||||
//
|
||||
// public String getSVNRProtoCRANDepsList(){
|
||||
// return props.getProperty("svn.rproto.deps-r");
|
||||
// }
|
||||
//
|
||||
// public String getSVNRProtoPreInstalledDepsList(){
|
||||
// return props.getProperty("svn.rproto.deps-pre-installed");
|
||||
// }
|
||||
//
|
||||
// public String getSVNRProtoRBDepsList(){
|
||||
// return props.getProperty("svn.rproto.deps-r-blackbox");
|
||||
// }
|
||||
//
|
||||
// public String getSVNRProtoJavaDepsList(){
|
||||
// return props.getProperty("svn.rproto.deps-java");
|
||||
// }
|
||||
//
|
||||
// public String getSVNRProtoKWDepsList(){
|
||||
// return props.getProperty("svn.rproto.deps-knime-workflow");
|
||||
// }
|
||||
//
|
||||
// public String getSVNRProtoOctaveDepsList(){
|
||||
// return props.getProperty("svn.rproto.deps-octave");
|
||||
// }
|
||||
//
|
||||
// public String getSVNRProtoPythonDepsList(){
|
||||
// return props.getProperty("svn.rproto.deps-python");
|
||||
// }
|
||||
//
|
||||
// public String getSVNRProtoWCDepsList(){
|
||||
// return props.getProperty("svn.rproto.deps-windows-compiled");
|
||||
// }
|
||||
|
||||
|
||||
//Prod
|
||||
|
|
@ -94,131 +94,223 @@ public class ServiceConfiguration {
|
|||
return props.getProperty("svn.prod.algorithms-list");
|
||||
}
|
||||
|
||||
public String getSVNRProdLinuxCompiledDepsList(){
|
||||
return props.getProperty("svn.prod.deps-linux-compiled");
|
||||
}
|
||||
|
||||
public String getSVNRProdCRANDepsList(){
|
||||
return props.getProperty("svn.prod.deps-r");
|
||||
}
|
||||
|
||||
public String getSVNRProdPreInstalledDepsList(){
|
||||
return props.getProperty("svn.prod.deps-pre-installed");
|
||||
}
|
||||
// public String getSVNProdLinuxCompiledDepsList(){
|
||||
// return props.getProperty("svn.prod.deps-linux-compiled");
|
||||
// }
|
||||
//
|
||||
// public String getSVNProdCRANDepsList(){
|
||||
// return props.getProperty("svn.prod.deps-r");
|
||||
// }
|
||||
//
|
||||
// public String getSVNProdPreInstalledDepsList(){
|
||||
// return props.getProperty("svn.prod.deps-pre-installed");
|
||||
// }
|
||||
//
|
||||
// public String getSVNProdRBDepsList(){
|
||||
// return props.getProperty("svn.prod.deps-r-blackbox");
|
||||
// }
|
||||
//
|
||||
// public String getSVNProdJavaDepsList(){
|
||||
// return props.getProperty("svn.prod.deps-java");
|
||||
// }
|
||||
//
|
||||
// public String getSVNProdKWDepsList(){
|
||||
// return props.getProperty("svn.prod.deps-knime-workflow");
|
||||
// }
|
||||
//
|
||||
// public String getSVNProdOctaveDepsList(){
|
||||
// return props.getProperty("svn.prod.deps-octave");
|
||||
// }
|
||||
//
|
||||
// public String getSVNProdPythonDepsList(){
|
||||
// return props.getProperty("svn.prod.deps-python");
|
||||
// }
|
||||
//
|
||||
// public String getSVNProdWCDepsList(){
|
||||
// return props.getProperty("svn.prod.deps-windows-compiled");
|
||||
// }
|
||||
//
|
||||
|
||||
public String getSVNRProdRBDepsList(){
|
||||
return props.getProperty("svn.prod.deps-r-blackbox");
|
||||
}
|
||||
|
||||
public String getSVNRProdJavaDepsList(){
|
||||
return props.getProperty("svn.prod.deps-java");
|
||||
}
|
||||
|
||||
public String getSVNRProdKWDepsList(){
|
||||
return props.getProperty("svn.prod.deps-knime-workflow");
|
||||
}
|
||||
|
||||
public String getSVNRProdOctaveDepsList(){
|
||||
return props.getProperty("svn.prod.deps-octave");
|
||||
}
|
||||
|
||||
public String getSVNRProdPythonDepsList(){
|
||||
return props.getProperty("svn.prod.deps-python");
|
||||
}
|
||||
|
||||
public String getSVNRProdWCDepsList(){
|
||||
return props.getProperty("svn.prod.deps-windows-compiled");
|
||||
}
|
||||
|
||||
//PreProd
|
||||
// public String getSVNPreProdAlgorithmsList(){
|
||||
// return props.getProperty("svn.preprod.algorithms-list");
|
||||
// }
|
||||
//
|
||||
// public String getSVNPreProdLinuxCompiledDepsList(){
|
||||
// return props.getProperty("svn.preprod.deps-linux-compiled");
|
||||
// }
|
||||
//
|
||||
// public String getSVNPreProdCRANDepsList(){
|
||||
// return props.getProperty("svn.preprod.deps-r");
|
||||
// }
|
||||
//
|
||||
// public String getSVNPreProdPreInstalledDepsList(){
|
||||
// return props.getProperty("svn.preprod.deps-pre-installed");
|
||||
// }
|
||||
//
|
||||
// public String getSVNPreProdRBDepsList(){
|
||||
// return props.getProperty("svn.preprod.deps-r-blackbox");
|
||||
// }
|
||||
//
|
||||
// public String getSVNPreProdJavaDepsList(){
|
||||
// return props.getProperty("svn.preprod.deps-java");
|
||||
// }
|
||||
//
|
||||
// public String getSVNPreProdKWDepsList(){
|
||||
// return props.getProperty("svn.preprod.deps-knime-workflow");
|
||||
// }
|
||||
//
|
||||
// public String getSVNPreProdOctaveDepsList(){
|
||||
// return props.getProperty("svn.preprod.deps-octave");
|
||||
// }
|
||||
//
|
||||
// public String getSVNPreProdPythonDepsList(){
|
||||
// return props.getProperty("svn.preprod.deps-python");
|
||||
// }
|
||||
//
|
||||
// public String getSVNPreProdWCDepsList(){
|
||||
// return props.getProperty("svn.preprod.deps-windows-compiled");
|
||||
// }
|
||||
|
||||
|
||||
|
||||
//dev
|
||||
public String getSVNDevAlgorithmsList(){
|
||||
return props.getProperty("svn.dev.algorithms-list");
|
||||
}
|
||||
// public String getSVNDevAlgorithmsList(){
|
||||
// return props.getProperty("svn.dev.algorithms-list");
|
||||
// }
|
||||
//
|
||||
// public String getSVNDevLinuxCompiledDepsList(){
|
||||
// return props.getProperty("svn.dev.deps-linux-compiled");
|
||||
// }
|
||||
//
|
||||
// public String getSVNDevCRANDepsList(){
|
||||
// return props.getProperty("svn.dev.deps-r");
|
||||
// }
|
||||
//
|
||||
// public String getSVNDevPreInstalledDepsList(){
|
||||
// return props.getProperty("svn.dev.deps-pre-installed");
|
||||
// }
|
||||
//
|
||||
// public String getSVNDevRBDepsList(){
|
||||
// return props.getProperty("svn.dev.deps-r-blackbox");
|
||||
// }
|
||||
//
|
||||
// public String getSVNDevJavaDepsList(){
|
||||
// return props.getProperty("svn.dev.deps-java");
|
||||
// }
|
||||
//
|
||||
// public String getSVNDevKWDepsList(){
|
||||
// return props.getProperty("svn.dev.deps-knime-workflow");
|
||||
// }
|
||||
//
|
||||
// public String getSVNDevOctaveDepsList(){
|
||||
// return props.getProperty("svn.dev.deps-octave");
|
||||
// }
|
||||
//
|
||||
// public String getSVNDevPythonDepsList(){
|
||||
// return props.getProperty("svn.dev.deps-python");
|
||||
// }
|
||||
//
|
||||
// public String getSVNDevWCDepsList(){
|
||||
// return props.getProperty("svn.dev.deps-windows-compiled");
|
||||
// }
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
|
||||
public String getSVNRDevLinuxCompiledDepsList(){
|
||||
return props.getProperty("svn.dev.deps-linux-compiled");
|
||||
}
|
||||
// public String getCSVUrl() {
|
||||
// return props.getProperty("HAPROXY_CSV");
|
||||
// }
|
||||
|
||||
public String getSVNRDevCRANDepsList(){
|
||||
return props.getProperty("svn.dev.deps-r");
|
||||
}
|
||||
|
||||
public String getSVNRDevPreInstalledDepsList(){
|
||||
return props.getProperty("svn.dev.deps-pre-installed");
|
||||
}
|
||||
|
||||
public String getSVNRDevRBDepsList(){
|
||||
return props.getProperty("svn.dev.deps-r-blackbox");
|
||||
}
|
||||
|
||||
public String getSVNRDevJavaDepsList(){
|
||||
return props.getProperty("svn.dev.deps-java");
|
||||
}
|
||||
|
||||
public String getSVNRDevKWDepsList(){
|
||||
return props.getProperty("svn.dev.deps-knime-workflow");
|
||||
}
|
||||
|
||||
public String getSVNRDevOctaveDepsList(){
|
||||
return props.getProperty("svn.dev.deps-octave");
|
||||
}
|
||||
|
||||
public String getSVNRDevPythonDepsList(){
|
||||
return props.getProperty("svn.dev.deps-python");
|
||||
}
|
||||
|
||||
public String getSVNRDevWCDepsList(){
|
||||
return props.getProperty("svn.dev.deps-windows-compiled");
|
||||
}
|
||||
|
||||
|
||||
// public String getHost(String env){
|
||||
// String a = "";
|
||||
//
|
||||
// if (env.equals("Dev")||(env.equals("Preprod"))){
|
||||
// a = this.getDevStagingHost().trim();
|
||||
// }
|
||||
//
|
||||
// if (env.equals("Prod")||(env.equals("Proto"))){
|
||||
// a = this.getProtoProdStagingHost().trim();
|
||||
// }
|
||||
// return a;
|
||||
// }
|
||||
|
||||
|
||||
|
||||
|
||||
public String getCSVUrl() {
|
||||
return props.getProperty("HAPROXY_CSV");
|
||||
}
|
||||
|
||||
// public String getDevStagingHost() {
|
||||
// return props.getProperty("DEV_STAGING_HOST");
|
||||
// }
|
||||
|
||||
public String getHost(String env){
|
||||
String a = "";
|
||||
|
||||
if (env.equals("Dev")){
|
||||
a = this.getDevStagingHost().trim();
|
||||
}
|
||||
|
||||
if (env.equals("Prod")||(env.equals("Prod"))){
|
||||
a = this.getProtoProdStagingHost().trim();
|
||||
}
|
||||
return a;
|
||||
|
||||
|
||||
public String getStagingHost() {
|
||||
return props.getProperty("STAGE_GHOST");
|
||||
}
|
||||
|
||||
|
||||
|
||||
public String getDevStagingHost() {
|
||||
return props.getProperty("DEV_STAGING_HOST");
|
||||
}
|
||||
// public String getProtoProdStagingHost() {
|
||||
// return props.getProperty("PROTO_PROD_STAGING_HOST");
|
||||
// }
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//Staging
|
||||
public String getSVNStagingAlgorithmsList(){
|
||||
return props.getProperty("svn.stage.algorithms-list");
|
||||
}
|
||||
|
||||
public String getSVNStagingLinuxCompiledDepsList(){
|
||||
return props.getProperty("svn.stage.deps-linux-compiled");
|
||||
}
|
||||
|
||||
public String getSVNStagingCRANDepsList(){
|
||||
return props.getProperty("svn.stage.deps-r");
|
||||
}
|
||||
|
||||
public String getSVNStagingPreInstalledDepsList(){
|
||||
return props.getProperty("svn.stage.deps-pre-installed");
|
||||
}
|
||||
|
||||
public String getSVNStagingRBDepsList(){
|
||||
return props.getProperty("svn.stage.deps-r-blackbox");
|
||||
}
|
||||
|
||||
public String getSVNStagingJavaDepsList(){
|
||||
return props.getProperty("svn.stage.deps-java");
|
||||
}
|
||||
|
||||
public String getSVNStagingKWDepsList(){
|
||||
return props.getProperty("svn.stage.deps-knime-workflow");
|
||||
}
|
||||
|
||||
public String getSVNStagingOctaveDepsList(){
|
||||
return props.getProperty("svn.stage.deps-octave");
|
||||
}
|
||||
|
||||
public String getSVNStagingPythonDepsList(){
|
||||
return props.getProperty("svn.stage.deps-python");
|
||||
}
|
||||
|
||||
public String getSVNStagingWCDepsList(){
|
||||
return props.getProperty("svn.stage.deps-windows-compiled");
|
||||
}
|
||||
|
||||
|
||||
public String getProtoProdStagingHost() {
|
||||
return props.getProperty("PROTO_PROD_STAGING_HOST");
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void main(String[] args) throws FileNotFoundException {
|
||||
ServiceConfiguration a = new ServiceConfiguration();
|
||||
//System.out.println(a.getStagingHost());
|
||||
System.out.println(a.getDevStagingHost());
|
||||
System.out.println(a.getProtoProdStagingHost());
|
||||
System.out.println(a.getCSVUrl());
|
||||
System.out.println(a.getSVNMainAlgoRepo());
|
||||
System.out.println(a.getSVNRProtoCRANDepsList());
|
||||
//System.out.println(a.getDevStagingHost());
|
||||
//System.out.println(a.getProtoProdStagingHost());
|
||||
//System.out.println(a.getCSVUrl());
|
||||
//System.out.println(a.getSVNMainAlgoRepo());
|
||||
//System.out.println(a.getSVNRProtoCRANDepsList());
|
||||
System.out.println(a.getStagingHost());
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,50 +1,23 @@
|
|||
#YML node file
|
||||
DEV_STAGING_HOST: dataminer1-devnext.d4science.org
|
||||
PROTO_PROD_STAGING_HOST: dataminer-proto-ghost.d4science.org
|
||||
SVN_REPO: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/RConfiguration/RPackagesManagement/
|
||||
#HAPROXY_CSV: http://data.d4science.org/Yk4zSFF6V3JOSytNd3JkRDlnRFpDUUR5TnRJZEw2QjRHbWJQNStIS0N6Yz0
|
||||
|
||||
SVN_REPO = https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/RConfiguration/RPackagesManagement/
|
||||
|
||||
svn.repository = https://svn.d4science.research-infrastructures.eu/gcube
|
||||
|
||||
svn.algo.main.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms
|
||||
|
||||
svn.rproto.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/proto/algorithms
|
||||
|
||||
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 =
|
||||
#STAGE
|
||||
STAGE_GHOST = dataminer-ghost-d.dev.d4science.org
|
||||
svn.stage.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/dev/algorithms
|
||||
|
||||
svn.stage.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
|
||||
svn.stage.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
|
||||
svn.stage.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
|
||||
svn.stage.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
|
||||
svn.stage.deps-java =
|
||||
svn.stage.deps-knime-workflow =
|
||||
svn.stage.deps-octave =
|
||||
svn.stage.deps-python =
|
||||
svn.stage.deps-windows-compiled =
|
||||
|
||||
svn.prod.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms
|
||||
|
||||
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 =
|
||||
|
||||
|
||||
|
||||
svn.dev.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/dev/algorithms
|
||||
|
||||
svn.dev.deps-linux-compiled =
|
||||
svn.dev.deps-pre-installed =
|
||||
svn.dev.deps-r-blackbox =
|
||||
svn.dev.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
|
||||
svn.dev.deps-java =
|
||||
svn.dev.deps-knime-workflow =
|
||||
svn.dev.deps-octave =
|
||||
svn.dev.deps-python =
|
||||
svn.dev.deps-windows-compiled =
|
||||
|
||||
#PROD
|
||||
svn.prod.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms
|
||||
|
|
@ -5,12 +5,12 @@
|
|||
<web-app>
|
||||
<display-name>Archetype Created Web Application</display-name>
|
||||
|
||||
<context-param>
|
||||
<!-- <context-param>
|
||||
<param-name>Environment</param-name>
|
||||
<param-value>Dev</param-value>
|
||||
<!-- Possible Values: Dev, Proto, Prod -->
|
||||
Possible Values: Dev, Proto, Prod, Preprod
|
||||
<description>This is a context parameter example</description>
|
||||
</context-param>
|
||||
</context-param> -->
|
||||
|
||||
<servlet>
|
||||
<servlet-name>REST-API</servlet-name>
|
||||
|
|
|
|||
Loading…
Reference in New Issue