craigmcc 00/10/21 06:21:22
Modified: webapps/examples/WEB-INF/classes/filters ExampleFilter.java
RequestDumperFilter.java
Log:
Begin dealing with the mountain of API changes recently checked in to
the 2.3/1.2 branch of jakarta-servletapi.
The example filters have been modified so that they compile clean, but
nothing will work again until the corresponding changes happen to the
Catalina core classes.
Revision Changes Path
1.2 +10 -6
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExampleFilter.java 2000/08/22 04:10:20 1.1
+++ ExampleFilter.java 2000/10/21 13:21:22 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java,v
1.1 2000/08/22 04:10:20 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/22 04:10:20 $
+ * $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 $
*
* ====================================================================
*
@@ -67,6 +67,7 @@
import java.io.IOException;
import javax.servlet.Filter;
+import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -88,7 +89,7 @@
* </ul>
*
* @author Craig McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/22 04:10:20 $
+ * @version $Revision: 1.2 $ $Date: 2000/10/21 13:21:22 $
*/
public final class ExampleFilter implements Filter {
@@ -119,11 +120,13 @@
*
* @param request The servlet request we are processing
* @param result The servlet response we are creating
+ * @param chain The filter chain we are processing
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
*/
- public void doFilter(ServletRequest request, ServletResponse response)
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain)
throws IOException, ServletException {
// Store ourselves as a request attribute (if requested)
@@ -132,8 +135,9 @@
// Time and log the subsequent processing
long startTime = System.currentTimeMillis();
- Filter next = filterConfig.getNext();
- next.doFilter(request, response);
+// Filter next = filterConfig.getNext();
+// next.doFilter(request, response);
+ chain.doFilter(request, response);
long stopTime = System.currentTimeMillis();
filterConfig.getServletContext().log
(this.toString() + ": " + (stopTime - startTime) +
1.2 +10 -6
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestDumperFilter.java 2000/09/14 00:49:12 1.1
+++ RequestDumperFilter.java 2000/10/21 13:21:22 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java,v
1.1 2000/09/14 00:49:12 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/09/14 00:49:12 $
+ * $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 $
*
* ====================================================================
*
@@ -72,6 +72,7 @@
import java.util.Enumeration;
import java.util.Locale;
import javax.servlet.Filter;
+import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -88,7 +89,7 @@
* to assist in debugging problems.
*
* @author Craig McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/09/14 00:49:12 $
+ * @version $Revision: 1.2 $ $Date: 2000/10/21 13:21:22 $
*/
public final class RequestDumperFilter implements Filter {
@@ -113,11 +114,13 @@
*
* @param request The servlet request we are processing
* @param result The servlet response we are creating
+ * @param chain The filter chain we are processing
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
*/
- public void doFilter(ServletRequest request, ServletResponse response)
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain)
throws IOException, ServletException {
if (filterConfig == null)
@@ -196,8 +199,9 @@
filterConfig.getServletContext().log(sw.getBuffer().toString());
// Pass control on to the next filter
- Filter next = filterConfig.getNext();
- next.doFilter(request, response);
+// Filter next = filterConfig.getNext();
+// next.doFilter(request, response);
+ chain.doFilter(request, response);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
