From da731d2bb81666b9c697d9099da632e7dfcdc0f7 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 9 Sep 2014 12:13:21 +0200
Subject: Replaced int sysKey Item identifier with UUID, which is now portable.
 ItemPath objects are now used to identify Items throughout the kernel,
 replacing ints and Integers.

---
 src/main/resources/mapFiles/ModuleMap.xml | 34 +++++++++++++++++++------------
 1 file changed, 21 insertions(+), 13 deletions(-)

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

diff --git a/src/main/resources/mapFiles/ModuleMap.xml b/src/main/resources/mapFiles/ModuleMap.xml
index 45f6cbe..f1980d8 100644
--- a/src/main/resources/mapFiles/ModuleMap.xml
+++ b/src/main/resources/mapFiles/ModuleMap.xml
@@ -2,25 +2,28 @@
 <mapping>
 	<class name="com.c2kernel.process.module.Module">
 		<map-to xml="CristalModule" />
-		<field name="ns" direct="true" type="string">
+		<field name="ns" direct="false" type="string" get-method="getNamespace" set-method="setNamespace">
 			<bind-xml name="ns" node="attribute" />
 		</field>
-		<field name="name" direct="true" type="string">
+		<field name="name" direct="false" type="string">
 			<bind-xml name="name" node="attribute" />
 		</field>
-		<field name="info" direct="true" type="com.c2kernel.process.module.ModuleInfo">
+		<field name="id" direct="false" type="string" get-method="getID" set-method="setID">
+			<bind-xml name="id" node="attribute" />
+		</field>		
+		<field name="info" direct="false" type="com.c2kernel.process.module.ModuleInfo">
 			<bind-xml name="Info" node="element" />
 		</field>
-		<field name="resURL" direct="true" type="string">
+		<field name="resURL" direct="false" type="string">
 			<bind-xml name="ResourceURL" node="element" />
 		</field>
-		<field name="imports" direct="true" type="com.c2kernel.process.module.ModuleImports">
+		<field name="imports" direct="false" 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">    		   
+    	<field name="config" collection="arraylist" direct="false" 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">    		   
+    	<field name="scripts" collection="arraylist" direct="false" type="com.c2kernel.process.module.ModuleScript">    		   
 			<bind-xml name="Script" node="element" />
     	</field>    		
 	</class>
@@ -43,18 +46,23 @@
 			<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">
+   	<class name="com.c2kernel.process.module.ModuleImport">
+   		<field name="name" direct="false" type="string">
 			<bind-xml name="name" node="attribute" />
 		</field>
-		<field name="version" direct="true" type="integer">
+		<field name="id" direct="false" type="string" get-method="getID" set-method="setID">
+			<bind-xml name="id" node="attribute" />
+		</field>
+   	</class>
+	<class name="com.c2kernel.process.module.ModuleResource" extends="com.c2kernel.process.module.ModuleImport">
+		<map-to xml="Resource"/>
+		<field name="version" direct="false" type="integer">
 			<bind-xml name="version" node="attribute" />
 		</field>
-		<field name="resourceType" direct="true" type="string">
+		<field name="resourceType" direct="false" type="string">
 			<bind-xml name="type" node="attribute" />
 		</field>
-		<field name="resourceLocation" direct="true" type="string">
+		<field name="resourceLocation" direct="false" type="string">
 			<bind-xml node="text" />
 		</field>
 	</class>
-- 
cgit v1.2.3