Author: markt
Date: Fri Oct 9 13:38:24 2015
New Revision: 1707726
URL: http://svn.apache.org/viewvc?rev=1707726&view=rev
Log:
Servlet 4.0
Use of @Deprecated
Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/javax/servlet/ServletRequest.java
tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
tomcat/trunk/java/javax/servlet/SingleThreadModel.java
tomcat/trunk/java/javax/servlet/UnavailableException.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java
tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java
tomcat/trunk/java/javax/servlet/http/HttpSession.java
tomcat/trunk/java/javax/servlet/http/HttpSessionContext.java
tomcat/trunk/java/javax/servlet/http/HttpUtils.java
Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri Oct 9 13:38:24 2015
@@ -308,8 +308,7 @@ public interface ServletContext {
*
* @deprecated As of Java Servlet API 2.1, with no direct replacement.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public Servlet getServlet(String name) throws ServletException;
/**
@@ -323,8 +322,7 @@ public interface ServletContext {
*
* @deprecated As of Java Servlet API 2.0, with no replacement.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public Enumeration<Servlet> getServlets();
/**
@@ -339,8 +337,7 @@ public interface ServletContext {
*
* @deprecated As of Java Servlet API 2.1, with no replacement.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public Enumeration<String> getServletNames();
/**
@@ -365,8 +362,7 @@ public interface ServletContext {
* stack trace and an explanatory error message to the servlet
* log file.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public void log(Exception exception, String msg);
/**
Modified: tomcat/trunk/java/javax/servlet/ServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequest.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequest.java Fri Oct 9 13:38:24 2015
@@ -401,8 +401,7 @@ public interface ServletRequest {
* @deprecated As of Version 2.1 of the Java Servlet API, use
* {@link ServletContext#getRealPath} instead.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public String getRealPath(String path);
/**
Modified: tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java Fri Oct 9
13:38:24 2015
@@ -298,8 +298,7 @@ public class ServletRequestWrapper imple
* @deprecated As of Version 3.0 of the Java Servlet API
*/
@Override
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public String getRealPath(String path) {
return this.request.getRealPath(path);
}
Modified: tomcat/trunk/java/javax/servlet/SingleThreadModel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/SingleThreadModel.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/SingleThreadModel.java (original)
+++ tomcat/trunk/java/javax/servlet/SingleThreadModel.java Fri Oct 9 13:38:24
2015
@@ -37,8 +37,7 @@ package javax.servlet;
*
* @deprecated As of Java Servlet API 2.4, with no direct replacement.
*/
-@SuppressWarnings("dep-ann")
-// Spec API does not use @Deprecated
+@Deprecated
public interface SingleThreadModel {
// No methods
}
Modified: tomcat/trunk/java/javax/servlet/UnavailableException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/UnavailableException.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/UnavailableException.java (original)
+++ tomcat/trunk/java/javax/servlet/UnavailableException.java Fri Oct 9
13:38:24 2015
@@ -55,8 +55,7 @@ public class UnavailableException extend
* @deprecated As of Java Servlet API 2.2, use
* {@link #UnavailableException(String)} instead.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public UnavailableException(Servlet servlet, String msg) {
super(msg);
this.servlet = servlet;
@@ -77,8 +76,7 @@ public class UnavailableException extend
* @deprecated As of Java Servlet API 2.2, use
* {@link #UnavailableException(String, int)} instead.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public UnavailableException(int seconds, Servlet servlet, String msg) {
super(msg);
this.servlet = servlet;
@@ -153,8 +151,7 @@ public class UnavailableException extend
* <code>UnavailableException</code>
* @deprecated As of Java Servlet API 2.2, with no replacement.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public Servlet getServlet() {
return servlet;
}
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Fri Oct 9
13:38:24 2015
@@ -427,8 +427,7 @@ public interface HttpServletRequest exte
* @deprecated As of Version 2.1 of the Java Servlet API, use
* {@link #isRequestedSessionIdFromURL} instead.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public boolean isRequestedSessionIdFromUrl();
/**
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
(original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Fri Oct
9 13:38:24 2015
@@ -283,8 +283,7 @@ public class HttpServletRequestWrapper e
* @deprecated As of Version 3.0 of the Java Servlet API
*/
@Override
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public boolean isRequestedSessionIdFromUrl() {
return this._getHttpServletRequest().isRequestedSessionIdFromUrl();
}
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java Fri Oct 9
13:38:24 2015
@@ -100,8 +100,7 @@ public interface HttpServletResponse ext
* otherwise.
* @deprecated As of version 2.1, use encodeURL(String url) instead
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public String encodeUrl(String url);
/**
@@ -111,8 +110,7 @@ public interface HttpServletResponse ext
* otherwise.
* @deprecated As of version 2.1, use encodeRedirectURL(String url) instead
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public String encodeRedirectUrl(String url);
/**
@@ -291,8 +289,7 @@ public interface HttpServletResponse ext
* <code>setStatus(int)</code>, to send an error with a
* description use <code>sendError(int, String)</code>.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public void setStatus(int sc, String sm);
/**
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java
(original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java Fri
Oct 9 13:38:24 2015
@@ -92,8 +92,7 @@ public class HttpServletResponseWrapper
* @deprecated As of Version 3.0 of the Java Servlet API
*/
@Override
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public String encodeUrl(String url) {
return this._getHttpServletResponse().encodeUrl(url);
}
@@ -105,8 +104,7 @@ public class HttpServletResponseWrapper
* @deprecated As of Version 3.0 of the Java Servlet API
*/
@Override
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public String encodeRedirectUrl(String url) {
return this._getHttpServletResponse().encodeRedirectUrl(url);
}
@@ -208,8 +206,7 @@ public class HttpServletResponseWrapper
* @deprecated As of Version 3.0 of the Java Servlet API
*/
@Override
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public void setStatus(int sc, String sm) {
this._getHttpServletResponse().setStatus(sc, sm);
}
Modified: tomcat/trunk/java/javax/servlet/http/HttpSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpSession.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpSession.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpSession.java Fri Oct 9 13:38:24
2015
@@ -141,8 +141,7 @@ public interface HttpSession {
* replacement. It will be removed in a future version of the
* Java Servlet API.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public HttpSessionContext getSessionContext();
/**
@@ -166,8 +165,7 @@ public interface HttpSession {
* @deprecated As of Version 2.2, this method is replaced by
* {@link #getAttribute}.
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public Object getValue(String name);
/**
@@ -189,8 +187,7 @@ public interface HttpSession {
* @deprecated As of Version 2.2, this method is replaced by
* {@link #getAttributeNames}
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public String[] getValueNames();
/**
@@ -229,8 +226,7 @@ public interface HttpSession {
* @deprecated As of Version 2.2, this method is replaced by
* {@link #setAttribute}
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public void putValue(String name, Object value);
/**
@@ -259,8 +255,7 @@ public interface HttpSession {
* @deprecated As of Version 2.2, this method is replaced by
* {@link #removeAttribute}
*/
- @SuppressWarnings("dep-ann")
- // Spec API does not use @Deprecated
+ @Deprecated
public void removeValue(String name);
/**
Modified: tomcat/trunk/java/javax/servlet/http/HttpSessionContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpSessionContext.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpSessionContext.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpSessionContext.java Fri Oct 9
13:38:24 2015
@@ -28,8 +28,7 @@ import java.util.Enumeration;
* @see HttpSessionBindingEvent
* @see HttpSessionBindingListener
*/
-@SuppressWarnings("dep-ann")
-// Spec API does not use @Deprecated
+@Deprecated
public interface HttpSessionContext {
/**
@@ -40,7 +39,7 @@ public interface HttpSessionContext {
* must return null and will be removed in a future version of
* this API.
*/
- // Spec API does not use @Deprecated
+ @Deprecated
public HttpSession getSession(String sessionId);
/**
@@ -50,6 +49,6 @@ public interface HttpSessionContext {
* must return an empty <code>Enumeration</code> and will be
* removed in a future version of this API.
*/
- // Spec API does not use @Deprecated
+ @Deprecated
public Enumeration<String> getIds();
}
Modified: tomcat/trunk/java/javax/servlet/http/HttpUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpUtils.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpUtils.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpUtils.java Fri Oct 9 13:38:24 2015
@@ -30,7 +30,7 @@ import javax.servlet.ServletInputStream;
* with the default encoding and have been moved
* to the request interfaces.
*/
-@SuppressWarnings("dep-ann") // Spec API does not use @Deprecated
+@Deprecated
public class HttpUtils {
private static final String LSTRING_FILE =
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
