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

[Gavin King]

  User: gavin   
  Date: 07/06/13 17:07:33

  Modified:    src/main/org/jboss/seam/contexts   Lifecycle.java
  Added:       src/main/org/jboss/seam/contexts  
                        ContextualHttpServletRequest.java
  Log:
  refactor
  
  Revision  Changes    Path
  1.96      +0 -12     jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Lifecycle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -b -r1.95 -r1.96
  --- Lifecycle.java	11 Jun 2007 20:08:52 -0000	1.95
  +++ Lifecycle.java	13 Jun 2007 21:07:33 -0000	1.96
  @@ -12,7 +12,6 @@
   import javax.faces.context.ExternalContext;
   import javax.faces.event.PhaseId;
   import javax.servlet.ServletContext;
  -import javax.servlet.ServletRequest;
   import javax.servlet.http.HttpServletRequest;
   
   import org.jboss.seam.Component;
  @@ -520,7 +519,6 @@
         phaseId.set(phase);
      }
   
  -   private static ThreadLocal<ServletRequest> servletRequest = new ThreadLocal<ServletRequest>();
      private static ServletContext servletContext;
   
      public static ServletContext getServletContext() 
  @@ -537,16 +535,6 @@
         Lifecycle.servletContext = servletContext;
      }
   
  -   public static ServletRequest getServletRequest() 
  -   {
  -      return servletRequest.get();
  -   }
  -
  -   public static void setServletRequest(ServletRequest servletRequest) 
  -   {
  -      Lifecycle.servletRequest.set(servletRequest);
  -   }
  -
      private static ThreadLocal<Boolean> destroying = new ThreadLocal<Boolean>();
   
      public static void startDestroying()
  
  
  
  1.1      date: 2007/06/13 21:07:33;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/contexts/ContextualHttpServletRequest.java
  
  Index: ContextualHttpServletRequest.java
  ===================================================================
  package org.jboss.seam.contexts;
  
  import java.io.IOException;
  
  import javax.faces.event.PhaseId;
  import javax.servlet.ServletContext;
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
  
  import org.jboss.seam.core.ConversationPropagation;
  import org.jboss.seam.core.Manager;
  import org.jboss.seam.core.ServletContexts;
  import org.jboss.seam.log.LogProvider;
  import org.jboss.seam.log.Logging;
  import org.jboss.seam.servlet.ServletRequestSessionMap;
  
  public abstract class ContextualHttpServletRequest
  {
     private static final LogProvider log = Logging.getLogProvider(ContextualHttpServletRequest.class);
  
     private final HttpServletRequest request;
     private final ServletContext servletContext;
     
     public ContextualHttpServletRequest(HttpServletRequest request, ServletContext servletContext)
     {
        this.request = request;
        this.servletContext = servletContext;
     }
     
     public abstract void process() throws Exception;
     
     public void run() throws ServletException, IOException
     {
        log.debug("beginning request");
        Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
        Lifecycle.beginRequest(servletContext, request);
        ServletContexts.instance().setRequest(request);
        restoreConversationId();
        Manager.instance().restoreConversation();
        Lifecycle.resumeConversation(request);
        handleConversationPropagation();
        try
        {
           process();
           //TODO: conversation timeout
           Manager.instance().endRequest( new ServletRequestSessionMap(request)  );
           Lifecycle.endRequest(request);
        }
        catch (IOException ioe)
        {
           Lifecycle.endRequest();
           log.error("ended request due to exception", ioe);
           throw ioe;
        }
        catch (ServletException se)
        {
           Lifecycle.endRequest();
           log.error("ended request due to exception", se);
           throw se;
        }
        catch (Exception e)
        {
           Lifecycle.endRequest();
           log.error("ended request due to exception", e);
           throw new ServletException(e);
        }
        finally
        {
           Lifecycle.setPhaseId(null);
           log.debug("ended request");
        }
     }
  
     protected void handleConversationPropagation()
     {
        Manager.instance().handleConversationPropagation( request.getParameterMap() );
     }
  
     protected void restoreConversationId()
     {
        ConversationPropagation.instance().restoreConversationId( request.getParameterMap() );
     }
     
  }