X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FAbstractExecutionModulesManager.java;h=08da8cbe0866d4375bf32c8d75c9af7336c625f9;hb=a75c0516aca20f9a8c8fdd32feee402257ff2b61;hp=4e9856fe6f2745bd0d2cc5ab2ffa42c51592b633;hpb=30f4c6af6c20077e5e36b61faf5edb22c1aae6c6;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java
index 4e9856fe6..08da8cbe0 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.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,10 +13,11 @@
  * 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.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -26,23 +27,24 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.execution.ExecutionContext;
 import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.execution.ExecutionFlowDescriptorConverter;
-import org.argeo.slc.execution.ExecutionModulesListener;
 import org.argeo.slc.execution.ExecutionModulesManager;
-import org.argeo.slc.process.RealizedFlow;
-import org.argeo.slc.process.SlcExecution;
+import org.argeo.slc.execution.ExecutionProcess;
+import org.argeo.slc.execution.ExecutionProcessNotifier;
+import org.argeo.slc.execution.ExecutionStep;
+import org.argeo.slc.execution.RealizedFlow;
 import org.argeo.slc.process.SlcExecutionNotifier;
-import org.argeo.slc.process.SlcExecutionStep;
 
 /** Provides the base feature of an execution module manager. */
+@SuppressWarnings("deprecation")
 public abstract class AbstractExecutionModulesManager implements
 		ExecutionModulesManager {
 	private final static Log log = LogFactory
 			.getLog(AbstractExecutionModulesManager.class);
 
 	private List<SlcExecutionNotifier> slcExecutionNotifiers = new ArrayList<SlcExecutionNotifier>();
-	private List<ExecutionModulesListener> executionModulesListeners = new ArrayList<ExecutionModulesListener>();
 
-	private ThreadGroup processesThreadGroup = new ThreadGroup("Processes");
+	private List<FilteredNotifier> filteredNotifiers = Collections
+			.synchronizedList(new ArrayList<FilteredNotifier>());
 
 	protected abstract ExecutionFlow findExecutionFlow(String moduleName,
 			String moduleVersion, String flowName);
@@ -53,10 +55,6 @@ public abstract class AbstractExecutionModulesManager implements
 	protected abstract ExecutionFlowDescriptorConverter getExecutionFlowDescriptorConverter(
 			String moduleName, String moduleVersion);
 
-	public void process(SlcExecution slcExecution) {
-		new ProcessThread(this, slcExecution).start();
-	}
-
 	public void execute(RealizedFlow realizedFlow) {
 		if (log.isTraceEnabled())
 			log.trace("Executing " + realizedFlow);
@@ -84,43 +82,109 @@ public abstract class AbstractExecutionModulesManager implements
 		//
 	}
 
-	public void dispatchUpdateStatus(SlcExecution slcExecution,
+	public void dispatchUpdateStatus(ExecutionProcess process,
 			String oldStatus, String newStatus) {
+		// generic notifiers (notified of everything)
 		for (Iterator<SlcExecutionNotifier> it = getSlcExecutionNotifiers()
 				.iterator(); it.hasNext();) {
-			it.next().updateStatus(slcExecution, oldStatus, newStatus);
+			it.next().updateStatus(process, oldStatus, newStatus);
 		}
+
+		// filtered notifiers
+		for (Iterator<FilteredNotifier> it = filteredNotifiers.iterator(); it
+				.hasNext();) {
+			FilteredNotifier filteredNotifier = it.next();
+			if (filteredNotifier.receiveFrom(process))
+				filteredNotifier.getNotifier().updateStatus(process, oldStatus,
+						newStatus);
+		}
+
 	}
 
-	public void dispatchAddStep(SlcExecution slcExecution, SlcExecutionStep step) {
-		List<SlcExecutionStep> steps = new ArrayList<SlcExecutionStep>();
-		steps.add(step);
+	public void dispatchAddSteps(ExecutionProcess process,
+			List<ExecutionStep> steps) {
+		process.addSteps(steps);
+
 		for (Iterator<SlcExecutionNotifier> it = getSlcExecutionNotifiers()
 				.iterator(); it.hasNext();) {
-			it.next().addSteps(slcExecution, steps);
+			it.next().addSteps(process, steps);
+		}
+
+		for (Iterator<FilteredNotifier> it = filteredNotifiers.iterator(); it
+				.hasNext();) {
+			FilteredNotifier filteredNotifier = it.next();
+			if (filteredNotifier.receiveFrom(process))
+				filteredNotifier.getNotifier().addSteps(process, steps);
 		}
 	}
 
+	public void registerProcessNotifier(ExecutionProcessNotifier notifier,
+			Map<String, String> properties) {
+		filteredNotifiers.add(new FilteredNotifier(notifier, properties));
+	}
+
+	public void unregisterProcessNotifier(ExecutionProcessNotifier notifier,
+			Map<String, String> properties) {
+		filteredNotifiers.remove(notifier);
+	}
+
 	public void setSlcExecutionNotifiers(
 			List<SlcExecutionNotifier> slcExecutionNotifiers) {
 		this.slcExecutionNotifiers = slcExecutionNotifiers;
 	}
 
-	public List<SlcExecutionNotifier> getSlcExecutionNotifiers() {
+	private List<SlcExecutionNotifier> getSlcExecutionNotifiers() {
 		return slcExecutionNotifiers;
 	}
 
-	public ThreadGroup getProcessesThreadGroup() {
-		return processesThreadGroup;
-	}
+	protected class FilteredNotifier {
+		private final ExecutionProcessNotifier notifier;
+		private final String processId;
+
+		public FilteredNotifier(ExecutionProcessNotifier notifier,
+				Map<String, String> properties) {
+			super();
+			this.notifier = notifier;
+			if (properties == null)
+				properties = new HashMap<String, String>();
+			if (properties.containsKey(SLC_PROCESS_ID))
+				processId = properties.get(SLC_PROCESS_ID);
+			else
+				processId = null;
+		}
 
-	protected List<ExecutionModulesListener> getExecutionModulesListeners() {
-		return executionModulesListeners;
-	}
+		/**
+		 * Whether event from this process should be received by this listener.
+		 */
+		public Boolean receiveFrom(ExecutionProcess process) {
+			if (processId != null)
+				if (process.getUuid().equals(processId))
+					return true;
+				else
+					return false;
+			return true;
+		}
 
-	public void setExecutionModulesListeners(
-			List<ExecutionModulesListener> executionModulesListeners) {
-		this.executionModulesListeners = executionModulesListeners;
-	}
+		@Override
+		public int hashCode() {
+			return notifier.hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj instanceof FilteredNotifier) {
+				FilteredNotifier fn = (FilteredNotifier) obj;
+				return notifier.equals(fn.notifier);
+			} else if (obj instanceof ExecutionProcessNotifier) {
+				ExecutionProcessNotifier epn = (ExecutionProcessNotifier) obj;
+				return notifier.equals(epn);
+			} else
+				return false;
+		}
 
+		public ExecutionProcessNotifier getNotifier() {
+			return notifier;
+		}
+
+	}
 }