[jboss-cvs] jboss-seam/src/pdf/org/jboss/seam/pdf ...

[Gavin King]

  User: gavin   
  Date: 07/06/10 15:26:00

  Modified:    src/pdf/org/jboss/seam/pdf  DocumentStoreServlet.java
  Log:
  major refactor of contexts impl
  JBSEAM-953
  
  Revision  Changes    Path
  1.9       +5 -7      jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStoreServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentStoreServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStoreServlet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- DocumentStoreServlet.java	22 Feb 2007 05:02:34 -0000	1.8
  +++ DocumentStoreServlet.java	10 Jun 2007 19:26:00 -0000	1.9
  @@ -7,11 +7,10 @@
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  -import javax.servlet.http.HttpSession;
   
  -import org.jboss.seam.contexts.ContextAdaptor;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.core.Manager;
  +import org.jboss.seam.servlet.ServletRequestSessionMap;
   import org.jboss.seam.util.Parameters;
   
   public class DocumentStoreServlet 
  @@ -24,19 +23,18 @@
           throws ServletException, 
                  IOException 
       {
  -        HttpSession session = request .getSession(true);
           Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
           Lifecycle.setServletRequest(request);
  -        Lifecycle.beginRequest(getServletContext(), session, request);
  +        Lifecycle.beginRequest( getServletContext(), request );
           Manager.instance().restoreConversation(request.getParameterMap());
  -        Lifecycle.resumeConversation(session);
  +        Lifecycle.resumeConversation(request);
           Manager.instance().handleConversationPropagation(request.getParameterMap());
           try 
           {
              doWork(request, response);
              //TODO: conversation timeout
  -           Manager.instance().endRequest(ContextAdaptor.getSession(session));
  -           Lifecycle.endRequest(session);
  +           Manager.instance().endRequest( new ServletRequestSessionMap(request) );
  +           Lifecycle.endRequest(request);
           } 
           catch (Exception e) 
           {