From d43164830403245353080f5d6f838ed9f56d9a35 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 18 Nov 2013 09:48:03 +0100
Subject: 3.0-SNAPSHOT (Will be first open source version) New StateMachine
 desc IssueID #28

---
 src/main/resources/mapFiles/CollectionMap.xml   |  9 +++
 src/main/resources/mapFiles/HistoryMap.xml      | 15 ++++-
 src/main/resources/mapFiles/JobListMap.xml      | 43 ++++++-------
 src/main/resources/mapFiles/LifeCycleMap.xml    |  7 +--
 src/main/resources/mapFiles/ModuleMap.xml       |  6 +-
 src/main/resources/mapFiles/NewEntityMap.xml    |  1 -
 src/main/resources/mapFiles/StateMachineMap.xml | 81 +++++++++++++++++++++++++
 src/main/resources/mapFiles/index               |  1 +
 8 files changed, 128 insertions(+), 35 deletions(-)
 create mode 100644 src/main/resources/mapFiles/StateMachineMap.xml

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

diff --git a/src/main/resources/mapFiles/CollectionMap.xml b/src/main/resources/mapFiles/CollectionMap.xml
index e9a7d7a..804022b 100644
--- a/src/main/resources/mapFiles/CollectionMap.xml
+++ b/src/main/resources/mapFiles/CollectionMap.xml
@@ -112,4 +112,13 @@
 	<class name="com.c2kernel.collection.AggregationInstance" extends="com.c2kernel.collection.Aggregation">
 		<map-to xml="AggregationInstance"/>
 	</class>
+	    <class name="com.c2kernel.collection.CollectionArrayList">
+    	<map-to xml="CollectionList"/>
+    	<field name="list" 
+    		   collection="arraylist" 
+    		   direct="true" 
+    		   type="com.c2kernel.collection.Collection">    		   
+			<bind-xml auto-naming="deriveByClass" node="element"/>
+    	</field>
+   	</class> 
 </mapping>
diff --git a/src/main/resources/mapFiles/HistoryMap.xml b/src/main/resources/mapFiles/HistoryMap.xml
index 85a2afa..ced8483 100644
--- a/src/main/resources/mapFiles/HistoryMap.xml
+++ b/src/main/resources/mapFiles/HistoryMap.xml
@@ -24,12 +24,21 @@
       <field name="mSchemaVersion" type="integer" direct="false" get-method="getSchemaVersion" set-method="setSchemaVersion">
          <bind-xml name="SchemaVersion" node="attribute"/>
       </field>       
+      <field name="mStateMachineName" type="string" direct="false" get-method="getStateMachineName" set-method="setStateMachineName">
+         <bind-xml name="StateMachineName" node="attribute"/>
+      </field>
+      <field name="mStateMachineVersion" type="integer" direct="false" get-method="getStateMachineVersion" set-method="setStateMachineVersion">
+         <bind-xml name="StateMachineVersion" node="attribute"/>
+      </field>      
       <field name="mViewName" type="string" direct="false" get-method="getViewName" set-method="setViewName">
          <bind-xml name="ViewName" node="attribute"/>
       </field>         
-      <field name="mCurrentState" type="integer" direct="false" get-method="getCurrentState" set-method="setCurrentState">
-         <bind-xml name="CurrentState" node="attribute"/>
+      <field name="mOriginState" type="integer" direct="false" get-method="getOriginState" set-method="setOriginState">
+         <bind-xml name="OriginState" node="attribute"/>
       </field>
+      <field name="mTargetState" type="integer" direct="false" get-method="getTargetState" set-method="setTargetState">
+         <bind-xml name="TargetState" node="attribute"/>
+      </field>      
       <field name="mTransition" type="integer" direct="false" get-method="getTransition" set-method="setTransition">
          <bind-xml name="Transition" node="attribute"/>
       </field>
@@ -37,7 +46,7 @@
       <field name="mAgentName" type="string" direct="false" 
         	   get-method="getAgentName"
 		       set-method="setAgentName">
-            <bind-xml name="AgentId" node="attribute"/>
+            <bind-xml name="AgentName" node="attribute"/>
       </field>
       <field name="mAgentRole" type="string" direct="false" 
         	   get-method="getAgentRole"
diff --git a/src/main/resources/mapFiles/JobListMap.xml b/src/main/resources/mapFiles/JobListMap.xml
index 7352248..d09f7cc 100644
--- a/src/main/resources/mapFiles/JobListMap.xml
+++ b/src/main/resources/mapFiles/JobListMap.xml
@@ -2,40 +2,37 @@
 <mapping>
 	<class name="com.c2kernel.entity.agent.Job">
 		<map-to xml="Job"/>
-		<field name="mItemSysKey" type="integer" direct="false" get-method="getItemSysKey" set-method="setItemSysKey">
+		<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="mID" type="integer" direct="false" get-method="getID" set-method="setID">
-			<bind-xml name="ID" node="attribute"/>
+		<field name="stepName" type="string" direct="false" get-method="getStepName" set-method="setStepName">
+			<bind-xml name="StepName" node="attribute"/>
+		</field>		
+		<field name="stepType" type="string" direct="false" get-method="getStepType" set-method="setStepType">
+			<bind-xml name="StepType" node="attribute"/>
 		</field>
-		<field name="mStepPath" type="string" direct="false" get-method="getStepPath" set-method="setStepPath">
+		<field name="stepPath" type="string" direct="false" get-method="getStepPath" set-method="setStepPath">
 			<bind-xml name="StepPath" node="attribute"/>
 		</field>
-		<field name="mPossibleTransition" type="integer" direct="false" get-method="getPossibleTransition" set-method="setPossibleTransition">
-			<bind-xml name="PossibleTransition" node="attribute"/>
-		</field>
-		<field name="mCurrentState" type="integer" direct="false" get-method="getCurrentState" set-method="setCurrentState">
-			<bind-xml name="CurrentState" node="attribute"/>
-		</field>
-		<field name="mTargetState" type="integer" direct="false" get-method="getTargetState" set-method="setTargetState">
-			<bind-xml name="TargetState" node="attribute"/>
+		<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="mStepName" type="string" direct="false" get-method="getStepName" set-method="setStepName">
-			<bind-xml name="StepName" node="attribute"/>
+		<field name="agentName" type="string" direct="false" get-method="getAgentName" set-method="setAgentName">
+			<bind-xml name="AgentName" node="attribute"/>
 		</field>
-		<field name="mAgentId" type="integer" direct="false" get-method="getAgentId" set-method="setAgentId">
-			<bind-xml name="AgentId" node="attribute"/>
+		<field name="originStateName" type="string" direct="false" get-method="getOriginStateName" set-method="setOriginStateName">
+			<bind-xml name="OriginState" node="attribute"/>
 		</field>
-		<field name="mAgentName" type="string" direct="false" get-method="getAgentName" set-method="setAgentName">
-			<bind-xml name="AgentName" node="attribute"/>
+		<field name="targetStateName" type="string" direct="false" get-method="getTargetStateName" set-method="setTargetStateName">
+			<bind-xml name="TargetState" node="attribute"/>
 		</field>
-		<field name="mAgentRole" type="string" direct="false" get-method="getAgentRole" set-method="setAgentRole">
+		<field name="agentRole" type="string" direct="false" get-method="getAgentRole" set-method="setAgentRole">
 			<bind-xml name="AgentRole" node="attribute"/>
 		</field>
-		<field name="mStepType" type="string" direct="false" get-method="getStepType" set-method="setStepType">
-			<bind-xml name="StepType" node="attribute"/>
-		</field>
-		<field name="mActProps" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false" get-method="getKeyValuePairs" set-method="setKeyValuePairs">
+		<field name="actProps" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false" get-method="getKeyValuePairs" set-method="setKeyValuePairs">
 			<bind-xml name="ActProps" node="element"/>
 		</field>
 	</class>
diff --git a/src/main/resources/mapFiles/LifeCycleMap.xml b/src/main/resources/mapFiles/LifeCycleMap.xml
index f003a32..472fe84 100644
--- a/src/main/resources/mapFiles/LifeCycleMap.xml
+++ b/src/main/resources/mapFiles/LifeCycleMap.xml
@@ -57,11 +57,8 @@
 		<field name="eventIds" type="string" transient="true">
 			<bind-xml name="eventIds" node="element"/>
 		</field>
-		<field name="startDate" type="com.c2kernel.common.GTimeStamp" direct="false">
-			<bind-xml name="startDate" node="element"/>
-		</field>
-		<field name="activeDate" type="com.c2kernel.common.GTimeStamp" direct="false">
-			<bind-xml name="activeDate" node="element"/>
+		<field name="stateDate" type="com.c2kernel.common.GTimeStamp" direct="false">
+			<bind-xml name="stateDate" node="element"/>
 		</field>
 	</class>
 	<class name="com.c2kernel.lifecycle.instance.CompositeActivity" extends="com.c2kernel.lifecycle.instance.Activity">
diff --git a/src/main/resources/mapFiles/ModuleMap.xml b/src/main/resources/mapFiles/ModuleMap.xml
index 541b393..45f6cbe 100644
--- a/src/main/resources/mapFiles/ModuleMap.xml
+++ b/src/main/resources/mapFiles/ModuleMap.xml
@@ -17,12 +17,12 @@
 		<field name="imports" direct="true" 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="true" 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="true" type="com.c2kernel.process.module.ModuleScript">    		   
 			<bind-xml name="Script" node="element" />
-    		</field>    		
+    	</field>    		
 	</class>
 	<class name="com.c2kernel.process.module.ModuleImports">
 		<map-to xml="Imports"/>
diff --git a/src/main/resources/mapFiles/NewEntityMap.xml b/src/main/resources/mapFiles/NewEntityMap.xml
index dcbab09..239fa21 100644
--- a/src/main/resources/mapFiles/NewEntityMap.xml
+++ b/src/main/resources/mapFiles/NewEntityMap.xml
@@ -95,7 +95,6 @@
 		</field>
 	</class>
 	<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Outcome">
-		<map-to xml="Outcome"/>
 		<field name="viewname" type="string" direct="true">
 			<bind-xml name="viewname" node="attribute"/>
 		</field>
diff --git a/src/main/resources/mapFiles/StateMachineMap.xml b/src/main/resources/mapFiles/StateMachineMap.xml
new file mode 100644
index 0000000..023dfb4
--- /dev/null
+++ b/src/main/resources/mapFiles/StateMachineMap.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<mapping>
+	<class name="com.c2kernel.lifecycle.instance.stateMachine.StateMachine">
+		<map-to xml="StateMachine" />
+		<field name="states" type="com.c2kernel.lifecycle.instance.stateMachine.State"
+			collection="arraylist" direct="false" get-method="getStates" set-method="setStates">
+			<bind-xml name="State" node="element" />
+		</field>
+		<field name="transitions"
+			type="com.c2kernel.lifecycle.instance.stateMachine.Transition"
+			collection="arraylist" direct="false">
+			<bind-xml name="Transition" node="element" />
+		</field>
+		<field name="initialStateCode" type="integer">
+			<bind-xml name="initialState" node="attribute" />
+		</field>
+	</class>
+	<class name="com.c2kernel.lifecycle.instance.stateMachine.State">
+		<map-to xml="State"/>
+		<field name="id" type="integer" direct="false">
+			<bind-xml name="id" node="attribute" />
+		</field>
+		<field name="name" type="string" direct="false">
+			<bind-xml name="name" node="attribute" />
+		</field>
+		<field name="finished" type="boolean" direct="false">
+			<bind-xml name="proceeds" node="attribute" />
+		</field>
+	</class>
+	<class name="com.c2kernel.lifecycle.instance.stateMachine.Transition">
+		<map-to xml="Transition"/>
+		<field name="id" type="integer" direct="false">
+			<bind-xml name="id" node="attribute" />
+		</field>
+		<field name="name" type="string" direct="false">
+			<bind-xml name="name" node="attribute" />
+		</field>
+		<field name="originStateId" type="integer" direct="false">
+			<bind-xml name="origin" node="attribute" />
+		</field>
+		<field name="targetStateId" type="integer" direct="false">
+			<bind-xml name="target" node="attribute" />
+		</field>
+		<field name="enabledProp" type="string" direct="false">
+			<bind-xml name="enablingProperty" node="attribute" />
+		</field>
+		<field name="roleOverride" type="string" direct="false">
+			<bind-xml name="roleOverride" node="attribute" />
+		</field>
+		<field name="reservation" type="string" direct="false">
+			<bind-xml name="reservation" node="attribute" />
+		</field>		
+		<field name="outcome" type="com.c2kernel.lifecycle.instance.stateMachine.TransitionOutcome" direct="false">
+			<bind-xml name="Outcome" node="element" />
+		</field>
+		<field name="script" type="com.c2kernel.lifecycle.instance.stateMachine.TransitionScript" direct="false">
+			<bind-xml name="Script" node="element" />
+		</field>
+	</class>
+	<class name="com.c2kernel.lifecycle.instance.stateMachine.TransitionOutcome">
+		<map-to xml="Outcome"/>
+		<field name="schemaName" type="string" direct="false">
+			<bind-xml name="name" node="attribute" />
+		</field>
+		<field name="schemaVersion" type="string" direct="false">
+			<bind-xml name="version" node="attribute" />
+		</field>
+		<field name="required" type="boolean" direct="false">
+			<bind-xml name="required" node="attribute" />
+		</field>
+	</class>
+	<class name="com.c2kernel.lifecycle.instance.stateMachine.TransitionScript">
+		<map-to xml="Script"/>
+		<field name="scriptName" type="string" direct="false">
+			<bind-xml name="name" node="attribute" />
+		</field>
+		<field name="scriptVersion" type="string" direct="false">
+			<bind-xml name="version" node="attribute" />
+		</field>
+	</class>
+</mapping>
diff --git a/src/main/resources/mapFiles/index b/src/main/resources/mapFiles/index
index 25fef77..4e378e4 100644
--- a/src/main/resources/mapFiles/index
+++ b/src/main/resources/mapFiles/index
@@ -9,3 +9,4 @@ ViewpointMap.xml
 TransferMap.xml
 NewEntityMap.xml
 ModuleMap.xml
+StateMachineMap.xml
-- 
cgit v1.2.3