From 160f610b24ee3802a109bcd32e00bfa2dde31ec2 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Tue, 13 Mar 2012 15:31:25 +0100
Subject: Added Description Factory

---
 build.xml                                          |   7 ++-
 cristaldev.jar                                     | Bin 48384 -> 34031 bytes
 factory.rar                                        | Bin 0 -> 1203 bytes
 resources/boot/CA/ItemDescriptionFactoryWf.xml     |   1 +
 resources/boot/CA/ItemDescriptionWf.xml            |   1 +
 resources/boot/EA/CreateItem.xml                   |   1 +
 resources/boot/EA/CreateNewLocalObjectDef.xml      |   2 +-
 resources/boot/EA/EditProperties.xml               |  20 ---------
 resources/boot/EA/EditPropertyDescription.xml      |   1 +
 resources/boot/EA/SetInstanceWorkflow.xml          |   1 +
 resources/boot/OD/ChooseWorkflow.xsd               |  14 ++++++
 resources/boot/OD/NewDevObjectDef.xsd              |  20 +++++++++
 resources/boot/SC/InstantiateItem.xml              |  30 +++++++++++++
 resources/boot/SC/LocalObjectDefCreator.xml        |   4 +-
 resources/boot/SC/SetWorkflow.xml                  |  47 +++++++++++++++++++++
 resources/boot/factory/CA.xml                      |   8 ----
 resources/boot/factory/EA.xml                      |   8 ----
 resources/boot/factory/OD.xml                      |   8 ----
 resources/boot/factory/SC.xml                      |   8 ----
 resources/boot/property/DescProp.xml               |   2 +
 resources/images/typeicons/factory_16.png          | Bin 0 -> 916 bytes
 resources/images/typeicons/factory_32.png          | Bin 0 -> 2084 bytes
 resources/images/typeicons/itemdescription_16.png  | Bin 0 -> 722 bytes
 resources/images/typeicons/itemdescription_32.png  | Bin 0 -> 1782 bytes
 .../images/typeicons/localobjectfactory_16.png     | Bin 916 -> 0 bytes
 .../images/typeicons/localobjectfactory_32.png     | Bin 2084 -> 0 bytes
 src/module.xml                                     |  36 ++++++++++++----
 27 files changed, 155 insertions(+), 64 deletions(-)
 create mode 100644 factory.rar
 create mode 100644 resources/boot/CA/ItemDescriptionFactoryWf.xml
 create mode 100644 resources/boot/CA/ItemDescriptionWf.xml
 create mode 100644 resources/boot/EA/CreateItem.xml
 delete mode 100644 resources/boot/EA/EditProperties.xml
 create mode 100644 resources/boot/EA/EditPropertyDescription.xml
 create mode 100644 resources/boot/EA/SetInstanceWorkflow.xml
 create mode 100644 resources/boot/OD/ChooseWorkflow.xsd
 create mode 100644 resources/boot/OD/NewDevObjectDef.xsd
 create mode 100644 resources/boot/SC/InstantiateItem.xml
 create mode 100644 resources/boot/SC/SetWorkflow.xml
 delete mode 100644 resources/boot/factory/CA.xml
 delete mode 100644 resources/boot/factory/EA.xml
 delete mode 100644 resources/boot/factory/OD.xml
 delete mode 100644 resources/boot/factory/SC.xml
 create mode 100644 resources/boot/property/DescProp.xml
 create mode 100644 resources/images/typeicons/factory_16.png
 create mode 100644 resources/images/typeicons/factory_32.png
 create mode 100644 resources/images/typeicons/itemdescription_16.png
 create mode 100644 resources/images/typeicons/itemdescription_32.png
 delete mode 100644 resources/images/typeicons/localobjectfactory_16.png
 delete mode 100644 resources/images/typeicons/localobjectfactory_32.png

diff --git a/build.xml b/build.xml
index 74b0711..0fc492b 100644
--- a/build.xml
+++ b/build.xml
@@ -47,7 +47,7 @@
 	<target name="clean" description="cleans up the build directories">
 		<delete dir="${build.dir}"/>
 	</target>	
-	<target name="rebuild" depends="clean, jar" description="deletes and recompiles the whole of cristal2"/>
+	<target name="rebuild" depends="clean, jar" description="deletes and rebuilds the cristal-dev module"/>
 	<target name="jar" depends="resources" description="make jar">
 		<jar basedir="${build.dir}" includes="**" jarfile="cristaldev.jar"/>
 	</target>
@@ -61,6 +61,11 @@
 				<patternset refid="resource.files"/>
 			</fileset>
 		</copy>
+		<copy todir="${build.dir}">
+			<fileset dir="${src.dir}">
+				<filename name="module.xml"/>
+			</fileset>
+		</copy>
 	</target>
 
 </project>
diff --git a/cristaldev.jar b/cristaldev.jar
index 4806ada..928fb7a 100644
Binary files a/cristaldev.jar and b/cristaldev.jar differ
diff --git a/factory.rar b/factory.rar
new file mode 100644
index 0000000..b11875e
Binary files /dev/null and b/factory.rar differ
diff --git a/resources/boot/CA/ItemDescriptionFactoryWf.xml b/resources/boot/CA/ItemDescriptionFactoryWf.xml
new file mode 100644
index 0000000..43cdfc1
--- /dev/null
+++ b/resources/boot/CA/ItemDescriptionFactoryWf.xml
@@ -0,0 +1 @@
+<CompositeActivityDef ID="-1" Name="ItemDescriptionFactoryWf" Height="0" Width="0" IsLayoutable="false" IsComposite="true"><childrenGraphModel><GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator" StartVertexId="1" NextId="14"><JoinDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false"><CentrePoint x="312" y="390"/><OutlinePoint x="282" y="378"/><OutlinePoint x="342" y="378"/><OutlinePoint x="342" y="402"/><OutlinePoint x="282" y="402"/><InEdgeId>7</InEdgeId><Properties><KeyValuePair Key="Type" String="Join"/></Properties></JoinDef><LoopDef ID="2" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0"><CentrePoint x="313" y="204"/><OutlinePoint x="283" y="192"/><OutlinePoint x="343" y="192"/><OutlinePoint x="343" y="216"/><OutlinePoint x="283" y="216"/><InEdgeId>13</InEdgeId><OutEdgeId>6</OutEdgeId><OutEdgeId>7</OutEdgeId><Properties><KeyValuePair Key="LastNum" String="2"/><KeyValuePair Key="RoutingScriptName" String="javascript:true;"/><KeyValuePair Key="RoutingScriptVersion" String=""/></Properties></LoopDef><ActivitySlotDef ID="11" Name="CreateItem slot" Height="60" Width="130" IsLayoutable="true" IsComposite="false"><CentrePoint x="126" y="204"/><OutlinePoint x="61" y="174"/><OutlinePoint x="191" y="174"/><OutlinePoint x="191" y="234"/><OutlinePoint x="61" y="234"/><InEdgeId>12</InEdgeId><OutEdgeId>13</OutEdgeId><Properties><KeyValuePair Key="Name" String="CreateNewDescription"/><KeyValuePair Key="Version" String="last"/></Properties><activityDef>CreateItem</activityDef></ActivitySlotDef><JoinDef ID="1" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false"><CentrePoint x="126" y="57"/><OutlinePoint x="96" y="45"/><OutlinePoint x="156" y="45"/><OutlinePoint x="156" y="69"/><OutlinePoint x="96" y="69"/><InEdgeId>6</InEdgeId><OutEdgeId>12</OutEdgeId><Properties><KeyValuePair Key="Type" String="Join"/></Properties></JoinDef><NextDef ID="6" OriginVertexId="2" TerminusVertexId="1"><OriginPoint x="313" y="204"/><TerminusPoint x="126" y="57"/><Properties><KeyValuePair Key="Alias" String="true"/></Properties></NextDef><NextDef ID="13" OriginVertexId="11" TerminusVertexId="2"><OriginPoint x="126" y="204"/><TerminusPoint x="313" y="204"/><Properties/></NextDef><NextDef ID="12" OriginVertexId="1" TerminusVertexId="11"><OriginPoint x="126" y="57"/><TerminusPoint x="126" y="204"/><Properties/></NextDef><NextDef ID="7" OriginVertexId="2" TerminusVertexId="3"><OriginPoint x="313" y="204"/><TerminusPoint x="312" y="390"/><Properties><KeyValuePair Key="Alias" String="false"/></Properties></NextDef></GraphModelCastorData></childrenGraphModel><Properties><KeyValuePair Key="Description" String=""/><KeyValuePair Key="Ignorable" Boolean="false"/><KeyValuePair Key="ScriptVersion" String=""/><KeyValuePair Key="Mail Message" String=""/><KeyValuePair Key="Viewpoint" String=""/><KeyValuePair Key="Agent Name" String=""/><KeyValuePair Key="SchemaVersion" String=""/><KeyValuePair Key="Skippable" Boolean="false"/><KeyValuePair Key="ScriptName" String=""/><KeyValuePair Key="Mail event" String=""/><KeyValuePair Key="Autostart" Boolean="true"/><KeyValuePair Key="Repeatable" Boolean="false"/><KeyValuePair Key="Show time" Boolean="true"/><KeyValuePair Key="Agent Role" String=""/><KeyValuePair Key="AlwaysUseOutcome" Boolean="false"/><KeyValuePair Key="SchemaType" String=""/></Properties></CompositeActivityDef>
\ No newline at end of file
diff --git a/resources/boot/CA/ItemDescriptionWf.xml b/resources/boot/CA/ItemDescriptionWf.xml
new file mode 100644
index 0000000..e8c294f
--- /dev/null
+++ b/resources/boot/CA/ItemDescriptionWf.xml
@@ -0,0 +1 @@
+<CompositeActivityDef ID="-1" Name="ItemDescriptionWf" Height="0" Width="0" IsLayoutable="false" IsComposite="true"><childrenGraphModel><GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator" StartVertexId="0" NextId="37"><ActivitySlotDef ID="33" Name="CreateItem slot" Height="60" Width="130" IsLayoutable="true" IsComposite="false"><CentrePoint x="437" y="611"/><OutlinePoint x="372" y="581"/><OutlinePoint x="502" y="581"/><OutlinePoint x="502" y="641"/><OutlinePoint x="372" y="641"/><InEdgeId>35</InEdgeId><OutEdgeId>36</OutEdgeId><Properties><KeyValuePair Key="Name" String="CreateNewInstance"/><KeyValuePair Key="Version" String="last"/></Properties><activityDef>CreateItem</activityDef></ActivitySlotDef><LoopDef ID="19" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0"><CentrePoint x="540" y="676"/><OutlinePoint x="510" y="664"/><OutlinePoint x="570" y="664"/><OutlinePoint x="570" y="688"/><OutlinePoint x="510" y="688"/><InEdgeId>36</InEdgeId><OutEdgeId>29</OutEdgeId><OutEdgeId>32</OutEdgeId><Properties><KeyValuePair Key="LastNum" String="3"/><KeyValuePair Key="RoutingScriptName" String="javascript:true;"/><KeyValuePair Key="RoutingScriptVersion" String=""/></Properties></LoopDef><LoopDef ID="18" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0"><CentrePoint x="370" y="679"/><OutlinePoint x="340" y="667"/><OutlinePoint x="400" y="667"/><OutlinePoint x="400" y="691"/><OutlinePoint x="340" y="691"/><InEdgeId>25</InEdgeId><OutEdgeId>28</OutEdgeId><OutEdgeId>31</OutEdgeId><Properties><KeyValuePair Key="LastNum" String="2"/><KeyValuePair Key="RoutingScriptName" String="javascript:true;"/><KeyValuePair Key="RoutingScriptVersion" String=""/></Properties></LoopDef><JoinDef ID="9" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false"><CentrePoint x="472" y="449"/><OutlinePoint x="442" y="437"/><OutlinePoint x="502" y="437"/><OutlinePoint x="502" y="461"/><OutlinePoint x="442" y="461"/><InEdgeId>12</InEdgeId><InEdgeId>32</InEdgeId><OutEdgeId>35</OutEdgeId><Properties><KeyValuePair Key="Type" String="Join"/></Properties></JoinDef><JoinDef ID="20" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false"><CentrePoint x="370" y="792"/><OutlinePoint x="340" y="780"/><OutlinePoint x="400" y="780"/><OutlinePoint x="400" y="804"/><OutlinePoint x="340" y="804"/><InEdgeId>27</InEdgeId><InEdgeId>28</InEdgeId><InEdgeId>29</InEdgeId><Properties><KeyValuePair Key="Type" String="Join"/></Properties></JoinDef><LoopDef ID="17" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0"><CentrePoint x="158" y="677"/><OutlinePoint x="128" y="665"/><OutlinePoint x="188" y="665"/><OutlinePoint x="188" y="689"/><OutlinePoint x="128" y="689"/><InEdgeId>24</InEdgeId><OutEdgeId>27</OutEdgeId><OutEdgeId>30</OutEdgeId><Properties><KeyValuePair Key="LastNum" String="2"/><KeyValuePair Key="RoutingScriptName" String="javascript:true;"/><KeyValuePair Key="RoutingScriptVersion" String=""/></Properties></LoopDef><JoinDef ID="8" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false"><CentrePoint x="286" y="449"/><OutlinePoint x="256" y="437"/><OutlinePoint x="316" y="437"/><OutlinePoint x="316" y="461"/><OutlinePoint x="256" y="461"/><InEdgeId>11</InEdgeId><InEdgeId>31</InEdgeId><OutEdgeId>22</OutEdgeId><Properties><KeyValuePair Key="Type" String="Join"/></Properties></JoinDef><JoinDef ID="7" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false"><CentrePoint x="104" y="448"/><OutlinePoint x="74" y="436"/><OutlinePoint x="134" y="436"/><OutlinePoint x="134" y="460"/><OutlinePoint x="74" y="460"/><InEdgeId>10</InEdgeId><InEdgeId>30</InEdgeId><OutEdgeId>21</OutEdgeId><Properties><KeyValuePair Key="Type" String="Join"/></Properties></JoinDef><ActivitySlotDef ID="15" Name="SetInstanceWorkflow slot" Height="60" Width="130" IsLayoutable="true" IsComposite="false"><CentrePoint x="254" y="609"/><OutlinePoint x="189" y="579"/><OutlinePoint x="319" y="579"/><OutlinePoint x="319" y="639"/><OutlinePoint x="189" y="639"/><InEdgeId>22</InEdgeId><OutEdgeId>25</OutEdgeId><Properties><KeyValuePair Key="Name" String="ChangeInstanceWorkflow"/><KeyValuePair Key="Version" String="last"/></Properties><activityDef>SetInstanceWorkflow</activityDef></ActivitySlotDef><ActivitySlotDef ID="14" Name="EditPropertyDescription slot" Height="60" Width="130" IsLayoutable="true" IsComposite="false"><CentrePoint x="62" y="607"/><OutlinePoint x="-3" y="577"/><OutlinePoint x="127" y="577"/><OutlinePoint x="127" y="637"/><OutlinePoint x="-3" y="637"/><InEdgeId>21</InEdgeId><OutEdgeId>24</OutEdgeId><Properties><KeyValuePair Key="Name" String="EditPropertyDescription"/><KeyValuePair Key="Version" String="last"/></Properties><activityDef>EditPropertyDescription</activityDef></ActivitySlotDef><AndSplitDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false"><CentrePoint x="251" y="354"/><OutlinePoint x="221" y="342"/><OutlinePoint x="281" y="342"/><OutlinePoint x="281" y="366"/><OutlinePoint x="221" y="366"/><InEdgeId>13</InEdgeId><OutEdgeId>10</OutEdgeId><OutEdgeId>11</OutEdgeId><OutEdgeId>12</OutEdgeId><Properties><KeyValuePair Key="RoutingScriptName" String=""/><KeyValuePair Key="RoutingScriptVersion" String=""/></Properties></AndSplitDef><ActivitySlotDef ID="1" Name="SetInstanceWorkflow slot" Height="60" Width="130" IsLayoutable="true" IsComposite="false"><CentrePoint x="251" y="231"/><OutlinePoint x="186" y="201"/><OutlinePoint x="316" y="201"/><OutlinePoint x="316" y="261"/><OutlinePoint x="186" y="261"/><InEdgeId>2</InEdgeId><OutEdgeId>13</OutEdgeId><Properties><KeyValuePair Key="Name" String="SetInstanceWorkflow"/><KeyValuePair Key="Version" String="last"/></Properties><activityDef>SetInstanceWorkflow</activityDef></ActivitySlotDef><ActivitySlotDef ID="0" Name="EditPropertyDescription slot" Height="60" Width="130" IsLayoutable="true" IsComposite="false"><CentrePoint x="251" y="105"/><OutlinePoint x="186" y="75"/><OutlinePoint x="316" y="75"/><OutlinePoint x="316" y="135"/><OutlinePoint x="186" y="135"/><OutEdgeId>2</OutEdgeId><Properties><KeyValuePair Key="Name" String="SetPropertyDescription"/><KeyValuePair Key="Version" String="last"/></Properties><activityDef>EditPropertyDescription</activityDef></ActivitySlotDef><NextDef ID="32" OriginVertexId="19" TerminusVertexId="9"><OriginPoint x="540" y="676"/><TerminusPoint x="472" y="449"/><Properties><KeyValuePair Key="Alias" String="true"/></Properties></NextDef><NextDef ID="29" OriginVertexId="19" TerminusVertexId="20"><OriginPoint x="540" y="676"/><TerminusPoint x="370" y="792"/><Properties><KeyValuePair Key="Alias" String="false"/></Properties></NextDef><NextDef ID="31" OriginVertexId="18" TerminusVertexId="8"><OriginPoint x="370" y="679"/><TerminusPoint x="286" y="449"/><Properties><KeyValuePair Key="Alias" String="true"/></Properties></NextDef><NextDef ID="28" OriginVertexId="18" TerminusVertexId="20"><OriginPoint x="370" y="679"/><TerminusPoint x="370" y="792"/><Properties><KeyValuePair Key="Alias" String="false"/></Properties></NextDef><NextDef ID="30" OriginVertexId="17" TerminusVertexId="7"><OriginPoint x="158" y="677"/><TerminusPoint x="104" y="448"/><Properties><KeyValuePair Key="Alias" String="true"/></Properties></NextDef><NextDef ID="27" OriginVertexId="17" TerminusVertexId="20"><OriginPoint x="158" y="677"/><TerminusPoint x="370" y="792"/><Properties><KeyValuePair Key="Alias" String="false"/></Properties></NextDef><NextDef ID="25" OriginVertexId="15" TerminusVertexId="18"><OriginPoint x="254" y="609"/><TerminusPoint x="370" y="679"/><Properties/></NextDef><NextDef ID="24" OriginVertexId="14" TerminusVertexId="17"><OriginPoint x="62" y="607"/><TerminusPoint x="158" y="677"/><Properties/></NextDef><NextDef ID="22" OriginVertexId="8" TerminusVertexId="15"><OriginPoint x="286" y="449"/><TerminusPoint x="254" y="609"/><Properties/></NextDef><NextDef ID="21" OriginVertexId="7" TerminusVertexId="14"><OriginPoint x="104" y="448"/><TerminusPoint x="62" y="607"/><Properties/></NextDef><NextDef ID="13" OriginVertexId="1" TerminusVertexId="4"><OriginPoint x="251" y="231"/><TerminusPoint x="251" y="354"/><Properties/></NextDef><NextDef ID="12" OriginVertexId="4" TerminusVertexId="9"><OriginPoint x="251" y="354"/><TerminusPoint x="472" y="449"/><Properties/></NextDef><NextDef ID="11" OriginVertexId="4" TerminusVertexId="8"><OriginPoint x="251" y="354"/><TerminusPoint x="286" y="449"/><Properties/></NextDef><NextDef ID="2" OriginVertexId="0" TerminusVertexId="1"><OriginPoint x="251" y="105"/><TerminusPoint x="251" y="231"/><Properties/></NextDef><NextDef ID="10" OriginVertexId="4" TerminusVertexId="7"><OriginPoint x="251" y="354"/><TerminusPoint x="104" y="448"/><Properties/></NextDef><NextDef ID="36" OriginVertexId="33" TerminusVertexId="19"><OriginPoint x="437" y="611"/><TerminusPoint x="540" y="676"/><Properties/></NextDef><NextDef ID="35" OriginVertexId="9" TerminusVertexId="33"><OriginPoint x="472" y="449"/><TerminusPoint x="437" y="611"/><Properties/></NextDef></GraphModelCastorData></childrenGraphModel><Properties><KeyValuePair Key="Description" String=""/><KeyValuePair Key="Ignorable" Boolean="false"/><KeyValuePair Key="ScriptVersion" String=""/><KeyValuePair Key="Mail Message" String=""/><KeyValuePair Key="Viewpoint" String=""/><KeyValuePair Key="Agent Name" String=""/><KeyValuePair Key="SchemaVersion" String=""/><KeyValuePair Key="Skippable" Boolean="false"/><KeyValuePair Key="ScriptName" String=""/><KeyValuePair Key="Mail event" String=""/><KeyValuePair Key="Autostart" Boolean="true"/><KeyValuePair Key="Repeatable" Boolean="false"/><KeyValuePair Key="Show time" Boolean="true"/><KeyValuePair Key="Agent Role" String=""/><KeyValuePair Key="AlwaysUseOutcome" Boolean="false"/><KeyValuePair Key="SchemaType" String=""/></Properties></CompositeActivityDef>
\ No newline at end of file
diff --git a/resources/boot/EA/CreateItem.xml b/resources/boot/EA/CreateItem.xml
new file mode 100644
index 0000000..6facb82
--- /dev/null
+++ b/resources/boot/EA/CreateItem.xml
@@ -0,0 +1 @@
+<ActivityDef ID="-1" Name="CreateItem" Height="0" Width="0" IsLayoutable="false" IsComposite="false"><Properties><KeyValuePair Key="Description" String=""/><KeyValuePair Key="Ignorable" Boolean="false"/><KeyValuePair Key="ScriptVersion" String="0"/><KeyValuePair Key="Mail Message" String=""/><KeyValuePair Key="Viewpoint" String=""/><KeyValuePair Key="Agent Name" String=""/><KeyValuePair Key="SchemaVersion" String="0"/><KeyValuePair Key="Skippable" Boolean="false"/><KeyValuePair Key="ScriptName" String="InstantiateItem"/><KeyValuePair Key="Mail event" String=""/><KeyValuePair Key="Autostart" Boolean="true"/><KeyValuePair Key="Repeatable" Boolean="false"/><KeyValuePair Key="Show time" Boolean="true"/><KeyValuePair Key="Agent Role" String=""/><KeyValuePair Key="AlwaysUseOutcome" Boolean="false"/><KeyValuePair Key="SchemaType" String="NewDevObjectDef"/></Properties></ActivityDef>
\ No newline at end of file
diff --git a/resources/boot/EA/CreateNewLocalObjectDef.xml b/resources/boot/EA/CreateNewLocalObjectDef.xml
index e4a9426..8c8c9c1 100644
--- a/resources/boot/EA/CreateNewLocalObjectDef.xml
+++ b/resources/boot/EA/CreateNewLocalObjectDef.xml
@@ -10,7 +10,7 @@
 		<KeyValuePair Key="Show time" Boolean="true"/>
 		<KeyValuePair Key="Viewpoint" String=""/>
 		<KeyValuePair Key="Agent Role" String="Admin"/>
-		<KeyValuePair Key="SchemaType" String="NewLocalObjectDef"/>
+		<KeyValuePair Key="SchemaType" String="NewDevObjectDef"/>
 		<KeyValuePair Key="ScriptName" String="LocalObjectDefCreator"/>
 		<KeyValuePair Key="Ignorable" Boolean="false"/>
 		<KeyValuePair Key="ScriptVersion" String="0"/>
diff --git a/resources/boot/EA/EditProperties.xml b/resources/boot/EA/EditProperties.xml
deleted file mode 100644
index 15d51b8..0000000
--- a/resources/boot/EA/EditProperties.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Andrew Branson (CERN) -->
-<ActivityDef ID="251" Name="EditProperties" Height="0" Width="0" IsLayoutable="false" IsComposite="false">
-	<Properties>
-		<KeyValuePair Key="SchemaType" String="PropertyDescription"/>
-		<KeyValuePair Key="Description" String="Define the properties for instances of this description"/>
-		<KeyValuePair Key="ItemSystemKey" String=""/>
-		<KeyValuePair Key="Agent Name" String=""/>
-		<KeyValuePair Key="ScriptName" String=""/>
-		<KeyValuePair Key="Mail event" String=""/>
-		<KeyValuePair Key="Autostart" Boolean="true"/>
-		<KeyValuePair Key="Skippable" Boolean="false"/>
-		<KeyValuePair Key="Agent Role" String="Coor"/>
-		<KeyValuePair Key="Name" String="EditProperties"/>
-		<KeyValuePair Key="ScriptVersion" String=""/>
-		<KeyValuePair Key="Viewpoint" String="last"/>
-		<KeyValuePair Key="SchemaVersion" String="0"/>
-		<KeyValuePair Key="Mail Message" String=""/>
-		<KeyValuePair Key="Repeatable" Boolean="false"/>
-	</Properties>
-</ActivityDef>
diff --git a/resources/boot/EA/EditPropertyDescription.xml b/resources/boot/EA/EditPropertyDescription.xml
new file mode 100644
index 0000000..f560988
--- /dev/null
+++ b/resources/boot/EA/EditPropertyDescription.xml
@@ -0,0 +1 @@
+<ActivityDef ID="-1" Name="EditPropertyDescription" Height="0" Width="0" IsLayoutable="false" IsComposite="false"><Properties><KeyValuePair Key="Description" String="Set the initial properties for new instances."/><KeyValuePair Key="Ignorable" Boolean="false"/><KeyValuePair Key="ScriptVersion" String=""/><KeyValuePair Key="Mail Message" String=""/><KeyValuePair Key="Viewpoint" String="last"/><KeyValuePair Key="Agent Name" String=""/><KeyValuePair Key="SchemaVersion" String="0"/><KeyValuePair Key="Skippable" Boolean="false"/><KeyValuePair Key="ScriptName" String=""/><KeyValuePair Key="Mail event" String=""/><KeyValuePair Key="Autostart" Boolean="true"/><KeyValuePair Key="Repeatable" Boolean="false"/><KeyValuePair Key="Show time" Boolean="true"/><KeyValuePair Key="Agent Role" String=""/><KeyValuePair Key="AlwaysUseOutcome" Boolean="false"/><KeyValuePair Key="SchemaType" String="PropertyDescription"/></Properties></ActivityDef>
\ No newline at end of file
diff --git a/resources/boot/EA/SetInstanceWorkflow.xml b/resources/boot/EA/SetInstanceWorkflow.xml
new file mode 100644
index 0000000..63f07ea
--- /dev/null
+++ b/resources/boot/EA/SetInstanceWorkflow.xml
@@ -0,0 +1 @@
+<ActivityDef ID="-1" Name="SetInstanceWorkflow" Height="0" Width="0" IsLayoutable="false" IsComposite="false"><Properties><KeyValuePair Key="Description" String=""/><KeyValuePair Key="Ignorable" Boolean="false"/><KeyValuePair Key="ScriptVersion" String="0"/><KeyValuePair Key="Mail Message" String=""/><KeyValuePair Key="Viewpoint" String="last"/><KeyValuePair Key="Agent Name" String=""/><KeyValuePair Key="SchemaVersion" String="0"/><KeyValuePair Key="Skippable" Boolean="false"/><KeyValuePair Key="ScriptName" String="SetWorkflow"/><KeyValuePair Key="Mail event" String=""/><KeyValuePair Key="Autostart" Boolean="true"/><KeyValuePair Key="Repeatable" Boolean="false"/><KeyValuePair Key="Show time" Boolean="true"/><KeyValuePair Key="Agent Role" String=""/><KeyValuePair Key="AlwaysUseOutcome" Boolean="false"/><KeyValuePair Key="SchemaType" String="ChooseWorkflow"/></Properties></ActivityDef>
\ No newline at end of file
diff --git a/resources/boot/OD/ChooseWorkflow.xsd b/resources/boot/OD/ChooseWorkflow.xsd
new file mode 100644
index 0000000..9927231
--- /dev/null
+++ b/resources/boot/OD/ChooseWorkflow.xsd
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+	<xs:element name="ChooseWorkflow">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="WorkflowDefinitionName" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>Give the name of the composite activity description that you would like new instance of this description to run.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/resources/boot/OD/NewDevObjectDef.xsd b/resources/boot/OD/NewDevObjectDef.xsd
new file mode 100644
index 0000000..637581e
--- /dev/null
+++ b/resources/boot/OD/NewDevObjectDef.xsd
@@ -0,0 +1,20 @@
+<?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="NewDevObjectDef">
+		<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/resources/boot/SC/InstantiateItem.xml b/resources/boot/SC/InstantiateItem.xml
new file mode 100644
index 0000000..4cd84b5
--- /dev/null
+++ b/resources/boot/SC/InstantiateItem.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cristalscript>
+	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+	<script language="javascript" name="InstantiateItem"><![CDATA[
+
+		var job = bsf.lookupBean("job");
+		var item = bsf.lookupBean("item");
+		var agent = bsf.lookupBean("agent");
+		var errorBuffer = bsf.lookupBean("errors");
+
+		var name = job.getOutcome().getDOM().getDocumentElement().
+				getElementsByTagName("ObjectName").item(0).getFirstChild().getData();
+		var folder = job.getOutcome().getDOM().getDocumentElement().
+				getElementsByTagName("SubFolder").item(0).getFirstChild();
+		var domPath = "/" + (folder != null?folder.getData():"");
+
+		
var params = new Array(2);
+		params[0] = name;
+		params[1] = domPath;
+
+		try {
+			agent.execute(item, "CreateItemFromDescription", params);
+		} catch (e) {
+			errorBuffer.addError("Could not create "+name+": "+e.message);
+			errorBuffer.setFatal();
+		}
+
+		errorBuffer;
+		]]></script>
+</cristalscript>
diff --git a/resources/boot/SC/LocalObjectDefCreator.xml b/resources/boot/SC/LocalObjectDefCreator.xml
index c70ee72..cce559e 100644
--- a/resources/boot/SC/LocalObjectDefCreator.xml
+++ b/resources/boot/SC/LocalObjectDefCreator.xml
@@ -42,8 +42,8 @@
 				newObj = CastorXMLUtility.marshall(newAct);
 				}
 			else {
-				var fileType = type.equals("OD")?"xsd":"xml";
-				newObj = Resource.getTextResource("dev", "boot/"+type+"/New."+fileType);
+				var fileType = type.equals("OD")?"Schema":"Script";
+				newObj = item.getObject("/ViewPoint/"+fileType+"/last").getOutcome().getData();
 			}
 			var newPath = new Packages.com.c2kernel.lookup.DomainPath(domPath+"/"+name);
 			var newItem = agent.getItem(newPath);
diff --git a/resources/boot/SC/SetWorkflow.xml b/resources/boot/SC/SetWorkflow.xml
new file mode 100644
index 0000000..0fb2a30
--- /dev/null
+++ b/resources/boot/SC/SetWorkflow.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cristalscript>
+	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+	<script language="javascript" name=""><![CDATA[
+
		importClass(Packages.com.c2kernel.lookup.DomainPath);
+
+		var job = bsf.lookupBean("job");
+		var item = bsf.lookupBean("item");
+		var agent = bsf.lookupBean("agent");
+		var errorBuffer = bsf.lookupBean("errors");
+
+		var wfDefName = job.getOutcome().getField("WorkflowDefinitionName");
+		var root = new DomainPath("/desc/ActivityDesc");
+		var wfItem;
+		try {
+				var wfPath = root.find(wfDefName);
+				wfItem = agent.getItem(wfPath);
+		} catch (e) { errorBuffer.addError(wfDefName+" is not a valid item"); errorBuffer.setFatal(); }
+
+		if (!errorBuffer.getFatal()) {
+				var itemType = wfItem.getProperty("Type");
+				var complex = wfItem.getProperty("Complexity");
+				if (!itemType.equals("ActivityDesc")) {
+						errorBuffer.addError(wfDefName+" is not an activity description");
+						errorBuffer.setFatal();
+				}
+				if (!complex.equals("Composite")) {
+						errorBuffer.addError(wfDefName+" is not a composite activity description");
+						errorBuffer.setFatal();
+				}
+		}
+
+		if (!errorBuffer.getFatal()) {
+				var coll = item.getObject("/Collection/Workflow");
+				if (coll.size() > 0) { 
+						var member = coll.getMembers().list.get(0);
+						coll.removeMember(member.getID());
+				}
+				coll.addMember(wfItem.getSystemKey());
+				var params = new Array(1);
+				params[0] = agent.marshall(coll);
+				agent.execute(item, "AddC2KObject", params);
+		}
+
+		errorBuffer;
+		]]></script>
+</cristalscript>
diff --git a/resources/boot/factory/CA.xml b/resources/boot/factory/CA.xml
deleted file mode 100644
index 908647a..0000000
--- a/resources/boot/factory/CA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<NewItem initialPath="/desc" name="CompositeActivityDefFactory" workflow="CompositeActivityFactory">
-	<Property name="LocalObjectType" value="CompositeActivityDef"/>
-	<Property name="Type" value="LocalObjectFactory"/>
-	<Dependency name="Workflow" isDescription="false">
-		<DependencyMember itemPath="/desc/ActivityDesc/system/kernel/ManageCompositeActDef"/>
-	</Dependency>
-</NewItem>
diff --git a/resources/boot/factory/EA.xml b/resources/boot/factory/EA.xml
deleted file mode 100644
index 1185f10..0000000
--- a/resources/boot/factory/EA.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<NewItem initialPath="/desc" name="ElementaryActivityDefFactory" workflow="ElementaryActivityFactory">
-	<Property name="LocalObjectType" value="ElementaryActivityDef"/>
-	<Property name="Type" value="LocalObjectFactory"/>
-	<Dependency name="Workflow" isDescription="false">
-		<DependencyMember itemPath="/desc/ActivityDesc/system/kernel/ManageElementaryActDef"/>
-	</Dependency>
-</NewItem>
diff --git a/resources/boot/factory/OD.xml b/resources/boot/factory/OD.xml
deleted file mode 100644
index 275048b..0000000
--- a/resources/boot/factory/OD.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<NewItem initialPath="/desc" name="SchemaFactory" workflow="SchemaFactory">
-	<Property name="LocalObjectType" value="Schema"/>
-	<Property name="Type" value="LocalObjectFactory"/>
-		<Dependency name="Workflow" isDescription="false">
-		<DependencyMember itemPath="/desc/ActivityDesc/system/kernel/ManageSchema"/>
-	</Dependency>
-</NewItem>
diff --git a/resources/boot/factory/SC.xml b/resources/boot/factory/SC.xml
deleted file mode 100644
index 7f3f97e..0000000
--- a/resources/boot/factory/SC.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<NewItem initialPath="/desc" name="ScriptFactory" workflow="ScriptFactory">
-	<Property name="LocalObjectType" value="Script"/>
-	<Property name="Type" value="LocalObjectFactory"/>
-		<Dependency name="Workflow" isDescription="false">
-		<DependencyMember itemPath="/desc/ActivityDesc/system/kernel/ManageScript"/>
-	</Dependency>
-</NewItem>
diff --git a/resources/boot/property/DescProp.xml b/resources/boot/property/DescProp.xml
new file mode 100644
index 0000000..95a41c9
--- /dev/null
+++ b/resources/boot/property/DescProp.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<AllProperties><PropertyDescription DefaultValue="" IsClassIdentifier="false" IsMutable="true" Name="Name"/><PropertyDescription DefaultValue="ItemDescription" IsClassIdentifier="true" IsMutable="false" Name="Type"/></AllProperties>
\ No newline at end of file
diff --git a/resources/images/typeicons/factory_16.png b/resources/images/typeicons/factory_16.png
new file mode 100644
index 0000000..9979ee7
Binary files /dev/null and b/resources/images/typeicons/factory_16.png differ
diff --git a/resources/images/typeicons/factory_32.png b/resources/images/typeicons/factory_32.png
new file mode 100644
index 0000000..f43f44f
Binary files /dev/null and b/resources/images/typeicons/factory_32.png differ
diff --git a/resources/images/typeicons/itemdescription_16.png b/resources/images/typeicons/itemdescription_16.png
new file mode 100644
index 0000000..7c80fd6
Binary files /dev/null and b/resources/images/typeicons/itemdescription_16.png differ
diff --git a/resources/images/typeicons/itemdescription_32.png b/resources/images/typeicons/itemdescription_32.png
new file mode 100644
index 0000000..d0afc4d
Binary files /dev/null and b/resources/images/typeicons/itemdescription_32.png differ
diff --git a/resources/images/typeicons/localobjectfactory_16.png b/resources/images/typeicons/localobjectfactory_16.png
deleted file mode 100644
index 9979ee7..0000000
Binary files a/resources/images/typeicons/localobjectfactory_16.png and /dev/null differ
diff --git a/resources/images/typeicons/localobjectfactory_32.png b/resources/images/typeicons/localobjectfactory_32.png
deleted file mode 100644
index f43f44f..0000000
Binary files a/resources/images/typeicons/localobjectfactory_32.png and /dev/null differ
diff --git a/src/module.xml b/src/module.xml
index 7d56649..bbf7109 100644
--- a/src/module.xml
+++ b/src/module.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CristalModule ns="dev" name="CristalDev" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="C:\Users\andrew\workspace\cristal-kernel\resources\boot\OD\Module.xsd">
+<CristalModule ns="dev" name="CristalDev" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<Info>
-		<Description>CRISTAL Development Items, such as resource factories and workflows</Description>
+		<Description>CRISTAL Development Items, such as resource factories and workflows. Also includes a demonstrative description factory</Description>
 		<Version>0.1</Version>
 	</Info>
 	<ResourceURL>ch/cern/cristaldev/resources/</ResourceURL>
 	<Imports>
 		<Resource type="OD" name="NewLocalObjectDef">boot/OD/NewLocalObjectDef.xsd</Resource>
+		<Resource type="OD" name="NewDevObjectDef">boot/OD/NewDevObjectDef.xsd</Resource>
+		<Resource type="OD" name="ChooseWorkflow">boot/OD/ChooseWorkflow.xsd</Resource>
 		<Resource type="EA" name="AssignNewVersionFromLast">boot/EA/AssignNewVersionFromLast.xml</Resource>
 		<Resource type="EA" name="CreateNewLocalObjectDef">boot/EA/CreateNewLocalObjectDef.xml</Resource>
 		<Resource type="EA" name="EditActivityDef">boot/EA/EditActivityDef.xml</Resource>
-		<Resource type="EA" name="EditProperties">boot/EA/EditProperties.xml</Resource>
+		<Resource type="EA" name="EditPropertyDescription">boot/EA/EditPropertyDescription.xml</Resource>
 		<Resource type="EA" name="EditSchema">boot/EA/EditSchema.xml</Resource>
 		<Resource type="EA" name="EditScriptDefinition">boot/EA/EditScriptDefinition.xml</Resource>
+		<Resource type="EA" name="CreateItem">boot/EA/CreateItem.xml</Resource>
+		<Resource type="EA" name="SetInstanceWorkflow">boot/EA/SetInstanceWorkflow.xml</Resource>
 		<Resource type="CA" name="CompositeActivityFactory">boot/CA/CompositeActivityFactory.xml</Resource>
 		<Resource type="CA" name="ElementaryActivityFactory">boot/CA/ElementaryActivityFactory.xml</Resource>
 		<Resource type="CA" name="ManageCompositeActDef">boot/CA/ManageCompositeActDef.xml</Resource>
@@ -21,19 +25,24 @@
 		<Resource type="CA" name="ManageScript">boot/CA/ManageScript.xml</Resource>
 		<Resource type="CA" name="SchemaFactoryWf">boot/CA/SchemaFactoryWf.xml</Resource>
 		<Resource type="CA" name="ScriptFactoryWf">boot/CA/ScriptFactoryWf.xml</Resource>
+		<Resource type="CA" name="ItemDescriptionWf">boot/CA/ItemDescriptionWf.xml</Resource>
+		<Resource type="CA" name="ItemDescriptionFactoryWf">boot/CA/ItemDescriptionFactoryWf.xml</Resource>				
 		<Resource type="SC" name="CreateNewNumberedVersionFromLast">boot/SC/CreateNewNumberedVersionFromLast.xml</Resource>
 		<Resource type="SC" name="LocalObjectDefCreator">boot/SC/LocalObjectDefCreator.xml</Resource>
+		<Resource type="SC" name="InstantiateItem">boot/SC/InstantiateItem.xml</Resource>
+		<Resource type="SC" name="SetWorkflow">boot/SC/SetWorkflow.xml</Resource>		
 		<Item name="ScriptFactory" workflow="ScriptFactoryWf">
 			<Property name="LocalObjectType">Script</Property>
-			<Property name="Type">LocalObjectFactory</Property>
+			<Property name="Type">Factory</Property>
 			<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">
 				<DependencyMember>/desc/ActivityDesc/system/dev/ManageScript</DependencyMember>
 			</Dependency>			
 		</Item>
 		<Item name="ElementaryActivityDefFactory" workflow="ElementaryActivityFactory">
 			<Property name="LocalObjectType">ElementaryActivityDef</Property>
-			<Property name="Type">LocalObjectFactory</Property>
+			<Property name="Type">Factory</Property>
 			<Outcome viewname="last" schema="PropertyDescription" version="0">boot/property/EAProp.xml</Outcome>
 			<Dependency name="workflow">
 				<DependencyMember>/desc/ActivityDesc/system/dev/ManageElementaryActDef</DependencyMember>
@@ -41,7 +50,7 @@
 		</Item>
 		<Item name="CompositeActivityDefFactory" workflow="CompositeActivityFactory">
 			<Property name="LocalObjectType">CompositeActivityDef</Property>
-			<Property name="Type">LocalObjectFactory</Property>
+			<Property name="Type">Factory</Property>
 			<Outcome viewname="last" schema="PropertyDescription" version="0">boot/property/CAProp.xml</Outcome>
 			<Dependency name="workflow">
 				<DependencyMember>/desc/ActivityDesc/system/dev/ManageCompositeActDef</DependencyMember>
@@ -49,13 +58,24 @@
 		</Item>
 		<Item name="SchemaFactory" workflow="SchemaFactoryWf">
 			<Property name="LocalObjectType">Schema</Property>
-			<Property name="Type">LocalObjectFactory</Property>
+			<Property name="Type">Factory</Property>
 			<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">
 				<DependencyMember>/desc/ActivityDesc/system/dev/ManageSchema</DependencyMember>
 			</Dependency>
 		</Item>
-		<Agent password="test" name="andrew">
+		<Item name="DescriptionFactory" workflow="ItemDescriptionFactoryWf">
+			<Property name="Type">Factory</Property>
+			<Outcome viewname="last" schema="PropertyDescription" version="0">boot/property/DescProp.xml</Outcome>
+			<Dependency name="workflow">
+				<DependencyMember>/desc/ActivityDesc/system/dev/ItemDescriptionWf</DependencyMember>
+			</Dependency>
+			<Dependency name="workflow'" isDescription="true">
+				<DependencyMember>/desc/dev/CompositeActivityDefFactory</DependencyMember>
+			</Dependency>			
+		</Item>		
+		<Agent password="test" name="dev">
 			<Role>Admin</Role>
 		</Agent>
 	</Imports>
-- 
cgit v1.2.3