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%2FExecutor.java;h=cc46fd97c5e78aa1ab37441b1c93b26484d751d9;hb=ae98a7536a842021e433a43427db79a18abf3a6c;hp=92e2f5e306afb98322ad93202aeda1e2dd68ad4a;hpb=1b19cac6a92c31d9119fc2986e7aaf3df98b2393;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/Executor.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/Executor.java index 92e2f5e30..cc46fd97c 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/Executor.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/Executor.java @@ -2,6 +2,7 @@ package org.argeo.slc.core.execution; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.slc.execution.ExecutionContext; import org.argeo.slc.execution.ExecutionFlow; import org.argeo.slc.process.SlcExecution; import org.springframework.beans.BeansException; @@ -19,7 +20,7 @@ public class Executor implements ApplicationListener, ApplicationContextAware { if (event instanceof NewExecutionEvent) { SlcExecution slcExecution = ((NewExecutionEvent) event) .getSlcExecution(); - ExecutionContext executionContext = new ExecutionContext(); + MapExecutionContext executionContext = new MapExecutionContext(); ExecutionThread thread = new ExecutionThread(executionContext, slcExecution); thread.start(); @@ -36,22 +37,22 @@ public class Executor implements ApplicationListener, ApplicationContextAware { private final SlcExecution slcExecution; private final ExecutionContext executionContext; - public ExecutionThread(ExecutionContext executionContext, + public ExecutionThread(MapExecutionContext executionContext, SlcExecution slcExecution) { super("SLC Execution #" + executionContext.getUuid()); this.slcExecution = slcExecution; this.executionContext = executionContext; } - public void run() { + public void run() {/* // Initialize from SlcExecution - ExecutionContext.registerExecutionContext(executionContext); - ExecutionContext.getVariables() + MapExecutionContext.registerExecutionContext(executionContext); + MapExecutionContext.getVariables() .putAll(slcExecution.getAttributes()); try { log.info("Start execution #" - + ExecutionContext.getExecutionUuid()); + + MapExecutionContext.getExecutionUuid()); String executionBean = slcExecution.getAttributes().get( "slc.flows"); ExecutionFlow main = (ExecutionFlow) applicationContext @@ -64,7 +65,7 @@ public class Executor implements ApplicationListener, ApplicationContextAware { applicationContext.publishEvent(new ExecutionFinishedEvent( this, executionContext)); } - +*/ } }