You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2001/05/14 06:10:09 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationHttpRequest.java ApplicationHttpResponse.java ApplicationRequest.java ApplicationResponse.java
remm 01/05/13 21:10:09
Modified: catalina/src/share/org/apache/catalina/core
ApplicationHttpRequest.java
ApplicationHttpResponse.java
ApplicationRequest.java ApplicationResponse.java
Log:
- The request and response objects had to be modified be able to use facades.
They will now handled the facade as the parent "internal" request / response.
Revision Changes Path
1.7 +10 -8 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApplicationHttpRequest.java 2001/05/12 04:56:54 1.6
+++ ApplicationHttpRequest.java 2001/05/14 04:10:04 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v 1.6 2001/05/12 04:56:54 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2001/05/12 04:56:54 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v 1.7 2001/05/14 04:10:04 remm Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/05/14 04:10:04 $
*
* ====================================================================
*
@@ -75,6 +75,7 @@
import javax.servlet.http.HttpServletRequestWrapper;
import org.apache.catalina.Globals;
import org.apache.catalina.HttpRequest;
+import org.apache.catalina.connector.HttpRequestFacade;
import org.apache.catalina.util.Enumerator;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.StringManager;
@@ -93,7 +94,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/05/12 04:56:54 $
+ * @version $Revision: 1.7 $ $Date: 2001/05/14 04:10:04 $
*/
class ApplicationHttpRequest extends HttpServletRequestWrapper {
@@ -160,7 +161,7 @@
/**
* The parent object that is actually an internal request object.
*/
- protected HttpRequest parent = null;
+ protected HttpServletRequest parent = null;
/**
@@ -419,7 +420,8 @@
return;
}
while (request != null) {
- if (request instanceof HttpRequest)
+ if ((request instanceof HttpRequest)
+ || (request instanceof HttpRequestFacade))
break;
if (!(request instanceof HttpServletRequestWrapper)) {
throw new IllegalArgumentException
@@ -432,7 +434,7 @@
throw new IllegalArgumentException
(sm.getString("applicationRequest.badParent"));
}
- this.parent = (HttpRequest) request;
+ this.parent = request;
}
@@ -463,7 +465,7 @@
* Get the parent of the wrapped servlet request that is actually an
* internal Request implementation.
*/
- HttpRequest getParent() {
+ HttpServletRequest getParent() {
return (this.parent);
1.3 +10 -8 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java
Index: ApplicationHttpResponse.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationHttpResponse.java 2001/05/12 04:56:55 1.2
+++ ApplicationHttpResponse.java 2001/05/14 04:10:05 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v 1.2 2001/05/12 04:56:55 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2001/05/12 04:56:55 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v 1.3 2001/05/14 04:10:05 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/05/14 04:10:05 $
*
* ====================================================================
*
@@ -70,6 +70,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.catalina.HttpResponse;
+import org.apache.catalina.connector.HttpResponseFacade;
import org.apache.catalina.util.StringManager;
@@ -86,7 +87,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/05/12 04:56:55 $
+ * @version $Revision: 1.3 $ $Date: 2001/05/14 04:10:05 $
*/
class ApplicationHttpResponse extends HttpServletResponseWrapper {
@@ -147,7 +148,7 @@
/**
* The parent object that is actually an internal response object.
*/
- protected HttpResponse parent = null;
+ protected HttpServletResponse parent = null;
/**
@@ -402,7 +403,8 @@
return;
}
while (response != null) {
- if (response instanceof HttpResponse)
+ if ((response instanceof HttpResponse)
+ || (response instanceof HttpResponseFacade))
break;
if (!(response instanceof HttpServletResponseWrapper)) {
throw new IllegalArgumentException
@@ -415,7 +417,7 @@
throw new IllegalArgumentException
(sm.getString("applicationResponse.badParent"));
}
- this.parent = (HttpResponse) response;
+ this.parent = response;
}
@@ -424,7 +426,7 @@
* Get the parent of the wrapped servlet response that is actually an
* internal Response implementation.
*/
- HttpResponse getParent() {
+ HttpServletResponse getParent() {
return (this.parent);
1.4 +10 -8 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationRequest.java
Index: ApplicationRequest.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationRequest.java 2001/05/02 20:44:24 1.3
+++ ApplicationRequest.java 2001/05/14 04:10:05 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationRequest.java,v 1.3 2001/05/02 20:44:24 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/05/02 20:44:24 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationRequest.java,v 1.4 2001/05/14 04:10:05 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/05/14 04:10:05 $
*
* ====================================================================
*
@@ -72,6 +72,7 @@
import javax.servlet.ServletRequestWrapper;
import org.apache.catalina.Globals;
import org.apache.catalina.Request;
+import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.util.Enumerator;
import org.apache.catalina.util.StringManager;
@@ -89,7 +90,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/05/02 20:44:24 $
+ * @version $Revision: 1.4 $ $Date: 2001/05/14 04:10:05 $
*/
class ApplicationRequest extends ServletRequestWrapper {
@@ -136,7 +137,7 @@
/**
* The parent object that is actually an internal request object.
*/
- protected Request parent = null;
+ protected ServletRequest parent = null;
/**
@@ -280,7 +281,8 @@
return;
}
while (request != null) {
- if (request instanceof Request)
+ if ((request instanceof Request)
+ || (request instanceof RequestFacade))
break;
if (!(request instanceof ServletRequestWrapper)) {
throw new IllegalArgumentException
@@ -292,7 +294,7 @@
throw new IllegalArgumentException
(sm.getString("applicationRequest.badParent"));
}
- this.parent = (Request) request;
+ this.parent = request;
}
@@ -301,7 +303,7 @@
* Get the parent of the wrapped servlet request that is actually an
* internal Request implementation.
*/
- Request getParent() {
+ ServletRequest getParent() {
return (this.parent);
1.3 +10 -8 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java
Index: ApplicationResponse.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationResponse.java 2000/10/16 22:44:18 1.2
+++ ApplicationResponse.java 2001/05/14 04:10:06 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java,v 1.2 2000/10/16 22:44:18 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/10/16 22:44:18 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java,v 1.3 2001/05/14 04:10:06 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/05/14 04:10:06 $
*
* ====================================================================
*
@@ -72,6 +72,7 @@
import javax.servlet.ServletResponse;
import javax.servlet.ServletResponseWrapper;
import org.apache.catalina.Response;
+import org.apache.catalina.connector.ResponseFacade;
import org.apache.catalina.util.StringManager;
@@ -88,7 +89,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2000/10/16 22:44:18 $
+ * @version $Revision: 1.3 $ $Date: 2001/05/14 04:10:06 $
*/
class ApplicationResponse extends ServletResponseWrapper {
@@ -141,7 +142,7 @@
/**
* The parent object that is actually an internal response object.
*/
- protected Response parent = null;
+ protected ServletResponse parent = null;
/**
@@ -232,7 +233,8 @@
return;
}
while (response != null) {
- if (response instanceof Response)
+ if ((response instanceof Response)
+ || (response instanceof ResponseFacade))
break;
if (!(response instanceof ServletResponseWrapper)) {
throw new IllegalArgumentException
@@ -244,7 +246,7 @@
throw new IllegalArgumentException
(sm.getString("applicationResponse.badParent"));
}
- this.parent = (Response) response;
+ this.parent = response;
}
@@ -253,7 +255,7 @@
* Get the parent of the wrapped servlet response that is actually an
* internal Response implementation.
*/
- Response getParent() {
+ ServletResponse getParent() {
return (this.parent);