From 3505e7bd1512b69fb28273210320d1a6b845e9de Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 1 Oct 2014 21:37:47 +0200
Subject: Testing of subroles and uuid specification. Remove erroneous ItemDesc
 workflow collection Version property

---
 src/main/resources/module.xml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/main/resources/module.xml b/src/main/resources/module.xml
index 7bb1c6c..fe90883 100644
--- a/src/main/resources/module.xml
+++ b/src/main/resources/module.xml
@@ -29,7 +29,7 @@
 		<Resource name="SchemaFactoryWf" version="0" type="CA">boot/CA/SchemaFactoryWf.xml</Resource>
 		<Resource name="ScriptFactoryWf" version="0" type="CA">boot/CA/ScriptFactoryWf.xml</Resource>
 		<Resource name="StateMachineFactoryWf" version="0" type="CA">boot/CA/StateMachineFactoryWf.xml</Resource>
-		<Resource name="ItemDescriptionWf" version="0" type="CA">boot/CA/ItemDescriptionWf.xml</Resource>
+		<Resource name="ItemDescriptionWf" version="0" type="CA" id="b9415b57-3a4a-4b31-825a-d307d1280ac0">boot/CA/ItemDescriptionWf.xml</Resource>
 		<Resource name="ItemDescriptionFactoryWf" version="0" type="CA">boot/CA/ItemDescriptionFactoryWf.xml</Resource>
 		<Resource name="ReadOnlyItemDescriptionWf" version="0" type="CA">boot/CA/ReadOnlyItemDescriptionWf.xml</Resource>
 		<Resource name="LocalObjectDefCreator" version="0" type="SC">boot/SC/LocalObjectDefCreator.xml</Resource>
@@ -110,11 +110,11 @@
 				<CollectionProperties/>
 			</Dependency>
 		</Item>
-		<Item name="DescriptionFactory" initialPath="/desc/dev" workflow="ItemDescriptionFactoryWf">
+		<Item name="DescriptionFactory" initialPath="/desc/dev" workflow="ItemDescriptionFactoryWf" id="57d87f6d-a83e-42b9-a7c2-800778d5e4d5">
 			<Property name="Type">Factory</Property>
 			<Outcome viewname="last" schema="PropertyDescription" version="0">boot/property/DescProp.xml</Outcome>
 			<Dependency name="workflow" isDescription="false">
-				<DependencyMember itemPath="/desc/ActivityDesc/system/dev/ItemDescriptionWf">
+				<DependencyMember itemPath="/entity/b9415b57-3a4a-4b31-825a-d307d1280ac0">
 					<MemberProperties>
 						<KeyValuePair Key="Version" String="0"/>
 					</MemberProperties>
@@ -122,15 +122,11 @@
 				<CollectionProperties/>
 			</Dependency>
 			<Dependency name="workflow'" isDescription="true">
-				<DependencyMember itemPath="/desc/dev/CompositeActivityDefFactory">
-					<MemberProperties>
-						<KeyValuePair Key="Version" String="0"/>
-					</MemberProperties>
-				</DependencyMember>
+				<DependencyMember itemPath="/desc/dev/CompositeActivityDefFactory"/>
 				<CollectionProperties/>
 			</Dependency>
 		</Item>
-		<Item name="ModuleFactory" initialPath="/desc/dev" workflow="ModuleFactory">
+		<Item name="ModuleFactory" initialPath="/desc/dev" workflow="ModuleFactory" id="ac4a49d0-a156-48ec-ae1a-c54b616899f1">
 			<Property name="Type">Factory</Property>
 			<Outcome viewname="last" schema="PropertyDescription" version="0">boot/property/ModuleProp.xml</Outcome>
 			<Dependency name="workflow" isDescription="false">
@@ -144,11 +140,13 @@
 			<Dependency name="contents" isDescription="true"/>		
 		</Item>
 		<Role jobList="false">User</Role>
+		<Role jobList="false">User/SubUser</Role>
 		<Agent name="dev" password="test">
 			<Role>Admin</Role>
 		</Agent>
 		<Agent name="user" password="test">
-			<Role>User</Role>
+			<Role>SubUser</Role>
+			<Role>Admin</Role>
 		</Agent>
 	</Imports>
 </CristalModule>
-- 
cgit v1.2.3