From 0ddc77cdd798577b3ecbdf047ceda7be58349cd8 Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Fri, 27 Feb 2009 19:52:17 +0000
Subject: Add BoundEntry support to bundle schema

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>


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

(limited to 'schemas/services.xsd')

diff --git a/schemas/services.xsd b/schemas/services.xsd
index 14964c955..828959e82 100644
--- a/schemas/services.xsd
+++ b/schemas/services.xsd
@@ -8,43 +8,27 @@
     </xsd:documentation>
   </xsd:annotation>
 
-  <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:include schemaLocation="servicetype.xsd"/>
 
-  <xsd:complexType name='ContainerType'>
+  <xsd:complexType name='ServiceContainerType'>
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
       <xsd:element name='Service' type='ServiceType'/>
-      <xsd:element name='Group' type='ContainerType'/>
-      <xsd:element name='Client' type='ContainerType'/>
+      <xsd:element name='Group' type='ServiceContainerType'/>
+      <xsd:element name='Client' type='ServiceContainerType'/>
     </xsd:choice>
     <xsd:attribute name='name' type='xsd:string'/>
     <xsd:attribute name='negate' type='xsd:string'/>
   </xsd:complexType>
-	
+
   <xsd:element name='Services'>
     <xsd:complexType>
       <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-	<xsd:element name='Service' type='ServiceType'/>
-	<xsd:element name='Group' type='ContainerType'/>
-	<xsd:element name='Client' type='ContainerType'/>
+        <xsd:element name='Service' type='ServiceType'/>
+        <xsd:element name='Group' type='ServiceContainerType'/>
+        <xsd:element name='Client' type='ServiceContainerType'/>
       </xsd:choice>
       <xsd:attribute name='priority' type='xsd:integer'/>
     </xsd:complexType>
   </xsd:element>
   
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
-- 
cgit v1.2.3-1-g7c22