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=2f264bed46ea59c441a4031e895cc1d70e3e5d3a;hb=af9457b0628ba4cc625192762d0c0fe7564b9846;hp=6f0143f0fcca651847610471a71ab0945e0d1b74;hpb=0e2ff188c2e8ffac85739cccc3925e8bd82d7be9;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 6f0143f0f..2f264bed4 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,49 +13,62 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.argeo.slc.core.execution;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.concurrent.ArrayBlockingQueue;
+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}. */
 public class ProcessThreadGroup extends ThreadGroup {
-	private final ExecutionModulesManager executionModulesManager;
-	private final ProcessThread processThread;
-
-	public ProcessThreadGroup(ExecutionModulesManager executionModulesManager,
-			ProcessThread processThread) {
-		super("SLC Process #" + processThread.getProcess().getUuid()
-				+ " thread group");
-		this.executionModulesManager = executionModulesManager;
-		this.processThread = processThread;
+	// private final ExecutionModulesManager executionModulesManager;
+	// private final ProcessThread processThread;
+	private final Authentication authentication;
+	private final static Integer STEPS_BUFFER_CAPACITY = 5000;
+
+	private BlockingQueue<ExecutionStep> steps = new ArrayBlockingQueue<ExecutionStep>(
+			STEPS_BUFFER_CAPACITY);
+
+	private Boolean hadAnError = false;
+
+	public ProcessThreadGroup(ExecutionProcess executionProcess) {
+		super("SLC Process #" + executionProcess.getUuid() + " thread group");
+		// this.executionModulesManager = executionModulesManager;
+		// this.processThread = processThread;
+		this.authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
 	}
 
-	// public SlcExecution getSlcProcess() {
-	// return processThread.getSlcProcess();
-	// }
+	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);
-		dispatchAddSteps(steps);
+		// ExecutionProcess slcProcess = processThread.getProcess();
+		// 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);
+		if (step.getType().equals(ExecutionStep.ERROR))
+			hadAnError = true;
+		this.steps.add(step);
 	}
 
-	public void dispatchAddSteps(List<ExecutionStep> steps) {
-		ExecutionProcess slcProcess = processThread.getProcess();
-		executionModulesManager.dispatchAddSteps(slcProcess, steps);
+	// public void dispatchAddSteps(List<ExecutionStep> steps) {
+	// ExecutionProcess slcProcess = processThread.getProcess();
+	// executionModulesManager.dispatchAddSteps(slcProcess, steps);
+	// }
+
+	public BlockingQueue<ExecutionStep> getSteps() {
+		return steps;
 	}
 
+	public Boolean hadAnError() {
+		return hadAnError;
+	}
 }