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.

8 files changed, 73 insertions, 62 deletions

diff --git a/src/main/resources/mapFiles/CollectionMap.xml b/src/main/resources/mapFiles/CollectionMap.xml
index ff6a61b..d04cc10 100644
--- a/src/main/resources/mapFiles/CollectionMap.xml
+++ b/src/main/resources/mapFiles/CollectionMap.xml
@@ -15,12 +15,12 @@
 		<field name="ID" type="integer" direct="false">

 			<bind-xml name="ID" node="attribute"/>

 		</field>		

-		<field name="mSystemKey"

-		       type="integer"

+		<field name="mItemPath"

+		       type="string"

 		       direct="false"

-		       get-method="getSystemKey"

-		       set-method="setSystemKey">

-			<bind-xml name="SystemKey" node="attribute"/>

+		       get-method="getChildUUID"

+		       set-method="setChildUUID">

+			<bind-xml name="ChildUUID" node="attribute"/>

 		</field>

 		<field name="mProperties" 

 			   type="com.c2kernel.utils.KeyValuePair"

@@ -36,12 +36,12 @@
 	<class name="com.c2kernel.collection.AggregationMember" 

 			extends="com.c2kernel.graph.model.GraphableVertex">

 		<map-to xml="AggregationMember"/>

-		<field name="mSystemKey"

-		       type="integer"

+		<field name="mItemPath"

+		       type="string"

 		       direct="false"

-		       get-method="getSystemKey"

-		       set-method="setSystemKey">

-			<bind-xml name="SystemKey" node="attribute"/>

+		       get-method="getChildUUID"

+		       set-method="setChildUUID">

+			<bind-xml name="ChildUUID" node="attribute"/>

 		</field>		

 		<field name="mClassProps"

 		       type="string"

diff --git a/src/main/resources/mapFiles/HistoryMap.xml b/src/main/resources/mapFiles/HistoryMap.xml
index ced8483..8e7b591 100644
--- a/src/main/resources/mapFiles/HistoryMap.xml
+++ b/src/main/resources/mapFiles/HistoryMap.xml
@@ -6,9 +6,12 @@
       <field name="mID" type="integer" direct="false" get-method="getID" set-method="setID">

          <bind-xml name="ID" node="attribute"/>

       </field>

-      <field name="mEntitySystemKey" type="integer" direct="false" get-method="getEntitySystemKey" set-method="setEntitySystemKey">

-         <bind-xml name="EntitySystemKey" node="attribute"/>

-      </field>

+      <field name="mItemPath" type="string" direct="false" get-method="getItemUUID" set-method="setItemUUID">

+         <bind-xml name="ItemUUID" node="attribute"/>

+	  </field>

+      <field name="mAgentPath" type="string" direct="false" get-method="getAgentUUID" set-method="setAgentUUID">

+         <bind-xml name="AgentUUID" node="attribute"/>

+	  </field>

       <field name="mStepName" type="string" direct="false" get-method="getStepName" set-method="setStepName">

          <bind-xml name="StepName" node="attribute"/>

       </field>

@@ -42,12 +45,6 @@
       <field name="mTransition" type="integer" direct="false" get-method="getTransition" set-method="setTransition">

          <bind-xml name="Transition" node="attribute"/>

       </field>

-

-      <field name="mAgentName" type="string" direct="false" 

-        	   get-method="getAgentName"

-		       set-method="setAgentName">

-            <bind-xml name="AgentName" node="attribute"/>

-      </field>

       <field name="mAgentRole" type="string" direct="false" 

         	   get-method="getAgentRole"

 		       set-method="setAgentRole">

diff --git a/src/main/resources/mapFiles/JobListMap.xml b/src/main/resources/mapFiles/JobListMap.xml
index d09f7cc..7eb5237 100644
--- a/src/main/resources/mapFiles/JobListMap.xml
+++ b/src/main/resources/mapFiles/JobListMap.xml
@@ -5,9 +5,9 @@
 		<field name="id" type="integer" direct="false" get-method="getId" set-method="setId">

 			<bind-xml name="Id" node="attribute"/>

 		</field>

-		<field name="itemSysKey" type="integer" direct="false" get-method="getItemSysKey" set-method="setItemSysKey">

-			<bind-xml name="ItemSysKey" node="attribute"/>

-		</field>

+        <field name="mItemPath" type="string" direct="false" get-method="getItemUUID" set-method="setItemUUID">

+            <bind-xml name="ItemUUID" node="attribute"/>

+	    </field>

 		<field name="stepName" type="string" direct="false" get-method="getStepName" set-method="setStepName">

 			<bind-xml name="StepName" node="attribute"/>

 		</field>		

@@ -20,9 +20,9 @@
 		<field name="transition" type="com.c2kernel.lifecycle.instance.stateMachine.Transition" direct="false" get-method="getTransition" set-method="setTransition">

 			<bind-xml name="Transition" node="element"/>

 		</field>

-		<field name="agentName" type="string" direct="false" get-method="getAgentName" set-method="setAgentName">

-			<bind-xml name="AgentName" node="attribute"/>

-		</field>

+        <field name="mAgentPath" type="string" direct="false" get-method="getAgentUUID" set-method="setAgentUUID">

+            <bind-xml name="AgentUUID" node="attribute"/>

+	    </field>

 		<field name="originStateName" type="string" direct="false" get-method="getOriginStateName" set-method="setOriginStateName">

 			<bind-xml name="OriginState" node="attribute"/>

 		</field>

diff --git a/src/main/resources/mapFiles/LifeCycleMap.xml b/src/main/resources/mapFiles/LifeCycleMap.xml
index f2183d5..d0ff71c 100644
--- a/src/main/resources/mapFiles/LifeCycleMap.xml
+++ b/src/main/resources/mapFiles/LifeCycleMap.xml
@@ -66,9 +66,9 @@
 	</class>

 	<class name="com.c2kernel.lifecycle.instance.Workflow" extends="com.c2kernel.lifecycle.instance.CompositeActivity">

 		<map-to xml="Workflow"/>

-		<field name="itemSysKey" type="integer" direct="false">

-			<bind-xml name="itemSysKey" node="attribute"/>

-		</field>

+		<field name="mItemPath" type="string" direct="false" get-method="getItemUUID" set-method="setItemUUID">

+            <bind-xml name="ItemUUID" node="attribute"/>

+	    </field>

 	</class>

 	<class name="com.c2kernel.lifecycle.instance.Join" extends="com.c2kernel.lifecycle.instance.WfVertex">

 		<map-to xml="Join"/>

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>

diff --git a/src/main/resources/mapFiles/NewEntityMap.xml b/src/main/resources/mapFiles/NewEntityMap.xml
index 1e58a9e..58de4d1 100644
--- a/src/main/resources/mapFiles/NewEntityMap.xml
+++ b/src/main/resources/mapFiles/NewEntityMap.xml
@@ -2,28 +2,31 @@
 <mapping>

 	<class name="com.c2kernel.entity.imports.ImportItem">

 		<map-to xml="Item"/>

-		<field name="name" type="string" direct="true">

+		<field name="name" type="string" direct="false">

 			<bind-xml name="name" node="attribute"/>

 		</field>

-		<field name="initialPath" type="string" direct="true">

+		<field name="initialPath" type="string" direct="false">

 			<bind-xml name="initialPath" node="attribute"/>

 		</field>

-		<field name="workflow" type="string" direct="true">

+		<field name="itemPath" type="string" direct="false" get-method="getID" set-method="setID">

+            <bind-xml name="id" node="attribute"/>

+	    </field>

+		<field name="workflow" type="string" direct="false">

 			<bind-xml name="workflow" node="attribute"/>

 		</field>

-		<field name="workflowVer" type="integer" direct="true">

+		<field name="workflowVer" type="integer" direct="false">

 			<bind-xml name="workflowVer" node="attribute"/>

 		</field>		

-		<field name="properties" collection="arraylist" direct="true" type="com.c2kernel.property.Property">

+		<field name="properties" collection="arraylist" direct="false" type="com.c2kernel.property.Property">

 			<bind-xml name="Property" node="element"/>

 		</field>

-		<field name="outcomes" collection="arraylist" direct="true" type="com.c2kernel.entity.imports.ImportOutcome">

+		<field name="outcomes" collection="arraylist" direct="false" type="com.c2kernel.entity.imports.ImportOutcome">

 			<bind-xml name="Outcome" node="element"/>

 		</field>

-		<field name="dependencyList" collection="arraylist" direct="true" type="com.c2kernel.entity.imports.ImportDependency">

+		<field name="dependencyList" collection="arraylist" direct="false" type="com.c2kernel.entity.imports.ImportDependency">

 			<bind-xml name="Dependency" node="element"/>

 		</field>

-		<field name="aggregationList" collection="arraylist" direct="true" type="com.c2kernel.entity.imports.ImportAggregation">

+		<field name="aggregationList" collection="arraylist" direct="false" type="com.c2kernel.entity.imports.ImportAggregation">

 			<bind-xml name="Aggregation" node="element"/>

 		</field>

 	</class>

@@ -113,25 +116,28 @@
 	</class>		

 	<class name="com.c2kernel.entity.imports.ImportAgent">

 		<map-to xml="Agent"/>

-		<field name="name" type="string" direct="true">

+		<field name="name" type="string" direct="false">

 			<bind-xml name="name" node="attribute"/>

 		</field>

-		<field name="password" type="string" direct="true">

+		<field name="password" type="string" direct="false">

 			<bind-xml name="password" node="attribute"/>

 		</field>

-		<field name="roles" collection="arraylist" direct="true" type="string">

+		<field name="roles" collection="arraylist" direct="false" type="string">

 			<bind-xml name="Role" node="element"/>

 		</field>

-		<field name="properties" collection="arraylist" direct="true" type="com.c2kernel.property.Property">

+		<field name="properties" collection="arraylist" direct="false" type="com.c2kernel.property.Property">

 			<bind-xml name="Property" node="element"/>

 		</field>

+		<field name="mItemPath" type="string" direct="false" get-method="getID" set-method="setID">

+            <bind-xml name="id" node="attribute"/>

+	    </field>

 	</class>	

 	<class name="com.c2kernel.entity.imports.ImportRole">

 		<map-to xml="Role"/>

-		<field name="name" type="string" direct="true">

+		<field name="name" type="string" direct="false">

 			<bind-xml name="name" node="text"/>

 		</field>

-		<field name="jobList" type="boolean" direct="true">

+		<field name="jobList" type="boolean" direct="false" get-method="hasJobList">

 			<bind-xml name="jobList" node="attribute"/>

 		</field>

 	</class>

diff --git a/src/main/resources/mapFiles/TransferMap.xml b/src/main/resources/mapFiles/TransferMap.xml
index a280ef3..814bbb2 100644
--- a/src/main/resources/mapFiles/TransferMap.xml
+++ b/src/main/resources/mapFiles/TransferMap.xml
@@ -8,10 +8,10 @@
     	</field>

    	</class>		

 	<class name="com.c2kernel.entity.transfer.TransferItem">

-		<field name="sysKey" type="integer" direct="true">

-			<bind-xml name="sysKey" node="attribute"/>

-		</field>

-		<field name="domainPaths" collection="arraylist" direct="true"

+      <field name="mItemPath" type="string" direct="false" get-method="getUUID" set-method="setUUID">

+         <bind-xml name="ItemUUID" node="attribute"/>

+	  </field>

+		<field name="domainPaths" collection="arraylist" direct="false"

 			type="string">

 			<bind-xml name="DomainPaths" node="element"/>

 		</field>		

diff --git a/src/main/resources/mapFiles/ViewpointMap.xml b/src/main/resources/mapFiles/ViewpointMap.xml
index 6799418..eb14175 100644
--- a/src/main/resources/mapFiles/ViewpointMap.xml
+++ b/src/main/resources/mapFiles/ViewpointMap.xml
@@ -2,9 +2,9 @@
 <mapping>

 	<class name="com.c2kernel.persistency.outcome.Viewpoint">

 		<map-to xml="Viewpoint"/>

-		<field name="sysKey" type="integer" direct="false" get-method="getSysKey" set-method="setSysKey">

-			<bind-xml name="SysKey" node="attribute"/>

-		</field>

+        <field name="mItemPath" type="string" direct="false" get-method="getItemUUID" set-method="setItemUUID">

+           <bind-xml name="ItemUUID" node="attribute"/>

+	    </field>

 		<field name="schemaName" type="string" direct="false" get-method="getSchemaName" set-method="setSchemaName">

 			<bind-xml name="SchemaName" node="attribute"/>

 		</field>