From 1e2131e0e64557320f84fa98b7d0d1d022bd725e Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Mon, 16 May 2011 11:19:17 -0500
Subject: doc: Better document PostInstall entries

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 schemas/bundle.xsd | 9 +++++++++
 schemas/rules.xsd  | 5 +++++
 2 files changed, 14 insertions(+)

(limited to 'schemas')

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index b226e1078..c0a7e08ac 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -55,6 +55,15 @@
           </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.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name='BoundPackage' type='PackageType'>
         <xsd:annotation>
           <xsd:documentation>
diff --git a/schemas/rules.xsd b/schemas/rules.xsd
index bc8a4af80..101b62384 100644
--- a/schemas/rules.xsd
+++ b/schemas/rules.xsd
@@ -24,6 +24,10 @@
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
+  <xsd:complexType name='PostInstallType'>
+    <xsd:attribute type='xsd:string' name='name' use='required'/>
+  </xsd:complexType>
+
   <xsd:complexType name='PathType'>
     <xsd:attribute type='PathTypeEnum' name='type' use='required'/>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
@@ -68,6 +72,7 @@
         <xsd:element name='Package' type='PackageType'/>
         <xsd:element name='Path' type='PathType'/>
         <xsd:element name='Action' type='ActionType'/>
+        <xsd:element name='PostInstall' type='PostInstallType'/>
         <xsd:element name='Group' type='RContainerType'/>
         <xsd:element name='Client' type='RContainerType'/>
         <xsd:element ref="py:def"/>
-- 
cgit v1.2.3-1-g7c22


From 834c2fb89af7f9cb6c626090caac7fe6903e88e8 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 18 May 2011 10:44:29 -0400
Subject: Fixed fileprobes schema

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

(limited to 'schemas')

diff --git a/schemas/fileprobes.xsd b/schemas/fileprobes.xsd
index 112047836..e10dc51dd 100644
--- a/schemas/fileprobes.xsd
+++ b/schemas/fileprobes.xsd
@@ -18,7 +18,7 @@
 
   <xsd:complexType name="FileProbeType">
     <xsd:attribute type="xsd:string" name="name" use="required"/>
-    <xsd:attribute type="xsd:string" name="base64"/>
+    <xsd:attribute type="xsd:string" name="encoding"/>
     <xsd:attribute type="xsd:string" name="update"/>
   </xsd:complexType>
 
-- 
cgit v1.2.3-1-g7c22


From 1066322c1e15eb38933442c9c320cdb0cf483484 Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Sat, 21 May 2011 23:13:45 -0500
Subject: schemas: Fix schema for important attribute

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 schemas/info.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'schemas')

diff --git a/schemas/info.xsd b/schemas/info.xsd
index 96ccbe56c..2ff1d937e 100644
--- a/schemas/info.xsd
+++ b/schemas/info.xsd
@@ -11,7 +11,7 @@
   <xsd:complexType name='InfoType'>
     <xsd:attribute name='encoding' type='xsd:string'/>
     <xsd:attribute name='group' type='xsd:string'/>
-    <xsd:attribute name='important' type='xsd:boolean'/>
+    <xsd:attribute name='important' type='xsd:string'/>
     <xsd:attribute name='owner' type='xsd:string'/>
     <xsd:attribute name='perms' type='xsd:string'/>
     <xsd:attribute name='paranoid' type='xsd:boolean'/>
-- 
cgit v1.2.3-1-g7c22


From 1e7d3491604fbba1709bb03215b6c1783847b530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Wei=C3=9F?= <holger@zedat.fu-berlin.de>
Date: Fri, 3 Jun 2011 23:22:40 +0200
Subject: Allow Bound entries and Client tags in Base Schema

Bound entries and Client tags may also be used in Base/*.xml files, so
the XML Schema for Base files must permit these entries.
---
 schemas/base.xsd | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'schemas')

diff --git a/schemas/base.xsd b/schemas/base.xsd
index 8eff0c69f..e8d677737 100644
--- a/schemas/base.xsd
+++ b/schemas/base.xsd
@@ -10,26 +10,30 @@
   
   <xsd:include schemaLocation="atom.xsd"/>
   <xsd:include schemaLocation="pathentry.xsd"/>
+  <xsd:include schemaLocation="rules.xsd"/>
 
-  <xsd:complexType name='ContainerType'>
-    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+  <xsd:group name='BaseEntries'>
+    <xsd:choice>
+      <xsd:element name='Group' type='ContainerType'/>
+      <xsd:element name='Client' type='ContainerType'/>
       <xsd:element name='Package' type='StructureEntry'/>
       <xsd:element name='Path' type='PathEntry'/>
       <xsd:element name='Service' type='StructureEntry'/>
-      <xsd:element name='Group' type='ContainerType'/>
+      <xsd:element name='BoundPackage' type='PackageType'/>
+      <xsd:element name='BoundPath' type='BoundPathEntry'/>
+      <xsd:element name='BoundService' type='ServiceType'/>
     </xsd:choice>
+  </xsd:group>
+
+  <xsd:complexType name='ContainerType'>
+    <xsd:group ref='BaseEntries' minOccurs='0' maxOccurs='unbounded'/>
     <xsd:attribute name='name' type='xsd:string'/>
     <xsd:attribute name='negate' type='xsd:string'/>
   </xsd:complexType>
 
   <xsd:element name='Base'>
     <xsd:complexType>
-      <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-        <xsd:element name='Package' type='StructureEntry'/>
-        <xsd:element name='Path' type='PathEntry'/>
-        <xsd:element name='Service' type='StructureEntry'/>
-        <xsd:element name='Group' type='ContainerType'/>
-      </xsd:choice>
+      <xsd:group ref='BaseEntries' minOccurs='0' maxOccurs='unbounded'/>
     </xsd:complexType>
   </xsd:element>
 
-- 
cgit v1.2.3-1-g7c22


From 701ff48cc9561ce88e80c1de5a19f8d6cda790bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Wei=C3=9F?= <holger@zedat.fu-berlin.de>
Date: Mon, 6 Jun 2011 00:54:55 +0200
Subject: All Genshi XML tags should be namespace-qualified

Our XML Schema for Genshi templates expected "choose" blocks to be
declared like this:

  <py:choose test="$foo">
    <when test="0"><!-- [...] --></when>
    <when test="1"><!-- [...] --></when>
    <otherwise><!-- [...] --></otherwise>
  </py:choose>

However, we prefer to namespace-qualify not only the "choose" element,
but also the "when" and "otherwise" tags (for clarity, and because
that's how it's done in the Genshi documentation):

  <py:choose test="$foo">
    <py:when test="0"><!-- [...] --></py:when>
    <py:when test="1"><!-- [...] --></py:when>
    <py:otherwise><!-- [...] --></py:otherwise>
  </py:choose>

This commit tells XML Schema validators to expect the latter style.
---
 schemas/genshi.xsd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'schemas')

diff --git a/schemas/genshi.xsd b/schemas/genshi.xsd
index 853b69c0d..d87c4a6e3 100644
--- a/schemas/genshi.xsd
+++ b/schemas/genshi.xsd
@@ -2,7 +2,8 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            xmlns:py="http://genshi.edgewall.org/"
            xml:lang="en"
-           targetNamespace="http://genshi.edgewall.org/">
+           targetNamespace="http://genshi.edgewall.org/"
+           elementFormDefault="qualified">
   <xs:annotation>
     <xs:documentation>
       Genshi schema
-- 
cgit v1.2.3-1-g7c22


From 76366b0bf116b0d320ec4a7168de8f62cc50ec98 Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Sat, 18 Jun 2011 19:41:19 -0500
Subject: POSIX: Add recursive permissions (Ticket #871)

This allows for a recursive='true' attribute such that the owner/group
can be set recursively for a directory when using Path type='permissions'.

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 schemas/pathentry.xsd | 1 +
 schemas/rules.xsd     | 1 +
 2 files changed, 2 insertions(+)

(limited to 'schemas')

diff --git a/schemas/pathentry.xsd b/schemas/pathentry.xsd
index 0c27f9112..24be22612 100644
--- a/schemas/pathentry.xsd
+++ b/schemas/pathentry.xsd
@@ -24,6 +24,7 @@
     <xsd:attribute type='xsd:string' name='owner' use='optional'/>
     <xsd:attribute type='xsd:string' name='perms' use='optional'/>
     <xsd:attribute type='xsd:string' name='prune' use='optional'/>
+    <xsd:attribute type='xsd:string' name='recursive' use='optional'/>
     <xsd:attribute type='xsd:string' name='to' use='optional'/>
     <xsd:attribute type='xsd:string' name='type' use='optional'/>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
diff --git a/schemas/rules.xsd b/schemas/rules.xsd
index 101b62384..0a408c35c 100644
--- a/schemas/rules.xsd
+++ b/schemas/rules.xsd
@@ -38,6 +38,7 @@
     <xsd:attribute type='xsd:string' name='perms'/>
     <xsd:attribute type='xsd:string' name='owner'/>
     <xsd:attribute type='xsd:string' name='group'/>
+    <xsd:attribute type='xsd:string' name='recursive'/>
     <xsd:attribute type='xsd:string' name='prune'/>
     <xsd:attribute type='xsd:string' name='to'/>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
-- 
cgit v1.2.3-1-g7c22