From 04048a6c4026b47fc6c372e792ffb60726baee56 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 24 Oct 2013 13:12:52 +0200
Subject: Clear of exceptions

---
 src/main/resources/boot/SM/CompositeActivity.xml | 11 +++++++++++
 src/main/resources/boot/SM/Default.xml           | 16 +++++++++++-----
 src/main/resources/boot/SM/PredefinedStep.xml    |  9 +++++++++
 src/main/resources/boot/allbootitems.txt         |  2 ++
 4 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/boot/SM/CompositeActivity.xml
 create mode 100644 src/main/resources/boot/SM/PredefinedStep.xml

(limited to 'src/main/resources')

diff --git a/src/main/resources/boot/SM/CompositeActivity.xml b/src/main/resources/boot/SM/CompositeActivity.xml
new file mode 100644
index 0000000..a713c27
--- /dev/null
+++ b/src/main/resources/boot/SM/CompositeActivity.xml
@@ -0,0 +1,11 @@
+<StateMachine initialState="0">
+              <State id="0" name="Waiting"/>
+              <State id="1" name="Started"/>
+              <State id="2" name="Finished" proceeds="true"/>
+
+              <Transition id="0" name="Start" origin="0" terminus="1"/>
+              <Transition id="1" name="Complete" origin="1" terminus="2"/>
+</StateMachine>
+
+
+
diff --git a/src/main/resources/boot/SM/Default.xml b/src/main/resources/boot/SM/Default.xml
index 237506e..8d08570 100644
--- a/src/main/resources/boot/SM/Default.xml
+++ b/src/main/resources/boot/SM/Default.xml
@@ -1,16 +1,22 @@
 <StateMachine initialState="0">
               <State id="0" name="Waiting"/>
-              <State id="1" name="Finished" proceeds="true"/>
-              <State id="2" name="Suspended"/>
+              <State id="1" name="Started"/>
+              <State id="2" name="Finished" proceeds="true"/>
+              <State id="3" name="Suspended"/>
 
-              <Transition id="0" name="Done" origin="0" terminus="1">
+              <Transition id="0" name="Done" origin="0" terminus="2">
                           <Outcome name="${SchemaType}" version="${SchemaVersion}"/>
                           <Script name="${ScriptName}" version="${ScriptVersion}"/>
               </Transition>
-              <Transition id="1" name="Suspend" origin="0" terminus="2">
+              <Transition id="1" name="Start" origin="0" terminus="1" reservation="set"/>
+              <Transition id="2" name="Complete" origin="1" terminus="2" reservation="clear">
+                          <Outcome name="${SchemaType}" version="${SchemaVersion}"/>
+                          <Script name="${ScriptName}" version="${ScriptVersion}"/>              
+              </Transition>
+              <Transition id="2" name="Suspend" origin="1" terminus="3">
                           <Outcome name="Errors" version="0"/>
               </Transition>
-              <Transition id="2" name="Retry" origin="2" terminus="0" roleOverride="Admin"/>
+              <Transition id="2" name="Resume" origin="3" terminus="1" roleOverride="Admin"/>
 </StateMachine>
 
 
diff --git a/src/main/resources/boot/SM/PredefinedStep.xml b/src/main/resources/boot/SM/PredefinedStep.xml
new file mode 100644
index 0000000..0cc418a
--- /dev/null
+++ b/src/main/resources/boot/SM/PredefinedStep.xml
@@ -0,0 +1,9 @@
+<StateMachine initialState="0">
+              <State id="0" name="Available"/>
+              <Transition id="0" name="Done" origin="0" terminus="0">
+                          <Outcome name="PredefinedStepOutcome" version="0"/>
+              </Transition>
+</StateMachine>
+
+
+
diff --git a/src/main/resources/boot/allbootitems.txt b/src/main/resources/boot/allbootitems.txt
index 3f13968..4fdcbdc 100644
--- a/src/main/resources/boot/allbootitems.txt
+++ b/src/main/resources/boot/allbootitems.txt
@@ -11,6 +11,8 @@ OD/Script
 OD/Errors
 OD/StateMachine
 SM/Default
+SM/PredefinedStep
+SM/CompositeActivity
 EA/AssignNewVersionFromLast
 EA/EditActivityDef
 EA/EditSchema
-- 
cgit v1.2.3