Author: kkolinko
Date: Wed Aug 8 19:57:36 2012
New Revision: 1370924
URL: http://svn.apache.org/viewvc?rev=1370924&view=rev
Log:
Document the constants that were added to the RequestDispatcher interface in
Tomcat 7.
Mark them as "@since Servlet 3.0".
It is backport of r1370916.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/RequestDispatcher.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1370916
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/RequestDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/RequestDispatcher.java?rev=1370924&r1=1370923&r2=1370924&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/RequestDispatcher.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/RequestDispatcher.java Wed Aug 8
19:57:36 2012
@@ -39,21 +39,179 @@ import java.io.IOException;
*/
public interface RequestDispatcher {
+ /**
+ * The name of the request attribute that should be set by the container
+ * when custom error-handling servlet or JSP page is invoked. The value of
+ * the attribute is of type {@code java.lang.Throwable}. See the chapter
+ * "Error Handling" in the Servlet Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String ERROR_EXCEPTION =
"javax.servlet.error.exception";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when custom error-handling servlet or JSP page is invoked. The value of
+ * the attribute is of type {@code java.lang.Class}. See the chapter
+ * "Error Handling" in the Servlet Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String ERROR_EXCEPTION_TYPE =
"javax.servlet.error.exception_type";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when custom error-handling servlet or JSP page is invoked. The value of
+ * the attribute is of type {@code java.lang.String}. See the chapter
+ * "Error Handling" in the Servlet Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String ERROR_MESSAGE = "javax.servlet.error.message";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when custom error-handling servlet or JSP page is invoked. The value of
+ * the attribute is of type {@code java.lang.String}. See the chapter
+ * "Error Handling" in the Servlet Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String ERROR_REQUEST_URI =
"javax.servlet.error.request_uri";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when custom error-handling servlet or JSP page is invoked. The value of
+ * the attribute is of type {@code java.lang.String}. See the chapter
+ * "Error Handling" in the Servlet Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String ERROR_SERVLET_NAME =
"javax.servlet.error.servlet_name";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when custom error-handling servlet or JSP page is invoked. The value of
+ * the attribute is of type {@code java.lang.Integer}. See the chapter
+ * "Error Handling" in the Servlet Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String ERROR_STATUS_CODE =
"javax.servlet.error.status_code";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when the {@link #forward(ServletRequest, ServletResponse)} method is
+ * called. It provides the original value of a path-related property of the
+ * request. See the chapter "Forwarded Request Parameters" in the Servlet
+ * Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String FORWARD_CONTEXT_PATH =
"javax.servlet.forward.context_path";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when the {@link #forward(ServletRequest, ServletResponse)} method is
+ * called. It provides the original value of a path-related property of the
+ * request. See the chapter "Forwarded Request Parameters" in the Servlet
+ * Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String FORWARD_PATH_INFO =
"javax.servlet.forward.path_info";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when the {@link #forward(ServletRequest, ServletResponse)} method is
+ * called. It provides the original value of a path-related property of the
+ * request. See the chapter "Forwarded Request Parameters" in the Servlet
+ * Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String FORWARD_QUERY_STRING =
"javax.servlet.forward.query_string";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when the {@link #forward(ServletRequest, ServletResponse)} method is
+ * called. It provides the original value of a path-related property of the
+ * request. See the chapter "Forwarded Request Parameters" in the Servlet
+ * Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String FORWARD_REQUEST_URI =
"javax.servlet.forward.request_uri";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when the {@link #forward(ServletRequest, ServletResponse)} method is
+ * called. It provides the original value of a path-related property of the
+ * request. See the chapter "Forwarded Request Parameters" in the Servlet
+ * Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String FORWARD_SERVLET_PATH =
"javax.servlet.forward.servlet_path";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when the {@link #include(ServletRequest, ServletResponse)} method is
+ * called on the {@code RequestDispatcher} obtained by a path and not by a
+ * name. It provides information on the path that was used to obtain the
+ * {@code RequestDispatcher} instance for this include call. See the
chapter
+ * "Included Request Parameters" in the Servlet Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String INCLUDE_CONTEXT_PATH =
"javax.servlet.include.context_path";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when the {@link #include(ServletRequest, ServletResponse)} method is
+ * called on the {@code RequestDispatcher} obtained by a path and not by a
+ * name. It provides information on the path that was used to obtain the
+ * {@code RequestDispatcher} instance for this include call. See the
chapter
+ * "Included Request Parameters" in the Servlet Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String INCLUDE_PATH_INFO =
"javax.servlet.include.path_info";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when the {@link #include(ServletRequest, ServletResponse)} method is
+ * called on the {@code RequestDispatcher} obtained by a path and not by a
+ * name. It provides information on the path that was used to obtain the
+ * {@code RequestDispatcher} instance for this include call. See the
chapter
+ * "Included Request Parameters" in the Servlet Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String INCLUDE_QUERY_STRING =
"javax.servlet.include.query_string";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when the {@link #include(ServletRequest, ServletResponse)} method is
+ * called on the {@code RequestDispatcher} obtained by a path and not by a
+ * name. It provides information on the path that was used to obtain the
+ * {@code RequestDispatcher} instance for this include call. See the
chapter
+ * "Included Request Parameters" in the Servlet Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String INCLUDE_REQUEST_URI =
"javax.servlet.include.request_uri";
+
+ /**
+ * The name of the request attribute that should be set by the container
+ * when the {@link #include(ServletRequest, ServletResponse)} method is
+ * called on the {@code RequestDispatcher} obtained by a path and not by a
+ * name. It provides information on the path that was used to obtain the
+ * {@code RequestDispatcher} instance for this include call. See the
chapter
+ * "Included Request Parameters" in the Servlet Specification for details.
+ *
+ * @since Servlet 3.0
+ */
public static final String INCLUDE_SERVLET_PATH =
"javax.servlet.include.servlet_path";
/**
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1370924&r1=1370923&r2=1370924&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 8 19:57:36 2012
@@ -99,6 +99,10 @@
<bug>53641</bug>: Correct name of HTTP header used in WebSocket
handshake for listing the preferred protocols. (markt)
</fix>
+ <scode>
+ Document the constants that were added to the
+ <code>RequestDispatcher</code> interface in Servlet 3.0. (kkolinko)
+ </scode>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
