Author: dan.j.allen Date: 2008-11-25 18:49:29 -0500 (Tue, 25 Nov 2008) New Revision: 9650 Modified: trunk/examples/booking/resources/WEB-INF/pages.xml trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml trunk/examples/icefaces/resources/WEB-INF/pages.xml trunk/examples/jee5/booking/resources/WEB-INF/pages.xml trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml trunk/examples/nestedbooking/resources/WEB-INF/pages.xml Log: if an attempt is made to access the login page while authenticated, redirect to main search page using a page action Modified: trunk/examples/booking/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/booking/resources/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/booking/resources/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml =================================================================== --- trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml =================================================================== --- trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml =================================================================== --- trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml =================================================================== --- trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml =================================================================== --- trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/icefaces/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/icefaces/resources/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/icefaces/resources/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/jee5/booking/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/jee5/booking/resources/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/jee5/booking/resources/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> @@ -49,7 +55,7 @@ </page> - <page view-id="/hotel.xhtml" + <page view-id="/hotel.xhtml" conversation-required="true"> <description>View hotel: #{hotel.name}</description> @@ -60,7 +66,7 @@ </page> - <page view-id="/book.xhtml" + <page view-id="/book.xhtml" conversation-required="true"> <description>Book hotel: #{hotel.name}</description> @@ -73,7 +79,7 @@ </page> - <page view-id="/confirm.xhtml" + <page view-id="/confirm.xhtml" conversation-required="true"> <description>Confirm booking: #{booking.description}</description> Modified: trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml =================================================================== --- trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -19,7 +19,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}"> Modified: trunk/examples/nestedbooking/resources/WEB-INF/pages.xml =================================================================== --- trunk/examples/nestedbooking/resources/WEB-INF/pages.xml 2008-11-25 23:48:21 UTC (rev 9649) +++ trunk/examples/nestedbooking/resources/WEB-INF/pages.xml 2008-11-25 23:49:29 UTC (rev 9650) @@ -15,7 +15,13 @@ </page> - <page view-id="/home.xhtml"> + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> <navigation> <rule if="#{identity.loggedIn}">