added selinux support

1 files changed, 30 insertions, 97 deletions

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 4e034ee3c..b72b174e2 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -16,10 +16,12 @@
   <xsd:include schemaLocation="atom.xsd"/>
   <xsd:include schemaLocation="pathentry.xsd"/>
   <xsd:include schemaLocation="rules.xsd"/>
+  <xsd:include schemaLocation="types.xsd"/>
   <xsd:include schemaLocation="services.xsd"/>
 
-  <xsd:complexType name='GroupType'>
-    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+  <xsd:group name="bundleElements">
+    <xsd:choice>
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name='Package' type='PackageStructure'>
         <xsd:annotation>
           <xsd:documentation>
@@ -56,12 +58,20 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name='SELinux' type='SELinuxStructure'>
+        <xsd:annotation>
+          <xsd:documentation>
+            Abstract implementation of an SELinux entry.  The
+            full specification will be included in Rules.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name='PostInstall' type='StructureEntry'>
         <xsd:annotation>
           <xsd:documentation>
             PostInstall entries are deprecated in favor of Action
-	    entries. Actions can do everything PostInstall entries can
-	    do and more.
+            entries. Actions can do everything PostInstall entries can
+            do and more.
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -72,7 +82,7 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name='BoundPath' type='BoundPathEntry'>
+      <xsd:element name='BoundPath' type='PathType'>
         <xsd:annotation>
           <xsd:documentation>
             Fully bound description of a filesystem path to be handled
@@ -94,6 +104,13 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name='BoundSELinux' type='SELinuxType'>
+        <xsd:annotation>
+          <xsd:documentation>
+            Fully bound description of an SELinux entry.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name='Group' type='GroupType'>
         <xsd:annotation>
           <xsd:documentation>
@@ -107,7 +124,7 @@
         <xsd:annotation>
           <xsd:documentation>
             Elements within Client tags only apply to the named client
-             (or vice-versa; see #element_negate below)
+            (or vice-versa; see #element_negate below)
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -119,7 +136,12 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:group ref="py:genshiElements"/>
+    </xsd:choice>
+  </xsd:group>
+
+  <xsd:complexType name='GroupType'>
+    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+      <xsd:group ref="bundleElements"/>
     </xsd:choice>
     <xsd:attribute type='xsd:string' name='name' use='required'>
       <xsd:annotation>
@@ -140,96 +162,7 @@
 
   <xsd:complexType name='BundleType'>
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-      <xsd:element name='Package' type='PackageStructure'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Abstract implementation of a Package entry.  The full
-            specification will be generated by a plugin such as
-            Packages.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name='Path' type='PathEntry'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Abstract implementation of a Path entry.  The entry will
-            either be handled by Cfg, TGenshi, or another
-            DirectoryBacked plugin; or handled by Rules, in which case
-            the full specification of this entry will be included in
-            Rules.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name='Service' type='StructureEntry'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Abstract implementation of a Service entry.  The full
-            specification will be included in Rules.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name='Action' type='StructureEntry'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Abstract implementation of an Action entry.  The full
-            specification will be included in Rules.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name='BoundPackage' type='PackageType'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Fully bound description of a software package to be managed.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name='BoundPath' type='BoundPathEntry'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Fully bound description of a filesystem path to be handled
-            by the POSIX driver.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name='BoundService' type='ServiceType'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Fully bound description of a system service to be managed.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name='BoundAction' type='ActionType'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Fully bound description of a command to be run.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name='Group' type='GroupType'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Elements within Group tags only apply to clients that are
-            members of that group
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name='Client' type='GroupType'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Elements within Client tags only apply to the named client
-            (or vice-versa; see #element_negate below)
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name='Bundle' type='BundleType'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Nesting Bundle tags is allowed in order to support
-            XInclude within Bundles.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:group ref="py:genshiElements"/>
+      <xsd:group ref="bundleElements"/>
     </xsd:choice>
     <xsd:attribute type='xsd:string' name='description' />
     <xsd:attribute type='xsd:string' name='name'/>