diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2007-01-11 20:01:33 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2007-01-11 20:01:33 +0000 |
commit | e353f337bb0144b4980068ab21e3e13cf3e70bc0 (patch) | |
tree | 699d172860d6a9b691412eac3c9599563d25eb85 /schemas | |
parent | ca543cba335b161e50fceabc1c7af6bd89bede48 (diff) | |
download | bcfg2-e353f337bb0144b4980068ab21e3e13cf3e70bc0.tar.gz bcfg2-e353f337bb0144b4980068ab21e3e13cf3e70bc0.tar.bz2 bcfg2-e353f337bb0144b4980068ab21e3e13cf3e70bc0.zip |
Fixes from Rick
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2649 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'schemas')
-rw-r--r-- | schemas/bundle.xsd | 2 | ||||
-rw-r--r-- | schemas/clients.xsd | 8 | ||||
-rw-r--r-- | schemas/metadata.xsd | 8 | ||||
-rw-r--r-- | schemas/report-configuration.xsd | 1 |
4 files changed, 12 insertions, 7 deletions
diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd index 685c7ca6f..55d6bc9b9 100644 --- a/schemas/bundle.xsd +++ b/schemas/bundle.xsd @@ -21,7 +21,7 @@ <xsd:element name='Group' type='GroupType'/> </xsd:choice> <xsd:attribute type='xsd:string' name='name' use='required'/> - <xsd:attribute type='xsd:string' name='negate' use='required'/> + <xsd:attribute type='xsd:string' name='negate' /> </xsd:complexType> <xsd:element name='Bundle'> diff --git a/schemas/clients.xsd b/schemas/clients.xsd index 26da2483f..7ff3471ad 100644 --- a/schemas/clients.xsd +++ b/schemas/clients.xsd @@ -29,9 +29,11 @@ <xsd:choice minOccurs='0' maxOccurs='unbounded'> <xsd:element name='Client' type='ClientType'/> <xsd:element name='Clients'> - <xsd:choice> - <xsd:element name='Client' type='ClientType'/> - </xsd:choice> + <xsd:complexType> + <xsd:choice> + <xsd:element name='Client' type='ClientType'/> + </xsd:choice> + </xsd:complexType> </xsd:element> </xsd:choice> <xsd:attribute name='version' type='xsd:string'/> diff --git a/schemas/metadata.xsd b/schemas/metadata.xsd index b58a8f40c..7f0a5a7c4 100644 --- a/schemas/metadata.xsd +++ b/schemas/metadata.xsd @@ -48,9 +48,11 @@ <xsd:choice minOccurs='0' maxOccurs='unbounded'> <xsd:element name='Group' type='groupType'/> <xsd:element name='Groups'> - <xsd:choice> - <xsd:element name='Group' type='groupType'/> - </xsd:choice> + <xsd:complexType> + <xsd:choice> + <xsd:element name='Group' type='groupType'/> + </xsd:choice> + </xsd:complexType> </xsd:element> </xsd:choice> <xsd:attribute name='version' type='xsd:string'/> diff --git a/schemas/report-configuration.xsd b/schemas/report-configuration.xsd index fad37e1e0..8e68e9bba 100644 --- a/schemas/report-configuration.xsd +++ b/schemas/report-configuration.xsd @@ -38,6 +38,7 @@ <xs:enumeration value="nodes-individual"/> <xs:enumeration value="nodes-digest"/> <xs:enumeration value="overview-stats"/> + <xs:enumeration value="timing-summary"/> </xs:restriction> </xs:simpleType> </xs:attribute> |