X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.support.castor%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fcastor%2Fexecution.xml;h=7e903d26f3bdfcbd3d2d7416ca5ec4a1ed2a1df1;hb=32ef657ca2c9388cd406b30159d60a3bf95c53b2;hp=4c9a256cc7d2151a081590c0a9df30cc9c106aa5;hpb=743ecb28b3c0236bc91a5d0993f70477236d96fd;p=gpl%2Fargeo-slc.git

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 4c9a256cc..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
@@ -12,11 +12,11 @@
 		<field name="version" />
 		<field name="executionFlows" collection="arraylist"
 			type="org.argeo.slc.execution.ExecutionFlowDescriptor">
-			<bind-xml auto-naming="deriveByClass" location="executionFlows" />
+			<bind-xml auto-naming="deriveByClass" location="execution-flows" />
 		</field>
 		<field name="executionSpecs" collection="arraylist"
 			type="org.argeo.slc.execution.ExecutionSpec">
-			<bind-xml auto-naming="deriveByClass" location="executionSpecs" />
+			<bind-xml auto-naming="deriveByClass" location="execution-specs" />
 		</field>
 	</class>
 
@@ -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>
@@ -37,7 +40,8 @@
 					<field name="key" type="string">
 						<bind-xml name="key" node="attribute" />
 					</field>
-					<field name="value">
+					<field name="value"
+						type="org.argeo.slc.core.execution.AbstractExecutionValue">
 						<bind-xml auto-naming="deriveByClass" />
 					</field>
 				</class>
@@ -60,7 +64,8 @@
 					<field name="key" type="string">
 						<bind-xml name="key" node="attribute" />
 					</field>
-					<field name="value">
+					<field name="value"
+						type="org.argeo.slc.core.execution.AbstractSpecAttribute">
 						<bind-xml auto-naming="deriveByClass" />
 					</field>
 				</class>
@@ -90,7 +95,9 @@
 			<bind-xml name="type" node="attribute" />
 		</field>
 		<field name="value" type="string"
-			handler="org.argeo.slc.castor.execution.PrimitiveFieldHandler" />
+			handler="org.argeo.slc.castor.execution.PrimitiveFieldHandler">
+			<bind-xml node="text" />
+		</field>
 	</class>
 
 	<class name="org.argeo.slc.core.execution.RefSpecAttribute"
@@ -103,17 +110,25 @@
 	</class>
 
 	<!-- Values -->
-	<class name="org.argeo.slc.core.execution.PrimitiveValue">
+	<class name="org.argeo.slc.core.execution.AbstractExecutionValue">
+		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
+			ns-prefix="slc" />
+	</class>
+
+	<class name="org.argeo.slc.core.execution.PrimitiveValue"
+		extends="org.argeo.slc.core.execution.AbstractExecutionValue">
 		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
 			ns-prefix="slc" />
 		<field name="type">
 			<bind-xml name="type" node="attribute" />
 		</field>
 		<field name="value" type="string"
-			handler="org.argeo.slc.castor.execution.PrimitiveFieldHandler" />
+			handler="org.argeo.slc.castor.execution.PrimitiveFieldHandler">
+			<bind-xml node="text" />
+		</field>
 	</class>
 
-	<class name="org.argeo.slc.core.execution.RefValue">
+	<class name="org.argeo.slc.core.execution.RefValue" extends="org.argeo.slc.core.execution.AbstractExecutionValue">
 		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
 			ns-prefix="slc" />
 		<field name="label" />