diff options
Diffstat (limited to 'schemas')
| -rw-r--r-- | schemas/base.xsd | 22 | ||||
| -rw-r--r-- | schemas/bundle.xsd | 9 | ||||
| -rw-r--r-- | schemas/fileprobes.xsd | 2 | ||||
| -rw-r--r-- | schemas/genshi.xsd | 3 | ||||
| -rw-r--r-- | schemas/info.xsd | 2 | ||||
| -rw-r--r-- | schemas/pathentry.xsd | 1 | ||||
| -rw-r--r-- | schemas/rules.xsd | 6 |
7 files changed, 33 insertions, 12 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> diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd index b226e1078..c0a7e08ac 100644 --- a/schemas/bundle.xsd +++ b/schemas/bundle.xsd @@ -55,6 +55,15 @@ </xsd:documentation> </xsd:annotation> </xsd:element> + <xsd:element name='PostInstall' type='StructureEntry'> + <xsd:annotation> + <xsd:documentation> + PostInstall entries are deprecated in favor of Action + entries. Actions can do everything PostInstall entries can + do and more. + </xsd:documentation> + </xsd:annotation> + </xsd:element> <xsd:element name='BoundPackage' type='PackageType'> <xsd:annotation> <xsd:documentation> diff --git a/schemas/fileprobes.xsd b/schemas/fileprobes.xsd index 112047836..e10dc51dd 100644 --- a/schemas/fileprobes.xsd +++ b/schemas/fileprobes.xsd @@ -18,7 +18,7 @@ <xsd:complexType name="FileProbeType"> <xsd:attribute type="xsd:string" name="name" use="required"/> - <xsd:attribute type="xsd:string" name="base64"/> + <xsd:attribute type="xsd:string" name="encoding"/> <xsd:attribute type="xsd:string" name="update"/> </xsd:complexType> diff --git a/schemas/genshi.xsd b/schemas/genshi.xsd index 853b69c0d..d87c4a6e3 100644 --- a/schemas/genshi.xsd +++ b/schemas/genshi.xsd @@ -2,7 +2,8 @@ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:py="http://genshi.edgewall.org/" xml:lang="en" - targetNamespace="http://genshi.edgewall.org/"> + targetNamespace="http://genshi.edgewall.org/" + elementFormDefault="qualified"> <xs:annotation> <xs:documentation> Genshi schema diff --git a/schemas/info.xsd b/schemas/info.xsd index 96ccbe56c..2ff1d937e 100644 --- a/schemas/info.xsd +++ b/schemas/info.xsd @@ -11,7 +11,7 @@ <xsd:complexType name='InfoType'> <xsd:attribute name='encoding' type='xsd:string'/> <xsd:attribute name='group' type='xsd:string'/> - <xsd:attribute name='important' type='xsd:boolean'/> + <xsd:attribute name='important' type='xsd:string'/> <xsd:attribute name='owner' type='xsd:string'/> <xsd:attribute name='perms' type='xsd:string'/> <xsd:attribute name='paranoid' type='xsd:boolean'/> diff --git a/schemas/pathentry.xsd b/schemas/pathentry.xsd index 0c27f9112..24be22612 100644 --- a/schemas/pathentry.xsd +++ b/schemas/pathentry.xsd @@ -24,6 +24,7 @@ <xsd:attribute type='xsd:string' name='owner' use='optional'/> <xsd:attribute type='xsd:string' name='perms' use='optional'/> <xsd:attribute type='xsd:string' name='prune' use='optional'/> + <xsd:attribute type='xsd:string' name='recursive' use='optional'/> <xsd:attribute type='xsd:string' name='to' use='optional'/> <xsd:attribute type='xsd:string' name='type' use='optional'/> <xsd:attributeGroup ref="py:genshiAttrs"/> diff --git a/schemas/rules.xsd b/schemas/rules.xsd index bc8a4af80..0a408c35c 100644 --- a/schemas/rules.xsd +++ b/schemas/rules.xsd @@ -24,6 +24,10 @@ <xsd:attributeGroup ref="py:genshiAttrs"/> </xsd:complexType> + <xsd:complexType name='PostInstallType'> + <xsd:attribute type='xsd:string' name='name' use='required'/> + </xsd:complexType> + <xsd:complexType name='PathType'> <xsd:attribute type='PathTypeEnum' name='type' use='required'/> <xsd:attribute type='xsd:string' name='name' use='required'/> @@ -34,6 +38,7 @@ <xsd:attribute type='xsd:string' name='perms'/> <xsd:attribute type='xsd:string' name='owner'/> <xsd:attribute type='xsd:string' name='group'/> + <xsd:attribute type='xsd:string' name='recursive'/> <xsd:attribute type='xsd:string' name='prune'/> <xsd:attribute type='xsd:string' name='to'/> <xsd:attributeGroup ref="py:genshiAttrs"/> @@ -68,6 +73,7 @@ <xsd:element name='Package' type='PackageType'/> <xsd:element name='Path' type='PathType'/> <xsd:element name='Action' type='ActionType'/> + <xsd:element name='PostInstall' type='PostInstallType'/> <xsd:element name='Group' type='RContainerType'/> <xsd:element name='Client' type='RContainerType'/> <xsd:element ref="py:def"/> |