craigmcc 01/05/11 21:56:55
Modified: catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
ApplicationHttpRequest.java
ApplicationHttpResponse.java
Log:
Add an innocuous public method to each class for unit tests to validate
that access is prevented.
Revision Changes Path
1.16 +24 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ApplicationDispatcher.java 2001/05/04 03:41:10 1.15
+++ ApplicationDispatcher.java 2001/05/12 04:56:54 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
1.15 2001/05/04 03:41:10 craigmcc Exp $
- * $Revision: 1.15 $
- * $Date: 2001/05/04 03:41:10 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
1.16 2001/05/12 04:56:54 craigmcc Exp $
+ * $Revision: 1.16 $
+ * $Date: 2001/05/12 04:56:54 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
* <code>javax.servlet.ServletResponseWrapper</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.15 $ $Date: 2001/05/04 03:41:10 $
+ * @version $Revision: 1.16 $ $Date: 2001/05/12 04:56:54 $
*/
final class ApplicationDispatcher
@@ -203,6 +203,13 @@
/**
+ * Descriptive information about this implementation.
+ */
+ private static final String info =
+ "org.apache.catalina.core.ApplicationDispatcher/1.0";
+
+
+ /**
* The servlet name for a named dispatcher.
*/
private String name = null;
@@ -238,6 +245,19 @@
* or included.
*/
private Wrapper wrapper = null;
+
+
+ // ------------------------------------------------------------- Properties
+
+
+ /**
+ * Return the descriptive information about this implementation.
+ */
+ public String getInfo() {
+
+ return (this.info);
+
+ }
// --------------------------------------------------------- Public Methods
1.6 +21 -4
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApplicationHttpRequest.java 2001/05/02 20:44:19 1.5
+++ ApplicationHttpRequest.java 2001/05/12 04:56:54 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
1.5 2001/05/02 20:44:19 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2001/05/02 20:44:19 $
+ * $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 $
*
* ====================================================================
*
@@ -93,7 +93,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2001/05/02 20:44:19 $
+ * @version $Revision: 1.6 $ $Date: 2001/05/12 04:56:54 $
*/
class ApplicationHttpRequest extends HttpServletRequestWrapper {
@@ -144,6 +144,13 @@
/**
+ * Descriptive information about this implementation.
+ */
+ protected static final String info =
+ "org.apache.catalina.core.ApplicationHttpRequest/1.0";
+
+
+ /**
* The request parameters for this request. This is initialized from the
* wrapped request, but updates are allowed.
*/
@@ -385,6 +392,16 @@
// -------------------------------------------------------- Package Methods
+
+
+ /**
+ * Return descriptive information about this implementation.
+ */
+ public String getInfo() {
+
+ return (this.info);
+
+ }
/**
1.2 +21 -4
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplicationHttpResponse.java 2000/08/23 01:07:11 1.1
+++ ApplicationHttpResponse.java 2001/05/12 04:56:55 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v
1.1 2000/08/23 01:07:11 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/23 01:07:11 $
+ * $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 $
*
* ====================================================================
*
@@ -86,7 +86,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/23 01:07:11 $
+ * @version $Revision: 1.2 $ $Date: 2001/05/12 04:56:55 $
*/
class ApplicationHttpResponse extends HttpServletResponseWrapper {
@@ -138,6 +138,13 @@
/**
+ * Descriptive information about this implementation.
+ */
+ protected static final String info =
+ "org.apache.catalina.core.ApplicationHttpResponse/1.0";
+
+
+ /**
* The parent object that is actually an internal response object.
*/
protected HttpResponse parent = null;
@@ -368,6 +375,16 @@
// -------------------------------------------------------- Package Methods
+
+
+ /**
+ * Return descriptive information about this implementation.
+ */
+ public String getInfo() {
+
+ return (this.info);
+
+ }
/**
