From edca0b698637c3fd0a70af7e4752a46afca938d3 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Mon, 23 Jan 2006 22:35:40 +0000
Subject: last step of repo switches

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

(limited to 'schemas/metadata.xsd')

diff --git a/schemas/metadata.xsd b/schemas/metadata.xsd
index 3636bb2b8..d200694cc 100644
--- a/schemas/metadata.xsd
+++ b/schemas/metadata.xsd
@@ -4,69 +4,44 @@
     <xsd:documentation>
       metadata schema for bcfg2
       Narayan Desai, Argonne National Laboratory
-      $Id: $
+      $Id$
     </xsd:documentation>
   </xsd:annotation>
   
-  <xsd:complexType name='ClientType'>
-    <xsd:attribute type='xsd:string' name='name' use='required'/>
-    <xsd:attribute type='xsd:string' name='image' use='required'/>
-    <xsd:attribute type='xsd:string' name='profile' use='required'/>
-  </xsd:complexType>
+  <xsd:simpleType name='toolsetType'>
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="rh|debian|solaris"/>
+    </xsd:restriction>
+  </xsd:simpleType>
 
-  <xsd:complexType name='ProfileType'>
-    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-      <xsd:element name='Class'>
-	<xsd:complexType>
-	  <xsd:attribute type='xsd:string' name='name' use='required'/>
-	</xsd:complexType>
-      </xsd:element>
-      <xsd:element name='Attribute'>
-	<xsd:complexType>
-	  <xsd:attribute name='name' type='xsd:string' use='required'/>
-	  <xsd:attribute name='scope' type='xsd:string' use='required'/>
-	</xsd:complexType>
-      </xsd:element>
-    </xsd:choice>
-    <xsd:attribute type='xsd:string' name='name' use='required'/>
-    <xsd:attribute type='xsd:string' name='public' use='required'/>
-  </xsd:complexType>
+  <xsd:simpleType name='booleanType'>
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="true|false"/>
+    </xsd:restriction>
+  </xsd:simpleType>
 
-  <xsd:complexType name='ClassType'>
+  <xsd:complexType name='groupType'>
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
       <xsd:element name='Bundle'>
 	<xsd:complexType>
 	  <xsd:attribute type='xsd:string' name='name' use='required'/>
 	</xsd:complexType>
       </xsd:element>
+      <xsd:element name='Group' type='groupType'/>
     </xsd:choice>
+    <xsd:attribute type='booleanType' name='profile' use='optional'/>
+    <xsd:attribute type='booleanType' name='public' use='optional'/>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
-  </xsd:complexType>
-
-  <xsd:simpleType name='ToolSetType'>
-     <xsd:restriction base="xsd:string">
-      <xsd:pattern value="rh|debian|solaris"/>                                                                                                                                             
-    </xsd:restriction>                                                                                                                                                                                                                  
-  </xsd:simpleType>                                                                                                                                                                                                                     
- 
-  <xsd:complexType name='ImageType'>
-    <xsd:attribute type='xsd:string' name='name' use='required'/>
-    <xsd:attribute type='ToolSetType' name='toolset' use='required'/>
+    <xsd:attribute type='toolsetType' name='toolset' use='optional'/>
+    <xsd:attribute type='xsd:string' name='category' use='optional'/>
   </xsd:complexType>
     
-
-  <xsd:element name='Metadata'>
+  <xsd:element name='Groups'>
     <xsd:complexType>
       <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-	<xsd:element name='Client' type='ClientType'/>
-	<xsd:element name='Class' type='ClassType'/>
-	<xsd:element name='Profile' type='ProfileType'/>
-        <xsd:element name='Image' type='ImageType'/>
+	<xsd:element name='Group' type='groupType'/>
       </xsd:choice>
       <xsd:attribute name='version' type='xsd:string'/>
-      <xsd:attribute type='xsd:string' name='default_image' use='required'/>
-      <xsd:attribute type='xsd:string' name='default_profile' use='required'/>
     </xsd:complexType>
   </xsd:element>
-
 </xsd:schema>
-- 
cgit v1.2.3-1-g7c22