schemas: Schema updates

* Remove old translation schema for bcfg1
* Remove old POSIX entries
* Remove toolsetType schema since it's no longer used

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

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5708 ce84e21b-d406-0410-9b95-82705330c041

6 files changed, 1 insertions, 70 deletions

diff --git a/schemas/base.xsd b/schemas/base.xsd
index b74e7168b..8eff0c69f 100644
--- a/schemas/base.xsd
+++ b/schemas/base.xsd
@@ -16,10 +16,6 @@
       <xsd:element name='Package' type='StructureEntry'/>
       <xsd:element name='Path' type='PathEntry'/>
       <xsd:element name='Service' type='StructureEntry'/>
-      <xsd:element name='ConfigFile' type='StructureEntry'/>
-      <xsd:element name='SymLink' type='StructureEntry'/>
-      <xsd:element name='Directory' type='StructureEntry'/>
-      <xsd:element name='Permissions' type='StructureEntry'/>
       <xsd:element name='Group' type='ContainerType'/>
     </xsd:choice>
     <xsd:attribute name='name' type='xsd:string'/>
@@ -29,14 +25,9 @@
   <xsd:element name='Base'>
     <xsd:complexType>
       <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-        <xsd:element name='Group' type='ContainerType'/>
         <xsd:element name='Package' type='StructureEntry'/>
         <xsd:element name='Path' type='PathEntry'/>
         <xsd:element name='Service' type='StructureEntry'/>
-        <xsd:element name='ConfigFile' type='StructureEntry'/>
-        <xsd:element name='SymLink' type='StructureEntry'/>
-        <xsd:element name='Directory' type='StructureEntry'/>
-        <xsd:element name='Permissions' type='StructureEntry'/>
         <xsd:element name='Group' type='ContainerType'/>
       </xsd:choice>
     </xsd:complexType>
diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 894dad116..bcc6ee858 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -18,17 +18,10 @@
       <xsd:element name='Package' type='StructureEntry'/>
       <xsd:element name='Path' type='PathEntry'/>
       <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='Action' type='StructureEntry'/>
       <xsd:element name='BoundPackage' type='PackageType'/>
       <xsd:element name='BoundPath' type='BoundPathEntry'/>
       <xsd:element name='BoundService' type='ServiceType'/>
-      <xsd:element name='BoundDirectory' type='DirectoryType'/>
-      <xsd:element name='BoundSymLink' type='SymLinkType'/>
-      <xsd:element name='BoundPermissions' type='PermissionsType'/>
       <xsd:element name='BoundAction' type='ActionType'/>
       <xsd:element name='Group' type='GroupType'/>
     </xsd:choice>
@@ -42,17 +35,10 @@
         <xsd:element name='Package' type='StructureEntry'/>
         <xsd:element name='Path' type='PathEntry'/>
         <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='Action' type='StructureEntry'/>       
         <xsd:element name='BoundPackage' type='PackageType'/>
         <xsd:element name='BoundPath' type='BoundPathEntry'/>
         <xsd:element name='BoundService' type='ServiceType'/>
-        <xsd:element name='BoundDirectory' type='DirectoryType'/>
-        <xsd:element name='BoundSymLink' type='SymLinkType'/>
-        <xsd:element name='BoundPermissions' type='PermissionsType'/>
         <xsd:element name='BoundAction' type='ActionType'/>
         <xsd:element name='Group' type='GroupType'/>
       </xsd:choice>
diff --git a/schemas/metadata.xsd b/schemas/metadata.xsd
index 9a5c17bb3..1c2474eac 100644
--- a/schemas/metadata.xsd
+++ b/schemas/metadata.xsd
@@ -11,19 +11,12 @@
   <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
               schemaLocation="xml.xsd"/>
 
-  <xsd:simpleType name='toolsetType'>
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="rh|debian|solaris|aix|gentoo|auto|freebsd"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
   <xsd:simpleType name='booleanType'>
     <xsd:restriction base="xsd:string">
       <xsd:pattern value="true|false"/>
     </xsd:restriction>
   </xsd:simpleType>
 
-
   <xsd:complexType name='groupType'>
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
       <xsd:element name='Bundle'>
@@ -42,7 +35,6 @@
     <xsd:attribute type='booleanType' name='default' use='optional'/>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
     <xsd:attribute type='xsd:string' name='auth' use='optional'/>
-    <xsd:attribute type='toolsetType' name='toolset' use='optional'/>
     <xsd:attribute type='xsd:string' name='category' use='optional'/>
     <xsd:attribute type='xsd:string' name='comment' use='optional'/>
   </xsd:complexType>
diff --git a/schemas/pathentry.xsd b/schemas/pathentry.xsd
index e564aaa90..cadd7cdda 100644
--- a/schemas/pathentry.xsd
+++ b/schemas/pathentry.xsd
@@ -10,7 +10,7 @@
 
   <xsd:complexType name='PathEntry'>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
-    <xsd:attribute type='xsd:string' name='altsrc' />
+    <xsd:attribute type='xsd:string' name='altsrc' use='optional'/>
   </xsd:complexType>
 
   <xsd:complexType name='BoundPathEntry'>
diff --git a/schemas/translation.xsd b/schemas/translation.xsd
deleted file mode 100644
index 1c7f8c92d..000000000
--- a/schemas/translation.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-  
-  <xsd:annotation>
-    <xsd:documentation>
-      translation image info schema for bcfg2
-      Narayan Desai, Argonne National Laboratory
-      $Id$
-    </xsd:documentation>
-  </xsd:annotation>
-  
-  <xsd:complexType name='SystemType'>
-    <xsd:choice minOccurs='1' maxOccurs='unbounded'>
-      <xsd:element name='Image'>
-        <xsd:complexType>
-          <xsd:attribute name='name' type='xsd:string'
-          use='required'/>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:choice>
-    <xsd:attribute name='name' type='xsd:string' use='required'/>
-    <xsd:attribute name='package' type='xsd:string' use='required'/>
-    <xsd:attribute name='service' type='xsd:string' use='required'/>
-  </xsd:complexType>
-
-  <xsd:element name='SystemSet'>
-    <xsd:complexType>
-      <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-        <xsd:element name='System' type='SystemType'/>
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
-
-</xsd:schema>
diff --git a/schemas/types.xsd b/schemas/types.xsd
index 92b38ecea..357c5173c 100644
--- a/schemas/types.xsd
+++ b/schemas/types.xsd
@@ -23,11 +23,6 @@
 
   <xsd:simpleType name='PathTypeEnum'>
     <xsd:restriction base='xsd:string'>
-      <xsd:enumeration value='ConfigFile' />
-      <xsd:enumeration value='Directory' />
-      <xsd:enumeration value='HardLink' />
-      <xsd:enumeration value='Perms' />
-      <xsd:enumeration value='SymLink' />
       <xsd:enumeration value='device' />
       <xsd:enumeration value='directory' />
       <xsd:enumeration value='file' />