X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FAbstractSpringExecutionModule.java;h=4e0842e37dd142d9c05ed6c9724060021059dad6;hb=743ecb28b3c0236bc91a5d0993f70477236d96fd;hp=fa42917fdb3e5ca43e43efdb79d1b6aa04939fdb;hpb=51d1c842e4e92cc65708b8bb88152d7344d43d04;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
index fa42917fd..4e0842e37 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
@@ -2,7 +2,9 @@ package org.argeo.slc.core.execution;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;
 
+import org.argeo.slc.SlcException;
 import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionModule;
@@ -10,6 +12,7 @@ import org.argeo.slc.execution.ExecutionModuleDescriptor;
 import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.process.SlcExecution;
+import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.generic.GenericBeanFactoryAccessor;
 import org.springframework.context.ApplicationContext;
@@ -40,21 +43,46 @@ public abstract class AbstractSpringExecutionModule implements ExecutionModule,
 			Assert.notNull(executionSpec);
 			Assert.notNull(executionSpec.getName());
 
-			Map<String, Object> values = new HashMap<String, Object>();
+			Map<String, Object> values = new TreeMap<String, Object>();
 			for (String key : executionSpec.getAttributes().keySet()) {
 				ExecutionSpecAttribute attribute = executionSpec
 						.getAttributes().get(key);
-				if (attribute instanceof SimpleExecutionSpec
-						&& attribute.getIsParameter()) {
-					values.put(key, executionFlow.getParameter(key));
+
+				if (executionFlow.isSetAsParameter(key)) {
+					Object value = executionFlow.getParameter(key);
+					if (attribute instanceof PrimitiveSpecAttribute) {
+						PrimitiveValue primitiveValue = new PrimitiveValue();
+						primitiveValue
+								.setType(((PrimitiveSpecAttribute) attribute)
+										.getType());
+						primitiveValue.setValue(value);
+						values.put(key, primitiveValue);
+					} else if (attribute instanceof RefSpecAttribute) {
+						RefValue refValue = new RefValue();
+						if (value instanceof ScopedObject) {
+							refValue.setLabel("RUNTIME "
+									+ value.getClass().getName());
+						} else {
+							refValue.setLabel("STATIC "
+									+ value.getClass().getName());
+						}
+						values.put(key, refValue);
+					} else {
+						throw new SlcException("Unkown spec attribute type "
+								+ attribute.getClass());
+					}
 				}
+
 			}
 
 			ExecutionFlowDescriptor efd = new ExecutionFlowDescriptor(name,
 					values, executionSpec);
 
+			// Add execution spec if necessary
 			if (!md.getExecutionSpecs().contains(executionSpec))
 				md.getExecutionSpecs().add(executionSpec);
+			
+			// Add execution flow
 			md.getExecutionFlows().add(efd);
 		}