diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2011-06-22 17:01:40 -0500 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2011-06-22 17:01:40 -0500 |
| commit | 4849378a62ab0dbf72f8ce4e6b2073dc73f2337a (patch) | |
| tree | 14945dd6045c438f5dbc8e96f023258d31e1adf9 /schemas/base.xsd | |
| parent | 8d08d5195fa0b6f503752273183948e5d24f33d6 (diff) | |
| parent | 2db056574f5f55c3c802da63abe7e3de10db5d76 (diff) | |
| download | bcfg2-4849378a62ab0dbf72f8ce4e6b2073dc73f2337a.tar.gz bcfg2-4849378a62ab0dbf72f8ce4e6b2073dc73f2337a.tar.bz2 bcfg2-4849378a62ab0dbf72f8ce4e6b2073dc73f2337a.zip | |
Merge branch 'master' of git.mcs.anl.gov:bcfg2
Diffstat (limited to 'schemas/base.xsd')
| -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> |