From 8b32fe15554c0103585321c3d397f6e46dd451b4 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 17 Sep 2013 08:54:33 +0200
Subject: Merge and tidy after 2.4

---
 src/main/resources/mapFiles/StateMachineMap.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/src/main/resources/mapFiles/StateMachineMap.xml b/src/main/resources/mapFiles/StateMachineMap.xml
index 7309647..53f24e1 100644
--- a/src/main/resources/mapFiles/StateMachineMap.xml
+++ b/src/main/resources/mapFiles/StateMachineMap.xml
@@ -16,8 +16,8 @@
 		</field>
 	</class>
 	<class name="com.c2kernel.lifecycle.instance.stateMachine.State">
-		<field name="code" type="integer" direct="false">
-			<bind-xml name="code" node="attribute" />
+		<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" />
@@ -27,16 +27,16 @@
 		</field>
 	</class>
 	<class name="com.c2kernel.lifecycle.instance.stateMachine.Transition">
-		<field name="code" type="integer" direct="false">
-			<bind-xml name="code" node="attribute" />
+		<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="originStateCode" type="integer" direct="false">
+		<field name="originStateId" type="integer" direct="false">
 			<bind-xml name="origin" node="attribute" />
 		</field>
-		<field name="targetStateCode" type="integer" direct="false">
+		<field name="targetStateId" type="integer" direct="false">
 			<bind-xml name="target" node="attribute" />
 		</field>
 		<field name="enabledProp" type="string" direct="false">
-- 
cgit v1.2.3