Author: dan.j.allen Date: 2008-12-01 16:49:27 -0500 (Mon, 01 Dec 2008) New Revision: 9685 Modified: trunk/src/main/org/jboss/seam/pages-2.1.xsd Log: if-outcome can be a string or a 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 21:41:20 UTC (rev 9684) +++ trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-12-01 21:49:27 UTC (rev 9685) @@ -245,7 +245,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.rule"> - <xs:attribute name="if-outcome" type="pages:value-expression" /> + <xs:attribute name="if-outcome" type="pages:outcome-expression" /> <xs:attribute name="if" type="pages:boolean-value-expression" /> </xs:attributeGroup> @@ -490,6 +490,10 @@ <xs:union memberTypes="pages:view-id pages:value-expression"></xs:union> </xs:simpleType> + <xs:simpleType name="outcome-expression"> + <xs:union memberTypes="pages:outcome pages:value-expression"></xs:union> + </xs:simpleType> + <xs:simpleType name="from-action-expression"> <xs:union memberTypes="pages:outcome pages:method-expression"></xs:union> </xs:simpleType>