diff options
| author | Holger Weiß <holger@zedat.fu-berlin.de> | 2011-06-03 23:22:40 +0200 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-06-14 12:36:46 -0500 |
| commit | 37960c3d76a04017120a91da604bb911f3e9823d (patch) | |
| tree | 4cd52ee1946db137516ee68513eb54f8a29826a2 | |
| parent | 5da2ced6d355a61032e254356c88804c7a44ffc1 (diff) | |
| download | bcfg2-37960c3d76a04017120a91da604bb911f3e9823d.tar.gz bcfg2-37960c3d76a04017120a91da604bb911f3e9823d.tar.bz2 bcfg2-37960c3d76a04017120a91da604bb911f3e9823d.zip | |
Allow Bound entries and Client tags in Base Schema
Bound entries and Client tags may also be used in Base/*.xml files, so
the XML Schema for Base files must permit these entries.
| -rw-r--r-- | schemas/base.xsd | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/schemas/base.xsd b/schemas/base.xsd index 8eff0c69f..e8d677737 100644 --- a/schemas/base.xsd +++ b/schemas/base.xsd @@ -10,26 +10,30 @@ <xsd:include schemaLocation="atom.xsd"/> <xsd:include schemaLocation="pathentry.xsd"/> + <xsd:include schemaLocation="rules.xsd"/> - <xsd:complexType name='ContainerType'> - <xsd:choice minOccurs='0' maxOccurs='unbounded'> + <xsd:group name='BaseEntries'> + <xsd:choice> + <xsd:element name='Group' type='ContainerType'/> + <xsd:element name='Client' type='ContainerType'/> <xsd:element name='Package' type='StructureEntry'/> <xsd:element name='Path' type='PathEntry'/> <xsd:element name='Service' type='StructureEntry'/> - <xsd:element name='Group' type='ContainerType'/> + <xsd:element name='BoundPackage' type='PackageType'/> + <xsd:element name='BoundPath' type='BoundPathEntry'/> + <xsd:element name='BoundService' type='ServiceType'/> </xsd:choice> + </xsd:group> + + <xsd:complexType name='ContainerType'> + <xsd:group ref='BaseEntries' minOccurs='0' maxOccurs='unbounded'/> <xsd:attribute name='name' type='xsd:string'/> <xsd:attribute name='negate' type='xsd:string'/> </xsd:complexType> <xsd:element name='Base'> <xsd:complexType> - <xsd:choice minOccurs='0' maxOccurs='unbounded'> - <xsd:element name='Package' type='StructureEntry'/> - <xsd:element name='Path' type='PathEntry'/> - <xsd:element name='Service' type='StructureEntry'/> - <xsd:element name='Group' type='ContainerType'/> - </xsd:choice> + <xsd:group ref='BaseEntries' minOccurs='0' maxOccurs='unbounded'/> </xsd:complexType> </xsd:element> |