From be9aa9c636204051381f4efe4b895dff968f0c4d Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 17 May 2013 11:44:46 +0200
Subject: Add Role management support to module, instead of just creating one
 if it's not already there. Supports 'jobList' attribute to enable job pushing

---
 src/main/resources/boot/OD/Module.xsd | 38 ++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'src/main/resources/boot/OD/Module.xsd')

diff --git a/src/main/resources/boot/OD/Module.xsd b/src/main/resources/boot/OD/Module.xsd
index 8351e65..1b54ac5 100644
--- a/src/main/resources/boot/OD/Module.xsd
+++ b/src/main/resources/boot/OD/Module.xsd
@@ -72,7 +72,8 @@
 							<xs:element name="Item" minOccurs="0" maxOccurs="unbounded">
 								<xs:complexType>
 									<xs:sequence>
-										<xs:element name="Property" type="property" minOccurs="0" maxOccurs="unbounded"/>
+										<xs:element name="Property" type="property"
+											minOccurs="0" maxOccurs="unbounded" />
 										<xs:element name="Outcome" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:simpleContent>
@@ -95,30 +96,35 @@
 														maxOccurs="unbounded">
 														<xs:complexType>
 															<xs:sequence>
-																<xs:element name="MemberProperties" type="collprops" minOccurs="0"/>
+																<xs:element name="MemberProperties" type="collprops"
+																	minOccurs="0" />
 															</xs:sequence>
 															<xs:attribute name="itemPath" type="xs:string"
 																use="required" />
 														</xs:complexType>
 													</xs:element>
-													<xs:element name="CollectionProperties" type="collprops" minOccurs="0"/>
+													<xs:element name="CollectionProperties" type="collprops"
+														minOccurs="0" />
 												</xs:sequence>
 												<xs:attribute name="name" type="xs:string" use="required" />
 												<xs:attribute name="isDescription" type="xs:boolean"
 													use="optional" default="false" />
-												<xs:attribute name="itemDescriptionPath"
-													type="xs:string" use="optional" />
+												<xs:attribute name="itemDescriptionPath" type="xs:string"
+													use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="Aggregation" minOccurs="0"
 											maxOccurs="unbounded">
 											<xs:annotation>
-												<xs:documentation>A new collection with layout
+												<xs:documentation>
+													A new collection
+													with layout
 												</xs:documentation>
 											</xs:annotation>
 											<xs:complexType>
 												<xs:sequence>
-													<xs:element name="AggregationMember" minOccurs="0" maxOccurs="unbounded">
+													<xs:element name="AggregationMember" minOccurs="0"
+														maxOccurs="unbounded">
 														<xs:complexType>
 															<xs:sequence>
 																<xs:element name="Geometry" minOccurs="1"
@@ -132,7 +138,8 @@
 																			use="required" />
 																	</xs:complexType>
 																</xs:element>
-																<xs:element name="MemberProperties" type="collprops" minOccurs="0"/>
+																<xs:element name="MemberProperties" type="collprops"
+																	minOccurs="0" />
 															</xs:sequence>
 															<xs:attribute name="slotNo" type="xs:int"
 																use="required" />
@@ -156,17 +163,28 @@
 										use="optional" />
 								</xs:complexType>
 							</xs:element>
+							<xs:element name="Role" maxOccurs="unbounded"
+								minOccurs="0">
+								<xs:complexType>
+									<xs:simpleContent>
+										<xs:extension base="xs:string">
+											<xs:attribute name="jobList" type="xs:boolean" use="required" />
+										</xs:extension>
+									</xs:simpleContent>
+								</xs:complexType>
+							</xs:element>
 							<xs:element name="Agent" minOccurs="0" maxOccurs="unbounded">
 								<xs:complexType>
 									<xs:sequence>
 										<xs:element name="Role" type="xs:string" maxOccurs="unbounded" />
-										<xs:element name="Property" type="property" minOccurs="0" maxOccurs="unbounded"/>
+										<xs:element name="Property" type="property"
+											minOccurs="0" maxOccurs="unbounded" />
 									</xs:sequence>
 									<xs:attribute name="name" type="xs:string" use="required" />
 									<xs:attribute name="password" type="xs:string"
 										use="required" />
 								</xs:complexType>
-							</xs:element>
+							</xs:element>

 						</xs:sequence>
 					</xs:complexType>
 				</xs:element>
-- 
cgit v1.2.3