From f09e07e3314bb9c0cb7a6da7055ecb01da3ed722 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 11 Apr 2014 17:03:38 +0200
Subject: OutcomeInitiator based description initialization. Absorbs all
 description editing from the kernel. Module.debug functionality missing -
 kernel now creates all imported module descriptions with NoWorkflow. Need a
 way to patch them in later (must be part of this module)

---
 .../c2kernel/dev/DevObjectOutcomeInitiator.java    |  70 +++++++
 .../resources/boot/CA/ManageCompositeActDef.xml    | 208 ++++++++++++++++++++
 .../resources/boot/CA/ManageElementaryActDef.xml   | 208 ++++++++++++++++++++
 src/main/resources/boot/CA/ManageSchema.xml        | 213 ++++++++++++++++++++
 src/main/resources/boot/CA/ManageScript.xml        | 214 +++++++++++++++++++++
 src/main/resources/boot/CA/ManageStateMachine.xml  | 213 ++++++++++++++++++++
 src/main/resources/boot/CA/SchemaFactoryWf.xml     |   3 +-
 src/main/resources/boot/CA/ScriptFactoryWf.xml     |   3 +-
 .../resources/boot/CA/StateMachineFactoryWf.xml    | 113 +++++++++++
 .../resources/boot/EA/AssignNewVersionFromLast.xml |  20 ++
 src/main/resources/boot/EA/EditDefinition.xml      |  14 ++
 src/main/resources/boot/OD/NewLocalObjectDef.xsd   |  24 ---
 .../boot/SC/CreateNewNumberedVersionFromLast.xml   |  31 +++
 .../resources/boot/SC/LocalObjectDefCreator.xml    |  34 +---
 src/main/resources/boot/property/SMProp.xml        |   6 +
 src/main/resources/module.xml                      |  32 ++-
 16 files changed, 1349 insertions(+), 57 deletions(-)
 create mode 100644 src/main/java/com/c2kernel/dev/DevObjectOutcomeInitiator.java
 create mode 100644 src/main/resources/boot/CA/ManageCompositeActDef.xml
 create mode 100644 src/main/resources/boot/CA/ManageElementaryActDef.xml
 create mode 100644 src/main/resources/boot/CA/ManageSchema.xml
 create mode 100644 src/main/resources/boot/CA/ManageScript.xml
 create mode 100644 src/main/resources/boot/CA/ManageStateMachine.xml
 create mode 100644 src/main/resources/boot/CA/StateMachineFactoryWf.xml
 create mode 100644 src/main/resources/boot/EA/AssignNewVersionFromLast.xml
 create mode 100644 src/main/resources/boot/EA/EditDefinition.xml
 delete mode 100644 src/main/resources/boot/OD/NewLocalObjectDef.xsd
 create mode 100644 src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
 create mode 100644 src/main/resources/boot/property/SMProp.xml

(limited to 'src')

diff --git a/src/main/java/com/c2kernel/dev/DevObjectOutcomeInitiator.java b/src/main/java/com/c2kernel/dev/DevObjectOutcomeInitiator.java
new file mode 100644
index 0000000..be0c996
--- /dev/null
+++ b/src/main/java/com/c2kernel/dev/DevObjectOutcomeInitiator.java
@@ -0,0 +1,70 @@
+package com.c2kernel.dev;
+
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.entity.agent.Job;
+import com.c2kernel.entity.proxy.ItemProxy;
+import com.c2kernel.lifecycle.ActivityDef;
+import com.c2kernel.lifecycle.CompositeActivityDef;
+import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;
+import com.c2kernel.lookup.DomainPath;
+import com.c2kernel.persistency.outcome.OutcomeInitiator;
+import com.c2kernel.persistency.outcome.Viewpoint;
+import com.c2kernel.process.Gateway;
+import com.c2kernel.utils.DescriptionObject;
+import com.c2kernel.utils.Logger;
+
+public class DevObjectOutcomeInitiator implements OutcomeInitiator {
+
+	public DevObjectOutcomeInitiator() {
+	}
+
+	@Override
+	public String initOutcome(Job job) throws InvalidDataException {
+		String type = job.getActPropString("SchemaType");
+		
+		// create empty object for activities and state machine
+		DescriptionObject emptyObj = null;
+		if (type.equals("CompositeActivityDef"))
+			emptyObj = new CompositeActivityDef();
+		else if (type.equals("ElementaryActivityDef"))
+			emptyObj = new ActivityDef();
+		else if (type.equals("StateMachine"))
+			emptyObj = new StateMachine();
+		
+		if (emptyObj != null) {
+			try {
+				emptyObj.setName(job.getItemProxy().getName());
+				return Gateway.getMarshaller().marshall(emptyObj);
+			} catch (Exception e) {
+				Logger.error("Error creating empty "+type);
+				Logger.error(e);
+				return null;
+			}
+		}
+			
+		// else load empty one from factory
+		DomainPath factoryPath; String schema;
+		if (type.equals("Schema")) {
+			factoryPath = new DomainPath("/desc/dev/SchemaFactory");
+			schema = "Schema";
+		}
+		else if (type.equals("Script")) {
+			factoryPath = new DomainPath("/desc/dev/ScriptFactory");
+			schema = "Script";
+		}
+		else 
+			throw new InvalidDataException("Unknown dev object type: "+type, "");
+		ItemProxy factory;
+		Viewpoint newInstance;
+		try {
+			factory = (ItemProxy) Gateway.getProxyManager().getProxy(factoryPath);
+			newInstance = factory.getViewpoint(schema, "last");
+			return newInstance.getOutcome().getData();
+		} catch (Exception e) {
+			Logger.error(e);
+			throw new InvalidDataException("Error loading new "+schema);
+		}
+			
+	}
+
+}
diff --git a/src/main/resources/boot/CA/ManageCompositeActDef.xml b/src/main/resources/boot/CA/ManageCompositeActDef.xml
new file mode 100644
index 0000000..ea0655a
--- /dev/null
+++ b/src/main/resources/boot/CA/ManageCompositeActDef.xml
@@ -0,0 +1,208 @@
+<CompositeActivityDef ID="-1" Name="ManageCompositeActDef" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+	<childrenGraphModel>
+		<GraphModelCastorData StartVertexId="13" NextId="26">
+			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
+				<CentrePoint x="358" y="360"/>
+				<OutlinePoint x="328" y="348"/>
+				<OutlinePoint x="388" y="348"/>
+				<OutlinePoint x="388" y="372"/>
+				<OutlinePoint x="328" y="372"/>
+				<InEdgeId>19</InEdgeId>
+				<OutEdgeId>20</OutEdgeId>
+				<OutEdgeId>21</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2"/>					
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="357" y="132"/>
+				<OutlinePoint x="327" y="120"/>
+				<OutlinePoint x="387" y="120"/>
+				<OutlinePoint x="387" y="144"/>
+				<OutlinePoint x="327" y="144"/>
+				<InEdgeId>17</InEdgeId>
+				<InEdgeId>20</InEdgeId>
+				<OutEdgeId>18</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<AndSplitDef ID="13" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="274" y="39"/>
+				<OutlinePoint x="244" y="27"/>
+				<OutlinePoint x="304" y="27"/>
+				<OutlinePoint x="304" y="51"/>
+				<OutlinePoint x="244" y="51"/>
+				<OutEdgeId>16</OutEdgeId>
+				<OutEdgeId>17</OutEdgeId>
+				<Properties/>
+			</AndSplitDef>
+			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="265" y="473"/>
+				<OutlinePoint x="235" y="461"/>
+				<OutlinePoint x="295" y="461"/>
+				<OutlinePoint x="295" y="485"/>
+				<OutlinePoint x="235" y="485"/>
+				<InEdgeId>8</InEdgeId>
+				<InEdgeId>21</InEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
+				<CentrePoint x="177" y="359"/>
+				<OutlinePoint x="147" y="347"/>
+				<OutlinePoint x="207" y="347"/>
+				<OutlinePoint x="207" y="371"/>
+				<OutlinePoint x="147" y="371"/>
+				<InEdgeId>25</InEdgeId>
+				<OutEdgeId>7</OutEdgeId>
+				<OutEdgeId>8</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2"/>
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+				</Properties>
+			</LoopDef>
+			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="270" y="251"/>
+				<OutlinePoint x="205" y="221"/>
+				<OutlinePoint x="335" y="221"/>
+				<OutlinePoint x="335" y="281"/>
+				<OutlinePoint x="205" y="281"/>
+				<InEdgeId>18</InEdgeId>
+				<OutEdgeId>19</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="ViewName" String="CompositeActivityDef"/>
+					<KeyValuePair Key="Name" String="AssignNewActivityVersionFromLast"/>
+				</Properties>
+				<activityDef>AssignNewVersionFromLast</activityDef>
+			</ActivitySlotDef>
+			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="175" y="131"/>
+				<OutlinePoint x="145" y="119"/>
+				<OutlinePoint x="205" y="119"/>
+				<OutlinePoint x="205" y="143"/>
+				<OutlinePoint x="145" y="143"/>
+				<InEdgeId>7</InEdgeId>
+				<InEdgeId>16</InEdgeId>
+				<OutEdgeId>24</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="22" Name="EditDefinition" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="76" y="251"/>
+				<OutlinePoint x="11" y="221"/>
+				<OutlinePoint x="141" y="221"/>
+				<OutlinePoint x="141" y="281"/>
+				<OutlinePoint x="11" y="281"/>
+				<InEdgeId>24</InEdgeId>
+				<OutEdgeId>25</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="EditDefinition"/>
+					<KeyValuePair Key="SchemaType" String="CompositeActivityDef"/>
+				</Properties>
+				<activityDef>EditDefinition</activityDef>
+			</ActivitySlotDef>
+			<NextDef ID="25" OriginVertexId="22" TerminusVertexId="3">
+				<OriginPoint x="76" y="251"/>
+				<TerminusPoint x="177" y="359"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="24" OriginVertexId="2" TerminusVertexId="22">
+				<OriginPoint x="175" y="131"/>
+				<TerminusPoint x="76" y="251"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
+				<OriginPoint x="270" y="251"/>
+				<TerminusPoint x="358" y="360"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="4">
+				<OriginPoint x="358" y="360"/>
+				<TerminusPoint x="265" y="473"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
+				<OriginPoint x="357" y="132"/>
+				<TerminusPoint x="270" y="251"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="20" OriginVertexId="15" TerminusVertexId="14">
+				<OriginPoint x="358" y="360"/>
+				<TerminusPoint x="357" y="132"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
+				<OriginPoint x="177" y="359"/>
+				<TerminusPoint x="265" y="473"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="17" OriginVertexId="13" TerminusVertexId="14">
+				<OriginPoint x="274" y="39"/>
+				<TerminusPoint x="357" y="132"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="16" OriginVertexId="13" TerminusVertexId="2">
+				<OriginPoint x="274" y="39"/>
+				<TerminusPoint x="175" y="131"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
+				<OriginPoint x="177" y="359"/>
+				<TerminusPoint x="175" y="131"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true"/>
+				</Properties>
+			</NextDef>
+		</GraphModelCastorData>
+	</childrenGraphModel>
+	<Properties>
+		<KeyValuePair Key="Expected Time" Integer="0"/>
+		<KeyValuePair Key="Repeatable" Boolean="false"/>
+		<KeyValuePair Key="Has Timeout" Boolean="false"/>
+		<KeyValuePair Key="Time Out Action" Integer="2"/>
+		<KeyValuePair Key="Agent Name" String=""/>
+		<KeyValuePair Key="Autostart" Boolean="true"/>
+		<KeyValuePair Key="Expected Time Unit" Integer="3"/>
+		<KeyValuePair Key="Maximum Time" Integer="0"/>
+		<KeyValuePair Key="Mail Message" String=""/>
+		<KeyValuePair Key="Mail event" String=""/>
+		<KeyValuePair Key="Maximum Time Unit" Integer="3"/>
+		<KeyValuePair Key="Description" String=""/>
+		<KeyValuePair Key="SchemaVersion" String=""/>
+		<KeyValuePair Key="Show time" Boolean="true"/>
+		<KeyValuePair Key="Viewpoint" String=""/>
+		<KeyValuePair Key="Agent Role" String=""/>
+		<KeyValuePair Key="Timeout Activated" Boolean="false"/>
+		<KeyValuePair Key="SchemaType" String=""/>
+		<KeyValuePair Key="ScriptName" String=""/>
+		<KeyValuePair Key="Ignorable" Boolean="false"/>
+		<KeyValuePair Key="ScriptVersion" String=""/>
+		<KeyValuePair Key="Skippable" Boolean="false"/>
+	</Properties>
+</CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ManageElementaryActDef.xml b/src/main/resources/boot/CA/ManageElementaryActDef.xml
new file mode 100644
index 0000000..a1ba712
--- /dev/null
+++ b/src/main/resources/boot/CA/ManageElementaryActDef.xml
@@ -0,0 +1,208 @@
+<CompositeActivityDef ID="-1" Name="ManageElementaryActDef" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+	<childrenGraphModel>
+		<GraphModelCastorData StartVertexId="13" NextId="26">
+			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
+				<CentrePoint x="358" y="360"/>
+				<OutlinePoint x="328" y="348"/>
+				<OutlinePoint x="388" y="348"/>
+				<OutlinePoint x="388" y="372"/>
+				<OutlinePoint x="328" y="372"/>
+				<InEdgeId>19</InEdgeId>
+				<OutEdgeId>20</OutEdgeId>
+				<OutEdgeId>21</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2"/>
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="357" y="132"/>
+				<OutlinePoint x="327" y="120"/>
+				<OutlinePoint x="387" y="120"/>
+				<OutlinePoint x="387" y="144"/>
+				<OutlinePoint x="327" y="144"/>
+				<InEdgeId>17</InEdgeId>
+				<InEdgeId>20</InEdgeId>
+				<OutEdgeId>18</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="265" y="473"/>
+				<OutlinePoint x="235" y="461"/>
+				<OutlinePoint x="295" y="461"/>
+				<OutlinePoint x="295" y="485"/>
+				<OutlinePoint x="235" y="485"/>
+				<InEdgeId>8</InEdgeId>
+				<InEdgeId>21</InEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<AndSplitDef ID="13" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="274" y="39"/>
+				<OutlinePoint x="244" y="27"/>
+				<OutlinePoint x="304" y="27"/>
+				<OutlinePoint x="304" y="51"/>
+				<OutlinePoint x="244" y="51"/>
+				<OutEdgeId>16</OutEdgeId>
+				<OutEdgeId>17</OutEdgeId>
+				<Properties/>
+			</AndSplitDef>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
+				<CentrePoint x="177" y="359"/>
+				<OutlinePoint x="147" y="347"/>
+				<OutlinePoint x="207" y="347"/>
+				<OutlinePoint x="207" y="371"/>
+				<OutlinePoint x="147" y="371"/>
+				<InEdgeId>25</InEdgeId>
+				<OutEdgeId>7</OutEdgeId>
+				<OutEdgeId>8</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2"/>
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="175" y="131"/>
+				<OutlinePoint x="145" y="119"/>
+				<OutlinePoint x="205" y="119"/>
+				<OutlinePoint x="205" y="143"/>
+				<OutlinePoint x="145" y="143"/>
+				<InEdgeId>7</InEdgeId>
+				<InEdgeId>16</InEdgeId>
+				<OutEdgeId>24</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="270" y="251"/>
+				<OutlinePoint x="205" y="221"/>
+				<OutlinePoint x="335" y="221"/>
+				<OutlinePoint x="335" y="281"/>
+				<OutlinePoint x="205" y="281"/>
+				<InEdgeId>18</InEdgeId>
+				<OutEdgeId>19</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="ViewName" String="ElementaryActivityDef"/>
+					<KeyValuePair Key="Name" String="AssignNewActivityVersionFromLast"/>
+				</Properties>
+				<activityDef>AssignNewVersionFromLast</activityDef>
+			</ActivitySlotDef>
+			<ActivitySlotDef ID="22" Name="EditDefinition" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="76" y="251"/>
+				<OutlinePoint x="11" y="221"/>
+				<OutlinePoint x="141" y="221"/>
+				<OutlinePoint x="141" y="281"/>
+				<OutlinePoint x="11" y="281"/>
+				<InEdgeId>24</InEdgeId>
+				<OutEdgeId>25</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="EditDefinition"/>
+					<KeyValuePair Key="SchemaType" String="ElementaryActivityDef"/>
+				</Properties>
+				<activityDef>EditDefinition</activityDef>
+			</ActivitySlotDef>
+			<NextDef ID="25" OriginVertexId="22" TerminusVertexId="3">
+				<OriginPoint x="76" y="251"/>
+				<TerminusPoint x="177" y="359"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="24" OriginVertexId="2" TerminusVertexId="22">
+				<OriginPoint x="175" y="131"/>
+				<TerminusPoint x="76" y="251"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
+				<OriginPoint x="270" y="251"/>
+				<TerminusPoint x="358" y="360"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="4">
+				<OriginPoint x="358" y="360"/>
+				<TerminusPoint x="265" y="473"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
+				<OriginPoint x="357" y="132"/>
+				<TerminusPoint x="270" y="251"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="20" OriginVertexId="15" TerminusVertexId="14">
+				<OriginPoint x="358" y="360"/>
+				<TerminusPoint x="357" y="132"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
+				<OriginPoint x="177" y="359"/>
+				<TerminusPoint x="265" y="473"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="17" OriginVertexId="13" TerminusVertexId="14">
+				<OriginPoint x="274" y="39"/>
+				<TerminusPoint x="357" y="132"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
+				<OriginPoint x="177" y="359"/>
+				<TerminusPoint x="175" y="131"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="16" OriginVertexId="13" TerminusVertexId="2">
+				<OriginPoint x="274" y="39"/>
+				<TerminusPoint x="175" y="131"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+		</GraphModelCastorData>
+	</childrenGraphModel>
+	<Properties>
+		<KeyValuePair Key="Expected Time" Integer="0"/>
+		<KeyValuePair Key="Repeatable" Boolean="false"/>
+		<KeyValuePair Key="Has Timeout" Boolean="false"/>
+		<KeyValuePair Key="Time Out Action" Integer="2"/>
+		<KeyValuePair Key="Agent Name" String=""/>
+		<KeyValuePair Key="Autostart" Boolean="true"/>
+		<KeyValuePair Key="Expected Time Unit" Integer="3"/>
+		<KeyValuePair Key="Maximum Time" Integer="0"/>
+		<KeyValuePair Key="Mail Message" String=""/>
+		<KeyValuePair Key="Mail event" String=""/>
+		<KeyValuePair Key="Maximum Time Unit" Integer="3"/>
+		<KeyValuePair Key="Description" String=""/>
+		<KeyValuePair Key="SchemaVersion" String=""/>
+		<KeyValuePair Key="Show time" Boolean="true"/>
+		<KeyValuePair Key="Viewpoint" String=""/>
+		<KeyValuePair Key="Agent Role" String=""/>
+		<KeyValuePair Key="Timeout Activated" Boolean="false"/>
+		<KeyValuePair Key="SchemaType" String=""/>
+		<KeyValuePair Key="ScriptName" String=""/>
+		<KeyValuePair Key="Ignorable" Boolean="false"/>
+		<KeyValuePair Key="ScriptVersion" String=""/>
+		<KeyValuePair Key="Skippable" Boolean="false"/>
+	</Properties>
+</CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ManageSchema.xml b/src/main/resources/boot/CA/ManageSchema.xml
new file mode 100644
index 0000000..cee6b33
--- /dev/null
+++ b/src/main/resources/boot/CA/ManageSchema.xml
@@ -0,0 +1,213 @@
+<CompositeActivityDef ID="-1" Name="ManageSchema" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+	<childrenGraphModel>
+		<GraphModelCastorData StartVertexId="13" NextId="22">
+			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
+				<CentrePoint x="358" y="360"/>
+				<OutlinePoint x="328" y="348"/>
+				<OutlinePoint x="388" y="348"/>
+				<OutlinePoint x="388" y="372"/>
+				<OutlinePoint x="328" y="372"/>
+				<InEdgeId>19</InEdgeId>
+				<OutEdgeId>20</OutEdgeId>
+				<OutEdgeId>21</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2"/>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="357" y="132"/>
+				<OutlinePoint x="327" y="120"/>
+				<OutlinePoint x="387" y="120"/>
+				<OutlinePoint x="387" y="144"/>
+				<OutlinePoint x="327" y="144"/>
+				<InEdgeId>17</InEdgeId>
+				<InEdgeId>20</InEdgeId>
+				<OutEdgeId>18</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<AndSplitDef ID="13" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="274" y="39"/>
+				<OutlinePoint x="244" y="27"/>
+				<OutlinePoint x="304" y="27"/>
+				<OutlinePoint x="304" y="51"/>
+				<OutlinePoint x="244" y="51"/>
+				<OutEdgeId>16</OutEdgeId>
+				<OutEdgeId>17</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String=""/>
+				</Properties>
+			</AndSplitDef>
+			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="265" y="473"/>
+				<OutlinePoint x="235" y="461"/>
+				<OutlinePoint x="295" y="461"/>
+				<OutlinePoint x="295" y="485"/>
+				<OutlinePoint x="235" y="485"/>
+				<InEdgeId>8</InEdgeId>
+				<InEdgeId>21</InEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
+				<CentrePoint x="177" y="359"/>
+				<OutlinePoint x="147" y="347"/>
+				<OutlinePoint x="207" y="347"/>
+				<OutlinePoint x="207" y="371"/>
+				<OutlinePoint x="147" y="371"/>
+				<InEdgeId>6</InEdgeId>
+				<OutEdgeId>7</OutEdgeId>
+				<OutEdgeId>8</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2"/>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+				</Properties>
+			</LoopDef>
+			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="270" y="251"/>
+				<OutlinePoint x="205" y="221"/>
+				<OutlinePoint x="335" y="221"/>
+				<OutlinePoint x="335" y="281"/>
+				<OutlinePoint x="205" y="281"/>
+				<InEdgeId>18</InEdgeId>
+				<OutEdgeId>19</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="ViewName" String="Schema"/>
+					<KeyValuePair Key="Name" String="AssignNewSchemaVersionFromLast"/>
+				</Properties>
+				<activityDef>AssignNewVersionFromLast</activityDef>
+			</ActivitySlotDef>
+			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="175" y="131"/>
+				<OutlinePoint x="145" y="119"/>
+				<OutlinePoint x="205" y="119"/>
+				<OutlinePoint x="205" y="143"/>
+				<OutlinePoint x="145" y="143"/>
+				<InEdgeId>7</InEdgeId>
+				<InEdgeId>16</InEdgeId>
+				<OutEdgeId>5</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="0" Name="EditDefinition" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="93" y="252"/>
+				<OutlinePoint x="28" y="222"/>
+				<OutlinePoint x="158" y="222"/>
+				<OutlinePoint x="158" y="282"/>
+				<OutlinePoint x="28" y="282"/>
+				<InEdgeId>5</InEdgeId>
+				<OutEdgeId>6</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="SchemaType" String="Schema"/>
+					<KeyValuePair Key="Name" String="EditDefinition"/>
+				</Properties>
+				<activityDef>EditDefinition</activityDef>
+			</ActivitySlotDef>
+			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="4">
+				<OriginPoint x="358" y="360"/>
+				<TerminusPoint x="265" y="473"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
+				<OriginPoint x="270" y="251"/>
+				<TerminusPoint x="358" y="360"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="20" OriginVertexId="15" TerminusVertexId="14">
+				<OriginPoint x="358" y="360"/>
+				<TerminusPoint x="357" y="132"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
+				<OriginPoint x="357" y="132"/>
+				<TerminusPoint x="270" y="251"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
+				<OriginPoint x="177" y="359"/>
+				<TerminusPoint x="265" y="473"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="17" OriginVertexId="13" TerminusVertexId="14">
+				<OriginPoint x="274" y="39"/>
+				<TerminusPoint x="357" y="132"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
+				<OriginPoint x="177" y="359"/>
+				<TerminusPoint x="175" y="131"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="16" OriginVertexId="13" TerminusVertexId="2">
+				<OriginPoint x="274" y="39"/>
+				<TerminusPoint x="175" y="131"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="6" OriginVertexId="0" TerminusVertexId="3">
+				<OriginPoint x="93" y="252"/>
+				<TerminusPoint x="177" y="359"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="5" OriginVertexId="2" TerminusVertexId="0">
+				<OriginPoint x="175" y="131"/>
+				<TerminusPoint x="93" y="252"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+		</GraphModelCastorData>
+	</childrenGraphModel>
+	<Properties>
+		<KeyValuePair Key="Expected Time" Integer="0"/>
+		<KeyValuePair Key="Repeatable" Boolean="false"/>
+		<KeyValuePair Key="Has Timeout" Boolean="false"/>
+		<KeyValuePair Key="Time Out Action" Integer="2"/>
+		<KeyValuePair Key="Agent Name" String=""/>
+		<KeyValuePair Key="Autostart" Boolean="true"/>
+		<KeyValuePair Key="Expected Time Unit" Integer="3"/>
+		<KeyValuePair Key="Maximum Time" Integer="0"/>
+		<KeyValuePair Key="Mail Message" String=""/>
+		<KeyValuePair Key="Mail event" String=""/>
+		<KeyValuePair Key="Maximum Time Unit" Integer="3"/>
+		<KeyValuePair Key="Description" String=""/>
+		<KeyValuePair Key="SchemaVersion" String=""/>
+		<KeyValuePair Key="Show time" Boolean="true"/>
+		<KeyValuePair Key="Viewpoint" String=""/>
+		<KeyValuePair Key="Agent Role" String=""/>
+		<KeyValuePair Key="Timeout Activated" Boolean="false"/>
+		<KeyValuePair Key="SchemaType" String=""/>
+		<KeyValuePair Key="ScriptName" String=""/>
+		<KeyValuePair Key="Ignorable" Boolean="false"/>
+		<KeyValuePair Key="ScriptVersion" String=""/>
+		<KeyValuePair Key="Skippable" Boolean="false"/>
+	</Properties>
+</CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ManageScript.xml b/src/main/resources/boot/CA/ManageScript.xml
new file mode 100644
index 0000000..f42d1b7
--- /dev/null
+++ b/src/main/resources/boot/CA/ManageScript.xml
@@ -0,0 +1,214 @@
+<CompositeActivityDef ID="-1" Name="ManageScript" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+	<childrenGraphModel>
+		<GraphModelCastorData StartVertexId="11" NextId="27">
+			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
+				<CentrePoint x="425" y="291"/>
+				<OutlinePoint x="395" y="279"/>
+				<OutlinePoint x="455" y="279"/>
+				<OutlinePoint x="455" y="303"/>
+				<OutlinePoint x="395" y="303"/>
+				<InEdgeId>24</InEdgeId>
+				<OutEdgeId>25</OutEdgeId>
+				<OutEdgeId>26</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2"/>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+				</Properties>
+			</LoopDef>
+			<LoopDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
+				<CentrePoint x="184" y="289"/>
+				<OutlinePoint x="154" y="277"/>
+				<OutlinePoint x="214" y="277"/>
+				<OutlinePoint x="214" y="301"/>
+				<OutlinePoint x="154" y="301"/>
+				<InEdgeId>21</InEdgeId>
+				<OutEdgeId>22</OutEdgeId>
+				<OutEdgeId>23</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2"/>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="13" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="425" y="80"/>
+				<OutlinePoint x="395" y="68"/>
+				<OutlinePoint x="455" y="68"/>
+				<OutlinePoint x="455" y="92"/>
+				<OutlinePoint x="395" y="92"/>
+				<InEdgeId>18</InEdgeId>
+				<InEdgeId>25</InEdgeId>
+				<OutEdgeId>20</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<JoinDef ID="12" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="184" y="80"/>
+				<OutlinePoint x="154" y="68"/>
+				<OutlinePoint x="214" y="68"/>
+				<OutlinePoint x="214" y="92"/>
+				<OutlinePoint x="154" y="92"/>
+				<InEdgeId>17</InEdgeId>
+				<InEdgeId>23</InEdgeId>
+				<OutEdgeId>19</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<AndSplitDef ID="11" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="305" y="26"/>
+				<OutlinePoint x="275" y="14"/>
+				<OutlinePoint x="335" y="14"/>
+				<OutlinePoint x="335" y="38"/>
+				<OutlinePoint x="275" y="38"/>
+				<OutEdgeId>17</OutEdgeId>
+				<OutEdgeId>18</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String=""/>
+				</Properties>
+			</AndSplitDef>
+			<ActivitySlotDef ID="0" Name="EditDefinition" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="115" y="182"/>
+				<OutlinePoint x="50" y="152"/>
+				<OutlinePoint x="180" y="152"/>
+				<OutlinePoint x="180" y="212"/>
+				<OutlinePoint x="50" y="212"/>
+				<InEdgeId>19</InEdgeId>
+				<OutEdgeId>21</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="SchemaType" String="Script"/>
+					<KeyValuePair Key="Name" String="EditDefinition"/>
+				</Properties>
+				<activityDef>EditDefinition</activityDef>
+			</ActivitySlotDef>
+			<ActivitySlotDef ID="9" Name="AssignNewVersionFromLast_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="344" y="184"/>
+				<OutlinePoint x="279" y="154"/>
+				<OutlinePoint x="409" y="154"/>
+				<OutlinePoint x="409" y="214"/>
+				<OutlinePoint x="279" y="214"/>
+				<InEdgeId>20</InEdgeId>
+				<OutEdgeId>24</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="ViewName" String="Script"/>
+					<KeyValuePair Key="Name" String="AssignNewVersionFromLast"/>
+				</Properties>
+				<activityDef>AssignNewVersionFromLast</activityDef>
+			</ActivitySlotDef>
+			<JoinDef ID="16" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="293" y="399"/>
+				<OutlinePoint x="263" y="387"/>
+				<OutlinePoint x="323" y="387"/>
+				<OutlinePoint x="323" y="411"/>
+				<OutlinePoint x="263" y="411"/>
+				<InEdgeId>22</InEdgeId>
+				<InEdgeId>26</InEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<NextDef ID="26" OriginVertexId="15" TerminusVertexId="16">
+				<OriginPoint x="425" y="291"/>
+				<TerminusPoint x="293" y="399"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="25" OriginVertexId="15" TerminusVertexId="13">
+				<OriginPoint x="425" y="291"/>
+				<TerminusPoint x="425" y="80"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="24" OriginVertexId="9" TerminusVertexId="15">
+				<OriginPoint x="344" y="184"/>
+				<TerminusPoint x="425" y="291"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="23" OriginVertexId="14" TerminusVertexId="12">
+				<OriginPoint x="184" y="289"/>
+				<TerminusPoint x="184" y="80"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="22" OriginVertexId="14" TerminusVertexId="16">
+				<OriginPoint x="184" y="289"/>
+				<TerminusPoint x="293" y="399"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="19" OriginVertexId="12" TerminusVertexId="0">
+				<OriginPoint x="184" y="80"/>
+				<TerminusPoint x="115" y="182"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="21" OriginVertexId="0" TerminusVertexId="14">
+				<OriginPoint x="115" y="182"/>
+				<TerminusPoint x="184" y="289"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="20" OriginVertexId="13" TerminusVertexId="9">
+				<OriginPoint x="425" y="80"/>
+				<TerminusPoint x="344" y="184"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="18" OriginVertexId="11" TerminusVertexId="13">
+				<OriginPoint x="305" y="26"/>
+				<TerminusPoint x="425" y="80"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="17" OriginVertexId="11" TerminusVertexId="12">
+				<OriginPoint x="305" y="26"/>
+				<TerminusPoint x="184" y="80"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+		</GraphModelCastorData>
+	</childrenGraphModel>
+	<Properties>
+		<KeyValuePair Key="Expected Time" Integer="0"/>
+		<KeyValuePair Key="Has Timeout" Boolean="false"/>
+		<KeyValuePair Key="Repeatable" Boolean="false"/>
+		<KeyValuePair Key="Time Out Action" Integer="2"/>
+		<KeyValuePair Key="Agent Name" String=""/>
+		<KeyValuePair Key="Expected Time Unit" Integer="3"/>
+		<KeyValuePair Key="Autostart" Boolean="true"/>
+		<KeyValuePair Key="Maximum Time" Integer="0"/>
+		<KeyValuePair Key="Mail Message" String=""/>
+		<KeyValuePair Key="Mail event" String=""/>
+		<KeyValuePair Key="Maximum Time Unit" Integer="3"/>
+		<KeyValuePair Key="Description" String=""/>
+		<KeyValuePair Key="SchemaVersion" String=""/>
+		<KeyValuePair Key="Prefill" Boolean="false"/>
+		<KeyValuePair Key="Show time" Boolean="true"/>
+		<KeyValuePair Key="Agent Role" String=""/>
+		<KeyValuePair Key="Viewpoint" String=""/>
+		<KeyValuePair Key="Timeout Activated" Boolean="false"/>
+		<KeyValuePair Key="SchemaType" String=""/>
+		<KeyValuePair Key="Ignorable" Boolean="false"/>
+		<KeyValuePair Key="ScriptName" String=""/>
+		<KeyValuePair Key="Skippable" Boolean="false"/>
+		<KeyValuePair Key="ScriptVersion" String=""/>
+	</Properties>
+</CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ManageStateMachine.xml b/src/main/resources/boot/CA/ManageStateMachine.xml
new file mode 100644
index 0000000..16b5de7
--- /dev/null
+++ b/src/main/resources/boot/CA/ManageStateMachine.xml
@@ -0,0 +1,213 @@
+<CompositeActivityDef ID="-1" Name="ManageStateMachine" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+	<childrenGraphModel>
+		<GraphModelCastorData StartVertexId="13" NextId="22">
+			<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
+				<CentrePoint x="358" y="360"/>
+				<OutlinePoint x="328" y="348"/>
+				<OutlinePoint x="388" y="348"/>
+				<OutlinePoint x="388" y="372"/>
+				<OutlinePoint x="328" y="372"/>
+				<InEdgeId>19</InEdgeId>
+				<OutEdgeId>20</OutEdgeId>
+				<OutEdgeId>21</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2"/>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+				</Properties>
+			</LoopDef>
+			<JoinDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="357" y="132"/>
+				<OutlinePoint x="327" y="120"/>
+				<OutlinePoint x="387" y="120"/>
+				<OutlinePoint x="387" y="144"/>
+				<OutlinePoint x="327" y="144"/>
+				<InEdgeId>17</InEdgeId>
+				<InEdgeId>20</InEdgeId>
+				<OutEdgeId>18</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<AndSplitDef ID="13" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="274" y="39"/>
+				<OutlinePoint x="244" y="27"/>
+				<OutlinePoint x="304" y="27"/>
+				<OutlinePoint x="304" y="51"/>
+				<OutlinePoint x="244" y="51"/>
+				<OutEdgeId>16</OutEdgeId>
+				<OutEdgeId>17</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String=""/>
+				</Properties>
+			</AndSplitDef>
+			<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="265" y="473"/>
+				<OutlinePoint x="235" y="461"/>
+				<OutlinePoint x="295" y="461"/>
+				<OutlinePoint x="295" y="485"/>
+				<OutlinePoint x="235" y="485"/>
+				<InEdgeId>8</InEdgeId>
+				<InEdgeId>21</InEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
+				<CentrePoint x="177" y="359"/>
+				<OutlinePoint x="147" y="347"/>
+				<OutlinePoint x="207" y="347"/>
+				<OutlinePoint x="207" y="371"/>
+				<OutlinePoint x="147" y="371"/>
+				<InEdgeId>6</InEdgeId>
+				<OutEdgeId>7</OutEdgeId>
+				<OutEdgeId>8</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2"/>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+				</Properties>
+			</LoopDef>
+			<ActivitySlotDef ID="11" Name="AssignNewVersionFromLast_" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="270" y="251"/>
+				<OutlinePoint x="205" y="221"/>
+				<OutlinePoint x="335" y="221"/>
+				<OutlinePoint x="335" y="281"/>
+				<OutlinePoint x="205" y="281"/>
+				<InEdgeId>18</InEdgeId>
+				<OutEdgeId>19</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="ViewName" String="StateMachine"/>
+					<KeyValuePair Key="Name" String="AssignNewSchemaVersionFromLast"/>
+				</Properties>
+				<activityDef>AssignNewVersionFromLast</activityDef>
+			</ActivitySlotDef>
+			<JoinDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="175" y="131"/>
+				<OutlinePoint x="145" y="119"/>
+				<OutlinePoint x="205" y="119"/>
+				<OutlinePoint x="205" y="143"/>
+				<OutlinePoint x="145" y="143"/>
+				<InEdgeId>7</InEdgeId>
+				<InEdgeId>16</InEdgeId>
+				<OutEdgeId>5</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
+			<ActivitySlotDef ID="0" Name="EditDefinition" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="93" y="252"/>
+				<OutlinePoint x="28" y="222"/>
+				<OutlinePoint x="158" y="222"/>
+				<OutlinePoint x="158" y="282"/>
+				<OutlinePoint x="28" y="282"/>
+				<InEdgeId>5</InEdgeId>
+				<OutEdgeId>6</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="SchemaType" String="StateMachine"/>
+					<KeyValuePair Key="Name" String="EditDefinition"/>
+				</Properties>
+				<activityDef>EditDefinition</activityDef>
+			</ActivitySlotDef>
+			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="4">
+				<OriginPoint x="358" y="360"/>
+				<TerminusPoint x="265" y="473"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="19" OriginVertexId="11" TerminusVertexId="15">
+				<OriginPoint x="270" y="251"/>
+				<TerminusPoint x="358" y="360"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="20" OriginVertexId="15" TerminusVertexId="14">
+				<OriginPoint x="358" y="360"/>
+				<TerminusPoint x="357" y="132"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="18" OriginVertexId="14" TerminusVertexId="11">
+				<OriginPoint x="357" y="132"/>
+				<TerminusPoint x="270" y="251"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="8" OriginVertexId="3" TerminusVertexId="4">
+				<OriginPoint x="177" y="359"/>
+				<TerminusPoint x="265" y="473"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="false"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="17" OriginVertexId="13" TerminusVertexId="14">
+				<OriginPoint x="274" y="39"/>
+				<TerminusPoint x="357" y="132"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="2">
+				<OriginPoint x="177" y="359"/>
+				<TerminusPoint x="175" y="131"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="16" OriginVertexId="13" TerminusVertexId="2">
+				<OriginPoint x="274" y="39"/>
+				<TerminusPoint x="175" y="131"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="6" OriginVertexId="0" TerminusVertexId="3">
+				<OriginPoint x="93" y="252"/>
+				<TerminusPoint x="177" y="359"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="5" OriginVertexId="2" TerminusVertexId="0">
+				<OriginPoint x="175" y="131"/>
+				<TerminusPoint x="93" y="252"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+		</GraphModelCastorData>
+	</childrenGraphModel>
+	<Properties>
+		<KeyValuePair Key="Expected Time" Integer="0"/>
+		<KeyValuePair Key="Repeatable" Boolean="false"/>
+		<KeyValuePair Key="Has Timeout" Boolean="false"/>
+		<KeyValuePair Key="Time Out Action" Integer="2"/>
+		<KeyValuePair Key="Agent Name" String=""/>
+		<KeyValuePair Key="Autostart" Boolean="true"/>
+		<KeyValuePair Key="Expected Time Unit" Integer="3"/>
+		<KeyValuePair Key="Maximum Time" Integer="0"/>
+		<KeyValuePair Key="Mail Message" String=""/>
+		<KeyValuePair Key="Mail event" String=""/>
+		<KeyValuePair Key="Maximum Time Unit" Integer="3"/>
+		<KeyValuePair Key="Description" String=""/>
+		<KeyValuePair Key="SchemaVersion" String=""/>
+		<KeyValuePair Key="Show time" Boolean="true"/>
+		<KeyValuePair Key="Viewpoint" String=""/>
+		<KeyValuePair Key="Agent Role" String=""/>
+		<KeyValuePair Key="Timeout Activated" Boolean="false"/>
+		<KeyValuePair Key="SchemaType" String=""/>
+		<KeyValuePair Key="ScriptName" String=""/>
+		<KeyValuePair Key="Ignorable" Boolean="false"/>
+		<KeyValuePair Key="ScriptVersion" String=""/>
+		<KeyValuePair Key="Skippable" Boolean="false"/>
+	</Properties>
+</CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/SchemaFactoryWf.xml b/src/main/resources/boot/CA/SchemaFactoryWf.xml
index 9b709fd..fc5928b 100644
--- a/src/main/resources/boot/CA/SchemaFactoryWf.xml
+++ b/src/main/resources/boot/CA/SchemaFactoryWf.xml
@@ -54,8 +54,9 @@
 				<Properties>
 					<KeyValuePair Key="Name" String="EditEmptySchema" />
 					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="SchemaType" String="Schema" />
 				</Properties>
-				<activityDef>EditSchema</activityDef>
+				<activityDef>EditDefinition</activityDef>
 			</ActivitySlotDef>
 			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true"
 				IsComposite="false" isNext="0">
diff --git a/src/main/resources/boot/CA/ScriptFactoryWf.xml b/src/main/resources/boot/CA/ScriptFactoryWf.xml
index 0eb7cb6..7f2e203 100644
--- a/src/main/resources/boot/CA/ScriptFactoryWf.xml
+++ b/src/main/resources/boot/CA/ScriptFactoryWf.xml
@@ -101,8 +101,9 @@
 				<Properties>
 					<KeyValuePair Key="Name" String="EditEmptyScript" />
 					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="SchemaType" String="Script" />
 				</Properties>
-				<activityDef>EditScriptDefinition</activityDef>
+				<activityDef>EditDefinition</activityDef>
 			</ActivitySlotDef>
 			<LoopDef ID="16" Name="" Height="24" Width="60" IsLayoutable="true"
 				IsComposite="false" isNext="0">
diff --git a/src/main/resources/boot/CA/StateMachineFactoryWf.xml b/src/main/resources/boot/CA/StateMachineFactoryWf.xml
new file mode 100644
index 0000000..07a5af1
--- /dev/null
+++ b/src/main/resources/boot/CA/StateMachineFactoryWf.xml
@@ -0,0 +1,113 @@
+<CompositeActivityDef ID="-1" Name="StateMachineFactoryWf"
+	Height="0" Width="0" IsLayoutable="false" IsComposite="true">
+	<childrenGraphModel>
+		<GraphModelCastorData
+			ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"
+			StartVertexId="5" NextId="14">
+			<JoinDef ID="6" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="321" y="325" />
+				<OutlinePoint x="291" y="313" />
+				<OutlinePoint x="351" y="313" />
+				<OutlinePoint x="351" y="337" />
+				<OutlinePoint x="291" y="337" />
+				<InEdgeId>9</InEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<JoinDef ID="5" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false">
+				<CentrePoint x="321" y="92" />
+				<OutlinePoint x="291" y="80" />
+				<OutlinePoint x="351" y="80" />
+				<OutlinePoint x="351" y="104" />
+				<OutlinePoint x="291" y="104" />
+				<InEdgeId>7</InEdgeId>
+				<OutEdgeId>12</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join" />
+				</Properties>
+			</JoinDef>
+			<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true"
+				IsComposite="false" isNext="0">
+				<CentrePoint x="321" y="211" />
+				<OutlinePoint x="291" y="199" />
+				<OutlinePoint x="351" y="199" />
+				<OutlinePoint x="351" y="223" />
+				<OutlinePoint x="291" y="223" />
+				<InEdgeId>13</InEdgeId>
+				<OutEdgeId>7</OutEdgeId>
+				<OutEdgeId>9</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2" />
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;" />
+				</Properties>
+			</LoopDef>
+			<ActivitySlotDef ID="10" Name="CreateNewStateMachineDef"
+				Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="133" y="215" />
+				<OutlinePoint x="68" y="185" />
+				<OutlinePoint x="198" y="185" />
+				<OutlinePoint x="198" y="245" />
+				<OutlinePoint x="68" y="245" />
+				<InEdgeId>12</InEdgeId>
+				<OutEdgeId>13</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Name" String="CreateNewStateMachineDef" />
+					<KeyValuePair Key="Version" Integer="0" />
+					<KeyValuePair Key="NewType" String="SM" />
+				</Properties>
+				<activityDef>CreateNewLocalObjectDef</activityDef>
+			</ActivitySlotDef>
+			<NextDef ID="13" OriginVertexId="10" TerminusVertexId="3">
+				<OriginPoint x="133" y="215" />
+				<TerminusPoint x="321" y="211" />
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="12" OriginVertexId="5" TerminusVertexId="10">
+				<OriginPoint x="321" y="92" />
+				<TerminusPoint x="133" y="215" />
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="9" OriginVertexId="3" TerminusVertexId="6">
+				<OriginPoint x="321" y="211" />
+				<TerminusPoint x="321" y="325" />
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight" />
+					<KeyValuePair Key="Alias" String="false" />
+				</Properties>
+			</NextDef>
+			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="5">
+				<OriginPoint x="321" y="211" />
+				<TerminusPoint x="321" y="92" />
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight" />
+					<KeyValuePair Key="Alias" String="true" />
+				</Properties>
+			</NextDef>
+		</GraphModelCastorData>
+	</childrenGraphModel>
+	<Properties>
+		<KeyValuePair Key="Repeatable" Boolean="false" />
+		<KeyValuePair Key="Agent Name" String="" />
+		<KeyValuePair Key="Autostart" Boolean="true" />
+		<KeyValuePair Key="Mail Message" String="" />
+		<KeyValuePair Key="Mail event" String="" />
+		<KeyValuePair Key="Description" String="" />
+		<KeyValuePair Key="SchemaVersion" String="" />
+		<KeyValuePair Key="Show time" Boolean="true" />
+		<KeyValuePair Key="Viewpoint" String="" />
+		<KeyValuePair Key="Agent Role" String="" />
+		<KeyValuePair Key="SchemaType" String="" />
+		<KeyValuePair Key="ScriptName" String="" />
+		<KeyValuePair Key="Ignorable" Boolean="false" />
+		<KeyValuePair Key="ScriptVersion" String="" />
+		<KeyValuePair Key="Skippable" Boolean="false" />
+	</Properties>
+	<castorNonLayoutableChildren>CreateNewLocalObjectDef</castorNonLayoutableChildren>
+</CompositeActivityDef>
diff --git a/src/main/resources/boot/EA/AssignNewVersionFromLast.xml b/src/main/resources/boot/EA/AssignNewVersionFromLast.xml
new file mode 100644
index 0000000..248dfee
--- /dev/null
+++ b/src/main/resources/boot/EA/AssignNewVersionFromLast.xml
@@ -0,0 +1,20 @@
+<ActivityDef ID="10" Name="AssignNewVersionFromLast" Height="0" Width="0" IsLayoutable="false" IsComposite="false">
+	<Properties>
+		<KeyValuePair Key="Repeatable" Boolean="false"/>
+		<KeyValuePair Key="Agent Name" String=""/>
+		<KeyValuePair Key="Autostart" Boolean="true"/>
+		<KeyValuePair Key="Mail Message" String=""/>
+		<KeyValuePair Key="Mail event" String=""/>
+		<KeyValuePair Key="Description" String="Creates a new numbered viewpoint as a clone of the last for use in workflows. You can change the specific outcome referenced by this viewpoint in the Data Viewer."/>
+		<KeyValuePair Key="SchemaVersion" String=""/>
+		<KeyValuePair Key="Show time" Boolean="true"/>
+		<KeyValuePair Key="Viewpoint" String=""/>
+		<KeyValuePair Key="Agent Role" String="Admin"/>
+		<KeyValuePair Key="SchemaType" String=""/>
+		<KeyValuePair Key="ScriptName" String="CreateNewNumberedVersionFromLast"/>
+		<KeyValuePair Key="Ignorable" Boolean="false"/>
+		<KeyValuePair Key="ScriptVersion" String="0"/>
+		<KeyValuePair Key="Skippable" Boolean="false"/>
+		<KeyValuePair Key="ViewName" String=""/>
+	</Properties>
+</ActivityDef>
diff --git a/src/main/resources/boot/EA/EditDefinition.xml b/src/main/resources/boot/EA/EditDefinition.xml
new file mode 100644
index 0000000..8fbe25b
--- /dev/null
+++ b/src/main/resources/boot/EA/EditDefinition.xml
@@ -0,0 +1,14 @@
+<ActivityDef ID="23" Name="EditActivityDef" Height="0" Width="0" IsLayoutable="false" IsComposite="false">
+	<Properties>
+		<KeyValuePair Key="Description" String="Edit this Definition"/>
+		<KeyValuePair Key="Show time" Boolean="true"/>
+		<KeyValuePair Key="OutcomeInit" String="Dev"/>
+		<KeyValuePair Key="Viewpoint" String="last"/>
+		<KeyValuePair Key="Agent Name" String=""/>
+		<KeyValuePair Key="Agent Role" String="Admin"/>
+		<KeyValuePair Key="SchemaType" String=""/>
+		<KeyValuePair Key="SchemaVersion" String="0"/>
+		<KeyValuePair Key="ScriptName" String=""/>
+		<KeyValuePair Key="ScriptVersion" String=""/>
+	</Properties>
+</ActivityDef>
diff --git a/src/main/resources/boot/OD/NewLocalObjectDef.xsd b/src/main/resources/boot/OD/NewLocalObjectDef.xsd
deleted file mode 100644
index 2df4037..0000000
--- a/src/main/resources/boot/OD/NewLocalObjectDef.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2006 sp1 U (http://www.altova.com) by Andrew Branson 
-	(CERN) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="NewLocalObjectDef">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="ObjectName" type="xs:string">
-					<xs:annotation>
-						<xs:documentation>Please give a name for your new object.
-						</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="SubFolder" type="xs:string">
-					<xs:annotation>
-						<xs:documentation>If you want to store your object in a subfolder,
-							give the subpath here.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml b/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
new file mode 100644
index 0000000..7a63b76
--- /dev/null
+++ b/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cristalscript>
+	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+	<script language="javascript" name="CreateNewNumberedVersionFromLast"><![CDATA[
+
+		var viewName = job.getActPropString("ViewName");
+		
+		if (viewName.equals("")) 
+			throw "ViewName not specified. Cannot create new version.";
+			
+		var lastView = -1;
+		var existingViews = item.getContents("/ViewPoint/"+viewName);
+		for (i=0; i<existingViews.length; i++) {
+			var thisView = parseInt(existingViews[i]);
+			if (thisView!=NaN && lastView < thisView) lastView = thisView;
+		}
+		lastView++;
+		try {
+			var existingLast = agent.unmarshall(item.queryData("/ViewPoint/"+viewName+"/last"));
+		} catch (e) {
+			throw "No data found. You must submit at least one version before executing this activity.";
+		}
+		
+		var params = new Array(3);
+		params[0] = viewName;
+		params[1] = lastView;
+		params[2] = existingLast.getEventId();
+		agent.execute(item, "WriteViewpoint", params);
+
+		]]></script>
+</cristalscript>
diff --git a/src/main/resources/boot/SC/LocalObjectDefCreator.xml b/src/main/resources/boot/SC/LocalObjectDefCreator.xml
index de082dc..28eac12 100644
--- a/src/main/resources/boot/SC/LocalObjectDefCreator.xml
+++ b/src/main/resources/boot/SC/LocalObjectDefCreator.xml
@@ -2,16 +2,17 @@
 <cristalscript>
 	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />
 	<script language="javascript" name="LocalObjectDefCreator"><![CDATA[
-		importClass(Packages.com.c2kernel.process.Gateway);
-		importClass(Packages.com.c2kernel.process.Bootstrap);
-		importClass(Packages.com.c2kernel.lifecycle.CompositeActivityDef);
-		importClass(Packages.com.c2kernel.lifecycle.ActivityDef);
+		importClass(com.c2kernel.process.Gateway);
+		importClass(com.c2kernel.process.Bootstrap);
+		importClass(com.c2kernel.lifecycle.CompositeActivityDef);
+		importClass(com.c2kernel.lifecycle.ActivityDef);
+		importClass(com.c2kernel.process.resource.DefaultResourceImportHandler);
 	
-		var type = job.getActPropString("NewType");
 		var name = job.getOutcome().getField("ObjectName");
 		var folder = job.getOutcome().getField("SubFolder");
+		var handler = new DefaultResourceImportHandler(job.getActPropString("NewType"));
 		// Find the root of that object type
-		var domPath = Bootstrap.getTypeRoot(type).toString();
+		var domPath = handler.getTypeRoot();
 		if (folder != null) domPath = domPath + "/" + folder;
 		
 		var params = new Array(2);
@@ -24,26 +25,7 @@
 		} catch (e) {
 			throw "Could not create "+name+": "+e.message;
 		}
-		
-		// Store a fresh one in the new item
-
-		var newObj;
-		// Activities are serialized new instances
-		if (type.equals("EA") || type.equals("CA")) {
-			var newAct = type.equals("CA")?new CompositeActivityDef(): new ActivityDef();
-			newAct.setName(name);
-			newObj = Gateway.getMarshaller().marshall(newAct);
-			}
-		else { 
-			// Empty schemas and scripts are stored as outcomes of the factory.
-			var fileType = type.equals("OD")?"Schema":"Script";
-			newObj = item.getObject("/ViewPoint/"+fileType+"/last").getOutcome().getData();
-		}
-		// Store the new object with the 'EditDefinition' activity
-		var newPath = new Packages.com.c2kernel.lookup.DomainPath(domPath+"/"+name);
-		var newItem = agent.getItem(newPath);
-		newItem.requestAction(agent.getSystemKey(), "workflow/domain/EditDefinition", 0, newObj);
-		
+				
 		// If this script is running in the Cristal GUI, open the new item.
 		try {
 			var tree = Packages.com.c2kernel.gui.MainFrame.treeBrowser;
diff --git a/src/main/resources/boot/property/SMProp.xml b/src/main/resources/boot/property/SMProp.xml
new file mode 100644
index 0000000..6705443
--- /dev/null
+++ b/src/main/resources/boot/property/SMProp.xml
@@ -0,0 +1,6 @@
+<AllProperties>
+	<PropertyDescription Name="Name" IsClassIdentifier="false"
+		DefaultValue="" IsMutable="true" />
+	<PropertyDescription Name="Type" IsClassIdentifier="true"
+		DefaultValue="StateMachine" IsMutable="false" />
+</AllProperties>
diff --git a/src/main/resources/module.xml b/src/main/resources/module.xml
index ebcd1b7..1e9cc73 100644
--- a/src/main/resources/module.xml
+++ b/src/main/resources/module.xml
@@ -6,18 +6,27 @@
 	</Info>
 	<ResourceURL>uk/ac/uwe/cristaldev/resources/</ResourceURL>
     <Config name="Module.debug">true</Config>
+    <Config name="OutcomeInit.Dev">com.c2kernel.dev.DevObjectOutcomeInitiator</Config>
 	<Imports>
-		<Resource name="NewLocalObjectDef" version="0" type="OD">boot/OD/NewLocalObjectDef.xsd</Resource>
 		<Resource name="NewDevObjectDef" version="0" type="OD">boot/OD/NewDevObjectDef.xsd</Resource>
 		<Resource name="ChooseWorkflow" version="0" type="OD">boot/OD/ChooseWorkflow.xsd</Resource>
 		<Resource name="CreateNewLocalObjectDef" version="0" type="EA">boot/EA/CreateNewLocalObjectDef.xml</Resource>
 		<Resource name="EditPropertyDescription" version="0" type="EA">boot/EA/EditPropertyDescription.xml</Resource>
 		<Resource name="CreateItem" version="0" type="EA">boot/EA/CreateItem.xml</Resource>
 		<Resource name="SetInstanceWorkflow" version="0" type="EA">boot/EA/SetInstanceWorkflow.xml</Resource>
+		<Resource name="CreateNewNumberedVersionFromLast" version="0" type="SC">boot/SC/CreateNewNumberedVersionFromLast.xml</Resource>
+		<Resource name="AssignNewVersionFromLast" version="0" type="EA">boot/EA/AssignNewVersionFromLast.xml</Resource>
+		<Resource name="EditDefinition" version="0" type="EA">boot/EA/EditDefinition.xml</Resource>
+		<Resource name="ManageCompositeActDef" version="0" type="CA">boot/CA/ManageCompositeActDef.xml</Resource>
+		<Resource name="ManageElementaryActDef" version="0" type="CA">boot/CA/ManageElementaryActDef.xml</Resource>
+		<Resource name="ManageScript" version="0" type="CA">boot/CA/ManageScript.xml</Resource>
+		<Resource name="ManageSchema" version="0" type="CA">boot/CA/ManageSchema.xml</Resource>
+		<Resource name="ManageStateMachine" version="0" type="CA">boot/CA/ManageStateMachine.xml</Resource>
 		<Resource name="CompositeActivityFactory" version="0" type="CA">boot/CA/CompositeActivityFactory.xml</Resource>
 		<Resource name="ElementaryActivityFactory" version="0" type="CA">boot/CA/ElementaryActivityFactory.xml</Resource>
 		<Resource name="SchemaFactoryWf" version="0" type="CA">boot/CA/SchemaFactoryWf.xml</Resource>
 		<Resource name="ScriptFactoryWf" version="0" type="CA">boot/CA/ScriptFactoryWf.xml</Resource>
+		<Resource name="StateMachineFactoryWf" version="0" type="CA">boot/CA/StateMachineFactoryWf.xml</Resource>
 		<Resource name="ItemDescriptionWf" version="0" type="CA">boot/CA/ItemDescriptionWf.xml</Resource>
 		<Resource name="ItemDescriptionFactoryWf" version="0" type="CA">boot/CA/ItemDescriptionFactoryWf.xml</Resource>
 		<Resource name="ReadOnlyItemDescriptionWf" version="0" type="CA">boot/CA/ReadOnlyItemDescriptionWf.xml</Resource>
@@ -38,7 +47,7 @@
 			<Outcome viewname="last" schema="PropertyDescription" version="0">boot/property/SCProp.xml</Outcome>
 			<Outcome viewname="last" schema="Script" version="0">boot/SC/New.xml</Outcome>
 			<Dependency name="workflow" isDescription="false">
-				<DependencyMember itemPath="/desc/ActivityDesc/system/kernel/ManageScript">
+				<DependencyMember itemPath="/desc/ActivityDesc/system/dev/ManageScript">
 					<MemberProperties>
 						<KeyValuePair Key="Version" String="0"/>
 					</MemberProperties>
@@ -51,7 +60,7 @@
 			<Property name="Type">Factory</Property>
 			<Outcome viewname="last" schema="PropertyDescription" version="0">boot/property/EAProp.xml</Outcome>
 			<Dependency name="workflow" isDescription="false">
-				<DependencyMember itemPath="desc/ActivityDesc/system/kernel/ManageElementaryActDef">
+				<DependencyMember itemPath="desc/ActivityDesc/system/dev/ManageElementaryActDef">
 					<MemberProperties>
 						<KeyValuePair Key="Version" String="0"/>
 					</MemberProperties>
@@ -64,7 +73,7 @@
 			<Property name="Type">Factory</Property>
 			<Outcome viewname="last" schema="PropertyDescription" version="0">boot/property/CAProp.xml</Outcome>
 			<Dependency name="workflow" isDescription="false">
-				<DependencyMember itemPath="/desc/ActivityDesc/system/kernel/ManageCompositeActDef">
+				<DependencyMember itemPath="/desc/ActivityDesc/system/dev/ManageCompositeActDef">
 					<MemberProperties>
 						<KeyValuePair Key="Version" String="0"/>
 					</MemberProperties>
@@ -78,7 +87,20 @@
 			<Outcome viewname="last" schema="PropertyDescription" version="0">boot/property/ODProp.xml</Outcome>
 			<Outcome viewname="last" schema="Schema" version="0">boot/OD/New.xsd</Outcome>
 			<Dependency name="workflow" isDescription="false">
-				<DependencyMember itemPath="/desc/ActivityDesc/system/kernel/ManageSchema">
+				<DependencyMember itemPath="/desc/ActivityDesc/system/dev/ManageSchema">
+					<MemberProperties>
+						<KeyValuePair Key="Version" String="0"/>
+					</MemberProperties>
+				</DependencyMember>
+				<CollectionProperties/>
+			</Dependency>
+		</Item>
+		<Item name="StateMachineFactory" initialPath="/desc/dev" workflow="StateMachineFactoryWf">
+			<Property name="LocalObjectType">StateMachine</Property>
+			<Property name="Type">Factory</Property>
+			<Outcome viewname="last" schema="PropertyDescription" version="0">boot/property/SMProp.xml</Outcome>
+			<Dependency name="workflow" isDescription="false">
+				<DependencyMember itemPath="/desc/ActivityDesc/system/dev/ManageStateMachine">
 					<MemberProperties>
 						<KeyValuePair Key="Version" String="0"/>
 					</MemberProperties>
-- 
cgit v1.2.3