[seam-commits] Seam SVN: r8920 - trunk/src/main/org/jboss/seam.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-09-05 07:44:10 -0400 (Fri, 05 Sep 2008)
New Revision: 8920

Modified:
   trunk/src/main/org/jboss/seam/pages-2.1.xsd
Log:
Some fixes to the xsd from Arron Ferguson

Modified: trunk/src/main/org/jboss/seam/pages-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pages-2.1.xsd	2008-09-05 10:49:51 UTC (rev 8919)
+++ trunk/src/main/org/jboss/seam/pages-2.1.xsd	2008-09-05 11:44:10 UTC (rev 8920)
@@ -9,20 +9,18 @@
             <xs:documentation>The root of a pages.xml file</xs:documentation>
         </xs:annotation>
         <xs:complexType>
-            <xs:sequence>
-                <xs:choice minOccurs="0" maxOccurs="unbounded">
-                    <xs:element ref="pages:conversation"/>
-                    <xs:element ref="pages:page"/>
-                </xs:choice>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="pages:conversation"/>
+                <xs:element ref="pages:page"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:exception"/>
-            </xs:sequence>
+            </xs:choice>
             <xs:attributeGroup ref="pages:attlist.pages"/>
         </xs:complexType>
     </xs:element>
     
     <xs:attributeGroup name="attlist.pages">
-        <xs:attribute name="no-conversation-view-id" />
-        <xs:attribute name="login-view-id" />
+        <xs:attribute name="no-conversation-view-id" type="pages:view-id" />
+        <xs:attribute name="login-view-id" type="pages:view-id"/>
         <xs:attribute name="http-port" />
         <xs:attribute name="https-port" />
     </xs:attributeGroup>
@@ -90,7 +88,7 @@
     </xs:element>
     <xs:attributeGroup name="attlist.page">
         <xs:attribute name="action"/>
-        <xs:attribute name="view-id"/>
+        <xs:attribute name="view-id" type="pages:view-id"/>
         <xs:attribute name="switch" default="enabled">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -99,7 +97,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="no-conversation-view-id"/>
+        <xs:attribute name="no-conversation-view-id" type="pages:view-id" />
         <xs:attribute name="conversation-required" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -503,7 +501,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.render">
-        <xs:attribute name="view-id"/>
+        <xs:attribute name="view-id" type="pages:view-id" />
     </xs:attributeGroup>
     
     <xs:element name="redirect">
@@ -520,7 +518,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.redirect">
-        <xs:attribute name="view-id"/>
+        <xs:attribute name="view-id" type="pages:view-id" />
         <xs:attribute name="url"/>  
     </xs:attributeGroup>
     
@@ -536,7 +534,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.http-error">
-        <xs:attribute name="error-code"/>
+        <xs:attribute name="error-code" use="required"/>
     </xs:attributeGroup>
     
     <xs:element name="message">
@@ -565,6 +563,12 @@
         </xs:attribute>
     </xs:attributeGroup>
     
+    <xs:simpleType name="view-id">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="(/.*)|\*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    
     <xs:element name="description" type="xs:string">
         <xs:annotation>
             <xs:documentation>A page description for workflow switching</xs:documentation>