craigmcc 01/03/16 16:28:12
Modified: catalina/src/share/org/apache/catalina/core
ApplicationContext.java
ApplicationFilterConfig.java
catalina/src/share/org/apache/catalina/session
StandardSession.java
webapps/examples/WEB-INF/classes/filters ExampleFilter.java
RequestDumperFilter.java
webapps/examples/WEB-INF/classes/listeners
ContextListener.java SessionListener.java
Log:
Adapt to servlet API changes just checked in to "jakarta-servletapi-4".
Revision Changes Path
1.17 +11 -11
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ApplicationContext.java 2001/03/16 23:30:58 1.16
+++ ApplicationContext.java 2001/03/17 00:28:01 1.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.16 2001/03/16 23:30:58 remm Exp $
- * $Revision: 1.16 $
- * $Date: 2001/03/16 23:30:58 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.17 2001/03/17 00:28:01 craigmcc Exp $
+ * $Revision: 1.17 $
+ * $Date: 2001/03/17 00:28:01 $
*
* ====================================================================
*
@@ -86,7 +86,7 @@
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextAttributeEvent;
-import javax.servlet.ServletContextAttributesListener;
+import javax.servlet.ServletContextAttributeListener;
import javax.servlet.http.HttpServletRequest;
import org.apache.naming.resources.Resource;
import org.apache.naming.resources.DirContextURLStreamHandler;
@@ -111,7 +111,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.16 $ $Date: 2001/03/16 23:30:58 $
+ * @version $Revision: 1.17 $ $Date: 2001/03/17 00:28:01 $
*/
public final class ApplicationContext
@@ -727,10 +727,10 @@
new ServletContextAttributeEvent(context.getServletContext(),
name, value);
for (int i = 0; i < listeners.length; i++) {
- if (!(listeners[i] instanceof ServletContextAttributesListener))
+ if (!(listeners[i] instanceof ServletContextAttributeListener))
continue;
- ServletContextAttributesListener listener =
- (ServletContextAttributesListener) listeners[i];
+ ServletContextAttributeListener listener =
+ (ServletContextAttributeListener) listeners[i];
try {
context.fireContainerEvent("beforeContextAttributeRemoved",
listener);
@@ -774,10 +774,10 @@
new ServletContextAttributeEvent(context.getServletContext(),
name, value);
for (int i = 0; i < listeners.length; i++) {
- if (!(listeners[i] instanceof ServletContextAttributesListener))
+ if (!(listeners[i] instanceof ServletContextAttributeListener))
continue;
- ServletContextAttributesListener listener =
- (ServletContextAttributesListener) listeners[i];
+ ServletContextAttributeListener listener =
+ (ServletContextAttributeListener) listeners[i];
try {
if (replaced) {
context.fireContainerEvent("beforeContextAttributeReplaced",
1.4 +7 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java
Index: ApplicationFilterConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationFilterConfig.java 2000/10/22 09:55:52 1.3
+++ ApplicationFilterConfig.java 2001/03/17 00:28:02 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java,v
1.3 2000/10/22 09:55:52 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2000/10/22 09:55:52 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java,v
1.4 2001/03/17 00:28:02 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/03/17 00:28:02 $
*
* ====================================================================
*
@@ -83,7 +83,7 @@
* is first started.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2000/10/22 09:55:52 $
+ * @version $Revision: 1.4 $ $Date: 2001/03/17 00:28:02 $
*/
final class ApplicationFilterConfig implements FilterConfig {
@@ -244,7 +244,7 @@
// Instantiate a new instance of this filter and return it
Class clazz = classLoader.loadClass(filterClass);
this.filter = (Filter) clazz.newInstance();
- filter.setFilterConfig(this);
+ filter.init(this);
return (this.filter);
}
@@ -267,7 +267,7 @@
void release() {
if (this.filter != null)
- filter.setFilterConfig(null);
+ filter.destroy();
this.filter = null;
}
@@ -296,7 +296,7 @@
// Release any previously allocated filter instance
if (this.filter != null)
- this.filter.setFilterConfig(null);
+ this.filter.destroy();
this.filter = null;
} else {
1.15 +28 -11
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java
Index: StandardSession.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StandardSession.java 2001/03/14 02:17:22 1.14
+++ StandardSession.java 2001/03/17 00:28:05 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
1.14 2001/03/14 02:17:22 craigmcc Exp $
- * $Revision: 1.14 $
- * $Date: 2001/03/14 02:17:22 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
1.15 2001/03/17 00:28:05 craigmcc Exp $
+ * $Revision: 1.15 $
+ * $Date: 2001/03/17 00:28:05 $
*
* ====================================================================
*
@@ -75,10 +75,11 @@
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionActivationListener;
-import javax.servlet.http.HttpSessionAttributesListener;
+import javax.servlet.http.HttpSessionAttributeListener;
import javax.servlet.http.HttpSessionBindingEvent;
import javax.servlet.http.HttpSessionBindingListener;
import javax.servlet.http.HttpSessionContext;
@@ -110,7 +111,7 @@
* @author Craig R. McClanahan
* @author Sean Legassick
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
- * @version $Revision: 1.14 $ $Date: 2001/03/14 02:17:22 $
+ * @version $Revision: 1.15 $ $Date: 2001/03/17 00:28:05 $
*/
class StandardSession
@@ -723,6 +724,22 @@
/**
+ * Return the ServletContext to which this session belongs.
+ */
+ public ServletContext getServletContext() {
+
+ if (manager == null)
+ return (null);
+ Context context = (Context) manager.getContainer();
+ if (context == null)
+ return (null);
+ else
+ return (context.getServletContext());
+
+ }
+
+
+ /**
* Return the session context with which this session is associated.
*
* @deprecated As of Version 2.1, this method is deprecated and has no
@@ -934,10 +951,10 @@
if (listeners == null)
return;
for (int i = 0; i < listeners.length; i++) {
- if (!(listeners[i] instanceof HttpSessionAttributesListener))
+ if (!(listeners[i] instanceof HttpSessionAttributeListener))
continue;
- HttpSessionAttributesListener listener =
- (HttpSessionAttributesListener) listeners[i];
+ HttpSessionAttributeListener listener =
+ (HttpSessionAttributeListener) listeners[i];
try {
context.fireContainerEvent("beforeSessionAttributeRemoved",
listener);
@@ -1033,10 +1050,10 @@
if (listeners == null)
return;
for (int i = 0; i < listeners.length; i++) {
- if (!(listeners[i] instanceof HttpSessionAttributesListener))
+ if (!(listeners[i] instanceof HttpSessionAttributeListener))
continue;
- HttpSessionAttributesListener listener =
- (HttpSessionAttributesListener) listeners[i];
+ HttpSessionAttributeListener listener =
+ (HttpSessionAttributeListener) listeners[i];
try {
if (unbound != null) {
context.fireContainerEvent("beforeSessionAttributeReplaced",
1.3 +18 -22
jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
Index: ExampleFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExampleFilter.java 2000/10/21 13:21:22 1.2
+++ ExampleFilter.java 2001/03/17 00:28:07 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java,v
1.2 2000/10/21 13:21:22 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/10/21 13:21:22 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java,v
1.3 2001/03/17 00:28:07 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/03/17 00:28:07 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
* </ul>
*
* @author Craig McClanahan
- * @version $Revision: 1.2 $ $Date: 2000/10/21 13:21:22 $
+ * @version $Revision: 1.3 $ $Date: 2001/03/17 00:28:07 $
*/
public final class ExampleFilter implements Filter {
@@ -115,6 +115,17 @@
/**
+ * Take this filter out of service.
+ */
+ public void destroy() {
+
+ this.attribute = null;
+ this.filterConfig = null;
+
+ }
+
+
+ /**
* Time the processing that is performed by all subsequent filters in the
* current filter stack, including the ultimately invoked servlet.
*
@@ -135,8 +146,6 @@
// Time and log the subsequent processing
long startTime = System.currentTimeMillis();
-// Filter next = filterConfig.getNext();
-// next.doFilter(request, response);
chain.doFilter(request, response);
long stopTime = System.currentTimeMillis();
filterConfig.getServletContext().log
@@ -146,28 +155,15 @@
}
- /**
- * Return the filter configuration object for this filter.
- */
- public FilterConfig getFilterConfig() {
-
- return (this.filterConfig);
-
- }
-
-
/**
- * Set the filter configuration object for this filter.
+ * Place this filter into service.
*
* @param filterConfig The filter configuration object
*/
- public void setFilterConfig(FilterConfig filterConfig) {
+ public void init(FilterConfig filterConfig) {
this.filterConfig = filterConfig;
- if (filterConfig != null)
- this.attribute = filterConfig.getInitParameter("attribute");
- else
- this.attribute = null;
+ this.attribute = filterConfig.getInitParameter("attribute");
}
1.3 +16 -18
jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java
Index: RequestDumperFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestDumperFilter.java 2000/10/21 13:21:22 1.2
+++ RequestDumperFilter.java 2001/03/17 00:28:08 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java,v
1.2 2000/10/21 13:21:22 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/10/21 13:21:22 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java,v
1.3 2001/03/17 00:28:08 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/03/17 00:28:08 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
* to assist in debugging problems.
*
* @author Craig McClanahan
- * @version $Revision: 1.2 $ $Date: 2000/10/21 13:21:22 $
+ * @version $Revision: 1.3 $ $Date: 2001/03/17 00:28:08 $
*/
public final class RequestDumperFilter implements Filter {
@@ -109,6 +109,16 @@
/**
+ * Take this filter out of service.
+ */
+ public void destroy() {
+
+ this.filterConfig = null;
+
+ }
+
+
+ /**
* Time the processing that is performed by all subsequent filters in the
* current filter stack, including the ultimately invoked servlet.
*
@@ -199,29 +209,17 @@
filterConfig.getServletContext().log(sw.getBuffer().toString());
// Pass control on to the next filter
-// Filter next = filterConfig.getNext();
-// next.doFilter(request, response);
chain.doFilter(request, response);
}
- /**
- * Return the filter configuration object for this filter.
- */
- public FilterConfig getFilterConfig() {
-
- return (this.filterConfig);
-
- }
-
-
/**
- * Set the filter configuration object for this filter.
+ * Place this filter into service.
*
* @param filterConfig The filter configuration object
*/
- public void setFilterConfig(FilterConfig filterConfig) {
+ public void init(FilterConfig filterConfig) {
this.filterConfig = filterConfig;
1.2 +6 -6
jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
Index: ContextListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/listeners/ContextListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextListener.java 2000/08/22 02:18:46 1.1
+++ ContextListener.java 2001/03/17 00:28:10 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/listeners/ContextListener.java,v
1.1 2000/08/22 02:18:46 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/22 02:18:46 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/listeners/ContextListener.java,v
1.2 2001/03/17 00:28:10 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/03/17 00:28:10 $
*
* ====================================================================
*
@@ -67,7 +67,7 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletContextAttributeEvent;
-import javax.servlet.ServletContextAttributesListener;
+import javax.servlet.ServletContextAttributeListener;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -79,11 +79,11 @@
* associated with our servlet context.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/22 02:18:46 $
+ * @version $Revision: 1.2 $ $Date: 2001/03/17 00:28:10 $
*/
public final class ContextListener
- implements ServletContextAttributesListener, ServletContextListener {
+ implements ServletContextAttributeListener, ServletContextListener {
// ----------------------------------------------------- Instance Variables
1.2 +6 -6
jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
Index: SessionListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/listeners/SessionListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionListener.java 2000/08/22 02:18:47 1.1
+++ SessionListener.java 2001/03/17 00:28:11 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/listeners/SessionListener.java,v
1.1 2000/08/22 02:18:47 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/22 02:18:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/listeners/SessionListener.java,v
1.2 2001/03/17 00:28:11 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/03/17 00:28:11 $
*
* ====================================================================
*
@@ -68,7 +68,7 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import javax.servlet.http.HttpSessionAttributesListener;
+import javax.servlet.http.HttpSessionAttributeListener;
import javax.servlet.http.HttpSessionBindingEvent;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
@@ -81,12 +81,12 @@
* associated with our servlet context.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/22 02:18:47 $
+ * @version $Revision: 1.2 $ $Date: 2001/03/17 00:28:11 $
*/
public final class SessionListener
implements ServletContextListener,
- HttpSessionAttributesListener, HttpSessionListener {
+ HttpSessionAttributeListener, HttpSessionListener {
// ----------------------------------------------------- Instance Variables
