From 5b92ab2f3e57de3e5244086120f27e4f8fd7b1bd Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Wed, 13 Oct 2004 14:14:23 +0000
Subject: change field from "from" to "name"

2004/10/12 16:47:53-05:00 anl.gov!desai
loosen up directory restrictions for now

2004/10/12 16:44:21-05:00 anl.gov!desai
fixup schema

(Logical change 1.91)


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@427 ce84e21b-d406-0410-9b95-82705330c041
---
 schemas/bundle.xsd | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'schemas')

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 1c1539caa..3088108db 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -19,22 +19,38 @@
     <xsd:attribute type='xsd:string' name='name' use='required'/>
   </xsd:complexType>
 
+  <xsd:complexType name='DirectoryType'>
+    <xsd:attribute type='xsd:string' name='name' use='required'/>
+    <xsd:attribute type='xsd:string' name='perms'/>
+    <xsd:attribute type='xsd:string' name='owner'/>
+    <xsd:attribute type='xsd:string' name='group'/>
+  </xsd:complexType>
+
+  <xsd:complexType name='SymLinkType'>
+    <xsd:attribute type='xsd:string' name='to'/>
+    <xsd:attribute type='xsd:string' name='name'/>
+  </xsd:complexType>
+
   <xsd:complexType name='SystemType'>
-    <xsd:choice maxOccurs='unbounded'>
+    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
       <xsd:element name='Package' type='PackageType'/>
       <xsd:element name='Service' type='ServiceType'/>
       <xsd:element name='ConfigFile' type='ConfigFileType'/>
+      <xsd:element name='Directory' type='DirectoryType'/>
+      <xsd:element name='SymLink' type='SymLinkType'/>
     </xsd:choice>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
   </xsd:complexType>
 
   <xsd:element name='Bundle'>
     <xsd:complexType>
-      <xsd:choice maxOccurs='unbounded'>
+      <xsd:choice minOccurs='0' maxOccurs='unbounded'>
 	<xsd:element type='SystemType' name='System'/>
 	<xsd:element name='Package' type='PackageType'/>
 	<xsd:element name='Service' type='ServiceType'/>
 	<xsd:element name='ConfigFile' type='ConfigFileType'/>
+	<xsd:element name='Directory' type='DirectoryType'/>
+	<xsd:element name='SymLink' type='SymLinkType'/>
       </xsd:choice>
       <xsd:attribute type='xsd:string' name='name'/>
       <xsd:attribute type='xsd:string' name='version'/>
-- 
cgit v1.2.3-1-g7c22