From 0f892332b19ba8741a7db66a5c4daa386b2b5c1e Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 25 Oct 2013 17:27:29 +0200
Subject: Changes and refactoring to gui requirements Used descriptions must
 use an integer version.

---
 src/main/resources/boot/OD/StateMachine.xsd  |  4 ++--
 src/main/resources/boot/SM/Default.xml       |  4 ++--
 src/main/resources/mapFiles/HistoryMap.xml   | 15 +++++++++---
 src/main/resources/mapFiles/JobListMap.xml   | 34 +++++++---------------------
 src/main/resources/mapFiles/LifeCycleMap.xml |  6 -----
 5 files changed, 24 insertions(+), 39 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 ceeaf22..d59070c 100644
--- a/src/main/resources/boot/OD/StateMachine.xsd
+++ b/src/main/resources/boot/OD/StateMachine.xsd
@@ -16,13 +16,13 @@
   <xs:element name="Outcome">
     <xs:complexType>
       <xs:attribute name="name" type="xs:string" use="required"/>
-      <xs:attribute name="version" type="xs:string" use="required"/>
+      <xs:attribute name="version" type="xs:int" use="required"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="Script">
     <xs:complexType>
       <xs:attribute name="name" type="xs:string" use="required"/>
-      <xs:attribute name="version" type="xs:string" use="required"/>
+      <xs:attribute name="version" type="xs:int" use="required"/>
     </xs:complexType>
   </xs:element>
       </xs:sequence>
diff --git a/src/main/resources/boot/SM/Default.xml b/src/main/resources/boot/SM/Default.xml
index d58a976..f074926 100644
--- a/src/main/resources/boot/SM/Default.xml
+++ b/src/main/resources/boot/SM/Default.xml
@@ -13,10 +13,10 @@
                           <Outcome name="${SchemaType}" version="${SchemaVersion}"/>
                           <Script name="${ScriptName}" version="${ScriptVersion}"/>              
               </Transition>
-              <Transition id="2" name="Suspend" origin="1" terminus="3">
+              <Transition id="3" name="Suspend" origin="1" terminus="3">
                           <Outcome name="Errors" version="0"/>
               </Transition>
-              <Transition id="2" name="Resume" origin="3" terminus="1" roleOverride="Admin" reservation="preserve"/>
+              <Transition id="4" name="Resume" origin="3" terminus="1" roleOverride="Admin" reservation="preserve"/>
 </StateMachine>
 
 
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 ee18d48..84d40ae 100644
--- a/src/main/resources/mapFiles/JobListMap.xml
+++ b/src/main/resources/mapFiles/JobListMap.xml
@@ -17,38 +17,20 @@
 		<field name="stepPath" type="string" direct="false" get-method="getStepPath" set-method="setStepPath">
 			<bind-xml name="StepPath" node="attribute"/>
 		</field>
-		<field name="transitionId" type="integer" direct="false" get-method="getTransitionId" set-method="setTransitionId">
-			<bind-xml name="TransitionId" node="attribute"/>
-		</field>
-		<field name="currentStateId" type="integer" direct="false" get-method="getCurrentStateId" set-method="setCurrentStateId">
-			<bind-xml name="CurrentStateId" node="attribute"/>
-		</field>
-		<field name="targetStateId" type="integer" direct="false" get-method="getTargetStateId" set-method="setTargetStateId">
-			<bind-xml name="TargetStateId" node="attribute"/>
-		</field>
-		<field name="agentId" type="integer" direct="false" get-method="getAgentId" set-method="setAgentId">
-			<bind-xml name="AgentId" 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="attribute"/>
 		</field>
 		<field name="agentName" type="string" direct="false" get-method="getAgentName" set-method="setAgentName">
 			<bind-xml name="AgentName" node="attribute"/>
 		</field>
-		<field name="agentRole" type="string" direct="false" get-method="getAgentRole" set-method="setAgentRole">
-			<bind-xml name="AgentRole" node="attribute"/>
-		</field>
-		<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 name="originStateName" type="string" direct="false" get-method="getOriginStateName" set-method="setOriginStateName">
+			<bind-xml name="OriginState" node="attribute"/>
 		</field>
-		<field name="scriptName" type="string" direct="false" get-method="getScriptName" set-method="setScriptName">
-			<bind-xml name="ScriptName" node="attribute"/>
+		<field name="targetStateName" type="string" direct="false" get-method="getTargetStateName" set-method="setTargetStateName">
+			<bind-xml name="TargetState" node="attribute"/>
 		</field>
-		<field name="scriptVersion" type="integer" direct="false" get-method="getScriptVersion" set-method="setScriptVersion">
-			<bind-xml name="ScriptVersion" node="attribute"/>
+		<field name="agentRole" type="string" direct="false" get-method="getAgentRole" set-method="setAgentRole">
+			<bind-xml name="AgentRole" node="attribute"/>
 		</field>
 		<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"/>
diff --git a/src/main/resources/mapFiles/LifeCycleMap.xml b/src/main/resources/mapFiles/LifeCycleMap.xml
index d0f2e2c..472fe84 100644
--- a/src/main/resources/mapFiles/LifeCycleMap.xml
+++ b/src/main/resources/mapFiles/LifeCycleMap.xml
@@ -60,12 +60,6 @@
 		<field name="stateDate" type="com.c2kernel.common.GTimeStamp" direct="false">
 			<bind-xml name="stateDate" 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>
 	</class>
 	<class name="com.c2kernel.lifecycle.instance.CompositeActivity" extends="com.c2kernel.lifecycle.instance.Activity">
 		<map-to xml="CompositeActivity"/>
-- 
cgit v1.2.3