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

[Michael Yuan]

  User: myuan   
  Date: 07/02/26 04:43:28

  Modified:    examples/glassfish/resources/WEB-INF      components.xml
                        faces-config.xml pages.xml web.xml
  Removed:     examples/glassfish/resources/WEB-INF      navigation.xml
  Log:
  Works with the security model. But uses "org.jboss.seam.security.identity" instead of "identity"
  
  Revision  Changes    Path
  1.4       +0 -1      jboss-seam/examples/glassfish/resources/WEB-INF/components.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: components.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/glassfish/resources/WEB-INF/components.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- components.xml	15 Feb 2007 07:46:25 -0000	1.3
  +++ components.xml	26 Feb 2007 09:43:28 -0000	1.4
  @@ -18,5 +18,4 @@
                     conversation-is-long-running-parameter="clr"/>
                     
       <security:identity authenticate-method="#{authenticator.authenticate}"/>                  
  -
   </components>
  
  
  
  1.2       +1 -1      jboss-seam/examples/glassfish/resources/WEB-INF/faces-config.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: faces-config.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/glassfish/resources/WEB-INF/faces-config.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  
  
  
  1.4       +12 -4     jboss-seam/examples/glassfish/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/glassfish/resources/WEB-INF/pages.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- pages.xml	15 Feb 2007 07:46:25 -0000	1.3
  +++ pages.xml	26 Feb 2007 09:43:28 -0000	1.4
  @@ -21,7 +21,7 @@
       <page view-id="/home.xhtml">
       
           <navigation>
  -            <rule if="#{identity.loggedIn}">
  +            <rule if="#{org.jboss.seam.security.identity.loggedIn}">
                   <redirect view-id="/main.xhtml"/>
               </rule>
           </navigation>
  @@ -64,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>
  @@ -92,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.9       +0 -5      jboss-seam/examples/glassfish/resources/WEB-INF/web.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: web.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/glassfish/resources/WEB-INF/web.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- web.xml	22 Feb 2007 04:14:52 -0000	1.8
  +++ web.xml	26 Feb 2007 09:43:28 -0000	1.9
  @@ -4,11 +4,6 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"    
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">   
     
  -  <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>