From bd5764a27d81057d245b1cd70ae0fde1fab5c3b4 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 24 Jul 2012 11:35:55 +0200
Subject: Enable default 'New' schema and script to be edited in the factory.
 Fix transition in LocalObjectDefCreator for removal of Autostart

---
 src/main/resources/boot/CA/ScriptFactoryWf.xml | 192 ++++++++++++++++++-------
 1 file changed, 142 insertions(+), 50 deletions(-)

(limited to 'src/main/resources/boot/CA/ScriptFactoryWf.xml')

diff --git a/src/main/resources/boot/CA/ScriptFactoryWf.xml b/src/main/resources/boot/CA/ScriptFactoryWf.xml
index 5f51f9d..20a0715 100644
--- a/src/main/resources/boot/CA/ScriptFactoryWf.xml
+++ b/src/main/resources/boot/CA/ScriptFactoryWf.xml
@@ -1,108 +1,200 @@
 <CompositeActivityDef ID="-1" Name="ScriptFactoryWf" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator" StartVertexId="5" NextId="14">
+		<GraphModelCastorData StartVertexId="14" NextId="25">
+			<JoinDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="485" y="120"/>
+				<OutlinePoint x="455" y="108"/>
+				<OutlinePoint x="515" y="108"/>
+				<OutlinePoint x="515" y="132"/>
+				<OutlinePoint x="455" y="132"/>
+				<InEdgeId>20</InEdgeId>
+				<InEdgeId>23</InEdgeId>
+				<OutEdgeId>21</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="Type" String="Join"/>
+				</Properties>
+			</JoinDef>
 			<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"/>
+				<CentrePoint x="411" y="336"/>
+				<OutlinePoint x="381" y="324"/>
+				<OutlinePoint x="441" y="324"/>
+				<OutlinePoint x="441" y="348"/>
+				<OutlinePoint x="381" y="348"/>
 				<InEdgeId>9</InEdgeId>
+				<InEdgeId>24</InEdgeId>
 				<Properties>
 					<KeyValuePair Key="Type" String="Join"/>
 				</Properties>
 			</JoinDef>
+			<AndSplitDef ID="14" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="413" y="49"/>
+				<OutlinePoint x="383" y="37"/>
+				<OutlinePoint x="443" y="37"/>
+				<OutlinePoint x="443" y="61"/>
+				<OutlinePoint x="383" y="61"/>
+				<OutEdgeId>19</OutEdgeId>
+				<OutEdgeId>20</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="RoutingScriptName" String=""/>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+				</Properties>
+			</AndSplitDef>
 			<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"/>
+				<CentrePoint x="340" y="120"/>
+				<OutlinePoint x="310" y="108"/>
+				<OutlinePoint x="370" y="108"/>
+				<OutlinePoint x="370" y="132"/>
+				<OutlinePoint x="310" y="132"/>
 				<InEdgeId>7</InEdgeId>
+				<InEdgeId>19</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"/>
+				<CentrePoint x="337" y="258"/>
+				<OutlinePoint x="307" y="246"/>
+				<OutlinePoint x="367" y="246"/>
+				<OutlinePoint x="367" y="270"/>
+				<OutlinePoint x="307" y="270"/>
 				<InEdgeId>13</InEdgeId>
 				<OutEdgeId>7</OutEdgeId>
 				<OutEdgeId>9</OutEdgeId>
 				<Properties>
 					<KeyValuePair Key="LastNum" String="2"/>
-					<KeyValuePair Key="RoutingScriptVersion" String=""/>
 					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
 				</Properties>
 			</LoopDef>
 			<ActivitySlotDef ID="10" Name="CreateNewLocalObjectDef_" 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"/>
+				<CentrePoint x="202" y="196"/>
+				<OutlinePoint x="137" y="166"/>
+				<OutlinePoint x="267" y="166"/>
+				<OutlinePoint x="267" y="226"/>
+				<OutlinePoint x="137" y="226"/>
 				<InEdgeId>12</InEdgeId>
 				<OutEdgeId>13</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Prefill" Boolean="false"/>
 					<KeyValuePair Key="Prefill Version" String="-1"/>
 					<KeyValuePair Key="Name" String="CreateNewScript"/>
 					<KeyValuePair Key="NewType" String="SC"/>
+					<KeyValuePair Key="Prefill" Boolean="false"/>
+					<KeyValuePair Key="Version" String="last"/>
 				</Properties>
 				<activityDef>CreateNewLocalObjectDef</activityDef>
 			</ActivitySlotDef>
-			<NextDef ID="13" OriginVertexId="10" TerminusVertexId="3">
-				<OriginPoint x="133" y="215"/>
-				<TerminusPoint x="321" y="211"/>
+			<ActivitySlotDef ID="18" Name="EditScriptDefinition slot" Height="60" Width="130" IsLayoutable="true" IsComposite="false">
+				<CentrePoint x="604" y="193"/>
+				<OutlinePoint x="539" y="163"/>
+				<OutlinePoint x="669" y="163"/>
+				<OutlinePoint x="669" y="223"/>
+				<OutlinePoint x="539" y="223"/>
+				<InEdgeId>21</InEdgeId>
+				<OutEdgeId>22</OutEdgeId>
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Name" String="EditEmptyScript"/>
+					<KeyValuePair Key="Version" String="last"/>
+				</Properties>
+				<activityDef>EditScriptDefinition</activityDef>
+			</ActivitySlotDef>
+			<LoopDef ID="16" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
+				<CentrePoint x="486" y="258"/>
+				<OutlinePoint x="456" y="246"/>
+				<OutlinePoint x="516" y="246"/>
+				<OutlinePoint x="516" y="270"/>
+				<OutlinePoint x="456" y="270"/>
+				<InEdgeId>22</InEdgeId>
+				<OutEdgeId>23</OutEdgeId>
+				<OutEdgeId>24</OutEdgeId>
+				<Properties>
+					<KeyValuePair Key="LastNum" String="2"/>
+					<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
+					<KeyValuePair Key="RoutingScriptVersion" String=""/>
+				</Properties>
+			</LoopDef>
+			<NextDef ID="24" OriginVertexId="16" TerminusVertexId="6">
+				<OriginPoint x="486" y="258"/>
+				<TerminusPoint x="411" y="336"/>
+				<Properties>
+					<KeyValuePair Key="Alias" String="false"/>
 				</Properties>
 			</NextDef>
-			<NextDef ID="12" OriginVertexId="5" TerminusVertexId="10">
-				<OriginPoint x="321" y="92"/>
-				<TerminusPoint x="133" y="215"/>
+			<NextDef ID="23" OriginVertexId="16" TerminusVertexId="15">
+				<OriginPoint x="486" y="258"/>
+				<TerminusPoint x="485" y="120"/>
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
+					<KeyValuePair Key="Alias" String="true"/>
 				</Properties>
 			</NextDef>
+			<NextDef ID="22" OriginVertexId="18" TerminusVertexId="16">
+				<OriginPoint x="604" y="193"/>
+				<TerminusPoint x="486" y="258"/>
+				<Properties/>
+			</NextDef>
+			<NextDef ID="19" OriginVertexId="14" TerminusVertexId="5">
+				<OriginPoint x="413" y="49"/>
+				<TerminusPoint x="340" y="120"/>
+				<Properties/>
+			</NextDef>
+			<NextDef ID="21" OriginVertexId="15" TerminusVertexId="18">
+				<OriginPoint x="485" y="120"/>
+				<TerminusPoint x="604" y="193"/>
+				<Properties/>
+			</NextDef>
 			<NextDef ID="9" OriginVertexId="3" TerminusVertexId="6">
-				<OriginPoint x="321" y="211"/>
-				<TerminusPoint x="321" y="325"/>
+				<OriginPoint x="337" y="258"/>
+				<TerminusPoint x="411" y="336"/>
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
 					<KeyValuePair Key="Alias" String="false"/>
+					<KeyValuePair Key="Type" String="Straight"/>
 				</Properties>
 			</NextDef>
+			<NextDef ID="20" OriginVertexId="14" TerminusVertexId="15">
+				<OriginPoint x="413" y="49"/>
+				<TerminusPoint x="485" y="120"/>
+				<Properties/>
+			</NextDef>
 			<NextDef ID="7" OriginVertexId="3" TerminusVertexId="5">
-				<OriginPoint x="321" y="211"/>
-				<TerminusPoint x="321" y="92"/>
+				<OriginPoint x="337" y="258"/>
+				<TerminusPoint x="340" y="120"/>
 				<Properties>
-					<KeyValuePair Key="Type" String="Straight"/>
 					<KeyValuePair Key="Alias" String="true"/>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="13" OriginVertexId="10" TerminusVertexId="3">
+				<OriginPoint x="202" y="196"/>
+				<TerminusPoint x="337" y="258"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
+				</Properties>
+			</NextDef>
+			<NextDef ID="12" OriginVertexId="5" TerminusVertexId="10">
+				<OriginPoint x="340" y="120"/>
+				<TerminusPoint x="202" y="196"/>
+				<Properties>
+					<KeyValuePair Key="Type" String="Straight"/>
 				</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="Mail Message" String=""/>
+		<KeyValuePair Key="Agent Name" String=""/>
+		<KeyValuePair Key="Viewpoint" String=""/>
+		<KeyValuePair Key="SchemaVersion" String=""/>
 		<KeyValuePair Key="Skippable" Boolean="false"/>
+		<KeyValuePair Key="ScriptName" String=""/>
+		<KeyValuePair Key="Mail event" String=""/>
+		<KeyValuePair Key="Breakpoint" Boolean="false"/>
+		<KeyValuePair Key="Autostart" Boolean="true"/>
+		<KeyValuePair Key="Repeatable" Boolean="false"/>
+		<KeyValuePair Key="Agent Role" String=""/>
+		<KeyValuePair Key="Show time" Boolean="true"/>
+		<KeyValuePair Key="SchemaType" String=""/>
 	</Properties>
-	<castorNonLayoutableChildren>CreateNewLocalObjectDef</castorNonLayoutableChildren>
-</CompositeActivityDef>
+</CompositeActivityDef>
\ No newline at end of file
-- 
cgit v1.2.3