From fd8108209688cda9e782a4c3c91be522eb3ed1f4 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 29 Oct 2013 16:21:08 +0100
Subject: Exception cleanup Allow versions to be null: use Integer or String

---
 src/main/resources/boot/CA/ManageCompositeActDef.xml  | 13 ++-----------
 src/main/resources/boot/CA/ManageElementaryActDef.xml |  7 +------
 2 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'src/main/resources')

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>
-- 
cgit v1.2.3