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.

8 files changed, 151 insertions, 94 deletions

diff --git a/src/main/resources/boot/CA/ManageElementaryActDef.xml b/src/main/resources/boot/CA/ManageElementaryActDef.xml
index 03f747a..77baa8e 100644
--- a/src/main/resources/boot/CA/ManageElementaryActDef.xml
+++ b/src/main/resources/boot/CA/ManageElementaryActDef.xml
@@ -94,7 +94,7 @@
 					<KeyValuePair Key="Prefill" Boolean="false"/>

 					<KeyValuePair Key="Prefill Version" String="-1"/>

 					<KeyValuePair Key="ViewName" String="ElementaryActivityDef"/>

-					<KeyValuePair Key="Name" String="AssignNewSchemaVersionFromLast"/>

+					<KeyValuePair Key="Name" String="AssignNewActivityVersionFromLast"/>

 				</Properties>

 				<activityDef>AssignNewVersionFromLast</activityDef>

 			</ActivitySlotDef>

diff --git a/src/main/resources/boot/EA/CreateNewAgent.xml b/src/main/resources/boot/EA/CreateNewAgent.xml
index 49f1f32..1377012 100644
--- a/src/main/resources/boot/EA/CreateNewAgent.xml
+++ b/src/main/resources/boot/EA/CreateNewAgent.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="NewAgent"/>

+		<KeyValuePair Key="SchemaType" String="Agent"/>

 		<KeyValuePair Key="ScriptName" String="ServerNewEntity"/>

 		<KeyValuePair Key="Ignorable" Boolean="false"/>

 		<KeyValuePair Key="ScriptVersion" String="0"/>

diff --git a/src/main/resources/boot/EA/CreateNewItem.xml b/src/main/resources/boot/EA/CreateNewItem.xml
index 8daaf74..d3dee53 100644
--- a/src/main/resources/boot/EA/CreateNewItem.xml
+++ b/src/main/resources/boot/EA/CreateNewItem.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="NewItem"/>

+		<KeyValuePair Key="SchemaType" String="Item"/>

 		<KeyValuePair Key="ScriptName" String="ServerNewEntity"/>

 		<KeyValuePair Key="Ignorable" Boolean="false"/>

 		<KeyValuePair Key="ScriptVersion" String="0"/>

diff --git a/src/main/resources/boot/OD/NewAgent.xsd b/src/main/resources/boot/OD/Agent.xsd
index 773f4fc..5b9f3f4 100644
--- a/src/main/resources/boot/OD/NewAgent.xsd
+++ b/src/main/resources/boot/OD/Agent.xsd
@@ -1,7 +1,7 @@
 <?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:element name="Agent">

 		<xs:annotation>

 			<xs:documentation>Complete Structure for new agent</xs:documentation>

 		</xs:annotation>

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/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>

diff --git a/src/main/resources/boot/allbootitems.txt b/src/main/resources/boot/allbootitems.txt
index 5eddc7a..09a98b8 100644
--- a/src/main/resources/boot/allbootitems.txt
+++ b/src/main/resources/boot/allbootitems.txt
@@ -1,8 +1,8 @@
 OD/CompositeActivityDef

 OD/ElementaryActivityDef

 OD/Module

-OD/NewAgent

-OD/NewItem

+OD/Agent

+OD/Item

 OD/PredefinedStepOutcome

 OD/PropertyDescription

 OD/Schema