From e1d8819f03c1afd43a04293ee645ec1f075be23e Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Wed, 27 Jan 2010 01:23:02 +0000
Subject: schemas: Fix BoundPath schema for Bundles (Reported by gregcoit on
 irc) [bugfix]

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

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5705 ce84e21b-d406-0410-9b95-82705330c041
---
 schemas/bundle.xsd    | 4 ++--
 schemas/pathentry.xsd | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'schemas')

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 5b98fcf7b..894dad116 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -24,7 +24,7 @@
       <xsd:element name='Permissions' type='StructureEntry'/>
       <xsd:element name='Action' type='StructureEntry'/>
       <xsd:element name='BoundPackage' type='PackageType'/>
-      <xsd:element name='BoundPath' type='PathEntry'/>
+      <xsd:element name='BoundPath' type='BoundPathEntry'/>
       <xsd:element name='BoundService' type='ServiceType'/>
       <xsd:element name='BoundDirectory' type='DirectoryType'/>
       <xsd:element name='BoundSymLink' type='SymLinkType'/>
@@ -48,7 +48,7 @@
         <xsd:element name='Permissions' type='StructureEntry'/>
         <xsd:element name='Action' type='StructureEntry'/>       
         <xsd:element name='BoundPackage' type='PackageType'/>
-        <xsd:element name='BoundPath' type='PathEntry'/>
+        <xsd:element name='BoundPath' type='BoundPathEntry'/>
         <xsd:element name='BoundService' type='ServiceType'/>
         <xsd:element name='BoundDirectory' type='DirectoryType'/>
         <xsd:element name='BoundSymLink' type='SymLinkType'/>
diff --git a/schemas/pathentry.xsd b/schemas/pathentry.xsd
index db1a29e1a..e564aaa90 100644
--- a/schemas/pathentry.xsd
+++ b/schemas/pathentry.xsd
@@ -12,4 +12,13 @@
     <xsd:attribute type='xsd:string' name='name' use='required'/>
     <xsd:attribute type='xsd:string' name='altsrc' />
   </xsd:complexType>
+
+  <xsd:complexType name='BoundPathEntry'>
+    <xsd:attribute type='xsd:string' name='name' use='required'/>
+    <xsd:attribute type='xsd:string' name='group' use='optional'/>
+    <xsd:attribute type='xsd:string' name='owner' use='optional'/>
+    <xsd:attribute type='xsd:string' name='perms' use='optional'/>
+    <xsd:attribute type='xsd:string' name='type' use='optional'/>
+    <xsd:attribute type='xsd:string' name='altsrc' use='optional'/>
+  </xsd:complexType>
 </xsd:schema>
-- 
cgit v1.2.3-1-g7c22