Add path in execution flow descriptor

git-svn-id: https://svn.argeo.org/slc/trunk@2284 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 ed9272e01c21c7bbe56e7f517115192051fcb7ba..ea568116bc21083dac9ef29951f218cbad1efdf4 100644 (file)
--- 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 54895428cef2af3f80a78a8071ee03f1e4206f15..aeacfca187d59797c8ad6653f72faa6d65c3e39a 100644 (file)
--- 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 5920fea46e41a088d230fa1b7262c460ec4dcfc1..7e903d26f3bdfcbd3d2d7416ca5ec4a1ed2a1df1 100644 (file)
--- 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">\r
                        <bind-xml name="name" node="attribute" />\r
                </field>\r
+               <field name="path">\r
+                       <bind-xml name="path" node="attribute" />\r
+               </field>\r
                <field name="executionSpec">\r
                        <bind-xml name="executionSpec" node="attribute" reference="true" />\r
                </field>\r

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 75b22f424bf87de655c97b0a962126975c08fd52..51ca2f159f8c08db9d48b226620e86c21efbe380 100644 (file)
--- 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 5232ae3a77fe1fd9bd131f5d6360c9f0dc3be501..c2f554c15641035316beda2fff340b883066f148 100644 (file)
--- 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;
+       }
+       
+       
 }