From 24314dc1699c7e73048fa24e33729f1aa1ec0e86 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 6 Jul 2012 11:00:24 +0200
Subject: Modules serialize with Castor. Just about to remove the parsing.
 CastorXMLUtility is now a static member of gateway. Domain specific instances
 can be used by domain applications, but the maps do not interfere with the
 kernel.

---
 src/main/resources/boot/OD/Agent.xsd    |  20 ++++++
 src/main/resources/boot/OD/Item.xsd     | 105 ++++++++++++++++++++++++++++++++
 src/main/resources/boot/OD/Module.xsd   |  55 ++++++++++++-----
 src/main/resources/boot/OD/NewAgent.xsd |  20 ------
 src/main/resources/boot/OD/NewItem.xsd  |  73 ----------------------
 5 files changed, 165 insertions(+), 108 deletions(-)
 create mode 100644 src/main/resources/boot/OD/Agent.xsd
 create mode 100644 src/main/resources/boot/OD/Item.xsd
 delete mode 100644 src/main/resources/boot/OD/NewAgent.xsd
 delete mode 100644 src/main/resources/boot/OD/NewItem.xsd

(limited to 'src/main/resources/boot/OD')

diff --git a/src/main/resources/boot/OD/Agent.xsd b/src/main/resources/boot/OD/Agent.xsd
new file mode 100644
index 0000000..5b9f3f4
--- /dev/null
+++ b/src/main/resources/boot/OD/Agent.xsd
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2005 rel. 3 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="Agent">
+		<xs:annotation>
+			<xs:documentation>Complete Structure for new agent</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="Role" type="xs:string" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:documentation>The initial roles that this Agent will hold</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+			</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:schema>
diff --git a/src/main/resources/boot/OD/Item.xsd b/src/main/resources/boot/OD/Item.xsd
new file mode 100644
index 0000000..5d5c1cf
--- /dev/null
+++ b/src/main/resources/boot/OD/Item.xsd
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:element name="Item">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="Properties" type="properties" />
+				<xs:element name="Outcome" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute name="schema" type="xs:string" use="required" />
+								<xs:attribute name="version" type="xs:string" use="required" />
+								<xs:attribute name="viewname" type="xs:string" use="required" />
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Dependency" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="CollectionProperties" type="collprops" />
+							<xs:element name="DependencyMember" minOccurs="0"
+								maxOccurs="unbounded">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="MemberProperties" type="collprops" />
+									</xs:sequence>
+									<xs:attribute name="itemPath" type="xs:string"
+										use="required" />
+								</xs:complexType>
+							</xs:element>
+						</xs:sequence>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="isDescription" type="xs:boolean"
+							use="optional" default="false" />
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Aggregation" minOccurs="0" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:documentation>A new collection with layout
+						</xs:documentation>
+					</xs:annotation>
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="AggregationMember" maxOccurs="unbounded">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="Geometry" minOccurs="1"
+											maxOccurs="1">
+											<xs:complexType>
+												<xs:attribute name="x" type="xs:int" use="required" />
+												<xs:attribute name="y" type="xs:int" use="required" />
+												<xs:attribute name="width" type="xs:int" use="required" />
+												<xs:attribute name="height" type="xs:int" use="required" />
+											</xs:complexType>
+										</xs:element>
+										<xs:element name="MemberProperties" type="collprops" />
+									</xs:sequence>
+									<xs:attribute name="slotNo" type="xs:int" use="required" />
+									<xs:attribute name="itemDescriptionPath" type="xs:string"
+										use="optional" />
+									<xs:attribute name="itemPath" type="xs:string"
+										use="optional" />
+								</xs:complexType>
+							</xs:element>
+						</xs:sequence>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="isDescription" type="xs:boolean"
+							use="required" />
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="workflow" type="xs:string" use="optional" />
+			<xs:attribute name="initialPath" type="xs:string" use="optional" />
+		</xs:complexType>
+	</xs:element>
+	<xs:complexType name="properties">
+		<xs:sequence>
+			<xs:element name="Property" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:string">
+							<xs:attribute name="name" type="xs:string" />
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="collprops">
+		<xs:sequence>
+			<xs:element name="KeyValuePair" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:attribute name="Key" type="xs:string" use="optional" />
+					<xs:attribute name="Boolean" type="xs:boolean" use="optional" />
+					<xs:attribute name="String" type="xs:string" use="optional" />
+					<xs:attribute name="Integer" type="xs:int" use="optional" />
+					<xs:attribute name="Float" type="xs:double" use="optional" />
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+</xs:schema>
diff --git a/src/main/resources/boot/OD/Module.xsd b/src/main/resources/boot/OD/Module.xsd
index 10a0155..bd92ffc 100644
--- a/src/main/resources/boot/OD/Module.xsd
+++ b/src/main/resources/boot/OD/Module.xsd
@@ -47,7 +47,8 @@
 				<xs:element name="Imports" minOccurs="0">
 					<xs:annotation>
 						<xs:documentation>Items to import into or verify within the
-							Cristal server upon launch.</xs:documentation>
+							Cristal server upon launch.
+						</xs:documentation>
 					</xs:annotation>
 					<xs:complexType>
 						<xs:sequence>
@@ -73,17 +74,7 @@
 							<xs:element name="Item" minOccurs="0" maxOccurs="unbounded">
 								<xs:complexType>
 									<xs:sequence>
-										<xs:element name="Property" minOccurs="0"
-											maxOccurs="unbounded">
-											<xs:complexType>
-												<xs:simpleContent>
-													<xs:extension base="xs:string">
-														<xs:attribute name="name" type="xs:string"
-															use="required" />
-													</xs:extension>
-												</xs:simpleContent>
-											</xs:complexType>
-										</xs:element>
+										<xs:element name="Property" type="property" minOccurs="0" maxOccurs="unbounded"/>
 										<xs:element name="Outcome" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:simpleContent>
@@ -102,12 +93,23 @@
 											maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:sequence>
-													<xs:element name="DependencyMember" type="xs:string"
-														minOccurs="0" maxOccurs="unbounded" />
+													<xs:element name="DependencyMember" minOccurs="0"
+														maxOccurs="unbounded">
+														<xs:complexType>
+															<xs:sequence>
+																<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: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:complexType>
 										</xs:element>
 										<xs:element name="Aggregation" minOccurs="0"
@@ -121,7 +123,8 @@
 													<xs:element name="AggregationMember" maxOccurs="unbounded">
 														<xs:complexType>
 															<xs:sequence>
-																<xs:element name="Geometry">
+																<xs:element name="Geometry" minOccurs="1"
+																	maxOccurs="1">
 																	<xs:complexType>
 																		<xs:attribute name="x" type="xs:int" use="required" />
 																		<xs:attribute name="y" type="xs:int" use="required" />
@@ -131,6 +134,7 @@
 																			use="required" />
 																	</xs:complexType>
 																</xs:element>
+																<xs:element name="MemberProperties" type="collprops" minOccurs="0"/>
 															</xs:sequence>
 															<xs:attribute name="slotNo" type="xs:int"
 																use="required" />
@@ -158,6 +162,7 @@
 								<xs:complexType>
 									<xs:sequence>
 										<xs:element name="Role" type="xs:string" 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"
@@ -194,4 +199,24 @@
 			</xs:restriction>
 		</xs:simpleType>
 	</xs:attribute>
+	<xs:complexType name="property">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute name="name" type="xs:string" />
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<xs:complexType name="collprops">
+		<xs:sequence>
+			<xs:element name="KeyValuePair" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:attribute name="Key" type="xs:string" use="optional" />
+					<xs:attribute name="Boolean" type="xs:boolean" use="optional" />
+					<xs:attribute name="String" type="xs:string" use="optional" />
+					<xs:attribute name="Integer" type="xs:int" use="optional" />
+					<xs:attribute name="Float" type="xs:double" use="optional" />
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
 </xs:schema>
diff --git a/src/main/resources/boot/OD/NewAgent.xsd b/src/main/resources/boot/OD/NewAgent.xsd
deleted file mode 100644
index 773f4fc..0000000
--- a/src/main/resources/boot/OD/NewAgent.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2005 rel. 3 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="NewAgent">
-		<xs:annotation>
-			<xs:documentation>Complete Structure for new agent</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Role" type="xs:string" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>The initial roles that this Agent will hold</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-			</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:schema>
diff --git a/src/main/resources/boot/OD/NewItem.xsd b/src/main/resources/boot/OD/NewItem.xsd
deleted file mode 100644
index bcd5298..0000000
--- a/src/main/resources/boot/OD/NewItem.xsd
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2005 rel. 3 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="NewItem">
-		<xs:annotation>
-			<xs:documentation>Complete Structure for new item</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Property" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>New Properties for the item</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="name" type="xs:string" use="required"/>
-						<xs:attribute name="value" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="Aggregation" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>A new collection with layout</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="AggregationMember" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="Geometry">
-											<xs:annotation>
-												<xs:documentation>The position and size of this member slot on the layout</xs:documentation>
-											</xs:annotation>
-											<xs:complexType>
-												<xs:attribute name="x" type="xs:int" use="required"/>
-												<xs:attribute name="y" type="xs:int" use="required"/>
-												<xs:attribute name="width" type="xs:int" use="required"/>
-												<xs:attribute name="height" type="xs:int" use="required"/>
-											</xs:complexType>
-										</xs:element>
-									</xs:sequence>
-									<xs:attribute name="slotNo" type="xs:int" use="required"/>
-									<xs:attribute name="itemDescriptionPath" type="xs:string" use="optional"/>
-									<xs:attribute name="itemPath" type="xs:string" use="optional"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-						<xs:attribute name="name" type="xs:string" use="required"/>
-						<xs:attribute name="isDescription" type="xs:boolean" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="Dependency" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>A new collection without layout</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="DependencyMember" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:attribute name="itemPath" type="xs:string" use="required"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-						<xs:attribute name="name" type="xs:string" use="required"/>
-						<xs:attribute name="isDescription" type="xs:boolean" use="required"/>
-						<xs:attribute name="itemDescriptionPath" type="xs:string" use="optional"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="initialPath" type="xs:string" use="required"/>
-			<xs:attribute name="workflow" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
-- 
cgit v1.2.3