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

[Gavin King]

  User: gavin   
  Date: 07/06/20 11:53:32

  Modified:    src/main/org/jboss/seam/contexts    Contexts.java
                        FacesLifecycle.java
  Removed:     src/main/org/jboss/seam/contexts   
                        ClientConversationContext.java
  Log:
  nested->toplevel
  get rid of client-side conversation support
  
  Revision  Changes    Path
  1.54      +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.53
  retrieving revision 1.54
  diff -u -b -r1.53 -r1.54
  --- Contexts.java	20 Jun 2007 08:36:11 -0000	1.53
  +++ Contexts.java	20 Jun 2007 15:53:32 -0000	1.54
  @@ -373,14 +373,14 @@
               log.debug("destroying conversation context");
               destroy( getConversationContext() );
            }
  -         if ( !Init.instance().isClientSideConversations() )
  -         {
  +         /*if ( !Init.instance().isClientSideConversations() )
  +         {*/
               //note that we need to flush even if the session is
               //about to be invalidated, since we still need
               //to destroy the conversation context in endSession()
               log.debug("flushing server-side conversation context");
               getConversationContext().flush();
  -         }
  +        //}
      
            //uses the event and session contexts
            if ( ServletSession.getInstance()!=null )
  
  
  
  1.3       +3 -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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- FacesLifecycle.java	20 Jun 2007 08:36:11 -0000	1.2
  +++ FacesLifecycle.java	20 Jun 2007 15:53:32 -0000	1.3
  @@ -10,7 +10,6 @@
   import javax.faces.context.FacesContext;
   import javax.faces.event.PhaseId;
   
  -import org.jboss.seam.core.Init;
   import org.jboss.seam.core.ServletSession;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
  @@ -114,11 +113,10 @@
   
      public static void resumeConversation(ExternalContext externalContext)
      {
  -      Init init = Init.instance();
  -      Context conversationContext = init.isClientSideConversations() ?
  +      /*Context conversationContext = Init.instance().isClientSideConversations() ?
               (Context) new ClientConversationContext() :
  -            (Context) new ServerConversationContext( externalContext.getSessionMap() );
  -      Contexts.conversationContext.set( conversationContext );
  +            (Context) new ServerConversationContext( externalContext.getSessionMap() );*/
  +      Contexts.conversationContext.set( new ServerConversationContext( externalContext.getSessionMap() ) );
         Contexts.businessProcessContext.set( new BusinessProcessContext() );
      }