[jboss-cvs] jboss-seam/examples/hibernate2/resources ...

[Michael Yuan]

  User: myuan   
  Date: 07/02/26 18:39:44

  Modified:    examples/hibernate2/resources    pages.xml web.xml
  Removed:     examples/hibernate2/resources    navigation.xml
  Log:
  patch the example
  
  Revision  Changes    Path
  1.5       +14 -4     jboss-seam/examples/hibernate2/resources/pages.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pages.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/hibernate2/resources/pages.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- pages.xml	19 Feb 2007 08:37:31 -0000	1.4
  +++ pages.xml	26 Feb 2007 23:39:44 -0000	1.5
  @@ -2,7 +2,8 @@
             "-//JBoss/Seam Pages Configuration DTD 1.1//EN"
             "http://jboss.com/products/seam/pages-1.1.dtd">
   
  -<pages no-conversation-view-id="/main.xhtml" login-view-id="/home.xhtml">
  +<pages no-conversation-view-id="/main.xhtml"
  +                 login-view-id="/home.xhtml">
   
       <page view-id="/register.xhtml">
       
  @@ -37,7 +38,8 @@
           
       </page>
   
  -    <page view-id="/main.xhtml" login-required="true">
  +    <page view-id="/main.xhtml"
  +          login-required="true">
              
           <navigation from-action="#{hotelBooking.selectHotel(hot)}">
               <redirect view-id="/hotel.xhtml"/>
  @@ -62,7 +64,9 @@
           <description>Book hotel: #{hotel.name}</description>
           
           <navigation from-action="#{hotelBooking.setBookingDetails}">
  +            <rule if="#{hotelBooking.bookingValid}">
               <redirect view-id="/confirm.xhtml"/>
  +            </rule>
           </navigation>
           
       </page>
  @@ -90,4 +94,10 @@
           
       </page>
   
  +    <exception class="org.jboss.seam.security.NotLoggedInException">
  +        <redirect view-id="/home.xhtml">
  +            <message severity="warn">You must be logged in to use this feature</message>
  +        </redirect>
  +    </exception>
  +
   </pages>
  \ No newline at end of file
  
  
  
  1.5       +1 -6      jboss-seam/examples/hibernate2/resources/web.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: web.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/hibernate2/resources/web.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- web.xml	22 Feb 2007 04:14:52 -0000	1.4
  +++ web.xml	26 Feb 2007 23:39:44 -0000	1.5
  @@ -1,11 +1,6 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <web-app>   
         
  -    <context-param>      
  -      <param-name>javax.faces.CONFIG_FILES</param-name>      
  -      <param-value>/WEB-INF/navigation.xml</param-value>   
  -    </context-param>	   
  -    
       <!-- Ajax4jsf (must come first!) -->		   
       <filter>     
         <display-name>Ajax4jsf Filter</display-name>