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=1bbf16821539b2a8ec06bcfc234274ebded757e1;hb=53146ebdda3a7c0c217c44d395d270a7e9d045be;hp=75b22f424bf87de655c97b0a962126975c08fd52;hpb=654b23c7aadbec38664150323c6be0cd49e87207;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 75b22f424..1bbf16821 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 @@ -72,6 +72,13 @@ public abstract class AbstractSpringExecutionModule implements ExecutionModule, + value.getClass().getName()); } values.put(key, refValue); + } else if (attribute instanceof ResourceSpecAttribute) { + PrimitiveValue primitiveValue = new PrimitiveValue(); + primitiveValue + .setType(((ResourceSpecAttribute) attribute) + .getType()); + primitiveValue.setValue(value); + values.put(key, primitiveValue); } else { throw new SlcException("Unkown spec attribute type " + attribute.getClass()); @@ -82,6 +89,8 @@ public abstract class AbstractSpringExecutionModule implements ExecutionModule, ExecutionFlowDescriptor efd = new ExecutionFlowDescriptor(name, values, executionSpec); + if (executionFlow.getPath() != null) + efd.setPath(executionFlow.getPath()); // Add execution spec if necessary if (!md.getExecutionSpecs().contains(executionSpec)) @@ -100,7 +109,7 @@ public abstract class AbstractSpringExecutionModule implements ExecutionModule, .convertValues(executionFlowDescriptor)); ExecutionFlow flow = (ExecutionFlow) applicationContext.getBean( executionFlowDescriptor.getName(), ExecutionFlow.class); - flow.execute(); + flow.run(); } public void setApplicationContext(ApplicationContext applicationContext)