[seam-commits] Seam SVN: r9609 - trunk/src/main/org/jboss/seam.
Author: norman.richards(a)jboss.com
Date: 2008-11-21 14:10:24 -0500 (Fri, 21 Nov 2008)
New Revision: 9609
Modified:
trunk/src/main/org/jboss/seam/pages-2.1.xsd
Log:
JBSEAM-3741
Modified: trunk/src/main/org/jboss/seam/pages-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-11-20 21:53:00 UTC (rev 9608)
+++ trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-11-21 19:10:24 UTC (rev 9609)
@@ -397,7 +397,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.render">
- <xs:attribute name="view-id" type="pages:view-id" />
+ <xs:attribute name="view-id"
type="pages:view-id-expression" />
</xs:attributeGroup>
<xs:element name="redirect">
@@ -414,8 +414,8 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.redirect">
- <xs:attribute name="view-id" type="pages:view-id" />
- <xs:attribute name="url" type="pages:url" />
+ <xs:attribute name="view-id"
type="pages:view-id-expression" />
+ <xs:attribute name="url" type="pages:url-expression"
/>
<xs:attribute name="include-page-params"
type="pages:tf-boolean" />
</xs:attributeGroup>
@@ -458,10 +458,14 @@
</xs:element>
<xs:simpleType name="url">
- <xs:restriction base="xs:token">
+ <xs:restriction base="xs:anyURI">
<xs:pattern value="http://.*|https://.*"/>
</xs:restriction>
</xs:simpleType>
+
+ <xs:simpleType name="url-expression">
+ <xs:union memberTypes="pages:url
pages:method-expression"></xs:union>
+ </xs:simpleType>
<xs:simpleType name="schemes">
<xs:restriction base="xs:token">
@@ -475,6 +479,10 @@
<xs:pattern value="(/.*)|\*"/>
</xs:restriction>
</xs:simpleType>
+
+ <xs:simpleType name="view-id-expression">
+ <xs:union memberTypes="pages:view-id
pages:method-expression"></xs:union>
+ </xs:simpleType>
<xs:simpleType name="ableness">
<xs:restriction base="xs:token">