Merge branch 'master' of github.com:solj/bcfg2

1 files changed, 62 insertions, 15 deletions

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index bf72915d8..c0a7e08ac 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"/>
@@ -49,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>
@@ -87,6 +102,21 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name='Client' type='GroupType'>
+        <xsd:annotation>
+          <xsd:documentation>
+            Elements within Client tags only apply to the named client
+             (or vice-versa; see #element_negate below)
+          </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 +132,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 +224,28 @@
             </xsd:documentation>
           </xsd:annotation>
         </xsd:element>
+        <xsd:element name='Client' type='GroupType'>
+          <xsd:annotation>
+            <xsd:documentation>
+              Elements within Client tags only apply to the named client
+              (or vice-versa; see #element_negate below)
+            </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>