From 39350ff2e9a82aaba2d315f2a656e52f18ae0921 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 10 Apr 2012 16:54:48 -0400
Subject: add xml:base attr to all tags that can be xincluded

---
 schemas/bundle.xsd        |  3 ++-
 schemas/clients.xsd       |  8 ++++++--
 schemas/grouppatterns.xsd |  6 +++++-
 schemas/packages.xsd      | 18 +++++++++++-------
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 1e67e1f3a..4e034ee3c 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -1,6 +1,6 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
-  
+
   <xsd:annotation>
     <xsd:documentation>
       bundle schema for bcfg2
@@ -237,6 +237,7 @@
     <xsd:attribute type='xsd:string' name='origin'/>
     <xsd:attribute type='xsd:string' name='revision'/>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
+    <xsd:attribute ref="xml:base"/>
   </xsd:complexType>
 
   <xsd:element name='Bundle' type='BundleType'>
diff --git a/schemas/clients.xsd b/schemas/clients.xsd
index 0a9ce5202..b79be385c 100644
--- a/schemas/clients.xsd
+++ b/schemas/clients.xsd
@@ -1,5 +1,5 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-  
+
   <xsd:annotation>
     <xsd:documentation>
       client schema for bcfg2
@@ -8,12 +8,15 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
+              schemaLocation="xml.xsd"/>
+
   <xsd:complexType name='ClientType'>
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
       <xsd:element name='Alias'>
         <xsd:complexType>
           <xsd:attribute type='xsd:string' name='name' use='required'/>
-          <xsd:attribute type='xsd:string' name='address'/>   
+          <xsd:attribute type='xsd:string' name='address'/>
         </xsd:complexType>
       </xsd:element>
     </xsd:choice>
@@ -35,6 +38,7 @@
       <xsd:element name='Clients' type='ClientsType'/>
     </xsd:choice>
     <xsd:attribute name='version' type='xsd:string'/>
+    <xsd:attribute ref="xml:base"/>
   </xsd:complexType>
 
   <xsd:element name='Clients' type='ClientsType'/>
diff --git a/schemas/grouppatterns.xsd b/schemas/grouppatterns.xsd
index f2bdceccd..6c63b8694 100644
--- a/schemas/grouppatterns.xsd
+++ b/schemas/grouppatterns.xsd
@@ -1,5 +1,5 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-  
+
   <xsd:annotation>
     <xsd:documentation>
       group patterns config schema for bcfg2
@@ -7,6 +7,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
+              schemaLocation="xml.xsd"/>
+
   <xsd:complexType name="PatternType">
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
       <xsd:element name="NameRange" type="xsd:string"/>
@@ -21,6 +24,7 @@
       <xsd:element name="GroupPattern" type="PatternType"/>
       <xsd:element name="GroupPatterns" type="GroupPatternsType"/>
     </xsd:choice>
+    <xsd:attribute ref="xml:base"/>
   </xsd:complexType>
 
   <xsd:element name="GroupPatterns" type="GroupPatternsType"/>
diff --git a/schemas/packages.xsd b/schemas/packages.xsd
index e09dcf8b5..c29a85ecf 100644
--- a/schemas/packages.xsd
+++ b/schemas/packages.xsd
@@ -1,5 +1,5 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-  
+
   <xsd:annotation>
     <xsd:documentation>
       packages config schema for bcfg2
@@ -7,6 +7,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
+              schemaLocation="xml.xsd"/>
+
   <xsd:simpleType name="sourceTypeEnum">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="yum"/>
@@ -45,12 +48,13 @@
   </xsd:complexType>
 
   <xsd:complexType name="sourcesType">
-      <xsd:choice minOccurs="1" maxOccurs="unbounded">
-        <xsd:element name="Group" type="groupType"/>
-        <xsd:element name="Client" type="groupType"/>
-        <xsd:element name="Source" type="sourceType"/>
-        <xsd:element name="Sources" type="sourcesType"/>
-      </xsd:choice>
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:element name="Group" type="groupType"/>
+      <xsd:element name="Client" type="groupType"/>
+      <xsd:element name="Source" type="sourceType"/>
+      <xsd:element name="Sources" type="sourcesType"/>
+    </xsd:choice>
+    <xsd:attribute ref="xml:base"/>
   </xsd:complexType>
 
   <xsd:element name="Sources" type="sourcesType"/>
-- 
cgit v1.2.3-1-g7c22