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 Changes Path 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 -0000 1.11 +++ Globals.java 15 Oct 2004 00:18:35 -0000 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 static final String INCLUDE_SERVLET_PATH_ATTR = - "javax.servlet.include.servlet_path"; + public static final String FORWARD_PATH_INFO_ATTR = + "javax.servlet.forward.path_info"; /** @@ -255,6 +239,22 @@ */ public static final String FORWARD_SERVLET_PATH_ATTR = "javax.servlet.forward.servlet_path"; + + + /** + * 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 we forward a servlet name to + * an error page. + */ + public static final String SERVLET_NAME_ATTR = + "javax.servlet.error.servlet_name"; /**
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]