Author: scabanovich Date: 2008-11-24 08:05:51 -0500 (Mon, 24 Nov 2008) New Revision: 11974 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.1.xsd Log: JBIDE-3248 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-11-24 12:55:13 UTC (rev 11973) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-11-24 13:05:51 UTC (rev 11974) @@ -3355,6 +3355,15 @@ </Constraint> <Editor name="TreeChooser"/> </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + name="include page params" xmlname="include-page-params"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.1.xsd =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.1.xsd 2008-11-24 12:55:13 UTC (rev 11973) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.1.xsd 2008-11-24 13:05:51 UTC (rev 11974) @@ -287,7 +287,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.end-conversation"> - <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean"/> + <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean"/> <xs:attribute name="root" default="false" type="pages:tf-boolean"/> <xs:attribute name="if" type="pages:boolean-value-expression" /> </xs:attributeGroup> @@ -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,9 @@ </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> <xs:element name="http-error"> @@ -457,11 +458,15 @@ </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"> <xs:enumeration value="https"/> @@ -475,6 +480,10 @@ </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"> <xs:enumeration value="enabled"/>