updated StructFile schemas to allow genshi attrs/elements

8 files changed, 61 insertions, 0 deletions

diff --git a/schemas/authorizedkeys.xsd b/schemas/authorizedkeys.xsd
index 848f99bae..ca238d492 100644
--- a/schemas/authorizedkeys.xsd
+++ b/schemas/authorizedkeys.xsd
@@ -6,6 +6,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:complexType name="AuthorizedKeysGroupType">
     <xsd:annotation>
       <xsd:documentation>
@@ -18,6 +21,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Allow" type="AllowType"/>
       <xsd:element name="Group" type="AuthorizedKeysGroupType"/>
       <xsd:element name="Client" type="AuthorizedKeysGroupType"/>
@@ -40,6 +44,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="AllowType" mixed="true">
@@ -50,6 +55,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Params" type="AuthorizedKeysParamsType"/>
     </xsd:choice>
     <xsd:attribute name="from" type="xsd:string">
@@ -75,6 +81,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="AuthorizedKeysParamsType">
@@ -85,6 +92,7 @@
         parameters.
       </xsd:documentation>
     </xsd:annotation>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
     <xsd:anyAttribute processContents="lax"/>
   </xsd:complexType>
 
@@ -96,10 +104,12 @@
     </xsd:annotation>
     <xsd:complexType>
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
         <xsd:element name="Allow" type="AllowType"/>
         <xsd:element name="Group" type="AuthorizedKeysGroupType"/>
         <xsd:element name="Client" type="AuthorizedKeysGroupType"/>
       </xsd:choice>
+      <xsd:attributeGroup ref="py:genshiAttrs"/>
     </xsd:complexType>
   </xsd:element>
 </xsd:schema>
diff --git a/schemas/fileprobes.xsd b/schemas/fileprobes.xsd
index 0dfb8cdd2..4fe168c98 100644
--- a/schemas/fileprobes.xsd
+++ b/schemas/fileprobes.xsd
@@ -6,25 +6,32 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:complexType name="FileProbesGroupType">
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="FileProbe" type="FileProbeType"/>
       <xsd:element name="Group" type="FileProbesGroupType"/>
       <xsd:element name="Client" type="FileProbesGroupType"/>
     </xsd:choice>
     <xsd:attribute type="xsd:string" name="name" use="required"/>
     <xsd:attribute type="xsd:string" name="negate"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="FileProbeType">
     <xsd:attribute type="xsd:string" name="name" use="required"/>
     <xsd:attribute type="xsd:string" name="encoding"/>
     <xsd:attribute type="xsd:string" name="update"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="FileProbes">
     <xsd:complexType>
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
         <xsd:element name="FileProbe" type="FileProbeType"/>
         <xsd:element name="Group" type="FileProbesGroupType"/>
         <xsd:element name="Client" type="FileProbesGroupType"/>
diff --git a/schemas/nagiosgen.xsd b/schemas/nagiosgen.xsd
index 99d6b91c6..0ef1fb064 100644
--- a/schemas/nagiosgen.xsd
+++ b/schemas/nagiosgen.xsd
@@ -6,23 +6,31 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:complexType name="NagiosGenGroupType">
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Option" type="OptionType"/>
       <xsd:element name="Group" type="NagiosGenGroupType"/>
       <xsd:element name="Client" type="NagiosGenGroupType"/>
     </xsd:choice>
     <xsd:attribute type="xsd:string" name="name" use="required"/>
     <xsd:attribute type="xsd:string" name="negate"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="OptionType" mixed="true">
     <xsd:attribute type="xsd:string" name="name" use="required"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="NagiosGen">
     <xsd:complexType>
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
+        <xsd:element name="Option" type="OptionType"/>
         <xsd:element name="Group" type="NagiosGenGroupType"/>
         <xsd:element name="Client" type="NagiosGenGroupType"/>
       </xsd:choice>
diff --git a/schemas/packages.xsd b/schemas/packages.xsd
index dbee2f31b..948402ca5 100644
--- a/schemas/packages.xsd
+++ b/schemas/packages.xsd
@@ -8,6 +8,8 @@
 
   <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
               schemaLocation="xml.xsd"/>
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
 
   <xsd:simpleType name="SourceTypeEnum">
     <xsd:restriction base="xsd:string">
@@ -40,6 +42,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
     <xsd:anyAttribute processContents="lax">
       <xsd:annotation>
         <xsd:documentation>
@@ -58,6 +61,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Component" type="xsd:string">
         <xsd:annotation>
           <xsd:documentation>
@@ -107,6 +111,7 @@
         </xsd:annotation>
       </xsd:element>
       <xsd:choice>
+      <xsd:group ref="py:genshiElements"/>
         <xsd:element name="Blacklist" type="xsd:string">
           <xsd:annotation>
             <xsd:documentation>
@@ -202,10 +207,12 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="PackagesGroupType">
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Group" type="PackagesGroupType"/>
       <xsd:element name="Client" type="PackagesGroupType"/>
       <xsd:element name="Sources" type="SourcesType"/>
@@ -213,16 +220,19 @@
     </xsd:choice>
     <xsd:attribute type="xsd:string" name="name" use="required"/>
     <xsd:attribute type="xsd:boolean" name="negate"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="SourcesType">
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Group" type="PackagesGroupType"/>
       <xsd:element name="Client" type="PackagesGroupType"/>
       <xsd:element name="Source" type="SourceType"/>
       <xsd:element name="Sources" type="SourcesType"/>
     </xsd:choice>
     <xsd:attribute ref="xml:base"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="Sources" type="SourcesType"/>
diff --git a/schemas/privkey.xsd b/schemas/privkey.xsd
index f6de534c1..9446d5777 100644
--- a/schemas/privkey.xsd
+++ b/schemas/privkey.xsd
@@ -5,6 +5,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:include schemaLocation="types.xsd"/>
 
   <xsd:complexType name="PrivateKeyGroupType">
@@ -19,6 +22,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Passphrase" type="PassphraseType"/>
       <xsd:element name="Params" type="PrivateKeyParamsType"/>
       <xsd:element name="Group" type="PrivateKeyGroupType"/>
@@ -42,6 +46,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:simpleType name="PrivateKeyTypeEnum">
@@ -74,6 +79,7 @@
         </xsd:attribute>
       </xsd:extension>
     </xsd:simpleContent>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="PrivateKeyParamsType">
@@ -97,6 +103,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="PrivateKey">
@@ -107,6 +114,7 @@
     </xsd:annotation>
     <xsd:complexType>
       <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
         <xsd:element name="Passphrase" type="PassphraseType"/>
         <xsd:element name="Params" type="PrivateKeyParamsType"/>
         <xsd:element name="Group" type="PrivateKeyGroupType"/>
@@ -150,6 +158,7 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:attribute>
+      <xsd:attributeGroup ref="py:genshiAttrs"/>
     </xsd:complexType>
   </xsd:element>
 </xsd:schema>
diff --git a/schemas/pubkey.xsd b/schemas/pubkey.xsd
index 5671a818d..38d47ed0a 100644
--- a/schemas/pubkey.xsd
+++ b/schemas/pubkey.xsd
@@ -5,6 +5,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:element name="PublicKey">
     <xsd:annotation>
       <xsd:documentation>
diff --git a/schemas/sslca-cert.xsd b/schemas/sslca-cert.xsd
index a9c01fb29..97e258d78 100644
--- a/schemas/sslca-cert.xsd
+++ b/schemas/sslca-cert.xsd
@@ -5,6 +5,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:complexType name="SSLCACertGroupType">
     <xsd:annotation>
       <xsd:documentation>
@@ -17,6 +20,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Cert" type="CertType"/>
       <xsd:element name="Group" type="SSLCACertGroupType"/>
       <xsd:element name="Client" type="SSLCACertGroupType"/>
@@ -40,6 +44,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:simpleType name="SSLCACertFormatEnum">
@@ -147,6 +152,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="CertInfo">
@@ -157,6 +163,7 @@
     </xsd:annotation>
     <xsd:complexType>
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
         <xsd:element name="Cert" type="CertType"/>
         <xsd:element name="Group" type="SSLCACertGroupType"/>
         <xsd:element name="Client" type="SSLCACertGroupType"/>
diff --git a/schemas/sslca-key.xsd b/schemas/sslca-key.xsd
index efd4abd58..844304908 100644
--- a/schemas/sslca-key.xsd
+++ b/schemas/sslca-key.xsd
@@ -5,6 +5,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:complexType name="SSLCAKeyGroupType">
     <xsd:annotation>
       <xsd:documentation>
@@ -17,6 +20,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Key" type="KeyType"/>
       <xsd:element name="Group" type="SSLCAKeyGroupType"/>
       <xsd:element name="Client" type="SSLCAKeyGroupType"/>
@@ -39,6 +43,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:simpleType name="KeyTypeEnum">
@@ -68,6 +73,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="KeyInfo">
@@ -78,6 +84,7 @@
     </xsd:annotation>
     <xsd:complexType>
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
         <xsd:element name="Key" type="KeyType"/>
         <xsd:element name="Group" type="SSLCAKeyGroupType"/>
         <xsd:element name="Client" type="SSLCAKeyGroupType"/>