From 3c984f8e6e2eec4d9621633fe3902a556642e7b5 Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Wed, 29 Sep 2010 22:24:10 +0000
Subject: schemas/deps.xsd: Deprecate old configuration entries in Deps schema
 (Reported by Mike McCallister in Ticket #950)

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6083 ce84e21b-d406-0410-9b95-82705330c041
---
 schemas/deps.xsd | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/schemas/deps.xsd b/schemas/deps.xsd
index d0710ee08..539d9a7e4 100644
--- a/schemas/deps.xsd
+++ b/schemas/deps.xsd
@@ -11,10 +11,7 @@
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
       <xsd:element name='Package' type='StructureEntry'/>
       <xsd:element name='Service' type='StructureEntry'/>
-      <xsd:element name='ConfigFile' type='StructureEntry'/>
-      <xsd:element name='Directory' type='StructureEntry'/>
-      <xsd:element name='SymLink' type='StructureEntry'/>
-      <xsd:element name='Permissions' type='StructureEntry'/>
+      <xsd:element name='Path' type='StructureEntry'/>
     </xsd:choice>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
   </xsd:complexType>
@@ -23,10 +20,7 @@
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
       <xsd:element name='Package' type='StructureEntry'/>
       <xsd:element name='Service' type='StructureEntry'/>
-      <xsd:element name='ConfigFile' type='StructureEntry'/>
-      <xsd:element name='Directory' type='StructureEntry'/>
-      <xsd:element name='SymLink' type='StructureEntry'/>
-      <xsd:element name='Permissions' type='StructureEntry'/>
+      <xsd:element name='Path' type='StructureEntry'/>
       <xsd:element name='Group' type='GroupType'/>
     </xsd:choice>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
@@ -37,10 +31,7 @@
       <xsd:choice minOccurs='0' maxOccurs='unbounded'>
         <xsd:element name='Package' type='StructureEntry'/>
         <xsd:element name='Service' type='StructureEntry'/>
-        <xsd:element name='ConfigFile' type='StructureEntry'/>
-        <xsd:element name='Directory' type='StructureEntry'/>
-        <xsd:element name='SymLink' type='StructureEntry'/>
-        <xsd:element name='Permission' type='StructureEntry'/>
+        <xsd:element name='Path' type='StructureEntry'/>
         <xsd:element name='Group' type='GroupType'/>
       </xsd:choice>
       <xsd:attribute type='xsd:string' name='priority' />
-- 
cgit v1.2.3-1-g7c22