[Httpunit-commit] CVS: httpunit/src/com/meterware/servletunit ServletRunner.java,1.28,1.29 ServletUnitContext.java,1.8,1.9 ServletUnitHttpSession.java,1.11,1.12 SessionListenerDispatcher.java,1.2,1.3

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/servletunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3794/src/com/meterware/servletunit

Modified Files:
	ServletRunner.java ServletUnitContext.java 
	ServletUnitHttpSession.java SessionListenerDispatcher.java 
Log Message:
Implemented HttpSession.getServletContext()

Index: ServletRunner.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletRunner.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ServletRunner.java	22 Sep 2004 03:15:22 -0000	1.28
+++ ServletRunner.java	23 Sep 2004 22:48:19 -0000	1.29
@@ -130,7 +130,7 @@
 
 
     private void completeInitialization( String contextPath ) {
-        _context = new ServletUnitContext( contextPath, _application );
+        _context = new ServletUnitContext( contextPath, _application.getServletContext(), _application );
         _application.registerServlet( "*.jsp", _jspServletDescriptor.getClassName(), _jspServletDescriptor.getInitializationParameters( null, null ) );
     }
 

Index: ServletUnitContext.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitContext.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServletUnitContext.java	9 Sep 2004 00:16:40 -0000	1.8
+++ ServletUnitContext.java	23 Sep 2004 22:48:19 -0000	1.9
@@ -19,29 +19,18 @@
 * DEALINGS IN THE SOFTWARE.
 *
 *******************************************************************************************************************/
-
-
-import javax.servlet.http.HttpSession;
+import javax.servlet.ServletContext;
 import java.util.*;
 import java.util.Hashtable;
 
 class ServletUnitContext {
 
     private SessionListenerDispatcher _listenerDispatcher;
+    private ServletContext _servletContext;
 
 
-    ServletUnitContext() {
-        this( null, new SessionListenerDispatcher() {
-            public void sendSessionCreated( HttpSession session ) {}
-            public void sendSessionDestroyed( HttpSession session ) {}
-            public void sendAttributeAdded( HttpSession session, String name, Object value ) {}
-            public void sendAttributeReplaced( HttpSession session, String name, Object oldValue ) {}
-            public void sendAttributeRemoved( HttpSession session, String name, Object oldValue ) {}
-        } );
-    }
-
-
-    ServletUnitContext( String contextPath, SessionListenerDispatcher dispatcher ) {
+    ServletUnitContext( String contextPath, ServletContext servletContext, SessionListenerDispatcher dispatcher ) {
+        _servletContext = servletContext;
         _contextPath = (contextPath != null ? contextPath : "");
         _listenerDispatcher = dispatcher;
     }
@@ -87,7 +76,7 @@
      * Creates a new session with a unique ID.
      **/
     ServletUnitHttpSession newSession() {
-        ServletUnitHttpSession result = new ServletUnitHttpSession( _listenerDispatcher );
+        ServletUnitHttpSession result = new ServletUnitHttpSession( _servletContext, _listenerDispatcher );
         _sessions.put( result.getId(), result );
         _listenerDispatcher.sendSessionCreated( result );
         return result;

Index: ServletUnitHttpSession.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitHttpSession.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ServletUnitHttpSession.java	3 Mar 2004 01:12:51 -0000	1.11
+++ ServletUnitHttpSession.java	23 Sep 2004 22:48:19 -0000	1.12
@@ -35,10 +35,12 @@
     final static public String SESSION_COOKIE_NAME = "JSESSION";
 
 
+    private ServletContext _servletContext;
     private SessionListenerDispatcher _listenerDispatcher;
 
 
-    public ServletUnitHttpSession( SessionListenerDispatcher listenerDispatcher ) {
+    ServletUnitHttpSession( ServletContext servletContext, SessionListenerDispatcher listenerDispatcher ) {
+        _servletContext     = servletContext;
         _listenerDispatcher = listenerDispatcher;
     }
 
@@ -221,7 +223,7 @@
      * @since 1.3
      **/
     public ServletContext getServletContext() {
-        return null;    // XXX implement me
+        return _servletContext;
     }
 
 //-------------------------------------------- package members -------------------------------------------------

Index: SessionListenerDispatcher.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/SessionListenerDispatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionListenerDispatcher.java	15 Feb 2004 06:42:01 -0000	1.2
+++ SessionListenerDispatcher.java	23 Sep 2004 22:48:19 -0000	1.3
@@ -1,7 +1,4 @@
 package com.meterware.servletunit;
-
-import javax.servlet.http.HttpSession;
-
 /********************************************************************************************************************
  * $Id$
  *
@@ -22,6 +19,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  *******************************************************************************************************************/
+import javax.servlet.http.HttpSession;
 
 /**
  *