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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/03/09 02:05:12

  Modified:    src/main/org/jboss/seam/servlet  ResourceServlet.java
  Log:
  resources manage their own contexts
  
  Revision  Changes    Path
  1.8       +1 -33     jboss-seam/src/main/org/jboss/seam/servlet/ResourceServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ResourceServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/servlet/ResourceServlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- ResourceServlet.java	8 Mar 2007 22:55:49 -0000	1.7
  +++ ResourceServlet.java	9 Mar 2007 07:05:12 -0000	1.8
  @@ -4,21 +4,16 @@
   import java.util.HashMap;
   import java.util.Map;
   
  -import javax.faces.event.PhaseId;
   import javax.servlet.ServletConfig;
   import javax.servlet.ServletContext;
   import javax.servlet.ServletException;
   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.Context;
  -import org.jboss.seam.contexts.ContextAdaptor;
  -import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.contexts.WebApplicationContext;
   import org.jboss.seam.core.Init;
  -import org.jboss.seam.core.Manager;
   
   /**
    * Serves extra resources such as Javascript, CSS, Images
  @@ -70,33 +65,8 @@
            AbstractResource provider = providers.get(path);
            if (provider != null)
            {
  -            // Set up Seam contexts for Resource Providers
  -            HttpSession session = request.getSession(true);
  -            Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
  -            Lifecycle.setServletRequest(request);
  -            Lifecycle.beginRequest(getServletContext(), session, request);
  -            Manager.instance().restoreConversation(request.getParameterMap());
  -            Lifecycle.resumeConversation(session);
  -            Manager.instance().handleConversationPropagation(request.getParameterMap());
  -            try
  -            {
                  provider.getResource(request, response);
  -               // TODO: conversation timeout
  -               Manager.instance().endRequest(ContextAdaptor.getSession(session));
  -               Lifecycle.endRequest(session);
  -            }
  -            catch (Exception e)
  -            {
  -               Lifecycle.endRequest();
  -               throw new ServletException(e);
               }
  -            finally
  -            {
  -               Lifecycle.setServletRequest(null);
  -               Lifecycle.setPhaseId(null);
  -            }
  -         }
  -
         }
      }
   
  @@ -104,8 +74,6 @@
      public void doPost(HttpServletRequest request, HttpServletResponse response)
               throws ServletException, IOException
      {
  -      //needed for Seam remoting
  -      //TODO: why is remoting a "resource"??
         doGet(request, response);
      }
   }