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

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2008-11-26 15:49:02 -0500 (Wed, 26 Nov 2008)
New Revision: 9666

Modified:
   trunk/src/main/org/jboss/seam/pages-2.1.xsd
Log:
JBSEAM-3742


Modified: trunk/src/main/org/jboss/seam/pages-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pages-2.1.xsd	2008-11-26 17:18:04 UTC (rev 9665)
+++ trunk/src/main/org/jboss/seam/pages-2.1.xsd	2008-11-26 20:49:02 UTC (rev 9666)
@@ -218,7 +218,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.navigation">
-        <xs:attribute name="from-action" type="pages:method-expression" />
+        <xs:attribute name="from-action" type="pages:from-action-expression" />
         <xs:attribute name="evaluate" type="pages:method-expression" />
     </xs:attributeGroup>
     
@@ -473,6 +473,12 @@
             <xs:enumeration value="http"/>
         </xs:restriction>
     </xs:simpleType>
+
+    <xs:simpleType name="outcome">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[^\#\{\}]+"/>
+        </xs:restriction>
+    </xs:simpleType>
     
     <xs:simpleType name="view-id">
         <xs:restriction base="xs:string">
@@ -484,6 +490,10 @@
         <xs:union memberTypes="pages:view-id pages:method-expression"></xs:union>
     </xs:simpleType>
 
+    <xs:simpleType name="from-action-expression">
+        <xs:union memberTypes="pages:outcome pages:method-expression"></xs:union>
+    </xs:simpleType>
+
     <xs:simpleType name="ableness">
         <xs:restriction base="xs:token">
             <xs:enumeration value="enabled"/>
@@ -605,7 +615,7 @@
 
     <xs:simpleType name="method-expression">
         <xs:restriction base="xs:token">
-            <xs:pattern value="#\{.*\}"/>
+            <xs:pattern value="#\{.+\..+\}"/>
         </xs:restriction>
     </xs:simpleType>