From 925cadb84a24345ed4c3ee5ae47fd41b0420b5b7 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 11 Dec 2019 13:30:47 +0000 Subject: [PATCH] ref 18190: Configure SAI and DM to support KNIME 4.1 https://support.d4science.org/issues/18190 Updated to support Knime-Workflow 4.1 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@183316 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../poolmanager/clients/configuration/Configuration.java | 2 ++ .../clients/configuration/ConfigurationImpl.java | 6 ++++++ .../clients/configurations/AbstractConfiguration.java | 9 +++++++++ src/main/resources/service.properties | 1 + 4 files changed, 18 insertions(+) diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/Configuration.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/Configuration.java index 8db287f..94357af 100755 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/Configuration.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/Configuration.java @@ -20,6 +20,8 @@ public interface Configuration { public String getSVNJavaDepsList(); public String getSVNKWDepsList(); + + public String getSVNKW4_1DepsList(); public String getSVNOctaveDepsList(); diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/ConfigurationImpl.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/ConfigurationImpl.java index e836373..363ad1d 100755 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/ConfigurationImpl.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/ConfigurationImpl.java @@ -109,6 +109,12 @@ public class ConfigurationImpl implements Configuration { return this.cache.getConfiguration(this.type).getDepsKnimeWorkflow(); } + + @Override + public String getSVNKW4_1DepsList() { + + return this.cache.getConfiguration(this.type).getDepsKnimeWorkflow4_1(); + } @Override public String getSVNOctaveDepsList() { diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configurations/AbstractConfiguration.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configurations/AbstractConfiguration.java index 2787f6e..c95ec51 100755 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configurations/AbstractConfiguration.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configurations/AbstractConfiguration.java @@ -16,6 +16,7 @@ public abstract class AbstractConfiguration private String depsR; private String depsJava; private String depsKnimeWorkflow; + private String depsKnimeWorkflow4_1; private String depsOctave; private String depsPython; private String depsPython3_6; @@ -108,6 +109,14 @@ public abstract class AbstractConfiguration this.depsKnimeWorkflow = depsKnimeWorkflow; } + @XmlElement (name="deps-knime-workflow4_1") + public String getDepsKnimeWorkflow4_1() { + return depsKnimeWorkflow4_1; + } + public void setDepsKnimeWorkflow4_1(String depsKnimeWorkflow4_1) { + this.depsKnimeWorkflow4_1 = depsKnimeWorkflow4_1; + } + @XmlElement (name="deps-octave") public String getDepsOctave() { return depsOctave; diff --git a/src/main/resources/service.properties b/src/main/resources/service.properties index f3efe7f..3819f20 100644 --- a/src/main/resources/service.properties +++ b/src/main/resources/service.properties @@ -15,6 +15,7 @@ svn.stage.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagem 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-knime-workflow4_1 = svn.stage.deps-octave = svn.stage.deps-python = svn.stage.deps-python3_6 =