Deprecate wrapper methods that wrap deprecated methods.

The assumption is that the EG will accept the patch to do this too. If not, it should be reverted.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@733771 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/javax/servlet/ServletRequestWrapper.java b/java/javax/servlet/ServletRequestWrapper.java
index 2e42ab1..5f2cadc 100644 (file)
--- a/java/javax/servlet/ServletRequestWrapper.java
+++ b/java/javax/servlet/ServletRequestWrapper.java
@@ -349,6 +349,7 @@ public class ServletRequestWrapper implements ServletRequest {
     /**
       * The default behavior of this method is to return getRealPath(String path)
      * on the wrapped request object.
+     * @deprecated As of Version 3.0 of the Java Servlet API
      */
 
     public String getRealPath(String path) {

diff --git a/java/javax/servlet/http/HttpServletRequestWrapper.java b/java/javax/servlet/http/HttpServletRequestWrapper.java
index f9d87d5..70f83e9 100644 (file)
--- a/java/javax/servlet/http/HttpServletRequestWrapper.java
+++ b/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -253,6 +253,7 @@ public class HttpServletRequestWrapper extends ServletRequestWrapper implements
     /**
      * The default behavior of this method is to return isRequestedSessionIdFromUrl()
      * on the wrapped request object.
+     * @deprecated As of Version 3.0 of the Java Servlet API
      */
     public boolean isRequestedSessionIdFromUrl() {
        return this._getHttpServletRequest().isRequestedSessionIdFromUrl();

diff --git a/java/javax/servlet/http/HttpServletResponseWrapper.java b/java/javax/servlet/http/HttpServletResponseWrapper.java
index 6563b7b..b91823d 100644 (file)
--- a/java/javax/servlet/http/HttpServletResponseWrapper.java
+++ b/java/javax/servlet/http/HttpServletResponseWrapper.java
@@ -87,6 +87,7 @@ public class HttpServletResponseWrapper extends ServletResponseWrapper implement
     /**
      * The default behavior of this method is to call encodeUrl(String url)
      * on the wrapped response object.
+     * @deprecated As of Version 3.0 of the Java Servlet API
      */
     public String encodeUrl(String url) {
        return this._getHttpServletResponse().encodeUrl(url);
@@ -95,6 +96,7 @@ public class HttpServletResponseWrapper extends ServletResponseWrapper implement
     /**
      * The default behavior of this method is to return encodeRedirectUrl(String url)
      * on the wrapped response object.
+     * @deprecated As of Version 3.0 of the Java Servlet API
      */
     public String encodeRedirectUrl(String url) {
        return this._getHttpServletResponse().encodeRedirectUrl(url);
@@ -187,6 +189,7 @@ public class HttpServletResponseWrapper extends ServletResponseWrapper implement
     /**
      * The default behavior of this method is to call setStatus(int sc, String sm)
      * on the wrapped response object.
+     * @deprecated As of Version 3.0 of the Java Servlet API
      */
      public void setStatus(int sc, String sm) {
        this._getHttpServletResponse().setStatus(sc, sm);