cleaned up genshi schema

5 files changed, 20 insertions, 50 deletions

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 6b32434be..1e67e1f3a 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -119,13 +119,7 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element ref="py:def"/>
-      <xsd:element ref="py:match"/>
-      <xsd:element ref="py:choose"/>
-      <xsd:element ref="py:for"/>
-      <xsd:element ref="py:if"/>
-      <xsd:element ref="py:with"/>
-      <xsd:element ref="py:replace"/>
+      <xsd:group ref="py:genshiElements"/>
     </xsd:choice>
     <xsd:attribute type='xsd:string' name='name' use='required'>
       <xsd:annotation>
@@ -235,13 +229,7 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element ref="py:def"/>
-      <xsd:element ref="py:match"/>
-      <xsd:element ref="py:choose"/>
-      <xsd:element ref="py:for"/>
-      <xsd:element ref="py:if"/>
-      <xsd:element ref="py:with"/>
-      <xsd:element ref="py:replace"/>
+      <xsd:group ref="py:genshiElements"/>
     </xsd:choice>
     <xsd:attribute type='xsd:string' name='description' />
     <xsd:attribute type='xsd:string' name='name'/>
diff --git a/schemas/genshi.xsd b/schemas/genshi.xsd
index 4d3ad0e31..088ec56be 100644
--- a/schemas/genshi.xsd
+++ b/schemas/genshi.xsd
@@ -12,8 +12,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <!-- genshi tags -->
-  <xs:element name="for" type="py:forType"/>
+  <!-- genshi types -->
   <xs:complexType name="forType" mixed="true">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:any processContents="lax"/>
@@ -21,7 +20,6 @@
     <xs:attribute name="each" type="xs:string" use="required"/>
   </xs:complexType>
 
-  <xs:element name="if" type="py:ifType"/>
   <xs:complexType name="ifType" mixed="true">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:any processContents="lax"/>
@@ -29,7 +27,6 @@
     <xs:attribute name="test" type="xs:string" use="required"/>
   </xs:complexType>
 
-  <xs:element name="match" type="py:matchType"/>
   <xs:complexType name="matchType" mixed="true">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:any processContents="lax"/>
@@ -40,7 +37,6 @@
     <xs:attribute name="recursive" type="xs:boolean" default="true"/>
   </xs:complexType>
 
-  <xs:element name="def" type="py:defType"/>
   <xs:complexType name="defType" mixed="true">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:any processContents="lax"/>
@@ -48,7 +44,6 @@
     <xs:attribute name="function" type="xs:string" use="required"/>
   </xs:complexType>
 
-  <xs:element name="with" type="py:withType"/>
   <xs:complexType name="withType" mixed="true">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:any processContents="lax"/>
@@ -56,7 +51,6 @@
     <xs:attribute name="vars" type="xs:string" use="required"/>
   </xs:complexType>
 
-  <xs:element name="replace" type="py:replaceType"/>
   <xs:complexType name="replaceType" mixed="true">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:any processContents="lax"/>
@@ -64,7 +58,6 @@
     <xs:attribute name="value" type="xs:string" use="required"/>
   </xs:complexType>
 
-  <xs:element name="choose" type="py:chooseType"/>
   <xs:complexType name="chooseType" mixed="true">
     <xs:sequence>
       <xs:element name="when" type="py:ifType" maxOccurs="unbounded"/>
@@ -80,6 +73,19 @@
     </xs:choice>
   </xs:complexType>
 
+  <!-- genshi tags -->
+  <xs:group name="genshiElements">
+    <xs:choice>
+      <xs:element name="with" type="py:withType"/>
+      <xs:element name="replace" type="py:replaceType"/>
+      <xs:element name="choose" type="py:chooseType"/>
+      <xs:element name="for" type="py:forType"/>
+      <xs:element name="if" type="py:ifType"/>
+      <xs:element name="match" type="py:matchType"/>
+      <xs:element name="def" type="py:defType"/>
+    </xs:choice>
+  </xs:group>
+
   <!-- genshi attributes -->
   <xs:attributeGroup name="genshiAttrs">
     <xs:attribute name="if" type="xs:string" form="qualified"/>
diff --git a/schemas/pkgtype.xsd b/schemas/pkgtype.xsd
index 83e3f0e48..3655c646b 100644
--- a/schemas/pkgtype.xsd
+++ b/schemas/pkgtype.xsd
@@ -39,13 +39,7 @@
           <xsd:attributeGroup ref="py:genshiAttrs"/>
         </xsd:complexType>
       </xsd:element>
-      <xsd:element ref="py:def"/>
-      <xsd:element ref="py:match"/>
-      <xsd:element ref="py:choose"/>
-      <xsd:element ref="py:for"/>
-      <xsd:element ref="py:if"/>
-      <xsd:element ref="py:with"/>
-      <xsd:element ref="py:replace"/>
+      <xsd:group ref="py:genshiElements"/>
     </xsd:choice>
     <xsd:attribute type="xsd:string" name="name"/>
     <xsd:attribute type="xsd:string" name="group"/>
diff --git a/schemas/rules.xsd b/schemas/rules.xsd
index 193d63c99..06c3b38ac 100644
--- a/schemas/rules.xsd
+++ b/schemas/rules.xsd
@@ -56,13 +56,7 @@
       <xsd:element name='Action' type='ActionType'/>
       <xsd:element name='Group' type='RContainerType'/>
       <xsd:element name='Client' type='RContainerType'/>
-      <xsd:element ref="py:def"/>
-      <xsd:element ref="py:match"/>
-      <xsd:element ref="py:choose"/>
-      <xsd:element ref="py:for"/>
-      <xsd:element ref="py:if"/>
-      <xsd:element ref="py:with"/>
-      <xsd:element ref="py:replace"/>
+      <xsd:group ref="py:genshiElements"/>
     </xsd:choice>
     <xsd:attribute name='name' type='xsd:string'/>
     <xsd:attribute name='negate' type='xsd:boolean'/>
@@ -80,13 +74,7 @@
         <xsd:element name='PostInstall' type='PostInstallType'/>
         <xsd:element name='Group' type='RContainerType'/>
         <xsd:element name='Client' type='RContainerType'/>
-        <xsd:element ref="py:def"/>
-        <xsd:element ref="py:match"/>
-        <xsd:element ref="py:choose"/>
-        <xsd:element ref="py:for"/>
-        <xsd:element ref="py:if"/>
-        <xsd:element ref="py:with"/>
-        <xsd:element ref="py:replace"/>
+        <xsd:group ref="py:genshiElements"/>
       </xsd:choice>
       <xsd:attribute name='priority' type='xsd:integer' use='required'/>
       <xsd:attributeGroup ref="py:genshiAttrs"/>
diff --git a/schemas/servicetype.xsd b/schemas/servicetype.xsd
index f88260c39..6b497383d 100644
--- a/schemas/servicetype.xsd
+++ b/schemas/servicetype.xsd
@@ -21,13 +21,7 @@
           <xsd:attribute name="mask" type="xsd:string" use="required"/>
         </xsd:complexType>
       </xsd:element>
-      <xsd:element ref="py:def"/>
-      <xsd:element ref="py:match"/>
-      <xsd:element ref="py:choose"/>
-      <xsd:element ref="py:for"/>
-      <xsd:element ref="py:if"/>
-      <xsd:element ref="py:with"/>
-      <xsd:element ref="py:replace"/>
+      <xsd:group ref="py:genshiElements"/>
     </xsd:choice>
     <xsd:attribute name="name" type="xsd:string" use="required"/>
     <xsd:attribute name="status" type="StatusEnum"/>