diff options
Diffstat (limited to 'schemas')
| -rw-r--r-- | schemas/base.xsd | 1 | ||||
| -rw-r--r-- | schemas/bundle.xsd | 3 | ||||
| -rw-r--r-- | schemas/clients.xsd | 9 | ||||
| -rw-r--r-- | schemas/decisions.xsd | 1 | ||||
| -rw-r--r-- | schemas/defaults.xsd | 1 | ||||
| -rw-r--r-- | schemas/genshi.xsd | 1 | ||||
| -rw-r--r-- | schemas/grouppatterns.xsd | 6 | ||||
| -rw-r--r-- | schemas/metadata.xsd | 1 | ||||
| -rw-r--r-- | schemas/packages.xsd | 18 | ||||
| -rw-r--r-- | schemas/pathentry.xsd | 1 | ||||
| -rw-r--r-- | schemas/pkglist.xsd | 1 | ||||
| -rw-r--r-- | schemas/pkgtype.xsd | 4 | ||||
| -rw-r--r-- | schemas/rules.xsd | 1 | ||||
| -rw-r--r-- | schemas/services.xsd | 1 | ||||
| -rw-r--r-- | schemas/servicetype.xsd | 1 | ||||
| -rw-r--r-- | schemas/types.xsd | 1 |
16 files changed, 26 insertions, 25 deletions
diff --git a/schemas/base.xsd b/schemas/base.xsd index 91b7ac8f5..cca665b38 100644 --- a/schemas/base.xsd +++ b/schemas/base.xsd @@ -4,7 +4,6 @@ <xsd:documentation> base schema for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd index 1e67e1f3a..4e034ee3c 100644 --- a/schemas/bundle.xsd +++ b/schemas/bundle.xsd @@ -1,6 +1,6 @@ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:py="http://genshi.edgewall.org/" xml:lang="en"> - + <xsd:annotation> <xsd:documentation> bundle schema for bcfg2 @@ -237,6 +237,7 @@ <xsd:attribute type='xsd:string' name='origin'/> <xsd:attribute type='xsd:string' name='revision'/> <xsd:attributeGroup ref="py:genshiAttrs"/> + <xsd:attribute ref="xml:base"/> </xsd:complexType> <xsd:element name='Bundle' type='BundleType'> diff --git a/schemas/clients.xsd b/schemas/clients.xsd index 0a9ce5202..56f458a45 100644 --- a/schemas/clients.xsd +++ b/schemas/clients.xsd @@ -1,19 +1,21 @@ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en"> - + <xsd:annotation> <xsd:documentation> client schema for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="xml.xsd"/> + <xsd:complexType name='ClientType'> <xsd:choice minOccurs='0' maxOccurs='unbounded'> <xsd:element name='Alias'> <xsd:complexType> <xsd:attribute type='xsd:string' name='name' use='required'/> - <xsd:attribute type='xsd:string' name='address'/> + <xsd:attribute type='xsd:string' name='address'/> </xsd:complexType> </xsd:element> </xsd:choice> @@ -35,6 +37,7 @@ <xsd:element name='Clients' type='ClientsType'/> </xsd:choice> <xsd:attribute name='version' type='xsd:string'/> + <xsd:attribute ref="xml:base"/> </xsd:complexType> <xsd:element name='Clients' type='ClientsType'/> diff --git a/schemas/decisions.xsd b/schemas/decisions.xsd index a354ec8cb..30115b367 100644 --- a/schemas/decisions.xsd +++ b/schemas/decisions.xsd @@ -4,7 +4,6 @@ <xsd:documentation> decision list schema for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> diff --git a/schemas/defaults.xsd b/schemas/defaults.xsd index 27e749470..c7e2edc7e 100644 --- a/schemas/defaults.xsd +++ b/schemas/defaults.xsd @@ -4,7 +4,6 @@ <xsd:documentation> string enumeration definitions for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> diff --git a/schemas/genshi.xsd b/schemas/genshi.xsd index 088ec56be..35d81e2f1 100644 --- a/schemas/genshi.xsd +++ b/schemas/genshi.xsd @@ -8,7 +8,6 @@ <xs:documentation> Genshi schema Chris St. Pierre - $Id$ </xs:documentation> </xs:annotation> diff --git a/schemas/grouppatterns.xsd b/schemas/grouppatterns.xsd index f2bdceccd..6c63b8694 100644 --- a/schemas/grouppatterns.xsd +++ b/schemas/grouppatterns.xsd @@ -1,5 +1,5 @@ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en"> - + <xsd:annotation> <xsd:documentation> group patterns config schema for bcfg2 @@ -7,6 +7,9 @@ </xsd:documentation> </xsd:annotation> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="xml.xsd"/> + <xsd:complexType name="PatternType"> <xsd:choice minOccurs="1" maxOccurs="unbounded"> <xsd:element name="NameRange" type="xsd:string"/> @@ -21,6 +24,7 @@ <xsd:element name="GroupPattern" type="PatternType"/> <xsd:element name="GroupPatterns" type="GroupPatternsType"/> </xsd:choice> + <xsd:attribute ref="xml:base"/> </xsd:complexType> <xsd:element name="GroupPatterns" type="GroupPatternsType"/> diff --git a/schemas/metadata.xsd b/schemas/metadata.xsd index 58f9e8029..f79039d25 100644 --- a/schemas/metadata.xsd +++ b/schemas/metadata.xsd @@ -5,7 +5,6 @@ <xsd:documentation> metadata schema for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> diff --git a/schemas/packages.xsd b/schemas/packages.xsd index e09dcf8b5..c29a85ecf 100644 --- a/schemas/packages.xsd +++ b/schemas/packages.xsd @@ -1,5 +1,5 @@ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en"> - + <xsd:annotation> <xsd:documentation> packages config schema for bcfg2 @@ -7,6 +7,9 @@ </xsd:documentation> </xsd:annotation> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="xml.xsd"/> + <xsd:simpleType name="sourceTypeEnum"> <xsd:restriction base="xsd:string"> <xsd:enumeration value="yum"/> @@ -45,12 +48,13 @@ </xsd:complexType> <xsd:complexType name="sourcesType"> - <xsd:choice minOccurs="1" maxOccurs="unbounded"> - <xsd:element name="Group" type="groupType"/> - <xsd:element name="Client" type="groupType"/> - <xsd:element name="Source" type="sourceType"/> - <xsd:element name="Sources" type="sourcesType"/> - </xsd:choice> + <xsd:choice minOccurs="1" maxOccurs="unbounded"> + <xsd:element name="Group" type="groupType"/> + <xsd:element name="Client" type="groupType"/> + <xsd:element name="Source" type="sourceType"/> + <xsd:element name="Sources" type="sourcesType"/> + </xsd:choice> + <xsd:attribute ref="xml:base"/> </xsd:complexType> <xsd:element name="Sources" type="sourcesType"/> diff --git a/schemas/pathentry.xsd b/schemas/pathentry.xsd index 315b0082e..080758d0b 100644 --- a/schemas/pathentry.xsd +++ b/schemas/pathentry.xsd @@ -5,7 +5,6 @@ <xsd:documentation> path entry schema for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> diff --git a/schemas/pkglist.xsd b/schemas/pkglist.xsd index c16ed654e..c0d449f54 100644 --- a/schemas/pkglist.xsd +++ b/schemas/pkglist.xsd @@ -4,7 +4,6 @@ <xsd:documentation> package list schema for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> diff --git a/schemas/pkgtype.xsd b/schemas/pkgtype.xsd index 3655c646b..0aaea0c22 100644 --- a/schemas/pkgtype.xsd +++ b/schemas/pkgtype.xsd @@ -5,7 +5,6 @@ <xsd:documentation> package list schema for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> @@ -51,7 +50,8 @@ <xsd:attribute type="xsd:string" name="srcs"/> <xsd:attribute type="PackageTypeEnum" name="type"/> <xsd:attribute type="xsd:string" name="bname"/> - <xsd:attribute name="pkg_checks" type="xsd:string"/> + <xsd:attribute name="pkg_checks" type="xsd:boolean"/> + <xsd:attribute name="pkg_verify" type="xsd:boolean"/> <xsd:attribute name="verify_flags" type="xsd:string"/> <xsd:attributeGroup ref="py:genshiAttrs"/> </xsd:complexType> diff --git a/schemas/rules.xsd b/schemas/rules.xsd index 06c3b38ac..924792b18 100644 --- a/schemas/rules.xsd +++ b/schemas/rules.xsd @@ -5,7 +5,6 @@ <xsd:documentation> string enumeration definitions for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> diff --git a/schemas/services.xsd b/schemas/services.xsd index 828959e82..b91e851d2 100644 --- a/schemas/services.xsd +++ b/schemas/services.xsd @@ -4,7 +4,6 @@ <xsd:documentation> services schema for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> diff --git a/schemas/servicetype.xsd b/schemas/servicetype.xsd index 6b497383d..af5bc64a6 100644 --- a/schemas/servicetype.xsd +++ b/schemas/servicetype.xsd @@ -5,7 +5,6 @@ <xsd:documentation> services schema for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> diff --git a/schemas/types.xsd b/schemas/types.xsd index 689e693b7..ead377192 100644 --- a/schemas/types.xsd +++ b/schemas/types.xsd @@ -4,7 +4,6 @@ <xsd:documentation> string enumeration definitions for bcfg2 Narayan Desai, Argonne National Laboratory - $Id$ </xsd:documentation> </xsd:annotation> |