diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-04-08 13:29:12 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-04-08 13:29:12 -0400 |
| commit | 3798e8c5c0544ce62ab2c8751ddb21bbd4726d1c (patch) | |
| tree | 7e888a208d9f420c3398554340a2619ffebf5e5b /schemas/pkgtype.xsd | |
| parent | 2e1a79fe401bea5b33551b9f94689524bf43cdca (diff) | |
| download | bcfg2-3798e8c5c0544ce62ab2c8751ddb21bbd4726d1c.tar.gz bcfg2-3798e8c5c0544ce62ab2c8751ddb21bbd4726d1c.tar.bz2 bcfg2-3798e8c5c0544ce62ab2c8751ddb21bbd4726d1c.zip | |
A number of schema changes/fixes/updates:
* altsrc attr is not allowed on Service and Action tags
* Removed duplicate definition of PackageType, fixed required attrs
* Removed deprecated <Ignore> tags in BoundPackage Instances
* Added Genshi schema, made Genshi bundles validate
* Use builtin xs:boolean type where possible
Diffstat (limited to 'schemas/pkgtype.xsd')
| -rw-r--r-- | schemas/pkgtype.xsd | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/schemas/pkgtype.xsd b/schemas/pkgtype.xsd index 4756f0ecd..ad63cd9d2 100644 --- a/schemas/pkgtype.xsd +++ b/schemas/pkgtype.xsd @@ -1,4 +1,5 @@ -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en"> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:py="http://genshi.edgewall.org/" xml:lang="en"> <xsd:annotation> <xsd:documentation> @@ -9,23 +10,13 @@ </xsd:annotation> <xsd:include schemaLocation="types.xsd"/> + <xsd:import namespace="http://genshi.edgewall.org/" + schemaLocation="genshi.xsd"/> <xsd:complexType name='PackageType'> <xsd:choice minOccurs='0' maxOccurs='unbounded'> - <xsd:element name='Ignore'> - <xsd:complexType> - <xsd:attribute type='xsd:string' name='name'/> - </xsd:complexType> - </xsd:element> <xsd:element name='Instance'> <xsd:complexType> - <xsd:choice minOccurs='0' maxOccurs='unbounded'> - <xsd:element name='Ignore'> - <xsd:complexType> - <xsd:attribute type='xsd:string' name='name'/> - </xsd:complexType> - </xsd:element> - </xsd:choice> <xsd:attribute name='arch' type='xsd:string'/> <xsd:attribute name='epoch' type='xsd:string'/> <xsd:attribute name='version' type='xsd:string'/> @@ -36,10 +27,18 @@ <xsd:attribute name='installed_action' type='xsd:string'/> <xsd:attribute name='version_fail_action' type='xsd:string'/> <xsd:attribute name='verify_fail_action' type='xsd:string'/> + <xsd:attributeGroup ref="py:genshiAttrs"/> </xsd:complexType> </xsd:element> + <xsd:element ref="py:def"/> + <xsd:element ref="py:match"/> + <xsd:element ref="py:choose"/> + <xsd:element ref="py:for"/> + <xsd:element ref="py:if"/> + <xsd:element ref="py:with"/> + <xsd:element ref="py:replace"/> </xsd:choice> - <xsd:attribute type='xsd:string' name='name'/> + <xsd:attribute type='xsd:string' name='name' use="required"/> <xsd:attribute type='xsd:string' name='version'/> <xsd:attribute type='xsd:string' name='file'/> <xsd:attribute type='xsd:string' name='verify'/> @@ -51,5 +50,6 @@ <xsd:attribute type='xsd:string' name='bname'/> <xsd:attribute name='pkg_checks' type='xsd:string'/> <xsd:attribute name='verify_flags' type='xsd:string'/> + <xsd:attributeGroup ref="py:genshiAttrs"/> </xsd:complexType> </xsd:schema> |