[jboss-cvs] jboss-seam/src/main/org/jboss/seam/web ...
Gavin King
gavin.king at jboss.com
Sun Jun 10 15:25:59 EDT 2007
User: gavin
Date: 07/06/10 15:25:59
Modified: src/main/org/jboss/seam/web AuthenticationFilter.java
ContextFilter.java SeamFilter.java
Log:
major refactor of contexts impl
JBSEAM-953
Revision Changes Path
1.2 +6 -8 jboss-seam/src/main/org/jboss/seam/web/AuthenticationFilter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AuthenticationFilter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/AuthenticationFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AuthenticationFilter.java 30 May 2007 00:52:59 -0000 1.1
+++ AuthenticationFilter.java 10 Jun 2007 19:25:59 -0000 1.2
@@ -15,7 +15,6 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import org.jboss.seam.annotations.Filter;
import org.jboss.seam.annotations.Install;
@@ -26,7 +25,7 @@
import org.jboss.seam.annotations.Startup;
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Lifecycle;
-import org.jboss.seam.contexts.WebSessionContext;
+import org.jboss.seam.contexts.SessionContext;
import org.jboss.seam.core.Manager;
import org.jboss.seam.log.Log;
import org.jboss.seam.security.Identity;
@@ -34,7 +33,7 @@
import org.jboss.seam.security.digest.DigestRequest;
import org.jboss.seam.security.digest.DigestUtils;
import org.jboss.seam.security.digest.DigestValidationException;
-import org.jboss.seam.servlet.ServletSessionImpl;
+import org.jboss.seam.servlet.ServletRequestSessionMap;
import org.jboss.seam.util.Base64;
/**
@@ -130,7 +129,7 @@
HttpServletResponse response, FilterChain chain)
throws IOException, ServletException
{
- Context ctx = new WebSessionContext(new ServletSessionImpl(request.getSession()));
+ Context ctx = new SessionContext( new ServletRequestSessionMap(request) );
Identity identity = (Identity) ctx.get(Identity.class);
boolean requireAuth = false;
@@ -188,7 +187,7 @@
HttpServletResponse response, FilterChain chain)
throws IOException, ServletException
{
- Context ctx = new WebSessionContext(new ServletSessionImpl(request.getSession()));
+ Context ctx = new SessionContext( new ServletRequestSessionMap(request) );
Identity identity = (Identity) ctx.get(Identity.class);
boolean requireAuth = false;
@@ -286,12 +285,11 @@
{
try
{
- 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() );
identity.authenticate();
}
1.6 +6 -8 jboss-seam/src/main/org/jboss/seam/web/ContextFilter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ContextFilter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/ContextFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ContextFilter.java 4 May 2007 11:31:34 -0000 1.5
+++ ContextFilter.java 10 Jun 2007 19:25:59 -0000 1.6
@@ -12,7 +12,6 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import org.jboss.seam.annotations.Filter;
import org.jboss.seam.annotations.Install;
@@ -20,11 +19,11 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Startup;
-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.servlet.ServletRequestSessionMap;
/**
* Manages the Seam contexts associated with a request to any servlet.
@@ -45,20 +44,19 @@
throws IOException, ServletException
{
log.debug("beginning request");
-
- HttpSession session = ( (HttpServletRequest) request ).getSession(true);
+ HttpServletRequest hsr = (HttpServletRequest) request;
Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
Lifecycle.setServletRequest(request);
- Lifecycle.beginRequest(getServletContext(), session, request);
+ Lifecycle.beginRequest(getServletContext(), hsr);
Manager.instance().restoreConversation( request.getParameterMap() );
- Lifecycle.resumeConversation(session);
+ Lifecycle.resumeConversation(hsr);
Manager.instance().handleConversationPropagation( request.getParameterMap() );
try
{
chain.doFilter(request, response);
//TODO: conversation timeout
- Manager.instance().endRequest( ContextAdaptor.getSession(session) );
- Lifecycle.endRequest(session);
+ Manager.instance().endRequest( new ServletRequestSessionMap(hsr) );
+ Lifecycle.endRequest(hsr);
}
catch (Exception e)
{
1.7 +4 -2 jboss-seam/src/main/org/jboss/seam/web/SeamFilter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamFilter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/SeamFilter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- SeamFilter.java 30 May 2007 21:53:10 -0000 1.6
+++ SeamFilter.java 10 Jun 2007 19:25:59 -0000 1.7
@@ -15,11 +15,13 @@
import javax.servlet.ServletResponse;
import org.jboss.seam.Component;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.contexts.BasicContext;
import org.jboss.seam.contexts.Context;
-import org.jboss.seam.contexts.WebApplicationContext;
import org.jboss.seam.core.Init;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
+import org.jboss.seam.servlet.ServletApplicationMap;
import org.jboss.seam.util.SortItem;
import org.jboss.seam.util.Sorter;
@@ -73,7 +75,7 @@
public void init(FilterConfig filterConfig) throws ServletException
{
- Context tempApplicationContext = new WebApplicationContext( filterConfig.getServletContext() );
+ Context tempApplicationContext = new BasicContext(ScopeType.APPLICATION, new ServletApplicationMap( filterConfig.getServletContext() ) );
Init init = (Init) tempApplicationContext.get(Init.class);
// Setup ready for sorting
More information about the jboss-cvs-commits
mailing list