[jboss-cvs] jboss-seam/seam-gen/resources/WEB-INF ...

[Gavin King]

  User: gavin   
  Date: 07/02/07 12:14:21

  Modified:    seam-gen/resources/WEB-INF     components.xml pages.xml
                        web.xml
  Removed:     seam-gen/resources/WEB-INF     navigation.xml
  Log:
  JBSEAM-773 login redirects
  
  Revision  Changes    Path
  1.10      +7 -0      jboss-seam/seam-gen/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/seam-gen/resources/WEB-INF/components.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- components.xml	31 Jan 2007 04:07:27 -0000	1.9
  +++ components.xml	7 Feb 2007 17:14:21 -0000	1.10
  @@ -30,6 +30,13 @@
   
      <security:identity authenticate-method="#{authenticator.authenticate}"/>
           
  +   <event type="org.jboss.seam.notLoggedIn">
  +       <action expression="#{redirect.captureCurrentView}"/>
  +   </event>
  +   <event type="org.jboss.seam.postAuthenticate">
  +       <action expression="#{redirect.ifInitializedExecute}"/>
  +   </event>
  +        
      <!-- For use with jBPM pageflow or process management -->
      <!--  
      <core:jbpm>
  
  
  
  1.4       +16 -0     jboss-seam/seam-gen/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/seam-gen/resources/WEB-INF/pages.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- pages.xml	5 Feb 2007 06:12:09 -0000	1.3
  +++ pages.xml	7 Feb 2007 17:14:21 -0000	1.4
  @@ -4,6 +4,22 @@
   
   <pages>
   
  +    <page view-id="*">
  +        <navigation>
  +            <rule if-outcome="home">
  +                <redirect view-id="/home.xhtml"/>
  +            </rule>
  +        </navigation>
  +    </page>
  +
  +    <page view-id="/login.xhtml">
  +        <navigation from-action="#{identity.login}">
  +            <rule if-outcome="success">
  +                <redirect view-id="/home.xhtml"/>
  +            </rule>
  +        </navigation>
  +    </page>
  +
       <exception class="javax.persistence.EntityNotFoundException">
           <redirect view-id="/error.xhtml">
               <message>Not found</message>
  
  
  
  1.5       +0 -5      jboss-seam/seam-gen/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/seam-gen/resources/WEB-INF/web.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- web.xml	12 Jan 2007 04:25:36 -0000	1.4
  +++ web.xml	7 Feb 2007 17:14:21 -0000	1.5
  @@ -4,11 +4,6 @@
            xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
            version="2.4">
   
  -   <context-param>
  -      <param-name>javax.faces.CONFIG_FILES</param-name>
  -      <param-value>/WEB-INF/navigation.xml</param-value>
  -   </context-param>
  -
      <listener>
         <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
      </listener>