From dfe9dac83a9f6553b9d075fa14fcd28235aabda9 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 4 Feb 2013 13:51:38 -0500
Subject: updated StructFile schemas to allow genshi attrs/elements

---
 schemas/privkey.xsd | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'schemas/privkey.xsd')

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>
-- 
cgit v1.2.3-1-g7c22


From 1f6cb52d0c43f842766f3ecd6c8286f0f4eed5c2 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 4 Feb 2013 16:20:46 -0500
Subject: Bundler: various changes

* Deprecated use of an explicit name attribute
* Deprecated .genshi bundles
* Minor restructuring for better performance
* bcfg2-lint updates
---
 schemas/privkey.xsd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'schemas/privkey.xsd')

diff --git a/schemas/privkey.xsd b/schemas/privkey.xsd
index 9446d5777..392f28e97 100644
--- a/schemas/privkey.xsd
+++ b/schemas/privkey.xsd
@@ -1,4 +1,5 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
   <xsd:annotation>
     <xsd:documentation>
       Schema for :ref:`server-plugins-generators-cfg-sshkeys` ``privkey.xml``
@@ -77,9 +78,9 @@
             </xsd:documentation>
           </xsd:annotation>
         </xsd:attribute>
+        <xsd:attributeGroup ref="py:genshiAttrs"/>
       </xsd:extension>
     </xsd:simpleContent>
-    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="PrivateKeyParamsType">
-- 
cgit v1.2.3-1-g7c22


From 906b38cf27bad87b78b457f86db46e6cae5384b7 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 5 Feb 2013 08:59:30 -0500
Subject: misc. schema and schema doc fixes

---
 schemas/privkey.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'schemas/privkey.xsd')

diff --git a/schemas/privkey.xsd b/schemas/privkey.xsd
index 392f28e97..cf53904f0 100644
--- a/schemas/privkey.xsd
+++ b/schemas/privkey.xsd
@@ -14,7 +14,7 @@
   <xsd:complexType name="PrivateKeyGroupType">
     <xsd:annotation>
       <xsd:documentation>
-        An **PrivateKeyGroupType** is a tag used to provide logic.
+        A **PrivateKeyGroupType** is a tag used to provide logic.
         Child entries of a PrivateKeyGroupType tag only apply to
         machines that match the condition specified -- either
         membership in a group, or a matching client name.
-- 
cgit v1.2.3-1-g7c22