From 11eb9557a35e17450c0aefb758471f1ff3148336 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 29 Jun 2012 16:20:11 +0200
Subject: Pull remaining graph GUI components into cristal-gui

---
 .../resources/boot/CA/ManageCompositeActDef.xml     |  2 +-
 .../resources/boot/CA/ManageElementaryActDef.xml    |  2 +-
 src/main/resources/boot/CA/ManageSchema.xml         |  2 +-
 src/main/resources/boot/CA/ManageScript.xml         |  2 +-
 src/main/resources/boot/CA/NoWorkflow.xml           |  2 +-
 src/main/resources/boot/CA/ServerItemWorkflow.xml   |  2 +-
 src/main/resources/mapFiles/LifeCycleMap.xml        | 21 ---------------------
 7 files changed, 6 insertions(+), 27 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 9a48f1c..15a60b5 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.gui.model.WfVertexDefOutlineCreator" StartVertexId="13" NextId="26">
+		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" 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"/>
diff --git a/src/main/resources/boot/CA/ManageElementaryActDef.xml b/src/main/resources/boot/CA/ManageElementaryActDef.xml
index 1aa3840..90ffaf8 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.gui.model.WfVertexDefOutlineCreator" StartVertexId="13" NextId="26">
+		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" 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"/>
diff --git a/src/main/resources/boot/CA/ManageSchema.xml b/src/main/resources/boot/CA/ManageSchema.xml
index da501e4..d25ce70 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.gui.model.WfVertexDefOutlineCreator" StartVertexId="13" NextId="22">
+		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" 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"/>
diff --git a/src/main/resources/boot/CA/ManageScript.xml b/src/main/resources/boot/CA/ManageScript.xml
index f8100b0..c629c8e 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.gui.model.WfVertexDefOutlineCreator" StartVertexId="11" NextId="27">
+		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" 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"/>
diff --git a/src/main/resources/boot/CA/NoWorkflow.xml b/src/main/resources/boot/CA/NoWorkflow.xml
index c0e2d6f..e49b1cc 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.gui.model.WfVertexDefOutlineCreator" StartVertexId="-1" NextId="0"/>
+		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" 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 e480b07..7d8531d 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.gui.model.WfVertexDefOutlineCreator" StartVertexId="4" NextId="21">
+		<GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" 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"/>
diff --git a/src/main/resources/mapFiles/LifeCycleMap.xml b/src/main/resources/mapFiles/LifeCycleMap.xml
index 8291dee..ba75864 100644
--- a/src/main/resources/mapFiles/LifeCycleMap.xml
+++ b/src/main/resources/mapFiles/LifeCycleMap.xml
@@ -54,9 +54,6 @@
 		<field name="type" type="string" direct="false">
 			<bind-xml name="Type" node="attribute"/>
 		</field>
-		<field name="eventIds" type="com.c2kernel.lifecycle.instance.EventStorage" direct="true">
-			<bind-xml name="eventIds" node="element"/>
-		</field>
 		<field name="startDate" type="com.c2kernel.common.GTimeStamp" direct="false">
 			<bind-xml name="startDate" node="element"/>
 		</field>
@@ -100,22 +97,4 @@
 	<class name="com.c2kernel.lifecycle.instance.predefined.ServerPredefinedStepContainer" extends="com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer">
 		<map-to xml="ServerPredefinedStepContainer"/>
 	</class>
-	<class name="com.c2kernel.lifecycle.instance.EventStorage">
-		<map-to xml="EventStorage"/>
-		<field name="lastTransitionStored" type="integer" direct="true">
-			<bind-xml name="lastTransitionStored" node="attribute"/>
-		</field>
-		<field name="lists" type="com.c2kernel.lifecycle.instance.EventList" collection="array" direct="false">
-			<bind-xml name="lists" node="element"/>
-		</field>
-	</class>
-	<class name="com.c2kernel.lifecycle.instance.EventList">
-		<map-to xml="EventList"/>
-		<field name="transition" type="integer" direct="true">
-			<bind-xml name="transition" node="attribute"/>
-		</field>
-		<field name="nums" type="integer" collection="array" direct="false">
-			<bind-xml name="nums" node="element"/>
-		</field>
-	</class>
 </mapping>
-- 
cgit v1.2.3