diff --git a/pom.xml b/pom.xml index 783c0f6..fc8b68b 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ org.gcube.common home-library [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) - + xerces diff --git a/src/main/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/mapping/ConfigurationManager.java b/src/main/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/mapping/ConfigurationManager.java index b5f0368..0a746fb 100644 --- a/src/main/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/mapping/ConfigurationManager.java +++ b/src/main/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/mapping/ConfigurationManager.java @@ -49,6 +49,7 @@ public class ConfigurationManager { options.load(is); is.close(); maxComputations = Integer.parseInt(options.getProperty("maxcomputations")); + logger.info("setting max computation to {}",maxComputations); useStorage = Boolean.parseBoolean(options.getProperty("saveond4sstorage")); simulationMode=Boolean.parseBoolean(options.getProperty("simulationMode")); } diff --git a/src/main/resources/templates/setup.cfg b/src/main/resources/templates/setup.cfg index 6ba55af..aa923e8 100644 --- a/src/main/resources/templates/setup.cfg +++ b/src/main/resources/templates/setup.cfg @@ -1,3 +1,3 @@ -maxcomputations=4 +maxcomputations=1 saveond4sstorage=true simulationMode=false \ No newline at end of file diff --git a/src/test/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/test/AlgorithmTest.java b/src/test/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/test/AlgorithmTest.java index fd21284..921d288 100644 --- a/src/test/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/test/AlgorithmTest.java +++ b/src/test/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/test/AlgorithmTest.java @@ -17,22 +17,22 @@ import org.junit.Test; public class AlgorithmTest { - List executeOnly = Arrays.asList(); + List executeOnly = Arrays.asList("#BIONYM", "#AQUAMAPS_SUITABLE", "#AQUAMAPS_SUITABLE 21 sp", "#BIONYM1024","#CMSY2"); @Test public void executeAlgorithmsFromFile() throws Exception{ String env = "dev"; - Properties prop = new Properties(); + /*Properties prop = new Properties(); prop.load(AlgorithmTest.class.getResourceAsStream("/test_params.properties")); - + */ String protocol = "http"; - String hostname = prop.getProperty(env+".host"); - String token = prop.getProperty(env+".token"); - String layerID = prop.getProperty(env+".layer"); - + String hostname = "dataminer-genericworkers.d4science.org"; + String token = "257800d8-24bf-4bae-83cd-ea99369e7dd6-843339462"; + String layerID = "08ee0d70-4d8b-4f42-8b06-d709482bca95"; + Iterator uris = getUrisIterator(); HttpClient client = new HttpClient(); @@ -43,7 +43,7 @@ public class AlgorithmTest { if (nextLine.startsWith("#")) algorithmName = nextLine; else{ - if (!(executeOnly.isEmpty() || executeOnly.contains(algorithmName))) continue; + if (executeOnly.contains(algorithmName)) continue; String callUrl = nextLine.replace("{PROTOCOL}", protocol).replace("{HOST}", hostname).replace("{TOKEN}", token).replace("{LAYERID}", layerID); try{ long start = System.currentTimeMillis();