From 1e7d3491604fbba1709bb03215b6c1783847b530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Wei=C3=9F?= <holger@zedat.fu-berlin.de>
Date: Fri, 3 Jun 2011 23:22:40 +0200
Subject: Allow Bound entries and Client tags in Base Schema

Bound entries and Client tags may also be used in Base/*.xml files, so
the XML Schema for Base files must permit these entries.
---
 schemas/base.xsd | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 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>
 
-- 
cgit v1.2.3-1-g7c22