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

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2008-12-01 10:54:00 -0500 (Mon, 01 Dec 2008)
New Revision: 9680

Modified:
   trunk/src/main/org/jboss/seam/pages-2.1.xsd
Log:
oops, view-id should be value-expression, not method-expression
also, tighten value-expression and have restriction use boolean-value-expression


Modified: trunk/src/main/org/jboss/seam/pages-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pages-2.1.xsd	2008-12-01 15:11:20 UTC (rev 9679)
+++ trunk/src/main/org/jboss/seam/pages-2.1.xsd	2008-12-01 15:54:00 UTC (rev 9680)
@@ -183,7 +183,7 @@
         <xs:attribute name="execute" use="required" type="pages:method-expression" />
     </xs:attributeGroup>
     
-    <xs:element name="restrict" type="pages:value-expression">
+    <xs:element name="restrict" type="pages:boolean-value-expression">
         <xs:annotation>
             <xs:documentation>Security restrictions</xs:documentation>
         </xs:annotation>
@@ -487,7 +487,7 @@
     </xs:simpleType>
     
     <xs:simpleType name="view-id-expression">
-        <xs:union memberTypes="pages:view-id pages:method-expression"></xs:union>
+        <xs:union memberTypes="pages:view-id pages:value-expression"></xs:union>
     </xs:simpleType>
 
     <xs:simpleType name="from-action-expression">
@@ -620,7 +620,9 @@
     </xs:simpleType>
     
     <xs:simpleType name="value-expression">
-      <xs:restriction base="xs:token"/>
+        <xs:restriction base="xs:token">
+            <xs:pattern value="#\{.*\}"/>
+        </xs:restriction>
     </xs:simpleType>
     
     <xs:simpleType name="boolean-value-expression">