X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultExecutionFlow.java;h=9f2c9dbeabb5bf4c9717635f080f3ee1816153fa;hb=a050d4c27325c65fc04e7eed5b63b5f8ea117df0;hp=7425a35c93a1e94ff9a16d8c66e27d83b53fc517;hpb=a18184e7d6bb5cc2cd6763439310061c60a00a78;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
index 7425a35c9..9f2c9dbea 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * 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.
+ */
 package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
@@ -8,19 +23,14 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.structure.tree.TreeSRegistry;
 import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
-import org.argeo.slc.structure.StructureAware;
-import org.argeo.slc.structure.StructureRegistry;
 import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.validation.MapBindingResult;
 
-public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
-		BeanNameAware {
+/** Default implementation of an execution flow. */
+public class DefaultExecutionFlow implements ExecutionFlow, BeanNameAware {
 	private final static Log log = LogFactory
 			.getLog(DefaultExecutionFlow.class);
 
@@ -29,9 +39,6 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 	private Map<String, Object> parameters = new HashMap<String, Object>();
 	private List<Runnable> executables = new ArrayList<Runnable>();
 
-	private String path;
-	private StructureRegistry<TreeSPath> registry = new TreeSRegistry();
-
 	private Boolean failOnError = true;
 
 	public DefaultExecutionFlow() {
@@ -66,13 +73,13 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 			ExecutionSpecAttribute attr = executionSpec.getAttributes()
 					.get(key);
 
-			if (attr.getIsParameter() && !isSetAsParameter(key)) {
-				errors.rejectValue(key, "Parameter not set");
+			if (attr.getIsImmutable() && !isSetAsParameter(key)) {
+				errors.rejectValue(key, "Immutable but not set");
 				break;
 			}
 
-			if (attr.getIsFrozen() && !isSetAsParameter(key)) {
-				errors.rejectValue(key, "Frozen but not set as parameter");
+			if (attr.getIsConstant() && !isSetAsParameter(key)) {
+				errors.rejectValue(key, "Constant but not set as parameter");
 				break;
 			}
 
@@ -91,9 +98,23 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 	public void run() {
 		try {
 			for (Runnable executable : executables) {
-				doExecuteRunnable(executable);
+				if (Thread.interrupted()) {
+					log.error("Flow '" + getName() + "' killed before '"
+							+ executable + "'");
+					Thread.currentThread().interrupt();
+					return;
+					// throw new ThreadDeath();
+				}
+				this.doExecuteRunnable(executable);
 			}
 		} catch (RuntimeException e) {
+			if (Thread.interrupted()) {
+				log.error("Flow '" + getName()
+						+ "' killed while receiving an unrelated exception", e);
+				Thread.currentThread().interrupt();
+				return;
+				// throw new ThreadDeath();
+			}
 			if (failOnError)
 				throw e;
 			else {
@@ -111,23 +132,6 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 		runnable.run();
 	}
 
-	@SuppressWarnings(value = { "unchecked" })
-	public void afterPropertiesSet() throws Exception {
-		if (path != null) {
-			for (Runnable executable : executables) {
-				if (executable instanceof StructureAware) {
-					((StructureAware<TreeSPath>) executable).notifyCurrentPath(
-							registry, new TreeSPath(path));
-				} else if (executable instanceof DefaultExecutionFlow) {
-					// so we don't need to have DefaultExecutionFlow
-					// implementing StructureAware
-					DefaultExecutionFlow flow = (DefaultExecutionFlow) executable;
-					flow.setPath(path + '/' + flow.getName());
-				}
-			}
-		}
-	}
-
 	public void setBeanName(String name) {
 		this.name = name;
 	}
@@ -191,16 +195,9 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 		return name.hashCode();
 	}
 
-	public String getPath() {
-		return path;
-	}
-
+	/** @deprecated does nothing */
+	@Deprecated
 	public void setPath(String path) {
-		this.path = path;
-	}
-
-	public void setRegistry(StructureRegistry<TreeSPath> registry) {
-		this.registry = registry;
 	}
 
 	public Boolean getFailOnError() {