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

---
 src/module.xml | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

(limited to 'src/module.xml')

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