X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FProcessThreadGroup.java;h=969c9b93fba5737c75ea723c601402f991b7d7d9;hb=9ec3a30ade2e331102f3e38667129dc68bece661;hp=03b72f6052adad7ae80b38ac58c23eb7acd842b0;hpb=098e868d40b2130c6735b1547247c61a5d88da95;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThreadGroup.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThreadGroup.java
index 03b72f605..969c9b93f 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThreadGroup.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThreadGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
@@ -24,15 +23,14 @@ import java.util.concurrent.BlockingQueue;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.execution.ExecutionStep;
-import org.argeo.slc.process.SlcExecution;
-import org.argeo.slc.process.SlcExecutionStep;
+import org.springframework.security.Authentication;
+import org.springframework.security.context.SecurityContextHolder;
 
 /** The thread group attached to a given {@link SlcExecution}. */
-@SuppressWarnings("deprecation")
 public class ProcessThreadGroup extends ThreadGroup {
 	private final ExecutionModulesManager executionModulesManager;
 	private final ProcessThread processThread;
-//	private final Authentication authentication;
+	private final Authentication authentication;
 	private final static Integer STEPS_BUFFER_CAPACITY = 5000;
 
 	private BlockingQueue<ExecutionStep> steps = new ArrayBlockingQueue<ExecutionStep>(
@@ -44,23 +42,21 @@ public class ProcessThreadGroup extends ThreadGroup {
 				+ " thread group");
 		this.executionModulesManager = executionModulesManager;
 		this.processThread = processThread;
-//		this.authentication = SecurityContextHolder.getContext()
-//				.getAuthentication();
+		this.authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
 	}
 
-//	public Authentication getAuthentication() {
-//		return authentication;
-//	}
+	public Authentication getAuthentication() {
+		return authentication;
+	}
 
 	public void dispatchAddStep(ExecutionStep step) {
-		// legacy
 		ExecutionProcess slcProcess = processThread.getProcess();
-		if (slcProcess instanceof SlcExecution)
-			((SlcExecution) slcProcess).getSteps().add((SlcExecutionStep) step);
-
 		List<ExecutionStep> steps = new ArrayList<ExecutionStep>();
 		steps.add(step);
+		// TODO clarify why we don't dispatch steps, must be a reason
 		// dispatchAddSteps(steps);
+		slcProcess.addSteps(steps);
 		this.steps.add(step);
 	}