[jboss-cvs] jboss-seam/examples/booking/resources/WEB-INF ...

[Gavin King]

  User: gavin   
  Date: 06/12/17 09:07:46

  Modified:    examples/booking/resources/WEB-INF  pages.xml
  Log:
  better impl of login/out
  
  Revision  Changes    Path
  1.9       +14 -4     jboss-seam/examples/booking/resources/WEB-INF/pages.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pages.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/resources/WEB-INF/pages.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- pages.xml	17 Dec 2006 13:12:56 -0000	1.8
  +++ pages.xml	17 Dec 2006 14:07:46 -0000	1.9
  @@ -13,8 +13,8 @@
       </page>
   
       <page view-id="/home.xhtml">
  -        <action-navigation outcome="#{empty loggedIn}">
  -            <outcome value="false">
  +        <action-navigation outcome="#{login.loggedIn}">
  +            <outcome value="true">
                   <redirect view-id="/main.xhtml"/>
               </outcome>
           </action-navigation>
  @@ -28,12 +28,22 @@
           </action-navigation>
       </page>
   
  -    <page view-id="/main.xhtml">
  +    <page view-id="/main.xhtml" 
  +          action="#{login.validateLogin}">
  +        
  +        <action-navigation action="#{login.validateLogin}"
  +                          outcome="#{login.loggedIn}">
  +            <outcome value="false">
  +                <redirect view-id="/home.xhtml"/>
  +            </outcome>
  +        </action-navigation>
  +        
           <action-navigation action="#{hotelBooking.selectHotel(hot)}">
               <null-outcome>
                   <redirect view-id="/hotel.xhtml"/>
               </null-outcome>
           </action-navigation>
  +        
       </page>
   
   	<page view-id="/hotel.xhtml" 
  @@ -77,7 +87,7 @@
       
       <page view-id="*">
       
  -        <action-navigation action="#{logout.logout}">
  +        <action-navigation action="#{login.logout}">
               <null-outcome>
                   <redirect view-id="/home.xhtml"/>
               </null-outcome>