From 24314dc1699c7e73048fa24e33729f1aa1ec0e86 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 6 Jul 2012 11:00:24 +0200
Subject: Modules serialize with Castor. Just about to remove the parsing.
 CastorXMLUtility is now a static member of gateway. Domain specific instances
 can be used by domain applications, but the maps do not interfere with the
 kernel.

---
 src/main/resources/mapFiles/NewEntityMap.xml | 51 +++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 13 deletions(-)

(limited to 'src/main/resources/mapFiles/NewEntityMap.xml')

diff --git a/src/main/resources/mapFiles/NewEntityMap.xml b/src/main/resources/mapFiles/NewEntityMap.xml
index 5d9d7ca..a5d5006 100644
--- a/src/main/resources/mapFiles/NewEntityMap.xml
+++ b/src/main/resources/mapFiles/NewEntityMap.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <mapping>
 	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.NewItem">
-		<map-to xml="NewItem"/>
+		<map-to xml="Item"/>
 		<field name="name" type="string" direct="true">
 			<bind-xml name="name" node="attribute"/>
 		</field>
@@ -11,22 +11,17 @@
 		<field name="workflow" type="string" direct="true">
 			<bind-xml name="workflow" node="attribute"/>
 		</field>
-		<field name="propertyList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Property">
+		<field name="properties" collection="arraylist" direct="true" type="com.c2kernel.property.Property">
 			<bind-xml name="Property" node="element"/>
 		</field>
-		<field name="aggregationList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Aggregation">
-			<bind-xml name="Aggregation" node="element"/>
+		<field name="outcomes" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Outcome">
+			<bind-xml name="Outcome" node="element"/>
 		</field>
 		<field name="dependencyList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Dependency">
 			<bind-xml name="Dependency" node="element"/>
 		</field>
-	</class>
-	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Property">
-		<field name="name" type="string" direct="true">
-			<bind-xml name="name" node="attribute"/>
-		</field>
-		<field name="value" type="string" direct="true">
-			<bind-xml name="value" node="attribute"/>
+		<field name="aggregationList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Aggregation">
+			<bind-xml name="Aggregation" node="element"/>
 		</field>
 	</class>
 	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Aggregation">
@@ -53,6 +48,10 @@
 		<field name="geometry" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Geometry">
 			<bind-xml name="Geometry" node="element"/>
 		</field>
+		<field name="props" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
+			   get-method="getKeyValuePairs" set-method="setKeyValuePairs">
+			<bind-xml name="MemberProperties" node="element"/>
+		</field>		
 	</class>
 	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Geometry">
 		<field name="x" type="int" direct="true">
@@ -81,14 +80,37 @@
 		<field name="dependencyMemberList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.DependencyMember">
 			<bind-xml name="DependencyMember" node="element"/>
 		</field>
+		<field name="props" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
+			   get-method="getKeyValuePairs" set-method="setKeyValuePairs">
+			<bind-xml name="CollectionProperties" node="element"/>
+		</field>		
 	</class>
 	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.DependencyMember">
 		<field name="itemPath" type="string" direct="true">
 			<bind-xml name="itemPath" node="attribute"/>
 		</field>
+		<field name="props" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
+			   get-method="getKeyValuePairs" set-method="setKeyValuePairs">
+			<bind-xml name="MemberProperties" node="element"/>
+		</field>
 	</class>
+	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Outcome">
+		<map-to xml="Outcome"/>
+		<field name="viewname" type="string" direct="true">
+			<bind-xml name="viewname" node="attribute"/>
+		</field>
+		<field name="schema" type="string" direct="true">
+			<bind-xml name="schema" node="attribute"/>
+		</field>
+		<field name="version" type="integer" direct="true">
+			<bind-xml name="version" node="attribute"/>
+		</field>
+		<field name="path" type="string" direct="true">
+			<bind-xml name="viewname" node="text"/>
+		</field>
+	</class>		
 	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.NewAgent">
-		<map-to xml="NewAgent"/>
+		<map-to xml="Agent"/>
 		<field name="name" type="string" direct="true">
 			<bind-xml name="name" node="attribute"/>
 		</field>
@@ -98,5 +120,8 @@
 		<field name="roles" collection="arraylist" direct="true" type="string">
 			<bind-xml name="Role" node="element"/>
 		</field>
-	</class>
+		<field name="properties" collection="arraylist" direct="true" type="com.c2kernel.property.Property">
+			<bind-xml name="Property" node="element"/>
+		</field>
+	</class>	
 </mapping>
-- 
cgit v1.2.3