Improve If

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / execution / ExecutionThread.java

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java
index 1450ab98a065f5dbe614d7c8c52b8bfb125c7dfc..7493de4e7bd5178474304110ede04cc84c86ac6a 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java
@@ -1,19 +1,31 @@
-package org.argeo.slc.core.execution;
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+package org.argeo.slc.core.execution;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
+import org.argeo.slc.execution.ExecutionStep;
 import org.argeo.slc.process.RealizedFlow;
-import org.argeo.slc.process.SlcExecution;
-import org.argeo.slc.process.SlcExecutionNotifier;
-import org.argeo.slc.process.SlcExecutionStep;
 
 /** Thread of a single execution */
 public class ExecutionThread extends Thread {
+       public final static String SYSPROP_EXECUTION_AUTO_UPGRADE = "slc.execution.autoupgrade";
+
        private final static Log log = LogFactory.getLog(ExecutionThread.class);
 
        private final RealizedFlow realizedFlow;
@@ -28,40 +40,50 @@ public class ExecutionThread extends Thread {
        }
 
        public void run() {
+               if (getContextClassLoader() != null) {
+                       if (log.isTraceEnabled())
+                               log.trace("Context class loader set to "
+                                               + getContextClassLoader());
+               }
+
+               // Retrieve execution flow descriptor
                ExecutionFlowDescriptor executionFlowDescriptor = realizedFlow
                                .getFlowDescriptor();
                String flowName = executionFlowDescriptor.getName();
 
-               dispatchAddStep(processThread.getSlcProcess(), new SlcExecutionStep(
-                               SlcExecutionStep.TYPE_PHASE_START, "Flow " + flowName));
+               dispatchAddStep(new ExecutionStep(realizedFlow.getModuleName(),
+                               ExecutionStep.PHASE_START, "Flow " + flowName));
 
                try {
+                       String autoUpgrade = System
+                                       .getProperty(SYSPROP_EXECUTION_AUTO_UPGRADE);
+                       if (autoUpgrade != null && autoUpgrade.equals("true"))
+                               processThread.getExecutionModulesManager().upgrade(
+                                               realizedFlow.getModuleNameVersion());
+
+                       // START FLOW
                        processThread.getExecutionModulesManager().execute(realizedFlow);
+                       // END FLOW
                } catch (Exception e) {
                        // TODO: re-throw exception ?
                        String msg = "Execution of flow " + flowName + " failed.";
                        log.error(msg, e);
-                       dispatchAddStep(processThread.getSlcProcess(),
-                                       new SlcExecutionStep(msg + " " + e.getMessage()));
+                       dispatchAddStep(new ExecutionStep(realizedFlow.getModuleName(),
+                                       ExecutionStep.ERROR, msg + " " + e.getMessage()));
                        processThread.notifyError();
                } finally {
                        processThread.flowCompleted();
-                       dispatchAddStep(processThread.getSlcProcess(),
-                                       new SlcExecutionStep(SlcExecutionStep.TYPE_PHASE_END,
-                                                       "Flow " + flowName));
+                       dispatchAddStep(new ExecutionStep(realizedFlow.getModuleName(),
+                                       ExecutionStep.PHASE_END, "Flow " + flowName));
                }
        }
 
-       protected void dispatchAddStep(SlcExecution slcExecution,
-                       SlcExecutionStep step) {
-               slcExecution.getSteps().add(step);
-               List<SlcExecutionStep> steps = new ArrayList<SlcExecutionStep>();
-               steps.add(step);
-               for (Iterator<SlcExecutionNotifier> it = processThread
-                               .getExecutionModulesManager().getSlcExecutionNotifiers()
-                               .iterator(); it.hasNext();) {
-                       it.next().addSteps(slcExecution, steps);
-               }
+       private void dispatchAddStep(ExecutionStep step) {
+               processThread.getProcessThreadGroup().dispatchAddStep(step);
+       }
+
+       public RealizedFlow getRealizedFlow() {
+               return realizedFlow;
        }
 
 }