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

[Gavin King]

  User: gavin   
  Date: 07/06/20 18:11:30

  Modified:    src/main/org/jboss/seam/contexts    Contexts.java
                        FacesLifecycle.java ServletLifecycle.java
  Log:
  move the Session API
  
  Revision  Changes    Path
  1.57      +3 -3      jboss-seam/src/main/org/jboss/seam/contexts/Contexts.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Contexts.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/Contexts.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -b -r1.56 -r1.57
  --- Contexts.java	20 Jun 2007 20:24:08 -0000	1.56
  +++ Contexts.java	20 Jun 2007 22:11:30 -0000	1.57
  @@ -15,10 +15,10 @@
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.Mutable;
  -import org.jboss.seam.core.ServletSession;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.transaction.Transaction;
  +import org.jboss.seam.web.Session;
   
   /**
    * Provides access to the current contexts associated with the thread.
  @@ -372,7 +372,7 @@
           //}
      
            //uses the event and session contexts
  -         if ( ServletSession.getInstance()!=null )
  +         if ( Session.getInstance()!=null )
            {
               Manager.instance().unlockConversation();
            }
  @@ -411,7 +411,7 @@
         try
         {
            destroy(temp);
  -         if ( !ServletSession.instance().isInvalid() ) //its also unnecessary during a session timeout
  +         if ( !Session.instance().isInvalid() ) //its also unnecessary during a session timeout
            {
               temp.clear();
               temp.flush();
  
  
  
  1.5       +5 -5      jboss-seam/src/main/org/jboss/seam/contexts/FacesLifecycle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesLifecycle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/FacesLifecycle.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- FacesLifecycle.java	20 Jun 2007 17:49:42 -0000	1.4
  +++ FacesLifecycle.java	20 Jun 2007 22:11:30 -0000	1.5
  @@ -10,10 +10,10 @@
   import javax.faces.context.FacesContext;
   import javax.faces.event.PhaseId;
   
  -import org.jboss.seam.core.ServletSession;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.navigation.Pages;
  +import org.jboss.seam.web.Session;
   
   /**
    * @author Gavin King
  @@ -46,8 +46,8 @@
         Contexts.eventContext.set( new EventContext( externalContext.getRequestMap() ) );
         Contexts.applicationContext.set( new ApplicationContext( externalContext.getApplicationMap() ) );
         Contexts.sessionContext.set( new SessionContext( externalContext.getSessionMap() ) );
  -      ServletSession servletSession = ServletSession.getInstance();
  -      if ( servletSession!=null && servletSession.isInvalidDueToNewScheme( Pages.getRequestScheme( FacesContext.getCurrentInstance() ) ) )
  +      Session session = Session.getInstance();
  +      if ( session!=null && session.isInvalidDueToNewScheme( Pages.getRequestScheme( FacesContext.getCurrentInstance() ) ) )
         {
            invalidateSession(externalContext);
         }
  @@ -71,8 +71,8 @@
         log.debug("After render response, destroying contexts");
         try
         {
  -         ServletSession servletSession = ServletSession.getInstance();
  -         boolean sessionInvalid = servletSession!=null && servletSession.isInvalid();
  +         Session session = Session.getInstance();
  +         boolean sessionInvalid = session!=null && session.isInvalid();
            
            Contexts.flushAndDestroyContexts();
   
  
  
  
  1.2       +3 -3      jboss-seam/src/main/org/jboss/seam/contexts/ServletLifecycle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServletLifecycle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/ServletLifecycle.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ServletLifecycle.java	20 Jun 2007 08:23:17 -0000	1.1
  +++ ServletLifecycle.java	20 Jun 2007 22:11:30 -0000	1.2
  @@ -12,13 +12,13 @@
   
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.core.Events;
  -import org.jboss.seam.core.ServletSession;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.servlet.ServletApplicationMap;
   import org.jboss.seam.servlet.ServletRequestMap;
   import org.jboss.seam.servlet.ServletRequestSessionMap;
   import org.jboss.seam.servlet.ServletSessionMap;
  +import org.jboss.seam.web.Session;
   
   /**
    * @author Gavin King
  @@ -54,8 +54,8 @@
         log.debug("After request, destroying contexts");
         try
         {
  -         ServletSession servletSession = ServletSession.getInstance();
  -         boolean sessionInvalid = servletSession!=null && servletSession.isInvalid();
  +         Session session = Session.getInstance();
  +         boolean sessionInvalid = session!=null && session.isInvalid();
            
            Contexts.flushAndDestroyContexts();