Moved old entitycreation package from the predefined step package to a

new 'imports' package under entity. Renamed most classed with an
'Import' prefix to avoid clashes with other API classes. Fixes #194

1 files changed, 15 insertions, 15 deletions

diff --git a/src/main/resources/mapFiles/NewEntityMap.xml b/src/main/resources/mapFiles/NewEntityMap.xml
index 84c4ce7..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"/>

@@ -17,28 +17,28 @@
 		<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>

@@ -48,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"

@@ -56,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>

@@ -70,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>

@@ -80,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"

@@ -88,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>

@@ -97,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>

@@ -111,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"/>

@@ -126,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"/>