From 8340206111ea2375589ea78ccb2142de21d292c0 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Tue, 16 Jan 2007 15:27:05 +0000
Subject: Finish validation fixes for xinclude schemas

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2680 ce84e21b-d406-0410-9b95-82705330c041
---
 schemas/metadata.xsd | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'schemas/metadata.xsd')

diff --git a/schemas/metadata.xsd b/schemas/metadata.xsd
index 7385f10f9..4432aa5d6 100644
--- a/schemas/metadata.xsd
+++ b/schemas/metadata.xsd
@@ -7,7 +7,10 @@
       $Id$
     </xsd:documentation>
   </xsd:annotation>
-  
+
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
+              schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
   <xsd:simpleType name='toolsetType'>
     <xsd:restriction base="xsd:string">
       <xsd:pattern value="rh|debian|solaris|aix|gentoo|auto"/>
@@ -42,20 +45,17 @@
     <xsd:attribute type='xsd:string' name='category' use='optional'/>
     <xsd:attribute type='xsd:string' name='comment' use='optional'/>
   </xsd:complexType>
-    
-  <xsd:element name='Groups'>
-    <xsd:complexType>
-      <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-	<xsd:element name='Group' type='groupType'/>
-        <xsd:element name='Groups'>
-          <xsd:complexType>
-            <xsd:choice>
-              <xsd:element name='Group' type='groupType'/>
-            </xsd:choice>
-          </xsd:complexType>
-        </xsd:element>
-      </xsd:choice>
-      <xsd:attribute name='version' type='xsd:string'/>
-    </xsd:complexType>
-  </xsd:element>
+
+  <xsd:complexType name='groupsType'>
+    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+      <xsd:element name='Group' type='groupType'/>
+      <xsd:element name='Groups' type='groupsType'/>
+    </xsd:choice>
+    <xsd:attribute name='version' type='xsd:string'/>
+    <xsd:attribute name='origin' type='xsd:string'/>   
+    <xsd:attribute name='revision' type='xsd:string'/>  
+    <xsd:attribute ref='xml:base'/>  
+  </xsd:complexType>
+
+  <xsd:element name='Groups' type='groupsType'/>
 </xsd:schema>
-- 
cgit v1.2.3-1-g7c22