From 30cd736670a579985890d8c2dfe363bacbad7568 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Sun, 27 Oct 2013 00:27:24 +0200
Subject: Beta?

---
 src/main/resources/boot/CA/ModuleWorkflow.xml     |  2 +-
 src/main/resources/boot/CA/ServerItemWorkflow.xml |  5 +-
 src/main/resources/boot/OD/StateMachine.xsd       | 98 ++++++++++++-----------
 src/main/resources/boot/SM/CompositeActivity.xml  |  4 +-
 src/main/resources/boot/SM/Default.xml            | 10 +--
 src/main/resources/boot/SM/PredefinedStep.xml     |  2 +-
 src/main/resources/boot/allbootitems.txt          |  7 +-
 src/main/resources/boot/property/SMProp.xml       |  5 ++
 8 files changed, 69 insertions(+), 64 deletions(-)
 create mode 100644 src/main/resources/boot/property/SMProp.xml

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

diff --git a/src/main/resources/boot/CA/ModuleWorkflow.xml b/src/main/resources/boot/CA/ModuleWorkflow.xml
index 20ce685..1eb3ee4 100644
--- a/src/main/resources/boot/CA/ModuleWorkflow.xml
+++ b/src/main/resources/boot/CA/ModuleWorkflow.xml
@@ -49,7 +49,7 @@
 				<OutEdgeId>4</OutEdgeId>
 				<Properties>
 					<KeyValuePair Key="Name" String="EditModuleDefinition"/>
-					<KeyValuePair Key="Version" String="0"/>
+					<KeyValuePair Key="Version" Integer="0"/>
 				</Properties>
 				<activityDef>EditModuleDefinition</activityDef>
 			</ActivitySlotDef>
diff --git a/src/main/resources/boot/CA/ServerItemWorkflow.xml b/src/main/resources/boot/CA/ServerItemWorkflow.xml
index 085f8ab..b27b3cb 100644
--- a/src/main/resources/boot/CA/ServerItemWorkflow.xml
+++ b/src/main/resources/boot/CA/ServerItemWorkflow.xml
@@ -24,7 +24,6 @@
 				<OutEdgeId>19</OutEdgeId>
 				<Properties>
 					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
 					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
 				</Properties>
 			</LoopDef>
@@ -39,7 +38,6 @@
 				<OutEdgeId>18</OutEdgeId>
 				<Properties>
 					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
 					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
 				</Properties>
 			</LoopDef>
@@ -78,7 +76,6 @@
 				<OutEdgeId>10</OutEdgeId>
 				<OutEdgeId>11</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
 					<KeyValuePair Key="RoutingScriptName" String=""/>
 				</Properties>
 			</AndSplitDef>
@@ -94,6 +91,7 @@
 					<KeyValuePair Key="Prefill" Boolean="false"/>
 					<KeyValuePair Key="Prefill Version" String="-1"/>
 					<KeyValuePair Key="Name" String="CreateNewAgent"/>
+					<KeyValuePair Key="Version" Integer="0"/>
 				</Properties>
 				<activityDef>CreateNewAgent</activityDef>
 			</ActivitySlotDef>
@@ -109,6 +107,7 @@
 					<KeyValuePair Key="Prefill" Boolean="false"/>
 					<KeyValuePair Key="Prefill Version" String="-1"/>
 					<KeyValuePair Key="Name" String="CreateNewItem"/>
+					<KeyValuePair Key="Version" Integer="0"/>
 				</Properties>
 				<activityDef>CreateNewItem</activityDef>
 			</ActivitySlotDef>
diff --git a/src/main/resources/boot/OD/StateMachine.xsd b/src/main/resources/boot/OD/StateMachine.xsd
index d59070c..a7f8c04 100644
--- a/src/main/resources/boot/OD/StateMachine.xsd
+++ b/src/main/resources/boot/OD/StateMachine.xsd
@@ -1,52 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="StateMachine">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="State" maxOccurs="unbounded">
-            <xs:complexType>
-      <xs:attribute name="id" type="xs:int" use="required"/>
-      <xs:attribute name="name" type="xs:string" use="required"/>
-      <xs:attribute name="finished" type="xs:string"/>
-    </xs:complexType>
-        </xs:element>
-        <xs:element name="Transition" maxOccurs="unbounded">
-    <xs:complexType>
-      <xs:sequence>
-  <xs:element name="Outcome">
-    <xs:complexType>
-      <xs:attribute name="name" 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:int" use="required"/>
-    </xs:complexType>
-  </xs:element>
-      </xs:sequence>
-      <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="target" type="xs:int" use="required"/>
-      <xs:attribute name="enablingProperty" type="xs:string"/>
-      <xs:attribute name="roleOverride" type="xs:string"/>
-      <xs:attribute name="reservation">
-      		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="set"/>
-				<xs:enumeration value="clear"/>
-				<xs:enumeration value="preserve"/>
-			</xs:restriction>
-		</xs:simpleType>
-    </xs:attribute>
-    </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-      <xs:attribute name="initialState" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified">
+	<xs:element name="StateMachine">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="State" maxOccurs="unbounded">
+					<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:boolean" />
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Transition" maxOccurs="unbounded" minOccurs="0">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="Outcome" maxOccurs="1" minOccurs="0">
+								<xs:complexType>
+									<xs:attribute name="name" type="xs:string" use="required" />
+									<xs:attribute name="version" type="xs:string" use="required" />
+									<xs:attribute name="required" type="xs:boolean" use="optional" />
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="Script" maxOccurs="1" minOccurs="0">
+								<xs:complexType>
+									<xs:attribute name="name" type="xs:string" use="required" />
+									<xs:attribute name="version" type="xs:string" use="required" />
+								</xs:complexType>
+							</xs:element>
+						</xs:sequence>
+						<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="target" type="xs:int" use="required" />
+						<xs:attribute name="enablingProperty" type="xs:string" />
+						<xs:attribute name="roleOverride" type="xs:string" />
+						<xs:attribute name="reservation">
+							<xs:simpleType>
+								<xs:restriction base="xs:string">
+									<xs:enumeration value="set" />
+									<xs:enumeration value="clear" />
+									<xs:enumeration value="preserve" />
+								</xs:restriction>
+							</xs:simpleType>
+						</xs:attribute>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+			<xs:attribute name="initialState" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
 </xs:schema>
 
 
diff --git a/src/main/resources/boot/SM/CompositeActivity.xml b/src/main/resources/boot/SM/CompositeActivity.xml
index a713c27..2ed5c4d 100644
--- a/src/main/resources/boot/SM/CompositeActivity.xml
+++ b/src/main/resources/boot/SM/CompositeActivity.xml
@@ -3,8 +3,8 @@
               <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"/>
+              <Transition id="0" name="Start" origin="0" target="1"/>
+              <Transition id="1" name="Complete" origin="1" target="2"/>
 </StateMachine>
 
 
diff --git a/src/main/resources/boot/SM/Default.xml b/src/main/resources/boot/SM/Default.xml
index f074926..893bfe8 100644
--- a/src/main/resources/boot/SM/Default.xml
+++ b/src/main/resources/boot/SM/Default.xml
@@ -4,19 +4,19 @@
               <State id="2" name="Finished" proceeds="true"/>
               <State id="3" name="Suspended"/>
 
-              <Transition id="0" name="Done" origin="0" terminus="2">
+              <Transition id="0" name="Done" origin="0" target="2">
                           <Outcome name="${SchemaType}" version="${SchemaVersion}"/>
                           <Script name="${ScriptName}" version="${ScriptVersion}"/>
               </Transition>
-              <Transition id="1" name="Start" origin="0" terminus="1" reservation="set"/>
-              <Transition id="2" name="Complete" origin="1" terminus="2" reservation="clear">
+              <Transition id="1" name="Start" origin="0" target="1" reservation="set"/>
+              <Transition id="2" name="Complete" origin="1" target="2" reservation="clear">
                           <Outcome name="${SchemaType}" version="${SchemaVersion}"/>
                           <Script name="${ScriptName}" version="${ScriptVersion}"/>              
               </Transition>
-              <Transition id="3" name="Suspend" origin="1" terminus="3">
+              <Transition id="3" name="Suspend" origin="1" target="3">
                           <Outcome name="Errors" version="0"/>
               </Transition>
-              <Transition id="4" name="Resume" origin="3" terminus="1" roleOverride="Admin" reservation="preserve"/>
+              <Transition id="4" name="Resume" origin="3" target="1" roleOverride="Admin" reservation="preserve"/>
 </StateMachine>
 
 
diff --git a/src/main/resources/boot/SM/PredefinedStep.xml b/src/main/resources/boot/SM/PredefinedStep.xml
index 0cc418a..f62fd09 100644
--- a/src/main/resources/boot/SM/PredefinedStep.xml
+++ b/src/main/resources/boot/SM/PredefinedStep.xml
@@ -1,6 +1,6 @@
 <StateMachine initialState="0">
               <State id="0" name="Available"/>
-              <Transition id="0" name="Done" origin="0" terminus="0">
+              <Transition id="0" name="Done" origin="0" target="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 4fdcbdc..194eb61 100644
--- a/src/main/resources/boot/allbootitems.txt
+++ b/src/main/resources/boot/allbootitems.txt
@@ -1,4 +1,6 @@
-
+SM/Default
+SM/PredefinedStep
+SM/CompositeActivity
 OD/CompositeActivityDef
 OD/ElementaryActivityDef
 OD/Module
@@ -10,9 +12,6 @@ OD/Schema
 OD/Script
 OD/Errors
 OD/StateMachine
-SM/Default
-SM/PredefinedStep
-SM/CompositeActivity
 EA/AssignNewVersionFromLast
 EA/EditActivityDef
 EA/EditSchema
diff --git a/src/main/resources/boot/property/SMProp.xml b/src/main/resources/boot/property/SMProp.xml
new file mode 100644
index 0000000..8581e74
--- /dev/null
+++ b/src/main/resources/boot/property/SMProp.xml
@@ -0,0 +1,5 @@
+<AllProperties>
+	<PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
+	<PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="StateMachine" IsMutable="false"/>
+	<PropertyDescription Name="Module" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
+</AllProperties>
-- 
cgit v1.2.3