From 2827a4b2d5aea32dc3c26a80f47309a6b68ac34b Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 19 Jun 2012 21:00:29 +0200
Subject: Refactor modules Support workflows on module resources

---
 src/main/resources/mapFiles/CastorHashMapMap.xml | 41 ------------------------
 src/main/resources/mapFiles/KeyValuePairMap.xml  |  5 +++
 src/main/resources/mapFiles/ModuleMap.xml        | 32 ++++++++++++------
 3 files changed, 28 insertions(+), 50 deletions(-)
 delete mode 100644 src/main/resources/mapFiles/CastorHashMapMap.xml

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

diff --git a/src/main/resources/mapFiles/CastorHashMapMap.xml b/src/main/resources/mapFiles/CastorHashMapMap.xml
deleted file mode 100644
index 601cf06..0000000
--- a/src/main/resources/mapFiles/CastorHashMapMap.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<mapping>
-	<class name="com.c2kernel.utils.KeyValuePair">
-		<map-to xml="KeyValuePair"/>
-		<field name="mKey"
-		       type="string"
-		       direct="false"
-		       get-method="getKey"
-		       set-method="setKey">
-		       <bind-xml name="Key" node="attribute"/>
-		</field>
-		<field name="IntegerValue"
-		       type="java.lang.Integer"
-		       direct="false">
-		       <bind-xml name="Integer" node="attribute"/>
-		</field>
-		<field name="StringValue"
-		       type="java.lang.String"
-		       direct="false">
-		       <bind-xml name="String" node="attribute"/>
-		</field>
-		<field name="BooleanValue"
-		       type="java.lang.Boolean"
-		       direct="false">
-		       <bind-xml name="Boolean" node="attribute"/>
-		</field>		
-		<field name="FloatValue"
-		       type="java.lang.Float"
-		       direct="false">
-		       <bind-xml name="Float" node="attribute"/>
-		</field>					
-	</class>
-    <class name="com.c2kernel.utils.CastorArrayList">
-    	<map-to xml="ArrayList"/>
-    	<field name="list" collection="arraylist" direct="true" container="false">
-			<bind-xml name="ArrayListMember" node="element"/>
-    	</field>
-   	</class>    
-</mapping>
-
diff --git a/src/main/resources/mapFiles/KeyValuePairMap.xml b/src/main/resources/mapFiles/KeyValuePairMap.xml
index 8175151..dc67609 100644
--- a/src/main/resources/mapFiles/KeyValuePairMap.xml
+++ b/src/main/resources/mapFiles/KeyValuePairMap.xml
@@ -20,6 +20,11 @@
 		       direct="false">
 		       <bind-xml name="String" node="attribute"/>
 		</field>
+		<field name="FloatValue"
+		       type="java.lang.Double"
+		       direct="false">
+		       <bind-xml name="Float" node="attribute"/>
+		</field>		
 		<field name="BooleanValue"
 		       type="java.lang.Boolean"
 		       direct="false">
diff --git a/src/main/resources/mapFiles/ModuleMap.xml b/src/main/resources/mapFiles/ModuleMap.xml
index 4bc4db1..15fcb99 100644
--- a/src/main/resources/mapFiles/ModuleMap.xml
+++ b/src/main/resources/mapFiles/ModuleMap.xml
@@ -1,27 +1,41 @@
 <?xml version="1.0"?>
 <mapping>
-	<class name="com.c2kernel.process.Module">
+	<class name="com.c2kernel.process.module.Module">
 		<map-to xml="CristalModule"/>
-	    	<field name="ns" direct="false" type="string">    		   
+	    	<field name="ns" direct="true" type="string">    		   
 			<bind-xml name="ns" node="attribute"/>
 	    	</field>
-	    	<field name="name" direct="false" type="string">    		   
+	    	<field name="name" direct="true" type="string">    		   
 			<bind-xml name="name" node="attribute"/>
 	    	</field>
-	    	<field name="desc" direct="false" type="string">    		   
+	    	<field name="desc" direct="true" type="string">    		   
 			<bind-xml name="Description" node="element"/>
 	    	</field>
-	    	<field name="version" direct="false" type="string">    		   
+	    	<field name="version" direct="true" type="string">    		   
 			<bind-xml name="Version" node="element"/>
 	    	</field>
-	    	<field name="dependency" collection="array" direct="false" type="string">    		   
+	    	<field name="dependency" collection="arraylist" direct="true" type="string">    		   
 			<bind-xml name="Dependency" node="element"/>
 	    	</field>  
-	    	<field name="resURL" direct="false" type="string">    		   
+	    	<field name="resURL" direct="true" type="string">    		   
 			<bind-xml name="ResourceURL" node="element"/>
 	    	</field>    	
-	    	<field name="dependency" collection="arraylist" direct="false" type="string">    		   
-			<bind-xml name="Config" node="element"/>
+	    	<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>    	
+	</class>
 </mapping>
-- 
cgit v1.2.3