From d43164830403245353080f5d6f838ed9f56d9a35 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 18 Nov 2013 09:48:03 +0100
Subject: 3.0-SNAPSHOT (Will be first open source version) New StateMachine
 desc IssueID #28

---
 .../resources/boot/CA/ManageCompositeActDef.xml    | 13 +-----
 .../resources/boot/CA/ManageElementaryActDef.xml   |  7 +--
 src/main/resources/boot/CA/ModuleWorkflow.xml      |  2 +-
 src/main/resources/boot/CA/ServerItemWorkflow.xml  |  5 +-
 .../resources/boot/OD/CompositeActivityDef.xsd     | 46 +++++++++---------
 .../resources/boot/OD/ElementaryActivityDef.xsd    |  2 +-
 src/main/resources/boot/OD/StateMachine.xsd        | 54 ++++++++++++++++++++++
 src/main/resources/boot/SM/CompositeActivity.xml   | 11 +++++
 src/main/resources/boot/SM/Default.xml             | 23 +++++++++
 src/main/resources/boot/SM/PredefinedStep.xml      |  9 ++++
 src/main/resources/boot/allbootitems.txt           |  4 ++
 src/main/resources/boot/property/SMProp.xml        |  5 ++
 12 files changed, 136 insertions(+), 45 deletions(-)
 create mode 100644 src/main/resources/boot/OD/StateMachine.xsd
 create mode 100644 src/main/resources/boot/SM/CompositeActivity.xml
 create mode 100644 src/main/resources/boot/SM/Default.xml
 create mode 100644 src/main/resources/boot/SM/PredefinedStep.xml
 create mode 100644 src/main/resources/boot/property/SMProp.xml

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

diff --git a/src/main/resources/boot/CA/ManageCompositeActDef.xml b/src/main/resources/boot/CA/ManageCompositeActDef.xml
index 9eb8bf0..f1def44 100644
--- a/src/main/resources/boot/CA/ManageCompositeActDef.xml
+++ b/src/main/resources/boot/CA/ManageCompositeActDef.xml
@@ -11,8 +11,7 @@
 				<OutEdgeId>20</OutEdgeId>
 				<OutEdgeId>21</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+					<KeyValuePair Key="LastNum" String="2"/>					
 					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
 				</Properties>
 			</LoopDef>
@@ -37,10 +36,7 @@
 				<OutlinePoint x="244" y="51"/>
 				<OutEdgeId>16</OutEdgeId>
 				<OutEdgeId>17</OutEdgeId>
-				<Properties>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
-					<KeyValuePair Key="RoutingScriptName" String=""/>
-				</Properties>
+				<Properties/>
 			</AndSplitDef>
 			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
 				<CentrePoint x="265" y="473"/>
@@ -65,7 +61,6 @@
 				<OutEdgeId>8</OutEdgeId>
 				<Properties>
 					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
 					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
 				</Properties>
 			</LoopDef>
@@ -78,8 +73,6 @@
 				<InEdgeId>18</InEdgeId>
 				<OutEdgeId>19</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Prefill" Boolean="false"/>
-					<KeyValuePair Key="Prefill Version" String="-1"/>
 					<KeyValuePair Key="ViewName" String="CompositeActivityDef"/>
 					<KeyValuePair Key="Name" String="AssignNewActivityVersionFromLast"/>
 				</Properties>
@@ -107,8 +100,6 @@
 				<InEdgeId>24</InEdgeId>
 				<OutEdgeId>25</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Prefill" Boolean="false"/>
-					<KeyValuePair Key="Prefill Version" String="-1"/>
 					<KeyValuePair Key="Name" String="EditDefinition"/>
 					<KeyValuePair Key="SchemaType" String="CompositeActivityDef"/>
 				</Properties>
diff --git a/src/main/resources/boot/CA/ManageElementaryActDef.xml b/src/main/resources/boot/CA/ManageElementaryActDef.xml
index 77baa8e..756fb8a 100644
--- a/src/main/resources/boot/CA/ManageElementaryActDef.xml
+++ b/src/main/resources/boot/CA/ManageElementaryActDef.xml
@@ -12,7 +12,6 @@
 				<OutEdgeId>21</OutEdgeId>
 				<Properties>
 					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
 					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
 				</Properties>
 			</LoopDef>
@@ -49,10 +48,7 @@
 				<OutlinePoint x="244" y="51"/>
 				<OutEdgeId>16</OutEdgeId>
 				<OutEdgeId>17</OutEdgeId>
-				<Properties>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
-					<KeyValuePair Key="RoutingScriptName" String=""/>
-				</Properties>
+				<Properties/>
 			</AndSplitDef>
 			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
 				<CentrePoint x="177" y="359"/>
@@ -65,7 +61,6 @@
 				<OutEdgeId>8</OutEdgeId>
 				<Properties>
 					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
 					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
 				</Properties>
 			</LoopDef>
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/CompositeActivityDef.xsd b/src/main/resources/boot/OD/CompositeActivityDef.xsd
index 0b94df1..2e041cd 100644
--- a/src/main/resources/boot/OD/CompositeActivityDef.xsd
+++ b/src/main/resources/boot/OD/CompositeActivityDef.xsd
@@ -25,7 +25,7 @@
 													<xs:element ref="Properties"/>
 													<xs:element name="activityDef" type="xs:string"/>
 												</xs:sequence>
-												<xs:attribute name="ID" type="xs:byte" use="required"/>
+												<xs:attribute name="ID" type="xs:integer" use="required"/>
 												<xs:attribute name="Name" type="xs:string" use="required"/>
 												<xs:attribute name="Height" type="xs:integer" use="required"/>
 												<xs:attribute name="Width" type="xs:integer" use="required"/>
@@ -42,10 +42,10 @@
 													<xs:element ref="OutEdgeId" minOccurs="0"/>
 													<xs:element ref="Properties"/>
 												</xs:sequence>
-												<xs:attribute name="ID" type="xs:byte" use="required"/>
+												<xs:attribute name="ID" type="xs:integer" use="required"/>
 												<xs:attribute name="Name" type="xs:string" use="required"/>
-												<xs:attribute name="Height" type="xs:byte" use="required"/>
-												<xs:attribute name="Width" type="xs:byte" use="required"/>
+												<xs:attribute name="Height" type="xs:integer" use="required"/>
+												<xs:attribute name="Width" type="xs:integer" use="required"/>
 												<xs:attribute name="IsLayoutable" type="xs:boolean" use="required"/>
 												<xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
 											</xs:complexType>
@@ -59,10 +59,10 @@
 													<xs:element ref="OutEdgeId" maxOccurs="unbounded"/>
 													<xs:element ref="Properties"/>
 												</xs:sequence>
-												<xs:attribute name="ID" type="xs:byte" use="required"/>
+												<xs:attribute name="ID" type="xs:integer" use="required"/>
 												<xs:attribute name="Name" type="xs:string" use="required"/>
-												<xs:attribute name="Height" type="xs:byte" use="required"/>
-												<xs:attribute name="Width" type="xs:byte" use="required"/>
+												<xs:attribute name="Height" type="xs:integer" use="required"/>
+												<xs:attribute name="Width" type="xs:integer" use="required"/>
 												<xs:attribute name="IsLayoutable" type="xs:boolean" use="required"/>
 												<xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
 												<xs:attribute name="isNext" type="xs:boolean" use="required"/>
@@ -85,9 +85,9 @@
 													</xs:element>
 													<xs:element ref="Properties"/>
 												</xs:sequence>
-												<xs:attribute name="ID" type="xs:byte" use="required"/>
-												<xs:attribute name="OriginVertexId" type="xs:byte" use="required"/>
-												<xs:attribute name="TerminusVertexId" type="xs:byte" use="required"/>
+												<xs:attribute name="ID" type="xs:integer" use="required"/>
+												<xs:attribute name="OriginVertexId" type="xs:integer" use="required"/>
+												<xs:attribute name="TerminusVertexId" type="xs:integer" use="required"/>
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="XOrSplitDef">
@@ -99,10 +99,10 @@
 													<xs:element ref="OutEdgeId" maxOccurs="unbounded"/>
 													<xs:element ref="Properties"/>
 												</xs:sequence>
-												<xs:attribute name="ID" type="xs:byte" use="required"/>
+												<xs:attribute name="ID" type="xs:integer" use="required"/>
 												<xs:attribute name="Name" type="xs:string" use="required"/>
-												<xs:attribute name="Height" type="xs:byte" use="required"/>
-												<xs:attribute name="Width" type="xs:byte" use="required"/>
+												<xs:attribute name="Height" type="xs:integer" use="required"/>
+												<xs:attribute name="Width" type="xs:integer" use="required"/>
 												<xs:attribute name="IsLayoutable" type="xs:boolean" use="required"/>
 												<xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
 											</xs:complexType>
@@ -116,10 +116,10 @@
 													<xs:element ref="OutEdgeId" maxOccurs="unbounded"/>
 													<xs:element ref="Properties"/>
 												</xs:sequence>
-												<xs:attribute name="ID" type="xs:byte" use="required"/>
+												<xs:attribute name="ID" type="xs:integer" use="required"/>
 												<xs:attribute name="Name" type="xs:string" use="required"/>
-												<xs:attribute name="Height" type="xs:byte" use="required"/>
-												<xs:attribute name="Width" type="xs:byte" use="required"/>
+												<xs:attribute name="Height" type="xs:integer" use="required"/>
+												<xs:attribute name="Width" type="xs:integer" use="required"/>
 												<xs:attribute name="IsLayoutable" type="xs:boolean" use="required"/>
 												<xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
 											</xs:complexType>
@@ -133,18 +133,18 @@
 													<xs:element ref="OutEdgeId" maxOccurs="unbounded"/>
 													<xs:element ref="Properties"/>
 												</xs:sequence>
-												<xs:attribute name="ID" type="xs:byte" use="required"/>
+												<xs:attribute name="ID" type="xs:integer" use="required"/>
 												<xs:attribute name="Name" type="xs:string" use="required"/>
-												<xs:attribute name="Height" type="xs:byte" use="required"/>
-												<xs:attribute name="Width" type="xs:byte" use="required"/>
+												<xs:attribute name="Height" type="xs:integer" use="required"/>
+												<xs:attribute name="Width" type="xs:integer" use="required"/>
 												<xs:attribute name="IsLayoutable" type="xs:boolean" use="required"/>
 												<xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
 											</xs:complexType>
 										</xs:element>
 									</xs:choice>
 									<xs:attribute name="ClassNameOfVertexOutlineCreator" type="xs:string" use="optional"/>
-									<xs:attribute name="StartVertexId" type="xs:byte" use="required"/>
-									<xs:attribute name="NextId" type="xs:byte" use="required"/>
+									<xs:attribute name="StartVertexId" type="xs:integer" use="required"/>
+									<xs:attribute name="NextId" type="xs:integer" use="required"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>
@@ -161,8 +161,8 @@
 			<xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
 		</xs:complexType>
 	</xs:element>
-	<xs:element name="InEdgeId" type="xs:byte"/>
-	<xs:element name="OutEdgeId" type="xs:byte"/>
+	<xs:element name="InEdgeId" type="xs:integer"/>
+	<xs:element name="OutEdgeId" type="xs:integer"/>
 	<xs:element name="OutlinePoint">
 		<xs:complexType>
 			<xs:attribute name="x" type="xs:short" use="required"/>
diff --git a/src/main/resources/boot/OD/ElementaryActivityDef.xsd b/src/main/resources/boot/OD/ElementaryActivityDef.xsd
index 496ac90..ebe52a0 100644
--- a/src/main/resources/boot/OD/ElementaryActivityDef.xsd
+++ b/src/main/resources/boot/OD/ElementaryActivityDef.xsd
@@ -19,7 +19,7 @@
 					</xs:complexType>
 				</xs:element>
 			</xs:sequence>
-			<xs:attribute name="ID" type="xs:byte" use="required"/>
+			<xs:attribute name="ID" type="xs:integer" use="required"/>
 			<xs:attribute name="Name" type="xs:string" use="required"/>
 			<xs:attribute name="Height" type="xs:integer" use="optional"/>
 			<xs:attribute name="Width" type="xs:integer" use="optional"/>
diff --git a/src/main/resources/boot/OD/StateMachine.xsd b/src/main/resources/boot/OD/StateMachine.xsd
new file mode 100644
index 0000000..a7f8c04
--- /dev/null
+++ b/src/main/resources/boot/OD/StateMachine.xsd
@@ -0,0 +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="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
new file mode 100644
index 0000000..2ed5c4d
--- /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" 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
new file mode 100644
index 0000000..893bfe8
--- /dev/null
+++ b/src/main/resources/boot/SM/Default.xml
@@ -0,0 +1,23 @@
+<StateMachine initialState="0">
+              <State id="0" name="Waiting"/>
+              <State id="1" name="Started"/>
+              <State id="2" name="Finished" proceeds="true"/>
+              <State id="3" name="Suspended"/>
+
+              <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" 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" target="3">
+                          <Outcome name="Errors" version="0"/>
+              </Transition>
+              <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
new file mode 100644
index 0000000..f62fd09
--- /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" 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 8c6e052..194eb61 100644
--- a/src/main/resources/boot/allbootitems.txt
+++ b/src/main/resources/boot/allbootitems.txt
@@ -1,3 +1,6 @@
+SM/Default
+SM/PredefinedStep
+SM/CompositeActivity
 OD/CompositeActivityDef
 OD/ElementaryActivityDef
 OD/Module
@@ -8,6 +11,7 @@ OD/PropertyDescription
 OD/Schema
 OD/Script
 OD/Errors
+OD/StateMachine
 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