From e99ed30f6cae36c5f3fa03007d991e67894a01bb Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 23 Jul 2013 09:41:43 +0200
Subject: More

---
 src/main/resources/boot/OD/StateMachine.xsd     |  5 ++-
 src/main/resources/mapFiles/JobListMap.xml      | 53 ++++++++++++++++---------
 src/main/resources/mapFiles/StateMachineMap.xml |  8 ++--
 3 files changed, 41 insertions(+), 25 deletions(-)

(limited to 'src/main/resources')

diff --git a/src/main/resources/boot/OD/StateMachine.xsd b/src/main/resources/boot/OD/StateMachine.xsd
index f21e39d..ceeaf22 100644
--- a/src/main/resources/boot/OD/StateMachine.xsd
+++ b/src/main/resources/boot/OD/StateMachine.xsd
@@ -7,7 +7,7 @@
             <xs:complexType>
       <xs:attribute name="id" type="xs:int" use="required"/>
       <xs:attribute name="name" type="xs:string" use="required"/>
-      <xs:attribute name="proceeds" type="xs:string"/>
+      <xs:attribute name="finished" type="xs:string"/>
     </xs:complexType>
         </xs:element>
         <xs:element name="Transition" maxOccurs="unbounded">
@@ -29,7 +29,7 @@
       <xs:attribute name="id" type="xs:int" use="required"/>
       <xs:attribute name="name" type="xs:string" use="required"/>
       <xs:attribute name="origin" type="xs:int" use="required"/>
-      <xs:attribute name="terminus" type="xs:int" use="required"/>
+      <xs:attribute name="target" type="xs:int" use="required"/>
       <xs:attribute name="enablingProperty" type="xs:string"/>
       <xs:attribute name="roleOverride" type="xs:string"/>
       <xs:attribute name="reservation">
@@ -49,3 +49,4 @@
   </xs:element>
 </xs:schema>
 
+
diff --git a/src/main/resources/mapFiles/JobListMap.xml b/src/main/resources/mapFiles/JobListMap.xml
index 7352248..ee18d48 100644
--- a/src/main/resources/mapFiles/JobListMap.xml
+++ b/src/main/resources/mapFiles/JobListMap.xml
@@ -2,40 +2,55 @@
 <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 name="transitionId" type="integer" direct="false" get-method="getTransitionId" set-method="setTransitionId">
+			<bind-xml name="TransitionId" node="attribute"/>
 		</field>
-		<field name="mCurrentState" type="integer" direct="false" get-method="getCurrentState" set-method="setCurrentState">
-			<bind-xml name="CurrentState" node="attribute"/>
+		<field name="currentStateId" type="integer" direct="false" get-method="getCurrentStateId" set-method="setCurrentStateId">
+			<bind-xml name="CurrentStateId" 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="mStepName" type="string" direct="false" get-method="getStepName" set-method="setStepName">
-			<bind-xml name="StepName" node="attribute"/>
+		<field name="targetStateId" type="integer" direct="false" get-method="getTargetStateId" set-method="setTargetStateId">
+			<bind-xml name="TargetStateId" node="attribute"/>
 		</field>
-		<field name="mAgentId" type="integer" direct="false" get-method="getAgentId" set-method="setAgentId">
+		<field name="agentId" type="integer" direct="false" get-method="getAgentId" set-method="setAgentId">
 			<bind-xml name="AgentId" node="attribute"/>
 		</field>
-		<field name="mAgentName" type="string" direct="false" get-method="getAgentName" set-method="setAgentName">
+		<field name="agentName" 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">
+		<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 name="schemaName" type="string" direct="false" get-method="getSchemaName" set-method="setSchemaName">
+			<bind-xml name="SchemaName" node="attribute"/>
+		</field>
+		<field name="schemaVersion" type="integer" direct="false" get-method="getSchemaVersion" set-method="setSchemaVersion">
+			<bind-xml name="SchemaVersion" node="attribute"/>
+		</field>		
+		<field name="outcomeRequired" type="boolean" direct="false" get-method="isOutcomeRequired" set-method="setOutcomeRequired">
+			<bind-xml name="OutcomeRequired" node="attribute"/>
+		</field>
+		<field name="scriptName" type="string" direct="false" get-method="getScriptName" set-method="setScriptName">
+			<bind-xml name="ScriptName" node="attribute"/>
+		</field>
+		<field name="scriptVersion" type="integer" direct="false" get-method="getScriptVersion" set-method="setScriptVersion">
+			<bind-xml name="ScriptVersion" 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/StateMachineMap.xml b/src/main/resources/mapFiles/StateMachineMap.xml
index fb13789..7309647 100644
--- a/src/main/resources/mapFiles/StateMachineMap.xml
+++ b/src/main/resources/mapFiles/StateMachineMap.xml
@@ -22,8 +22,8 @@
 		<field name="name" type="string" direct="false">
 			<bind-xml name="name" node="attribute" />
 		</field>
-		<field name="proceeds" type="boolean" direct="false">
-			<bind-xml name="proceeds" node="attribute" />
+		<field name="finished" type="boolean" direct="false">
+			<bind-xml name="finishedd" node="attribute" />
 		</field>
 	</class>
 	<class name="com.c2kernel.lifecycle.instance.stateMachine.Transition">
@@ -36,8 +36,8 @@
 		<field name="originStateCode" type="integer" direct="false">
 			<bind-xml name="origin" node="attribute" />
 		</field>
-		<field name="terminalStateCode" type="integer" direct="false">
-			<bind-xml name="terminus" node="attribute" />
+		<field name="targetStateCode" type="integer" direct="false">
+			<bind-xml name="target" node="attribute" />
 		</field>
 		<field name="enabledProp" type="string" direct="false">
 			<bind-xml name="enablingProperty" node="attribute" />
-- 
cgit v1.2.3