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

[Gavin King]

  User: gavin   
  Date: 06/12/18 10:42:13

  Modified:    examples/booking/resources/WEB-INF  pages.xml
  Log:
  update
  
  Revision  Changes    Path
  1.10      +26 -33    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.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- pages.xml	17 Dec 2006 14:07:46 -0000	1.9
  +++ pages.xml	18 Dec 2006 15:42:13 -0000	1.10
  @@ -5,43 +5,46 @@
   <pages no-conversation-view-id="/main.xhtml">
   
       <page view-id="/register.xhtml">
  -        <action-navigation outcome="#{register.registered}">
  -            <outcome value="true">
  +    
  +        <action-navigation>
  +            <outcome if="#{register.registered}">
                   <redirect view-id="/home.xhtml"/>
               </outcome>
           </action-navigation>
  +        
       </page>
   
       <page view-id="/home.xhtml">
  -        <action-navigation outcome="#{login.loggedIn}">
  -            <outcome value="true">
  +    
  +        <action-navigation>
  +            <outcome if="#{login.loggedIn}">
                   <redirect view-id="/main.xhtml"/>
               </outcome>
           </action-navigation>
  +        
       </page>
       
       <page view-id="/password.xhtml">
  -        <action-navigation outcome="#{changePassword.changed}">
  -            <outcome value="true">
  +    
  +        <action-navigation>
  +            <outcome if="#{changePassword.changed}">
                   <redirect view-id="/main.xhtml"/>
               </outcome>
           </action-navigation>
  +        
       </page>
   
       <page view-id="/main.xhtml" 
             action="#{login.validateLogin}">
           
  -        <action-navigation action="#{login.validateLogin}"
  -                          outcome="#{login.loggedIn}">
  -            <outcome value="false">
  +        <action-navigation from-action="#{login.validateLogin}">
  +            <outcome if="#{not login.loggedIn}">
                   <redirect view-id="/home.xhtml"/>
               </outcome>
           </action-navigation>
           
  -        <action-navigation action="#{hotelBooking.selectHotel(hot)}">
  -            <null-outcome>
  +        <action-navigation from-action="#{hotelBooking.selectHotel(hot)}">
                   <redirect view-id="/hotel.xhtml"/>
  -            </null-outcome>
           </action-navigation>
           
       </page>
  @@ -51,10 +54,8 @@
             
           <description>View hotel: #{hotel.name}</description>
           
  -        <action-navigation action="#{hotelBooking.bookHotel}">
  -            <null-outcome>
  +        <action-navigation from-action="#{hotelBooking.bookHotel}">
                   <redirect view-id="/book.xhtml"/>
  -            </null-outcome>
           </action-navigation>
           
       </page>
  @@ -64,10 +65,8 @@
             
           <description>Book hotel: #{hotel.name}</description>
           
  -        <action-navigation outcome="#{hotelBooking.bookingValid}">
  -            <outcome value="true">
  +        <action-navigation>
                   <redirect view-id="/confirm.xhtml"/>
  -            </outcome>
           </action-navigation>
           
       </page>
  @@ -77,26 +76,20 @@
             
           <description>Confirm booking: #{booking.description}</description>
           
  -        <action-navigation action="#{hotelBooking.confirm}">
  -            <null-outcome>
  +        <action-navigation from-action="#{hotelBooking.confirm}">
                   <redirect view-id="/main.xhtml"/>
  -            </null-outcome>
           </action-navigation>
           
       </page>
       
       <page view-id="*">
       
  -        <action-navigation action="#{login.logout}">
  -            <null-outcome>
  +        <action-navigation from-action="#{login.logout}">
                   <redirect view-id="/home.xhtml"/>
  -            </null-outcome>
           </action-navigation>
   
  -        <action-navigation action="#{hotelBooking.cancel}">
  -            <null-outcome>
  +        <action-navigation from-action="#{hotelBooking.cancel}">
                   <redirect view-id="/main.xhtml"/>
  -            </null-outcome>
           </action-navigation>
           
       </page>