From 93c79aaf29bd5dd96b75140f81f38d6e4dbc5504 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 19 Mar 2009 11:01:13 +0000
Subject: [PATCH] Add path in execution flow descriptor

git-svn-id: https://svn.argeo.org/slc/trunk@2284 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../main/java/org/argeo/slc/execution/ExecutionFlow.java | 2 ++
 .../org/argeo/slc/execution/ExecutionFlowDescriptor.java | 9 +++++++++
 .../main/resources/org/argeo/slc/castor/execution.xml    | 3 +++
 .../core/execution/AbstractSpringExecutionModule.java    | 2 ++
 .../argeo/slc/core/execution/DefaultExecutionFlow.java   | 6 ++++++
 5 files changed, 22 insertions(+)

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlow.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlow.java
index ed9272e01..ea568116b 100644
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlow.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlow.java
@@ -9,4 +9,6 @@ public interface ExecutionFlow extends Executable {
 	public ExecutionSpec getExecutionSpec();
 
 	public String getName();
+	
+	public String getPath();
 }
diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlowDescriptor.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlowDescriptor.java
index 54895428c..aeacfca18 100644
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlowDescriptor.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlowDescriptor.java
@@ -4,6 +4,7 @@ import java.util.Map;
 
 public class ExecutionFlowDescriptor {
 	private String name;
+	private String path;
 	private Map<String, Object> values;
 	private ExecutionSpec executionSpec;
 
@@ -21,6 +22,14 @@ public class ExecutionFlowDescriptor {
 		return name;
 	}
 
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
 	public Map<String, Object> getValues() {
 		return values;
 	}
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml
index 5920fea46..7e903d26f 100644
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml
@@ -26,6 +26,9 @@
 		<field name="name" identity="true">
 			<bind-xml name="name" node="attribute" />
 		</field>
+		<field name="path">
+			<bind-xml name="path" node="attribute" />
+		</field>
 		<field name="executionSpec">
 			<bind-xml name="executionSpec" node="attribute" reference="true" />
 		</field>
diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
index 75b22f424..51ca2f159 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
@@ -82,6 +82,8 @@ public abstract class AbstractSpringExecutionModule implements ExecutionModule,
 
 			ExecutionFlowDescriptor efd = new ExecutionFlowDescriptor(name,
 					values, executionSpec);
+			if (executionFlow.getPath() != null)
+				efd.setPath(executionFlow.getPath());
 
 			// Add execution spec if necessary
 			if (!md.getExecutionSpecs().contains(executionSpec))
diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
index 5232ae3a7..c2f554c15 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
@@ -158,4 +158,10 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 	public boolean equals(Object obj) {
 		return ((ExecutionFlow) obj).getName().equals(name);
 	}
+
+	public String getPath() {
+		return path;
+	}
+	
+	
 }
-- 
2.39.5