[seam-commits] Seam SVN: r10268 - trunk/examples/booking/resources/WEB-INF.
Author: norman.richards(a)jboss.com
Date: 2009-04-01 17:26:06 -0400 (Wed, 01 Apr 2009)
New Revision: 10268
Modified:
trunk/examples/booking/resources/WEB-INF/pages.xml
Log:
JBSEAM-4061
Modified: trunk/examples/booking/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/booking/resources/WEB-INF/pages.xml 2009-04-01 18:05:44 UTC (rev
10267)
+++ trunk/examples/booking/resources/WEB-INF/pages.xml 2009-04-01 21:26:06 UTC (rev
10268)
@@ -39,7 +39,7 @@
login-required="true">
<navigation>
- <rule if="#{changePassword.changed}">
+ <rule if="#{identity.loggedIn and changePassword.changed}">
<redirect view-id="/main.xhtml"/>
</rule>
</navigation>
@@ -59,9 +59,9 @@
</page>
- <page view-id="/hotel.xhtml"
- conversation-required="true"
- login-required="true">
+ <page view-id="/hotel.xhtml"
+ conversation-required="true"
+ login-required="true">
<description>View hotel: #{hotel.name}</description>
@@ -71,9 +71,9 @@
</page>
- <page view-id="/book.xhtml"
- conversation-required="true"
- login-required="true">
+ <page view-id="/book.xhtml"
+ conversation-required="true"
+ login-required="true">
<description>Book hotel: #{hotel.name}</description>
@@ -85,9 +85,9 @@
</page>
- <page view-id="/confirm.xhtml"
- conversation-required="true"
- login-required="true">
+ <page view-id="/confirm.xhtml"
+ conversation-required="true"
+ login-required="true">
<description>Confirm booking: #{booking.description}</description>
@@ -97,8 +97,7 @@
</page>
- <page view-id="*">
-
+ <page view-id="*">
<navigation from-action="#{identity.logout}">
<redirect view-id="/home.xhtml"/>
</navigation>