[jboss-cvs] jboss-seam/src/remoting/org/jboss/seam/remoting ...
Gavin King
gavin.king at jboss.com
Sun Jun 10 15:26:00 EDT 2007
User: gavin
Date: 07/06/10 15:26:00
Modified: src/remoting/org/jboss/seam/remoting
ExecutionHandler.java InterfaceGenerator.java
PollHandler.java Remoting.java
SubscriptionHandler.java
Log:
major refactor of contexts impl
JBSEAM-953
Revision Changes Path
1.3 +6 -8 jboss-seam/src/remoting/org/jboss/seam/remoting/ExecutionHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ExecutionHandler.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/remoting/org/jboss/seam/remoting/ExecutionHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ExecutionHandler.java 8 May 2007 09:58:55 -0000 1.2
+++ ExecutionHandler.java 10 Jun 2007 19:26:00 -0000 1.3
@@ -10,17 +10,16 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
-import org.jboss.seam.contexts.ContextAdaptor;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.core.Manager;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
import org.jboss.seam.remoting.wrapper.Wrapper;
+import org.jboss.seam.servlet.ServletRequestSessionMap;
/**
* Unmarshals the calls from an HttpServletRequest, executes them in order and
@@ -71,13 +70,12 @@
RequestContext ctx = unmarshalContext(env);
// Reinstate the Seam conversation
- HttpSession session = request.getSession(true);
Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
Lifecycle.setServletRequest(request);
- Lifecycle.beginRequest(servletContext, session, request);
+ Lifecycle.beginRequest(servletContext, request);
Manager.instance().restoreConversation( ctx.getConversationId() );
- Lifecycle.resumeConversation(session);
+ Lifecycle.resumeConversation(request);
// Extract the calls from the request
List<Call> calls = unmarshalCalls(env);
@@ -93,7 +91,7 @@
// Package up the response
marshalResponse(calls, ctx, response.getOutputStream());
- Manager.instance().endRequest( ContextAdaptor.getSession(session) );
+ Manager.instance().endRequest( new ServletRequestSessionMap(request) );
Lifecycle.endRequest();
}
catch (Exception ex)
1.3 +4 -5 jboss-seam/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InterfaceGenerator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- InterfaceGenerator.java 11 Mar 2007 08:54:23 -0000 1.2
+++ InterfaceGenerator.java 10 Jun 2007 19:26:00 -0000 1.3
@@ -16,21 +16,21 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+
import javax.faces.event.PhaseId;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
import org.jboss.seam.Component;
import org.jboss.seam.ComponentType;
import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.WebRemote;
import org.jboss.seam.contexts.Lifecycle;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
import org.jboss.seam.util.EJB;
import org.jboss.seam.util.Reflections;
@@ -72,10 +72,9 @@
{
try
{
- HttpSession session = request.getSession(true);
Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
Lifecycle.setServletRequest(request);
- Lifecycle.beginRequest(servletContext, session, request);
+ Lifecycle.beginRequest(servletContext, request);
String[] componentNames = request.getQueryString().split("&");
Component[] components = new Component[componentNames.length];
1.3 +4 -5 jboss-seam/src/remoting/org/jboss/seam/remoting/PollHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PollHandler.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/remoting/org/jboss/seam/remoting/PollHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PollHandler.java 30 May 2007 01:32:55 -0000 1.2
+++ PollHandler.java 10 Jun 2007 19:26:00 -0000 1.3
@@ -4,6 +4,7 @@
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
+
import javax.faces.event.PhaseId;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -12,14 +13,13 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.jboss.seam.contexts.Lifecycle;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
import org.jboss.seam.remoting.messaging.PollError;
import org.jboss.seam.remoting.messaging.PollRequest;
import org.jboss.seam.remoting.wrapper.Wrapper;
@@ -74,10 +74,9 @@
try
{
- HttpSession session = request.getSession(true);
Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
Lifecycle.setServletRequest(request);
- Lifecycle.beginRequest(servletContext, session, request);
+ Lifecycle.beginRequest(servletContext, request);
for (PollRequest req : polls)
req.poll();
1.2 +8 -9 jboss-seam/src/remoting/org/jboss/seam/remoting/Remoting.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Remoting.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/remoting/org/jboss/seam/remoting/Remoting.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Remoting.java 27 Feb 2007 22:15:23 -0000 1.1
+++ Remoting.java 10 Jun 2007 19:26:00 -0000 1.2
@@ -14,7 +14,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Intercept;
@@ -60,14 +59,13 @@
return "/remoting";
}
- private synchronized void initConfig(String contextPath,
- HttpSession session, HttpServletRequest request)
+ private synchronized void initConfig(String contextPath, HttpServletRequest request)
{
if (!cachedConfig.containsKey(contextPath))
{
try
{
- Lifecycle.beginRequest(getServletContext(), session, request);
+ Lifecycle.beginRequest( getServletContext(), request );
StringBuilder sb = new StringBuilder();
sb.append("\nSeam.Remoting.resourcePath = \"");
@@ -89,7 +87,7 @@
}
finally
{
- Lifecycle.endRequest(session);
+ Lifecycle.endRequest(request);
}
}
}
@@ -116,7 +114,6 @@
{
String path = m.group(1);
String resource = m.group(2);
- HttpSession session = request.getSession();
if (REMOTING_RESOURCE_PATH.equals(path))
{
@@ -124,7 +121,7 @@
if ("remote.js".equals(resource))
{
appendConfig(response.getOutputStream(), request
- .getContextPath(), session, request);
+ .getContextPath(), request);
}
}
response.getOutputStream().flush();
@@ -144,10 +141,12 @@
* @param out OutputStream
*/
private void appendConfig(OutputStream out, String contextPath,
- HttpSession session, HttpServletRequest request) throws IOException
+ HttpServletRequest request) throws IOException
{
if (!cachedConfig.containsKey(contextPath))
- initConfig(contextPath, session, request);
+ {
+ initConfig(contextPath, request);
+ }
out.write(cachedConfig.get(contextPath));
}
1.2 +2 -4 jboss-seam/src/remoting/org/jboss/seam/remoting/SubscriptionHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SubscriptionHandler.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/remoting/org/jboss/seam/remoting/SubscriptionHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SubscriptionHandler.java 27 Feb 2007 22:15:23 -0000 1.1
+++ SubscriptionHandler.java 10 Jun 2007 19:26:00 -0000 1.2
@@ -9,7 +9,6 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import org.dom4j.Document;
import org.dom4j.Element;
@@ -66,13 +65,12 @@
try
{
- HttpSession session = request.getSession(true);
Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
Lifecycle.setServletRequest(request);
- Lifecycle.beginRequest(servletContext, session, request);
+ Lifecycle.beginRequest(servletContext, request);
Manager.instance().initializeTemporaryConversation();
- Lifecycle.resumeConversation(session);
+ Lifecycle.resumeConversation(request);
for (SubscriptionRequest req : requests)
req.subscribe();
More information about the jboss-cvs-commits
mailing list