X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultModulesManager.java;h=9bb6aae6442b6247e1a9daf9a9bb67825145e67a;hb=ae98a7536a842021e433a43427db79a18abf3a6c;hp=ec53ca9af8d7edc4be06e0c443b26f7051ffbfbd;hpb=b072c117f63f2bfc3ccdf1614bfbe03877ea15c1;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java
index ec53ca9af..9bb6aae64 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java
@@ -1,10 +1,14 @@
 package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.SlcException;
+import org.argeo.slc.execution.ExecutionContext;
 import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionModule;
@@ -23,8 +27,9 @@ public class DefaultModulesManager implements ExecutionModulesManager {
 	protected ExecutionModule getExecutionModule(String moduleName, String version) {
 		for (ExecutionModule moduleT : executionModules) {
 			if (moduleT.getName().equals(moduleName)) {
-				// TODO: check version
-				return moduleT;
+				if(moduleT.getVersion().equals(version)) {
+					return moduleT;
+				}
 			}
 		}
 		return null;
@@ -47,6 +52,29 @@ public class DefaultModulesManager implements ExecutionModulesManager {
 		this.executionModules = executionModules;
 	}
 
+	protected Map<String, Object> convertValues(ExecutionFlowDescriptor executionFlowDescriptor) {
+		// convert the values of flow.getFlowDescriptor()
+		Map<String, Object> values = executionFlowDescriptor.getValues();
+		
+		Map<String, Object> convertedValues = new HashMap<String, Object>();
+		
+		for(String key : values.keySet()) {
+			Object value = values.get(key);
+			if(value instanceof PrimitiveValue) {
+				PrimitiveValue primitiveValue = (PrimitiveValue) value;
+
+				// TODO: check that the class of the the primitiveValue.value matches
+				// the primitiveValue.type
+				convertedValues.put(key, primitiveValue.getValue());
+			}
+			else if(value instanceof RefValue) {
+				RefValue refValue = (RefValue) value;
+				convertedValues.put(key, refValue.getLabel());
+			}
+		}		
+		return convertedValues;
+	}
+	
 	public void process(SlcExecution slcExecution) {
 		log.info("##\n## Process SLC Execution " + slcExecution+"\n##");
 
@@ -54,41 +82,37 @@ public class DefaultModulesManager implements ExecutionModulesManager {
 			ExecutionModule module = getExecutionModule(flow.getModuleName(),
 					flow.getModuleVersion());
 			if(module != null) {
-				ExecutionContext executionContext = new ExecutionContext();
-				executionContext.addVariables(slcExecution.getAttributes());
-				ExecutionThread thread = new ExecutionThread(executionContext, flow.getFlowDescriptor(),
-						module);
+				ExecutionThread thread = new ExecutionThread(flow.getFlowDescriptor(), module);
 				thread.start();
 			}
 			else {
-				// throw exception ?
+				throw new SlcException("ExecutionModule " + flow.getModuleName() + ", version " 
+						+ flow.getModuleVersion() + " not found.");
 			}
 		}
 	}
 
 	private class ExecutionThread extends Thread {
 		private final ExecutionFlowDescriptor executionFlowDescriptor;
-		private final ExecutionContext executionContext;
 		private final ExecutionModule executionModule;
 
-		public ExecutionThread(ExecutionContext executionContext,
-				ExecutionFlowDescriptor executionFlowDescriptor,
+		public ExecutionThread(ExecutionFlowDescriptor executionFlowDescriptor,
 				ExecutionModule executionModule) {
-			super("SLC Execution #" + executionContext.getUuid());
+			super("SLC Execution #" /*+ executionContext.getUuid()*/);
 			this.executionFlowDescriptor = executionFlowDescriptor;
-			this.executionContext = executionContext;
 			this.executionModule = executionModule;
 		}
 
 		public void run() {
-			ExecutionContext.registerExecutionContext(executionContext);				
+			ExecutionContext executionContext = executionModule.getExecutionContext();
+			executionContext.addVariables(convertValues(executionFlowDescriptor));
 			try {
 				executionModule.execute(executionFlowDescriptor);
 			} catch (Exception e) {
+				//TODO: re-throw exception ?
 				log.error("Execution " + executionContext.getUuid()
 						+ " failed.", e);
 			}
 		}
-	}	
-	
+	}		
 }