diff options
Diffstat (limited to 'schemas')
| -rw-r--r-- | schemas/base.xsd | 2 | ||||
| -rw-r--r-- | schemas/bundle.xsd | 10 | ||||
| -rw-r--r-- | schemas/deps.xsd | 6 | ||||
| -rw-r--r-- | schemas/packages.xsd | 8 | ||||
| -rw-r--r-- | schemas/pkgtype.xsd | 10 |
5 files changed, 23 insertions, 13 deletions
diff --git a/schemas/base.xsd b/schemas/base.xsd index e8d677737..91b7ac8f5 100644 --- a/schemas/base.xsd +++ b/schemas/base.xsd @@ -16,7 +16,7 @@ <xsd:choice> <xsd:element name='Group' type='ContainerType'/> <xsd:element name='Client' type='ContainerType'/> - <xsd:element name='Package' type='StructureEntry'/> + <xsd:element name='Package' type='PackageStructure'/> <xsd:element name='Path' type='PathEntry'/> <xsd:element name='Service' type='StructureEntry'/> <xsd:element name='BoundPackage' type='PackageType'/> diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd index 2dd77e9af..6b32434be 100644 --- a/schemas/bundle.xsd +++ b/schemas/bundle.xsd @@ -20,11 +20,12 @@ <xsd:complexType name='GroupType'> <xsd:choice minOccurs='0' maxOccurs='unbounded'> - <xsd:element name='Package' type='StructureEntry'> + <xsd:element name='Package' type='PackageStructure'> <xsd:annotation> <xsd:documentation> Abstract implementation of a Package entry. The full - specification will be included in Rules. + specification will be generated by a plugin such as + Packages. </xsd:documentation> </xsd:annotation> </xsd:element> @@ -145,11 +146,12 @@ <xsd:complexType name='BundleType'> <xsd:choice minOccurs='0' maxOccurs='unbounded'> - <xsd:element name='Package' type='StructureEntry'> + <xsd:element name='Package' type='PackageStructure'> <xsd:annotation> <xsd:documentation> Abstract implementation of a Package entry. The full - specification will be included in Rules. + specification will be generated by a plugin such as + Packages. </xsd:documentation> </xsd:annotation> </xsd:element> diff --git a/schemas/deps.xsd b/schemas/deps.xsd index 539d9a7e4..b1400c320 100644 --- a/schemas/deps.xsd +++ b/schemas/deps.xsd @@ -9,7 +9,7 @@ <xsd:complexType name='StructureEntry'> <xsd:choice minOccurs='0' maxOccurs='unbounded'> - <xsd:element name='Package' type='StructureEntry'/> + <xsd:element name='Package' type='PackageStructure'/> <xsd:element name='Service' type='StructureEntry'/> <xsd:element name='Path' type='StructureEntry'/> </xsd:choice> @@ -18,7 +18,7 @@ <xsd:complexType name='GroupType'> <xsd:choice minOccurs='0' maxOccurs='unbounded'> - <xsd:element name='Package' type='StructureEntry'/> + <xsd:element name='Package' type='PackageStructure'/> <xsd:element name='Service' type='StructureEntry'/> <xsd:element name='Path' type='StructureEntry'/> <xsd:element name='Group' type='GroupType'/> @@ -29,7 +29,7 @@ <xsd:element name='Dependencies'> <xsd:complexType> <xsd:choice minOccurs='0' maxOccurs='unbounded'> - <xsd:element name='Package' type='StructureEntry'/> + <xsd:element name='Package' type='PackageStructure'/> <xsd:element name='Service' type='StructureEntry'/> <xsd:element name='Path' type='StructureEntry'/> <xsd:element name='Group' type='GroupType'/> diff --git a/schemas/packages.xsd b/schemas/packages.xsd index 8b5f31118..9f16a23c0 100644 --- a/schemas/packages.xsd +++ b/schemas/packages.xsd @@ -17,7 +17,7 @@ </xsd:simpleType> <xsd:complexType name="sourceType"> - <xsd:sequence> + <xsd:sequence minOccurs="0" maxOccurs="unbounded"> <xsd:element name="Component" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> <xsd:choice> @@ -26,14 +26,14 @@ <xsd:element name="Whitelist" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> </xsd:choice> - <xsd:element name="Arch" type="xsd:string" minOccurs="1" + <xsd:element name="Arch" type="xsd:string" minOccurs="1" maxOccurs="unbounded"/> - <xsd:element name="GPGKey" type="xsd:string" minOccurs="0" + <xsd:element name="GPGKey" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute type="xsd:boolean" name="recommended"/> <xsd:attribute type="sourceTypeEnum" name="type"/> - <xsd:attribute type="xsd:string" name="id"/> + <xsd:attribute type="xsd:string" name="pulp_id"/> <xsd:attribute type="xsd:string" name="url"/> <xsd:attribute type="xsd:string" name="rawurl"/> <xsd:attribute type="xsd:string" name="version"/> diff --git a/schemas/pkgtype.xsd b/schemas/pkgtype.xsd index 6c3821f82..23768e518 100644 --- a/schemas/pkgtype.xsd +++ b/schemas/pkgtype.xsd @@ -13,6 +13,13 @@ <xsd:import namespace="http://genshi.edgewall.org/" schemaLocation="genshi.xsd"/> + <xsd:complexType name="PackageStructure"> + <xsd:attribute type="xsd:string" name="name"/> + <xsd:attribute type="xsd:string" name="group"/> + <xsd:attribute type="xsd:string" name="verify" use="optional"/> + <xsd:attributeGroup ref="py:genshiAttrs"/> + </xsd:complexType> + <xsd:complexType name="PackageType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="Instance"> @@ -38,7 +45,8 @@ <xsd:element ref="py:with"/> <xsd:element ref="py:replace"/> </xsd:choice> - <xsd:attribute type="xsd:string" name="name" use="required"/> + <xsd:attribute type="xsd:string" name="name"/> + <xsd:attribute type="xsd:string" name="group"/> <xsd:attribute type="xsd:string" name="version"/> <xsd:attribute type="xsd:string" name="file"/> <xsd:attribute type="xsd:boolean" name="verify"/> |