From 3798e8c5c0544ce62ab2c8751ddb21bbd4726d1c Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Fri, 8 Apr 2011 13:29:12 -0400
Subject: 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
---
 schemas/bundle.xsd | 52 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 15 deletions(-)

(limited to 'schemas/bundle.xsd')

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index bf72915d8..1ea44c991 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.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>
@@ -7,6 +8,11 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
+              schemaLocation="xml.xsd"/>
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:include schemaLocation="atom.xsd"/>
   <xsd:include schemaLocation="pathentry.xsd"/>
   <xsd:include schemaLocation="rules.xsd"/>
@@ -87,6 +93,13 @@
           </xsd:documentation>
         </xsd:annotation>
       </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' use='required'>
       <xsd:annotation>
@@ -102,23 +115,24 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name='Bundle'>
-      <xsd:annotation>
-        <xsd:documentation>
-          A bundle describes a group of inter-dependent configuration
-          entries, such as the combination of packages, configuration
-          files, and service activations that comprise typical Unix
-          daemons. Bundles are used to add groups of configuration
-          entries to the inventory of client configurations, as
-          opposed to describing particular versions of those
-          entries. For example, a bundle could say that the
-          configuration file ``/etc/passwd`` should be included in a
-          configuration, but will not describe the particular version
-          of ``/etc/passwd`` that a given client will receive.
-        </xsd:documentation>
-      </xsd:annotation>
+    <xsd:annotation>
+      <xsd:documentation>
+        A bundle describes a group of inter-dependent configuration
+        entries, such as the combination of packages, configuration
+        files, and service activations that comprise typical Unix
+        daemons. Bundles are used to add groups of configuration
+        entries to the inventory of client configurations, as opposed
+        to describing particular versions of those entries. For
+        example, a bundle could say that the configuration file
+        ``/etc/passwd`` should be included in a configuration, but
+        will not describe the particular version of ``/etc/passwd``
+        that a given client will receive.
+      </xsd:documentation>
+    </xsd:annotation>
     <xsd:complexType>
       <xsd:choice minOccurs='0' maxOccurs='unbounded'>
         <xsd:element name='Package' type='StructureEntry'>
@@ -193,12 +207,20 @@
             </xsd:documentation>
           </xsd:annotation>
         </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='description' />
       <xsd:attribute type='xsd:string' name='name'/>
       <xsd:attribute type='xsd:string' name='version'/>
       <xsd:attribute type='xsd:string' name='origin'/>
       <xsd:attribute type='xsd:string' name='revision'/>
+      <xsd:attributeGroup ref="py:genshiAttrs"/>
     </xsd:complexType>
   </xsd:element>
 </xsd:schema>
-- 
cgit v1.2.3-1-g7c22