[jboss-cvs] jboss-seam/src/main/org/jboss/seam/web ...

[Gavin King]

  User: gavin   
  Date: 07/06/20 04:23:18

  Modified:    src/main/org/jboss/seam/web    AuthenticationFilter.java
                        ContextFilter.java ExceptionFilter.java
  Log:
  split up Lifecycle, much better
  
  Revision  Changes    Path
  1.6       +1 -1      jboss-seam/src/main/org/jboss/seam/web/AuthenticationFilter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AuthenticationFilter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/AuthenticationFilter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- AuthenticationFilter.java	14 Jun 2007 16:35:51 -0000	1.5
  +++ AuthenticationFilter.java	20 Jun 2007 08:23:18 -0000	1.6
  @@ -281,7 +281,7 @@
      private void authenticate(HttpServletRequest request, final String username)
         throws ServletException, IOException
      {
  -      new ContextualHttpServletRequest(request, getServletContext())
  +      new ContextualHttpServletRequest(request)
         {
            @Override
            public void process() throws ServletException, IOException, LoginException
  
  
  
  1.9       +1 -1      jboss-seam/src/main/org/jboss/seam/web/ContextFilter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ContextFilter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/ContextFilter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- ContextFilter.java	13 Jun 2007 21:07:34 -0000	1.8
  +++ ContextFilter.java	20 Jun 2007 08:23:18 -0000	1.9
  @@ -37,7 +37,7 @@
      public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) 
          throws IOException, ServletException 
      {
  -      new ContextualHttpServletRequest( (HttpServletRequest) request, getServletContext() )
  +      new ContextualHttpServletRequest( (HttpServletRequest) request )
         {
            @Override
            public void process() throws ServletException, IOException
  
  
  
  1.12      +7 -6      jboss-seam/src/main/org/jboss/seam/web/ExceptionFilter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExceptionFilter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/ExceptionFilter.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- ExceptionFilter.java	19 Jun 2007 19:02:37 -0000	1.11
  +++ ExceptionFilter.java	20 Jun 2007 08:23:18 -0000	1.12
  @@ -25,7 +25,7 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
  -import org.jboss.seam.contexts.Lifecycle;
  +import org.jboss.seam.contexts.FacesLifecycle;
   import org.jboss.seam.exceptions.Exceptions;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
  @@ -67,10 +67,11 @@
            log.error( "exception root cause", EJB.getCause(e) );
            endWebRequestAfterException( (HttpServletRequest) request, (HttpServletResponse) response, e);
         }
  -      finally
  +      //should we put this back in? why, who cares if its not cleaned up?
  +      /*finally
         {
  -         Lifecycle.setPhaseId(null);
  -      }
  +         Lifecycle.clearPhaseId();
  +      }*/
      }
      
      protected void endWebRequestAfterException(HttpServletRequest request, HttpServletResponse response, Exception e) 
  @@ -80,7 +81,7 @@
         //the FacesContext is gone - create a fake one for Redirect and HttpError to call
         MockFacesContext facesContext = createFacesContext(request, response);
         facesContext.setCurrent();
  -      Lifecycle.beginExceptionRecovery( facesContext.getExternalContext() );
  +      FacesLifecycle.beginExceptionRecovery( facesContext.getExternalContext() );
         try
         {
            rollbackTransactionIfNecessary();
  @@ -102,7 +103,7 @@
         {
            try 
            {
  -            Lifecycle.endRequest( facesContext.getExternalContext() );
  +            FacesLifecycle.endRequest( facesContext.getExternalContext() );
               facesContext.release();
               log.debug("ended request");
            }