From cc79e98c4763affba4fa2e17dfe5a412f9de66c3 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 2 Jul 2012 14:16:20 +0200
Subject: Removed persistency of VertexOutlineCreator - containing subclasses
 should set this. Fixed persistency of GTimeStamp Fixed CompActOutcome not
 showing when loaded

---
 src/main/resources/boot/CA/ManageCompositeActDef.xml  |  4 +---
 src/main/resources/boot/CA/ManageElementaryActDef.xml |  4 +---
 src/main/resources/boot/CA/ManageSchema.xml           |  4 +---
 src/main/resources/boot/CA/ManageScript.xml           |  4 +---
 src/main/resources/boot/CA/NoWorkflow.xml             |  2 +-
 src/main/resources/boot/CA/ServerItemWorkflow.xml     |  4 +---
 src/main/resources/boot/OD/CompositeActivityDef.xsd   |  2 +-
 src/main/resources/mapFiles/KeyValuePairMap.xml       | 10 ++++++++++
 src/main/resources/mapFiles/graphModelMap.xml         |  3 ---
 9 files changed, 17 insertions(+), 20 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 15a60b5..9eb8bf0 100644
--- a/src/main/resources/boot/CA/ManageCompositeActDef.xml
+++ b/src/main/resources/boot/CA/ManageCompositeActDef.xml
@@ -1,6 +1,6 @@
 <CompositeActivityDef ID="-1" Name="ManageCompositeActDef" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="13" NextId="26">
+		<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"/>
@@ -214,6 +214,4 @@
 		<KeyValuePair Key="ScriptVersion" String=""/>
 		<KeyValuePair Key="Skippable" Boolean="false"/>
 	</Properties>
-	<castorNonLayoutableChildren>AssignNewVersionFromLast</castorNonLayoutableChildren>
-	<castorNonLayoutableChildren>EditActivityDef</castorNonLayoutableChildren>
 </CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ManageElementaryActDef.xml b/src/main/resources/boot/CA/ManageElementaryActDef.xml
index 90ffaf8..03f747a 100644
--- a/src/main/resources/boot/CA/ManageElementaryActDef.xml
+++ b/src/main/resources/boot/CA/ManageElementaryActDef.xml
@@ -1,6 +1,6 @@
 <CompositeActivityDef ID="-1" Name="ManageElementaryActDef" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="13" NextId="26">
+		<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"/>
@@ -214,6 +214,4 @@
 		<KeyValuePair Key="ScriptVersion" String=""/>
 		<KeyValuePair Key="Skippable" Boolean="false"/>
 	</Properties>
-	<castorNonLayoutableChildren>AssignNewVersionFromLast</castorNonLayoutableChildren>
-	<castorNonLayoutableChildren>EditActivityDef</castorNonLayoutableChildren>
 </CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ManageSchema.xml b/src/main/resources/boot/CA/ManageSchema.xml
index d25ce70..69580fe 100644
--- a/src/main/resources/boot/CA/ManageSchema.xml
+++ b/src/main/resources/boot/CA/ManageSchema.xml
@@ -1,6 +1,6 @@
 <CompositeActivityDef ID="-1" Name="ManageSchema" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="13" NextId="22">
+		<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"/>
@@ -213,6 +213,4 @@
 		<KeyValuePair Key="ScriptVersion" String=""/>
 		<KeyValuePair Key="Skippable" Boolean="false"/>
 	</Properties>
-	<castorNonLayoutableChildren>AssignNewVersionFromLast</castorNonLayoutableChildren>
-	<castorNonLayoutableChildren>EditSchema</castorNonLayoutableChildren>
 </CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ManageScript.xml b/src/main/resources/boot/CA/ManageScript.xml
index c629c8e..9dff06f 100644
--- a/src/main/resources/boot/CA/ManageScript.xml
+++ b/src/main/resources/boot/CA/ManageScript.xml
@@ -1,6 +1,6 @@
 <CompositeActivityDef ID="-1" Name="ManageScript" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="11" NextId="27">
+		<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"/>
@@ -214,6 +214,4 @@
 		<KeyValuePair Key="Skippable" Boolean="false"/>
 		<KeyValuePair Key="ScriptVersion" String=""/>
 	</Properties>
-	<castorNonLayoutableChildren>EditScriptDefinition</castorNonLayoutableChildren>
-	<castorNonLayoutableChildren>AssignNewVersionFromLast</castorNonLayoutableChildren>
 </CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/NoWorkflow.xml b/src/main/resources/boot/CA/NoWorkflow.xml
index e49b1cc..e0746f4 100644
--- a/src/main/resources/boot/CA/NoWorkflow.xml
+++ b/src/main/resources/boot/CA/NoWorkflow.xml
@@ -1,6 +1,6 @@
 <CompositeActivityDef ID="-1" Name="NoWorkflow" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="-1" NextId="0"/>
+		<GraphModelCastorData StartVertexId="-1" NextId="0"/>
 	</childrenGraphModel>
 	<Properties>
 		<KeyValuePair Key="Autostart" Boolean="true"/>
diff --git a/src/main/resources/boot/CA/ServerItemWorkflow.xml b/src/main/resources/boot/CA/ServerItemWorkflow.xml
index 7d8531d..085f8ab 100644
--- a/src/main/resources/boot/CA/ServerItemWorkflow.xml
+++ b/src/main/resources/boot/CA/ServerItemWorkflow.xml
@@ -1,6 +1,6 @@
 <CompositeActivityDef ID="-1" Name="ServerItemWorkflow" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
 	<childrenGraphModel>
-		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="4" NextId="21">
+		<GraphModelCastorData StartVertexId="4" NextId="21">
 			<JoinDef ID="9" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
 				<CentrePoint x="244" y="378"/>
 				<OutlinePoint x="214" y="366"/>
@@ -212,6 +212,4 @@
 		<KeyValuePair Key="ScriptVersion" String=""/>
 		<KeyValuePair Key="Skippable" Boolean="false"/>
 	</Properties>
-	<castorNonLayoutableChildren>CreateNewAgent</castorNonLayoutableChildren>
-	<castorNonLayoutableChildren>CreateNewItem</castorNonLayoutableChildren>
 </CompositeActivityDef>
diff --git a/src/main/resources/boot/OD/CompositeActivityDef.xsd b/src/main/resources/boot/OD/CompositeActivityDef.xsd
index b6dc373..acdcae4 100644
--- a/src/main/resources/boot/OD/CompositeActivityDef.xsd
+++ b/src/main/resources/boot/OD/CompositeActivityDef.xsd
@@ -142,7 +142,7 @@
 											</xs:complexType>
 										</xs:element>
 									</xs:choice>
-									<xs:attribute name="ClassNameOfVertexOutlineCreator" type="xs:string" use="required"/>
+									<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:complexType>
diff --git a/src/main/resources/mapFiles/KeyValuePairMap.xml b/src/main/resources/mapFiles/KeyValuePairMap.xml
index dc67609..f709663 100644
--- a/src/main/resources/mapFiles/KeyValuePairMap.xml
+++ b/src/main/resources/mapFiles/KeyValuePairMap.xml
@@ -31,5 +31,15 @@
 		       <bind-xml name="Boolean" node="attribute"/>
 		</field>				
 	</class>
+	<class name="com.c2kernel.common.GTimeStamp">
+		<map-to xml="TimeStamp"/>
+		<field name="mYear" type="java.lang.Integer" direct="true"><bind-xml name="Y" node="attribute"/></field>
+		<field name="mMonth" type="java.lang.Integer" direct="true"><bind-xml name="Mo" node="attribute"/></field>
+		<field name="mDay" type="java.lang.Integer" direct="true"><bind-xml name="D" node="attribute"/></field>
+		<field name="mHour" type="java.lang.Integer" direct="true"><bind-xml name="H" node="attribute"/></field>
+		<field name="mMinute" type="java.lang.Integer" direct="true"><bind-xml name="Mi" node="attribute"/></field>
+		<field name="mSecond" type="java.lang.Integer" direct="true"><bind-xml name="S" node="attribute"/></field>
+		<field name="mTimeOffset" type="java.lang.Integer" direct="true"><bind-xml name="O" node="attribute"/></field>
+	</class>
 </mapping>
 
diff --git a/src/main/resources/mapFiles/graphModelMap.xml b/src/main/resources/mapFiles/graphModelMap.xml
index cebb589..58bf098 100644
--- a/src/main/resources/mapFiles/graphModelMap.xml
+++ b/src/main/resources/mapFiles/graphModelMap.xml
@@ -110,9 +110,6 @@
 		<field name="childrenGraphModel" type="com.c2kernel.graph.model.GraphModel" direct="false">
 			<bind-xml name="childrenGraphModel" node="element"/>
 		</field>
-		<field name="cNonLayoutableChildren" type="com.c2kernel.graph.model.GraphableVertex" direct="false" collection="array">
-			<bind-xml auto-naming="deriveByClass" node="element"/>
-		</field>
 		<field name="mProperties" 
 			   type="com.c2kernel.utils.KeyValuePair"
 			   collection="array"
-- 
cgit v1.2.3