From bcadd1b89d852fbc5af48917be9c7e9a318e7306 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Fri, 16 Feb 2007 21:24:52 +0000
Subject: Fix rules validation (Resolves Ticket #404)

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

(limited to 'schemas')

diff --git a/schemas/rules.xsd b/schemas/rules.xsd
index 81859613b..5c0bca4b0 100644
--- a/schemas/rules.xsd
+++ b/schemas/rules.xsd
@@ -9,21 +9,39 @@
   </xsd:annotation>
 
   <xsd:include schemaLocation="types.xsd"/>
-  
-  <xsd:complexType name='ServiceType'>
-    <xsd:attribute type='xsd:string' name='name'/>
-    <xsd:attribute type='StatusEnum' name='status'/>
-    <xsd:attribute type='xsd:string' name='reload'/>
-    <xsd:attribute type='xsd:string' name='type'/>
-    <xsd:attribute type='xsd:string' name='protocol'/>
-    <xsd:attribute type='xsd:string' name='port'/>
-  </xsd:complexType>
 
   <xsd:complexType name='PackageType'>
     <xsd:attribute type='xsd:string' name='name'/>
     <xsd:attribute type='xsd:string' name='version'/>
+    <xsd:attribute type='xsd:string' name='file'/>
+    <xsd:attribute type='xsd:string' name='verify'/>
+    <xsd:attribute type='xsd:string' name='simplefile'/>
+    <xsd:attribute type='xsd:string' name='reloc'/>
+    <xsd:attribute type='xsd:string' name='multiarch'/>
+    <xsd:attribute type='xsd:string' name='srcs'/>
+    <xsd:attribute type='xsd:string' name='type'/>
+    <xsd:attribute type='xsd:string' name='bname'/>
   </xsd:complexType>
 
+  <xsd:complexType name='ServiceType'>
+    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+      <xsd:element name='User'>
+	<xsd:complexType>
+	  <xsd:attribute name='address' type='xsd:string' use='required'/>
+	  <xsd:attribute name='mask' type='xsd:string' use='required'/>
+	</xsd:complexType>
+      </xsd:element>
+    </xsd:choice>
+    <xsd:attribute name='name' type='xsd:string' use='required'/>
+    <xsd:attribute name='status' type='xsd:string' use='required'/>
+    <xsd:attribute name='port' type='xsd:string'/>
+    <xsd:attribute name='protocol' type='xsd:string'/>
+    <xsd:attribute name='reload' type='xsd:string'/>
+    <xsd:attribute name='FMRI' type='xsd:string'/>
+    <xsd:attribute name='type' type='xsd:string'/>
+  </xsd:complexType>
+
+  
   <xsd:complexType name='DirectoryType'>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
     <xsd:attribute type='xsd:string' name='perms'/>
-- 
cgit v1.2.3-1-g7c22