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=0c6864f440fccf7aab7fbd7b346c1eaf5a32c3b0;hb=17ffc9fdb8f3a490881e540db8ff81655308233e;hp=497e6520e86177a7b1bf79748b1f1bb11298fb33;hpb=ee6c3543a0ff9403420ce6a9c647723269f14331;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 497e6520e..0c6864f44 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
@@ -5,6 +5,8 @@ import java.util.HashMap;
 import java.util.List;
 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;
@@ -13,15 +15,15 @@ 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.aop.scope.ScopedObject;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.ResourceLoaderAware;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
 import org.springframework.validation.MapBindingResult;
 
 public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
-		BeanNameAware, StructureAware<TreeSPath>, ResourceLoaderAware {
+		BeanNameAware {
+	private final static Log log = LogFactory
+			.getLog(DefaultExecutionFlow.class);
 
 	private final ExecutionSpec executionSpec;
 	private String name = null;
@@ -31,7 +33,7 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 	private String path;
 	private StructureRegistry<TreeSPath> registry = new TreeSRegistry();
 
-	private ResourceLoader resourceLoader = null;
+	private Boolean failOnError = true;
 
 	public DefaultExecutionFlow() {
 		this.executionSpec = new DefaultExecutionSpec();
@@ -88,17 +90,50 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 	}
 
 	public void run() {
-		for (Runnable executable : executables) {
-			executable.run();
+		try {
+			for (Runnable executable : executables) {
+				this.doExecuteRunnable(executable);
+			}
+		} catch (RuntimeException e) {
+			if (failOnError)
+				throw e;
+			else {
+				log.error("Execution flow failed,"
+						+ " but process did not fail"
+						+ " because failOnError property"
+						+ " is set to false: " + e);
+				if (log.isTraceEnabled())
+					e.printStackTrace();
+			}
 		}
 	}
 
+	public void doExecuteRunnable(Runnable runnable) {
+		runnable.run();
+	}
+
+	@SuppressWarnings(value = { "unchecked" })
 	public void afterPropertiesSet() throws Exception {
+		if (path == null) {
+			if (name.charAt(0) == '/') {
+				path = name.substring(0, name.lastIndexOf('/'));
+			}
+		}
+
 		if (path != null) {
 			for (Runnable executable : executables) {
-				if (executable instanceof StructureAware) {
+				if (executable instanceof StructureAware
+						&& !(executable instanceof ScopedObject)) {
 					((StructureAware<TreeSPath>) executable).notifyCurrentPath(
 							registry, new TreeSPath(path));
+				} else if (executable instanceof DefaultExecutionFlow) {
+					// so we don't need to have DefaultExecutionFlow
+					// implementing StructureAware
+					// FIXME: probably has side effects
+					DefaultExecutionFlow flow = (DefaultExecutionFlow) executable;
+					String newPath = path + '/' + flow.getName();
+					flow.setPath(newPath);
+					log.warn(newPath + " was forcibly set on " + flow);
 				}
 			}
 		}
@@ -152,14 +187,21 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 						.getAttributes().get(key).getValue() != null);
 	}
 
+	@Override
 	public String toString() {
-		return new StringBuffer("Flow ").append(name).toString();
+		return new StringBuffer("Execution flow ").append(name).toString();
 	}
 
+	@Override
 	public boolean equals(Object obj) {
 		return ((ExecutionFlow) obj).getName().equals(name);
 	}
 
+	@Override
+	public int hashCode() {
+		return name.hashCode();
+	}
+
 	public String getPath() {
 		return path;
 	}
@@ -172,15 +214,12 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 		this.registry = registry;
 	}
 
-	public void notifyCurrentPath(StructureRegistry<TreeSPath> registry,
-			TreeSPath path) {
-		if (this.path == null) {
-			this.path = path.toString();
-		}
+	public Boolean getFailOnError() {
+		return failOnError;
 	}
 
-	public void setResourceLoader(ResourceLoader resourceLoader) {
-		this.resourceLoader = resourceLoader;
+	public void setFailOnError(Boolean failOnError) {
+		this.failOnError = failOnError;
 	}
 
 }