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

[Gavin King]

  User: gavin   
  Date: 07/02/04 00:41:58

  Modified:    src/main/org/jboss/seam/contexts  Lifecycle.java
  Log:
  fixes
  
  Revision  Changes    Path
  1.80      +10 -9     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.79
  retrieving revision 1.80
  diff -u -b -r1.79 -r1.80
  --- Lifecycle.java	4 Feb 2007 01:13:18 -0000	1.79
  +++ Lifecycle.java	4 Feb 2007 05:41:58 -0000	1.80
  @@ -12,7 +12,6 @@
   import javax.faces.event.PhaseId;
   import javax.servlet.ServletContext;
   import javax.servlet.ServletRequest;
  -import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpSession;
   
   import org.jboss.seam.Component;
  @@ -30,14 +29,15 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.79 $
  + * @version $Revision: 1.80 $
    */
   public class Lifecycle
   {
   
      private static final LogProvider log = Logging.getLogProvider(Lifecycle.class);
   
  -   public static void beginRequest(ExternalContext externalContext) {
  +   public static void beginRequest(ExternalContext externalContext) 
  +   {
         log.debug( ">>> Begin web request" );
         Contexts.eventContext.set( new WebRequestContext( ContextAdaptor.getRequest(externalContext) ) );
         Contexts.sessionContext.set( new WebSessionContext( ContextAdaptor.getSession(externalContext) ) );
  @@ -46,7 +46,8 @@
         //Events.instance(); //TODO: only for now, until we have a way to do EL outside of JSF!
      }
   
  -   public static void beginRequest(ServletContext servletContext, HttpSession session, ServletRequest request) {
  +   public static void beginRequest(ServletContext servletContext, HttpSession session, ServletRequest request) 
  +   {
         log.debug( ">>> Begin web request" );
         Contexts.eventContext.set( new WebRequestContext( ContextAdaptor.getRequest(request) ) );
         Contexts.sessionContext.set( new WebSessionContext( ContextAdaptor.getSession(session) ) );
  @@ -112,12 +113,12 @@
         Contexts.conversationContext.set( new MapContext(ScopeType.CONVERSATION) );
      }
   
  -   public static void beginExceptionRecovery(ServletContext servletContext, HttpServletRequest request)
  +   public static void beginExceptionRecovery(ExternalContext externalContext)
      {
  -      Contexts.applicationContext.set( new WebApplicationContext(servletContext) );
  -      Contexts.eventContext.set( new WebRequestContext( ContextAdaptor.getRequest(request) ) );
  -      Contexts.sessionContext.set( new WebSessionContext( ContextAdaptor.getSession( request.getSession() ) ) );
  -      Contexts.conversationContext.set( new MapContext(ScopeType.CONVERSATION) );
  +      Contexts.applicationContext.set( new FacesApplicationContext(externalContext) );
  +      Contexts.eventContext.set( new WebRequestContext( ContextAdaptor.getRequest(externalContext) ) );
  +      Contexts.sessionContext.set( new WebSessionContext( ContextAdaptor.getSession(externalContext) ) );
  +      Contexts.conversationContext.set( new ServerConversationContext( ContextAdaptor.getSession(externalContext) ) );
      }
   
      public static void endInitialization()