From 9b27384d1218cbab85612e7d162edc23ee0f5617 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Fri, 8 Apr 2011 13:56:44 -0400
Subject: further schema fixes

---
 schemas/decisions.xsd   |  2 +-
 schemas/info.xsd        |  9 +++++----
 schemas/servicetype.xsd | 14 +++++++++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/schemas/decisions.xsd b/schemas/decisions.xsd
index 57ee71672..a354ec8cb 100644
--- a/schemas/decisions.xsd
+++ b/schemas/decisions.xsd
@@ -8,7 +8,7 @@
     </xsd:documentation>
   </xsd:annotation>
 
-<xsd:element name='Decisions'>
+  <xsd:element name='Decisions'>
     <xsd:complexType>
       <xsd:choice minOccurs='0' maxOccurs='unbounded'>
         <xsd:element name='Decision'>
diff --git a/schemas/info.xsd b/schemas/info.xsd
index 4028f5c15..983513d66 100644
--- a/schemas/info.xsd
+++ b/schemas/info.xsd
@@ -11,19 +11,20 @@
   <xsd:complexType name='InfoType'>
     <xsd:attribute name='encoding' type='xsd:string'/>
     <xsd:attribute name='group' type='xsd:string'/>
-    <xsd:attribute name='important' type='xsd:string'/>
+    <xsd:attribute name='important' type='xsd:boolean'/>
     <xsd:attribute name='owner' type='xsd:string'/>
     <xsd:attribute name='perms' type='xsd:string'/>
-    <xsd:attribute name='paranoid' type='xsd:string'/>
+    <xsd:attribute name='paranoid' type='xsd:boolean'/>
   </xsd:complexType>
 
   <xsd:complexType name='GroupType'>
     <xsd:choice minOccurs='1' maxOccurs='1'>
       <xsd:element name='Info' type='InfoType'/>
-      <xsd:element name='Group' type='GroupType' minOccurs='0' maxOccurs='unbounded'/>
+      <xsd:element name='Group' type='GroupType' minOccurs='0'
+                   maxOccurs='unbounded'/>
     </xsd:choice>
     <xsd:attribute type='xsd:string' name='name' use='required'/>
-    <xsd:attribute type='xsd:string' name='negate' />
+    <xsd:attribute type='xsd:boolean' name='negate' />
   </xsd:complexType>
 
   <xsd:element name='FileInfo'>
diff --git a/schemas/servicetype.xsd b/schemas/servicetype.xsd
index a9cb40667..07971a427 100644
--- a/schemas/servicetype.xsd
+++ b/schemas/servicetype.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>
@@ -8,6 +9,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:complexType name='ServiceType'>
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
       <xsd:element name='User'>
@@ -16,6 +20,13 @@
           <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:choice>
     <xsd:attribute name='name' type='xsd:string' use='required'/>
     <xsd:attribute name='status' type='xsd:string' use='required'/>
@@ -29,6 +40,7 @@
     <xsd:attribute name='sequence' type='xsd:string'/>
     <xsd:attribute name='target' type='xsd:string'/>
     <xsd:attribute name='parameters' type='xsd:string'/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
 </xsd:schema>
-- 
cgit v1.2.3-1-g7c22