diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2013-05-23 14:36:45 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2013-05-23 14:36:45 +0200 |
| commit | a36892b9788639aadda293cb27496ae00e189677 (patch) | |
| tree | af75ac00072150b8611152fc25a0a950b9cc5c7f /src/main/resources/boot/OD | |
| parent | 034cb248097b7db3aa57af3be6f91a984815ad4b (diff) | |
Agent and Item were out of line with the new module versions of NewItem
and NewAgent, and the mapfile.
Diffstat (limited to 'src/main/resources/boot/OD')
| -rw-r--r-- | src/main/resources/boot/OD/Agent.xsd | 26 | ||||
| -rw-r--r-- | src/main/resources/boot/OD/Item.xsd | 41 |
2 files changed, 36 insertions, 31 deletions
diff --git a/src/main/resources/boot/OD/Agent.xsd b/src/main/resources/boot/OD/Agent.xsd index 5b9f3f4..1f8f9ed 100644 --- a/src/main/resources/boot/OD/Agent.xsd +++ b/src/main/resources/boot/OD/Agent.xsd @@ -1,20 +1,22 @@ <?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: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: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" use="required"/>
+ <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:attribute name="password" type="xs:string" use="required" />
</xs:complexType>
</xs:element>
+ <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:schema>
diff --git a/src/main/resources/boot/OD/Item.xsd b/src/main/resources/boot/OD/Item.xsd index 5d5c1cf..c46de43 100644 --- a/src/main/resources/boot/OD/Item.xsd +++ b/src/main/resources/boot/OD/Item.xsd @@ -4,7 +4,8 @@ <xs:element name="Item">
<xs:complexType>
<xs:sequence>
- <xs:element name="Properties" type="properties" />
+ <xs:element name="Property" type="property" minOccurs="0"
+ maxOccurs="unbounded" />
<xs:element name="Outcome" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
@@ -19,31 +20,38 @@ <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: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" 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" maxOccurs="unbounded">
+ <xs:element name="AggregationMember" minOccurs="0"
+ maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
<xs:element name="Geometry" minOccurs="1"
@@ -55,7 +63,8 @@ <xs:attribute name="height" type="xs:int" use="required" />
</xs:complexType>
</xs:element>
- <xs:element name="MemberProperties" type="collprops" />
+ <xs:element name="MemberProperties" type="collprops"
+ minOccurs="0" />
</xs:sequence>
<xs:attribute name="slotNo" type="xs:int" use="required" />
<xs:attribute name="itemDescriptionPath" type="xs:string"
@@ -76,22 +85,16 @@ <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 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" maxOccurs="unbounded">
+ <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" />
|