Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

3 files changed, 29 insertions, 23 deletions

diff --git a/src/main/resources/mapFiles/CollectionMap.xml b/src/main/resources/mapFiles/CollectionMap.xml
index 804022b..ff6a61b 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="mEntityKey"

+		<field name="mSystemKey"

 		       type="integer"

 		       direct="false"

-		       get-method="getEntityKey"

-		       set-method="setEntityKey">

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

+		       get-method="getSystemKey"

+		       set-method="setSystemKey">

+			<bind-xml name="SystemKey" 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="mEntityKey"

+		<field name="mSystemKey"

 		       type="integer"

 		       direct="false"

-		       get-method="getEntityKey"

-		       set-method="setEntityKey">

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

+		       get-method="getSystemKey"

+		       set-method="setSystemKey">

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

 		</field>		

 		<field name="mClassProps"

 		       type="string"

diff --git a/src/main/resources/mapFiles/ModuleMap.xml b/src/main/resources/mapFiles/ModuleMap.xml
index 45f6cbe..440b852 100644
--- a/src/main/resources/mapFiles/ModuleMap.xml
+++ b/src/main/resources/mapFiles/ModuleMap.xml
@@ -38,6 +38,9 @@
 		<field name="version" direct="true" type="string">

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

 		</field>

+		<field name="layer" direct="true" type="integer">

+			<bind-xml name="Layer" node="element" />

+		</field>		

 		<field name="dependency" collection="arraylist" direct="true"

 			type="string">

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

diff --git a/src/main/resources/mapFiles/NewEntityMap.xml b/src/main/resources/mapFiles/NewEntityMap.xml
index 239fa21..1e58a9e 100644
--- a/src/main/resources/mapFiles/NewEntityMap.xml
+++ b/src/main/resources/mapFiles/NewEntityMap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>

 <mapping>

-	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.NewItem">

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

 		<map-to xml="Item"/>

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

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

@@ -11,31 +11,34 @@
 		<field name="workflow" type="string" direct="true">

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

 		</field>

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

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

+		</field>		

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

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

 		</field>

-		<field name="outcomes" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Outcome">

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

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

 		</field>

-		<field name="dependencyList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Dependency">

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

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

 		</field>

-		<field name="aggregationList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Aggregation">

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

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

 		</field>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Aggregation">

+	<class name="com.c2kernel.entity.imports.ImportAggregation">

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

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

 		</field>

 		<field name="isDescription" type="boolean" direct="true">

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

 		</field>

-		<field name="aggregationMemberList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.AggregationMember">

+		<field name="aggregationMemberList" collection="arraylist" direct="true" type="com.c2kernel.entity.imports.ImportAggregationMember">

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

 		</field>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.AggregationMember">

+	<class name="com.c2kernel.entity.imports.ImportAggregationMember">

 		<field name="slotNo" type="int" direct="true">

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

 		</field>

@@ -45,7 +48,7 @@
 		<field name="itemPath" type="string" direct="true">

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

 		</field>

-		<field name="geometry" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Geometry">

+		<field name="geometry" direct="true" type="com.c2kernel.entity.imports.Geometry">

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

 		</field>

 		<field name="props" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false"

@@ -53,7 +56,7 @@
 			<bind-xml name="MemberProperties" node="element"/>

 		</field>		

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Geometry">

+	<class name="com.c2kernel.entity.imports.Geometry">

 		<field name="x" type="int" direct="true">

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

 		</field>

@@ -67,7 +70,7 @@
 			<bind-xml name="height" node="attribute"/>

 		</field>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Dependency">

+	<class name="com.c2kernel.entity.imports.ImportDependency">

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

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

 		</field>

@@ -77,7 +80,7 @@
 		<field name="itemDescriptionPath" type="string" direct="true">

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

 		</field>

-		<field name="dependencyMemberList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.DependencyMember">

+		<field name="dependencyMemberList" collection="arraylist" direct="true" type="com.c2kernel.entity.imports.ImportDependencyMember">

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

 		</field>

 		<field name="props" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false"

@@ -85,7 +88,7 @@
 			<bind-xml name="CollectionProperties" node="element"/>

 		</field>		

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.DependencyMember">

+	<class name="com.c2kernel.entity.imports.ImportDependencyMember">

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

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

 		</field>

@@ -94,7 +97,7 @@
 			<bind-xml name="MemberProperties" node="element"/>

 		</field>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Outcome">

+	<class name="com.c2kernel.entity.imports.ImportOutcome">

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

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

 		</field>

@@ -108,7 +111,7 @@
 			<bind-xml name="viewname" node="text"/>

 		</field>

 	</class>		

-	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.NewAgent">

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

 		<map-to xml="Agent"/>

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

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

@@ -123,7 +126,7 @@
 			<bind-xml name="Property" node="element"/>

 		</field>

 	</class>	

-	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.NewRole">

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

 		<map-to xml="Role"/>

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

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