cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina Globals.java
luehe 2004/10/14 17:18:35 Modified:catalina/src/share/org/apache/catalina Globals.java Log: - Grouped javax.servlet.include.* and javax.servlet.forward.* attributes - Fixed description of javax.servlet.include.* attributes: They do not refer to the properties of the original request, but to those of the included request Revision ChangesPath 1.12 +50 -50 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java Index: Globals.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Globals.java 1 Sep 2004 18:33:32 - 1.11 +++ Globals.java 15 Oct 2004 00:18:35 - 1.12 @@ -88,22 +88,6 @@ /** - * The request attribute under which the original context path is stored - * on an included dispatcher request. - */ -public static final String INCLUDE_CONTEXT_PATH_ATTR = -javax.servlet.include.context_path; - - -/** - * The request attribute under which the original context path is stored - * on an forwarded dispatcher request. - */ -public static final String FORWARD_CONTEXT_PATH_ATTR = -javax.servlet.forward.context_path; - - -/** * The request attribute under which we forward a Java exception * (as an object of type Throwable) to an error page. */ @@ -186,43 +170,43 @@ /** - * The request attribute under which the original path info is stored - * on an included dispatcher request. + * The request attribute under which the request URI of the included + * servlet is stored on an included dispatcher request. */ -public static final String INCLUDE_PATH_INFO_ATTR = -javax.servlet.include.path_info; - - +public static final String INCLUDE_REQUEST_URI_ATTR = +javax.servlet.include.request_uri; + + /** - * The request attribute under which the original path info is stored - * on an forwarded dispatcher request. + * The request attribute under which the context path of the included + * servlet is stored on an included dispatcher request. */ -public static final String FORWARD_PATH_INFO_ATTR = -javax.servlet.forward.path_info; +public static final String INCLUDE_CONTEXT_PATH_ATTR = +javax.servlet.include.context_path; /** - * The request attribute under which the original query string is stored - * on an included dispatcher request. + * The request attribute under which the path info of the included + * servlet is stored on an included dispatcher request. */ -public static final String INCLUDE_QUERY_STRING_ATTR = -javax.servlet.include.query_string; +public static final String INCLUDE_PATH_INFO_ATTR = +javax.servlet.include.path_info; + - /** - * The request attribute under which the original query string is stored - * on an forwarded dispatcher request. + * The request attribute under which the servlet path of the included + * servlet is stored on an included dispatcher request. */ -public static final String FORWARD_QUERY_STRING_ATTR = -javax.servlet.forward.query_string; - - +public static final String INCLUDE_SERVLET_PATH_ATTR = +javax.servlet.include.servlet_path; + + /** - * The request attribute under which the original request URI is stored - * on an included dispatcher request. + * The request attribute under which the query string of the included + * servlet is stored on an included dispatcher request. */ -public static final String INCLUDE_REQUEST_URI_ATTR = -javax.servlet.include.request_uri; +public static final String INCLUDE_QUERY_STRING_ATTR = +javax.servlet.include.query_string; /** @@ -234,19 +218,19 @@ /** - * The request attribute under which we forward a servlet name to - * an error page. + * The request attribute under which the original context path is stored + * on an forwarded dispatcher request. */ -public static final String SERVLET_NAME_ATTR = -javax.servlet.error.servlet_name; +public static final String FORWARD_CONTEXT_PATH_ATTR = +javax.servlet.forward.context_path; /** - * The request attribute under which the original servlet path is stored - * on an included dispatcher request. + * The request attribute under which the original path info is stored + * on an forwarded dispatcher request. */ -public
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina Globals.java
jfarcand2002/12/17 12:05:07 Modified:catalina/src/share/org/apache/catalina Globals.java Log: Servlet 2.4 Specification addition -- SRV.8.4.2 Forwarded Request Parameters Except for servlets obtained by using the getNamedDispatcher method, a servlet being used from a servlet that has been invoked by another servlet using the forward method of RequestDispatcher. The following request attributes must be set: - javax.servlet.forward.request_uri - javax.servlet.forward.context_path - javax.servlet.forward.servlet_path - javax.servlet.forward.path_info - javax.servlet.forward.query_string Revision ChangesPath 1.3 +50 -10 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java Index: Globals.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Globals.java 21 Sep 2002 06:47:22 - 1.2 +++ Globals.java 17 Dec 2002 20:05:07 - 1.3 @@ -126,9 +126,17 @@ * The request attribute under which the original context path is stored * on an included dispatcher request. */ -public static final String CONTEXT_PATH_ATTR = +public static final String INCLUDE_CONTEXT_PATH_ATTR = javax.servlet.include.context_path; + +/** + * The request attribute under which the original context path is stored + * on an forwarded dispatcher request. + */ +public static final String FORWARD_CONTEXT_PATH_ATTR = +javax.servlet.forward.context_path; + /** * The request attribute under which we forward a Java exception @@ -216,27 +224,51 @@ * The request attribute under which the original path info is stored * on an included dispatcher request. */ -public static final String PATH_INFO_ATTR = +public static final String INCLUDE_PATH_INFO_ATTR = javax.servlet.include.path_info; + + +/** + * The request attribute under which the original path info is stored + * on an forwarded dispatcher request. + */ +public static final String FORWARD_PATH_INFO_ATTR = +javax.servlet.forward.path_info; /** * The request attribute under which the original query string is stored * on an included dispatcher request. */ -public static final String QUERY_STRING_ATTR = +public static final String INCLUDE_QUERY_STRING_ATTR = javax.servlet.include.query_string; - + +/** + * The request attribute under which the original query string is stored + * on an forwarded dispatcher request. + */ +public static final String FORWARD_QUERY_STRING_ATTR = +javax.servlet.forward.query_string; + + /** * The request attribute under which the original request URI is stored * on an included dispatcher request. */ -public static final String REQUEST_URI_ATTR = +public static final String INCLUDE_REQUEST_URI_ATTR = javax.servlet.include.request_uri; /** + * The request attribute under which the original request URI is stored + * on an forwarded dispatcher request. + */ +public static final String FORWARD_REQUEST_URI_ATTR = +javax.servlet.forward.request_uri; + + +/** * The request attribute under which we forward a servlet name to * an error page. */ @@ -248,10 +280,18 @@ * The request attribute under which the original servlet path is stored * on an included dispatcher request. */ -public static final String SERVLET_PATH_ATTR = +public static final String INCLUDE_SERVLET_PATH_ATTR = javax.servlet.include.servlet_path; +/** + * The request attribute under which the original servlet path is stored + * on an forwarded dispatcher request. + */ +public static final String FORWARD_SERVLET_PATH_ATTR = +javax.servlet.forward.servlet_path; + + /** * The name of the cookie used to pass the session identifier back * and forth with the client. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina Globals.java
billbarker2002/09/20 23:47:22 Modified:catalina/src/share/org/apache/catalina Globals.java Log: Duplicate the certificate attribute from Coyote, until we can use it for all versions. Revision ChangesPath 1.2 +8 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java Index: Globals.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Globals.java 18 Jul 2002 16:47:37 - 1.1 +++ Globals.java 21 Sep 2002 06:47:22 - 1.2 @@ -83,6 +83,10 @@ public static final String CERTIFICATES_ATTR = javax.servlet.request.X509Certificate; +/** + * SSL Certificate Request Attributite. + */ +public static final String SSL_CERTIFICATE_ATTR = org.apache.coyote.request.X509Certificate; /** * The request attribute under which we store the name of the cipher suite -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
