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/metadata.xsd | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'schemas/metadata.xsd')

diff --git a/schemas/metadata.xsd b/schemas/metadata.xsd
index 1c2474eac..7d07c4971 100644
--- a/schemas/metadata.xsd
+++ b/schemas/metadata.xsd
@@ -11,12 +11,6 @@
   <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
               schemaLocation="xml.xsd"/>
 
-  <xsd:simpleType name='booleanType'>
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="true|false"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
   <xsd:complexType name='groupType'>
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
       <xsd:element name='Bundle'>
@@ -30,9 +24,9 @@
         </xsd:complexType>
       </xsd:element>
     </xsd:choice>
-    <xsd:attribute type='booleanType' name='profile' use='optional'/>
-    <xsd:attribute type='booleanType' name='public' use='optional'/>
-    <xsd:attribute type='booleanType' name='default' use='optional'/>
+    <xsd:attribute type='xsd:boolean' name='profile' use='optional'/>
+    <xsd:attribute type='xsd:boolean' name='public' use='optional'/>
+    <xsd:attribute type='xsd:boolean' name='default' use='optional'/>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
     <xsd:attribute type='xsd:string' name='auth' use='optional'/>
     <xsd:attribute type='xsd:string' name='category' use='optional'/>
-- 
cgit v1.2.3-1-g7c22


From e386c37ff7436f78c1a9dd33e0c90e2b3254c99d Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 13 Apr 2011 11:40:50 -0400
Subject: * Made Metadata files validate whether or not XIncludes had been
 processed

* bcfg2-repo-validate does not chase XIncludes if --stdin has been
  specified, but just validates the Metadata files you provide on
  stdin
---
 schemas/metadata.xsd | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'schemas/metadata.xsd')

diff --git a/schemas/metadata.xsd b/schemas/metadata.xsd
index 7d07c4971..58f9e8029 100644
--- a/schemas/metadata.xsd
+++ b/schemas/metadata.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:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
   
   <xsd:annotation>
     <xsd:documentation>
@@ -10,6 +11,8 @@
 
   <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
               schemaLocation="xml.xsd"/>
+  <xsd:import namespace="http://www.w3.org/2001/XInclude"
+              schemaLocation="xinclude.xsd"/>
 
   <xsd:complexType name='groupType'>
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
@@ -37,6 +40,7 @@
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
       <xsd:element name='Group' type='groupType'/>
       <xsd:element name='Groups' type='groupsType'/>
+      <xsd:element ref="xi:include"/>
     </xsd:choice>
     <xsd:attribute name='version' type='xsd:string'/>
     <xsd:attribute name='origin' type='xsd:string'/>   
-- 
cgit v1.2.3-1-g7c22