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/ModuleMap.xml     | 116 ++++++++++++++++++--------
 src/main/resources/mapFiles/NewEntityMap.xml  |  51 ++++++++---
 src/main/resources/mapFiles/PropertiesMap.xml |   4 +-
 src/main/resources/mapFiles/index             |   1 +
 4 files changed, 121 insertions(+), 51 deletions(-)

(limited to 'src/main/resources/mapFiles')

diff --git a/src/main/resources/mapFiles/ModuleMap.xml b/src/main/resources/mapFiles/ModuleMap.xml
index 15fcb99..d858123 100644
--- a/src/main/resources/mapFiles/ModuleMap.xml
+++ b/src/main/resources/mapFiles/ModuleMap.xml
@@ -1,41 +1,85 @@
 <?xml version="1.0"?>
 <mapping>
 	<class name="com.c2kernel.process.module.Module">
-		<map-to xml="CristalModule"/>
-	    	<field name="ns" direct="true" type="string">    		   
-			<bind-xml name="ns" node="attribute"/>
-	    	</field>
-	    	<field name="name" direct="true" type="string">    		   
-			<bind-xml name="name" node="attribute"/>
-	    	</field>
-	    	<field name="desc" direct="true" type="string">    		   
-			<bind-xml name="Description" node="element"/>
-	    	</field>
-	    	<field name="version" direct="true" type="string">    		   
-			<bind-xml name="Version" node="element"/>
-	    	</field>
-	    	<field name="dependency" collection="arraylist" direct="true" type="string">    		   
-			<bind-xml name="Dependency" node="element"/>
-	    	</field>  
-	    	<field name="resURL" direct="true" type="string">    		   
-			<bind-xml name="ResourceURL" node="element"/>
-	    	</field>    	
-	    	<field name="dependency" collection="arraylist" direct="true" type="string">    		   
-			<bind-xml name="Dependency" node="element"/>
-	    	</field>  
-	    	<field name="imports" collection="arraylist" direct="true" 
-	    		type="com.c2kernel.process.module.ModuleImport">
-			<bind-xml auto-naming="deriveByClass" node="element"/>
-			<field name="importName" direct="true" type="string">    		   
-				<bind-xml name="name" node="attribute"/>
-	    		</field>
-	    	</field>
-   	</class>		
-   	<class name="com.c2kernel.process.module.ModuleItem" 
-				extends="com.c2kernel.process.module.ModuleImport">
-		<map-to xml="Item"/>
-		<field name="workflow" direct="true" type="string">    		   
-			<bind-xml name="workflow" node="attribute"/>
-	    	</field>    	
+		<map-to xml="CristalModule" />
+		<field name="ns" direct="true" type="string">
+			<bind-xml name="ns" node="attribute" />
+		</field>
+		<field name="name" direct="true" type="string">
+			<bind-xml name="name" node="attribute" />
+		</field>
+		<field name="info" direct="true" type="com.c2kernel.process.module.ModuleInfo">
+			<bind-xml name="Info" node="element" />
+		</field>
+		<field name="resURL" direct="true" type="string">
+			<bind-xml name="ResourceURL" node="element" />
+		</field>
+		<field name="imports" direct="true" type="com.c2kernel.process.module.ModuleImports">
+			<bind-xml name="Imports" node="element" />
+		</field>
+    		<field name="config" collection="arraylist" direct="true" type="com.c2kernel.process.module.ModuleConfig">    		   
+			<bind-xml name="Config" node="element" />
+    		</field>
+    		<field name="scripts" collection="arraylist" direct="true" type="com.c2kernel.process.module.ModuleScript">    		   
+			<bind-xml name="Script" node="element" />
+    		</field>    		
 	</class>
+	<class name="com.c2kernel.process.module.ModuleImports">
+		<map-to xml="Imports"/>
+		<field name="list" collection="arraylist" direct="true" type="com.c2kernel.process.module.ModuleImport">    		   
+				<bind-xml auto-naming="deriveByClass" node="element" />
+		</field>
+   	</class>  
+   	<class name="com.c2kernel.process.module.ModuleInfo">
+    	<map-to xml="Info"/>
+		<field name="desc" direct="true" type="string">
+			<bind-xml name="Description" node="element" />
+		</field>
+		<field name="version" direct="true" type="string">
+			<bind-xml name="Version" node="element" />
+		</field>
+		<field name="dependency" collection="arraylist" direct="true"
+			type="string">
+			<bind-xml name="Dependency" node="element" />
+		</field>
+   	</class> 
+	<class name="com.c2kernel.process.module.ModuleResource" extends="com.c2kernel.process.module.ModuleImport">
+		<map-to xml="Resource"/>
+		<field name="name" direct="true" type="string">
+			<bind-xml name="name" node="attribute" />
+		</field>
+		<field name="resourceType" direct="true" type="string">
+			<bind-xml name="type" node="attribute" />
+		</field>
+		<field name="resourceLocation" direct="true" type="string">
+			<bind-xml node="text" />
+		</field>
+	</class>
+	<class name="com.c2kernel.process.module.ModuleConfig">
+		<map-to xml="Config"/>
+		<field name="name" direct="true" type="string">
+			<bind-xml name="name" node="attribute" />
+		</field>
+		<field name="target" direct="true" type="string">
+			<bind-xml name="target" node="attribute" />
+		</field>	
+		<field name="value" direct="true" type="string">
+			<bind-xml node="text" />
+		</field>
+	</class>
+	<class name="com.c2kernel.process.module.ModuleScript">
+		<map-to xml="Script"/>
+		<field name="target" direct="true" type="string">
+			<bind-xml name="target" node="attribute" />
+		</field>
+		<field name="event" direct="true" type="string">
+			<bind-xml name="event" node="attribute" />
+		</field>
+		<field name="lang" direct="true" type="string">
+			<bind-xml name="lang" node="attribute" />
+		</field>		
+		<field name="script" direct="true" type="string">
+			<bind-xml node="text" />
+		</field>
+	</class>	
 </mapping>
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>
diff --git a/src/main/resources/mapFiles/PropertiesMap.xml b/src/main/resources/mapFiles/PropertiesMap.xml
index 7936a75..cdb27fc 100644
--- a/src/main/resources/mapFiles/PropertiesMap.xml
+++ b/src/main/resources/mapFiles/PropertiesMap.xml
@@ -3,10 +3,10 @@
 	<class name="com.c2kernel.property.Property">
 		<map-to xml="Property"/>
 		<field name="mName" type="string" direct="false" get-method="getName" set-method="setName">
-			<bind-xml name="Name" node="attribute"/>
+			<bind-xml name="name" node="attribute"/>
 		</field>
 		<field name="mValue" type="string" direct="false" get-method="getValue" set-method="setValue">
-			<bind-xml name="Value" node="element"/>
+			<bind-xml node="text"/>
 		</field>
 	</class>
 
diff --git a/src/main/resources/mapFiles/index b/src/main/resources/mapFiles/index
index 03de6f2..25fef77 100644
--- a/src/main/resources/mapFiles/index
+++ b/src/main/resources/mapFiles/index
@@ -8,3 +8,4 @@ JobListMap.xml
 ViewpointMap.xml
 TransferMap.xml
 NewEntityMap.xml
+ModuleMap.xml
-- 
cgit v1.2.3