X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FExecutionThread.java;h=075a851dc8af90e99f7fc63b07041f637b92d27f;hb=098e868d40b2130c6735b1547247c61a5d88da95;hp=c81e8b1a0d64eecfa2b13bd5a2a3349d1024ed2a;hpb=6926b1fc72b36a5d8ec188a4981665fb7554a7d9;p=gpl%2Fargeo-slc.git

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 c81e8b1a0..075a851dc 100644
--- 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,15 +1,26 @@
-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.SlcExecutionNotifier;
-import org.argeo.slc.process.SlcExecutionStep;
 
 /** Thread of a single execution */
 public class ExecutionThread extends Thread {
@@ -29,9 +40,16 @@ public class ExecutionThread extends Thread {
 	}
 
 	public void run() {
+		// authenticate thread
+//		Authentication authentication = getProcessThreadGroup()
+//				.getAuthentication();
+//		if (authentication == null)
+//			throw new SlcException("Can only execute authenticated threads");
+//		SecurityContextHolder.getContext().setAuthentication(authentication);
+
 		if (getContextClassLoader() != null) {
 			if (log.isTraceEnabled())
-				log.debug("Context class loader set to "
+				log.trace("Context class loader set to "
 						+ getContextClassLoader());
 		}
 
@@ -40,8 +58,8 @@ public class ExecutionThread extends Thread {
 				.getFlowDescriptor();
 		String flowName = executionFlowDescriptor.getName();
 
-		dispatchAddStep(new SlcExecutionStep(SlcExecutionStep.TYPE_PHASE_START,
-				"Flow " + flowName));
+		dispatchAddStep(new ExecutionStep(realizedFlow.getModuleName(),
+				ExecutionStep.PHASE_START, "Flow " + flowName));
 
 		try {
 			String autoUpgrade = System
@@ -49,29 +67,34 @@ public class ExecutionThread extends Thread {
 			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(new SlcExecutionStep(msg + " " + e.getMessage()));
+			dispatchAddStep(new ExecutionStep(realizedFlow.getModuleName(),
+					ExecutionStep.ERROR, msg + " " + e.getMessage()));
 			processThread.notifyError();
 		} finally {
 			processThread.flowCompleted();
-			dispatchAddStep(new SlcExecutionStep(
-					SlcExecutionStep.TYPE_PHASE_END, "Flow " + flowName));
+			dispatchAddStep(new ExecutionStep(realizedFlow.getModuleName(),
+					ExecutionStep.PHASE_END, "Flow " + flowName));
 		}
 	}
 
-	public void dispatchAddStep(SlcExecutionStep step) {
-		processThread.getSlcProcess().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(processThread.getSlcProcess(), steps);
-		}
+	private void dispatchAddStep(ExecutionStep step) {
+		processThread.getProcessThreadGroup().dispatchAddStep(step);
+	}
+
+	protected ProcessThreadGroup getProcessThreadGroup() {
+		return processThread.getProcessThreadGroup();
+	}
+
+	public RealizedFlow getRealizedFlow() {
+		return realizedFlow;
 	}
 
 }