Author: markt
Date: Thu Nov 5 00:46:07 2009
New Revision: 832938
URL: http://svn.apache.org/viewvc?rev=832938&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48131
Patch provided by sebb
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
tomcat/trunk/java/javax/servlet/jsp/JspException.java
tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java
tomcat/trunk/java/javax/servlet/jsp/el/Expression.java
tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java
tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
tomcat/trunk/java/org/apache/catalina/Cluster.java
tomcat/trunk/java/org/apache/catalina/Manager.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/core/DummyRequest.java
tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java
Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Thu Nov 5 00:46:07 2009
@@ -357,6 +357,7 @@
*
*/
+ @Deprecated
public Servlet getServlet(String name) throws ServletException;
@@ -377,6 +378,7 @@
*
*/
+ @Deprecated
public Enumeration<Servlet> getServlets();
@@ -396,6 +398,7 @@
*
*/
+ @Deprecated
public Enumeration<String> getServletNames();
@@ -431,6 +434,7 @@
*
*/
+ @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=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequest.java Thu Nov 5 00:46:07 2009
@@ -546,6 +546,7 @@
*
*/
+ @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=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java Thu Nov 5
00:46:07 2009
@@ -352,6 +352,7 @@
* @deprecated As of Version 3.0 of the Java Servlet API
*/
+ @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=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/SingleThreadModel.java (original)
+++ tomcat/trunk/java/javax/servlet/SingleThreadModel.java Thu Nov 5 00:46:07
2009
@@ -45,6 +45,7 @@
* replacement.
*/
+...@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=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/UnavailableException.java (original)
+++ tomcat/trunk/java/javax/servlet/UnavailableException.java Thu Nov 5
00:46:07 2009
@@ -68,6 +68,7 @@
*
*/
+ @Deprecated
public UnavailableException(Servlet servlet, String msg) {
super(msg);
this.servlet = servlet;
@@ -91,6 +92,7 @@
*
*/
+ @Deprecated
public UnavailableException(int seconds, Servlet servlet, String msg) {
super(msg);
this.servlet = servlet;
@@ -179,6 +181,7 @@
*
*/
+ @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=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Thu Nov 5
00:46:07 2009
@@ -658,6 +658,7 @@
*
*/
+ @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=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
(original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Thu Nov
5 00:46:07 2009
@@ -259,6 +259,7 @@
* on the wrapped request object.
* @deprecated As of Version 3.0 of the Java Servlet API
*/
+ @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=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java Thu Nov 5
00:46:07 2009
@@ -118,6 +118,7 @@
* the unchanged URL otherwise.
*/
+ @Deprecated
public String encodeUrl(String url);
/**
@@ -129,6 +130,7 @@
* the unchanged URL otherwise.
*/
+ @Deprecated
public String encodeRedirectUrl(String url);
/**
@@ -320,6 +322,7 @@
* @param sm the status message
*/
+ @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=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java
(original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java Thu
Nov 5 00:46:07 2009
@@ -90,6 +90,7 @@
* on the wrapped response object.
* @deprecated As of Version 3.0 of the Java Servlet API
*/
+ @Deprecated
public String encodeUrl(String url) {
return this._getHttpServletResponse().encodeUrl(url);
}
@@ -99,6 +100,7 @@
* on the wrapped response object.
* @deprecated As of Version 3.0 of the Java Servlet API
*/
+ @Deprecated
public String encodeRedirectUrl(String url) {
return this._getHttpServletResponse().encodeRedirectUrl(url);
}
@@ -192,7 +194,8 @@
* on the wrapped response object.
* @deprecated As of Version 3.0 of the Java Servlet API
*/
- public void setStatus(int sc, String sm) {
+ @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=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpSession.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpSession.java Thu Nov 5 00:46:07
2009
@@ -199,6 +199,7 @@
*
*/
+ @Deprecated
public HttpSessionContext getSessionContext();
@@ -237,6 +238,7 @@
*
*/
+ @Deprecated
public Object getValue(String name);
@@ -277,6 +279,7 @@
*
*/
+ @Deprecated
public String[] getValueNames();
@@ -333,6 +336,7 @@
*
*/
+ @Deprecated
public void putValue(String name, Object value);
@@ -379,6 +383,7 @@
* invalidated session
*/
+ @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=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpSessionContext.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpSessionContext.java Thu Nov 5
00:46:07 2009
@@ -37,6 +37,7 @@
*/
+...@deprecated
public interface HttpSessionContext {
/**
@@ -48,6 +49,7 @@
*
*/
+ @Deprecated
public HttpSession getSession(String sessionId);
@@ -62,6 +64,7 @@
*
*/
+ @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=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpUtils.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpUtils.java Thu Nov 5 00:46:07 2009
@@ -32,6 +32,7 @@
*/
+...@deprecated
public class HttpUtils {
private static final String LSTRING_FILE =
Modified: tomcat/trunk/java/javax/servlet/jsp/JspException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspException.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/JspException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspException.java Thu Nov 5 00:46:07
2009
@@ -93,6 +93,7 @@
* @return the <code>Throwable</code> that caused this JSP exception
*/
+ @Deprecated
public Throwable getRootCause() {
return getCause();
}
Modified: tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ELException.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ELException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ELException.java Thu Nov 5 00:46:07
2009
@@ -24,6 +24,7 @@
* @since 2.0
* @deprecated
*/
+...@deprecated
public class ELException extends Exception {
/**
Modified: tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java Thu Nov 5
00:46:07 2009
@@ -25,6 +25,7 @@
* @deprecated
*/
+...@deprecated
public class ELParseException extends ELException {
//-------------------------------------
Modified: tomcat/trunk/java/javax/servlet/jsp/el/Expression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/Expression.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/Expression.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/Expression.java Thu Nov 5 00:46:07
2009
@@ -32,6 +32,7 @@
* @since 2.0
* @deprecated
*/
+...@deprecated
public abstract class Expression {
/**
Modified: tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java Thu Nov 5
00:46:07 2009
@@ -53,6 +53,7 @@
* @since 2.0
* @deprecated
*/
+...@deprecated
public abstract class ExpressionEvaluator {
/**
Modified: tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java Thu Nov 5
00:46:07 2009
@@ -26,6 +26,7 @@
* @since 2.0
* @deprecated
*/
+...@deprecated
public interface FunctionMapper {
/**
* Resolves the specified local name and prefix into a Java.lang.Method.
Modified: tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java Thu Nov 5
00:46:07 2009
@@ -31,6 +31,7 @@
* @since 2.0
* @deprecated
*/
+...@deprecated
public interface VariableResolver
{
//-------------------------------------
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java Thu Nov 5 00:46:07
2009
@@ -123,6 +123,7 @@
* or IterationTag.EVAL_BODY_AGAIN.
*/
+ @Deprecated
public final static int EVAL_BODY_TAG = 2;
/**
Modified: tomcat/trunk/java/org/apache/catalina/Cluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Cluster.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Cluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Cluster.java Thu Nov 5 00:46:07 2009
@@ -79,6 +79,7 @@
* @param protocol The protocol used by the cluster
* @deprecated
*/
+ @Deprecated
public void setProtocol(String protocol);
/**
@@ -87,6 +88,7 @@
* @return The protocol
* @deprecated
*/
+ @Deprecated
public String getProtocol();
// --------------------------------------------------------- Public Methods
Modified: tomcat/trunk/java/org/apache/catalina/Manager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Manager.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Manager.java Thu Nov 5 00:46:07 2009
@@ -278,6 +278,7 @@
* instantiated for any reason
* @deprecated
*/
+ @Deprecated
public Session createSession();
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Nov 5
00:46:07 2009
@@ -1156,6 +1156,7 @@
* @deprecated As of version 2.1 of the Java Servlet API, use
* <code>ServletContext.getRealPath()</code>.
*/
+ @Deprecated
public String getRealPath(String path) {
if (context == null)
@@ -2143,6 +2144,7 @@
* @deprecated As of Version 2.1 of the Java Servlet API, use
* <code>isRequestedSessionIdFromURL()</code> instead.
*/
+ @Deprecated
public boolean isRequestedSessionIdFromUrl() {
return (isRequestedSessionIdFromURL());
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu Nov 5
00:46:07 2009
@@ -1130,6 +1130,7 @@
* @deprecated As of Version 2.1 of the Java Servlet API, use
* <code>encodeRedirectURL()</code> instead.
*/
+ @Deprecated
public String encodeRedirectUrl(String url) {
return (encodeRedirectURL(url));
}
@@ -1166,6 +1167,7 @@
* @deprecated As of Version 2.1 of the Java Servlet API, use
* <code>encodeURL()</code> instead.
*/
+ @Deprecated
public String encodeUrl(String url) {
return (encodeURL(url));
}
@@ -1384,6 +1386,7 @@
* has been deprecated due to the ambiguous meaning of the message
* parameter.
*/
+ @Deprecated
public void setStatus(int status, String message) {
if (isCommitted())
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Thu Nov
5 00:46:07 2009
@@ -630,6 +630,7 @@
/**
* @deprecated As of Java Servlet API 2.1, with no direct replacement.
*/
+ @Deprecated
public Servlet getServlet(String name) {
return (null);
@@ -650,6 +651,7 @@
/**
* @deprecated As of Java Servlet API 2.1, with no direct replacement.
*/
+ @Deprecated
public Enumeration<String> getServletNames() {
return (new Enumerator<String>(emptyString));
}
@@ -658,6 +660,7 @@
/**
* @deprecated As of Java Servlet API 2.1, with no direct replacement.
*/
+ @Deprecated
public Enumeration<Servlet> getServlets() {
return (new Enumerator<Servlet>(emptyServlet));
}
@@ -684,6 +687,7 @@
* @deprecated As of Java Servlet API 2.1, use
* <code>log(String, Throwable)</code> instead
*/
+ @Deprecated
public void log(Exception exception, String message) {
context.getLogger().error(message, exception);
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Thu Nov 5 00:46:07 2009
@@ -224,6 +224,7 @@
/**
* @deprecated
*/
+ @Deprecated
public Servlet getServlet(String name)
throws ServletException {
if (SecurityUtil.isPackageProtectionEnabled()) {
@@ -245,6 +246,7 @@
/**
* @deprecated
*/
+ @Deprecated
public Enumeration<Servlet> getServlets() {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (Enumeration<Servlet>) doPrivileged("getServlets", null);
@@ -257,6 +259,7 @@
/**
* @deprecated
*/
+ @Deprecated
public Enumeration<String> getServletNames() {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (Enumeration<String>) doPrivileged("getServletNames", null);
@@ -278,6 +281,7 @@
/**
* @deprecated
*/
+ @Deprecated
public void log(Exception exception, String msg) {
if (SecurityUtil.isPackageProtectionEnabled()) {
doPrivileged("log", new Class[]{Exception.class, String.class},
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Thu
Nov 5 00:46:07 2009
@@ -337,6 +337,7 @@
* @param msg The new message
* @deprecated
*/
+ @Deprecated
public void setStatus(int sc, String msg) {
if (!included)
Modified: tomcat/trunk/java/org/apache/catalina/core/DummyRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DummyRequest.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/DummyRequest.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/DummyRequest.java Thu Nov 5
00:46:07 2009
@@ -215,6 +215,7 @@
public String getProtocol() { return null; }
public BufferedReader getReader() throws IOException { return null; }
/** @deprecated */
+ @Deprecated
public String getRealPath(String path) { return null; }
public String getRemoteAddr() { return null; }
public String getRemoteHost() { return null; }
@@ -274,6 +275,7 @@
public boolean isRequestedSessionIdFromCookie() { return false; }
public boolean isRequestedSessionIdFromURL() { return false; }
/** @deprecated */
+ @Deprecated
public boolean isRequestedSessionIdFromUrl() { return false; }
public boolean isRequestedSessionIdValid() { return false; }
public boolean isUserInRole(String role) { return false; }
Modified: tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java Thu Nov 5
00:46:07 2009
@@ -117,9 +117,11 @@
public boolean containsHeader(String name) { return false; }
public String encodeRedirectURL(String url) { return null; }
/** @deprecated */
+ @Deprecated
public String encodeRedirectUrl(String url) { return null; }
public String encodeURL(String url) { return null; }
/** @deprecated */
+ @Deprecated
public String encodeUrl(String url) { return null; }
public void sendAcknowledgement() throws IOException {}
public void sendError(int status) throws IOException {}
@@ -130,6 +132,7 @@
public void setIntHeader(String name, int value) {}
public void setStatus(int status) {}
/** @deprecated */
+ @Deprecated
public void setStatus(int status, String message) {}
public Collection<String> getHeaders(String name) { return null; }
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Thu Nov
5 00:46:07 2009
@@ -805,6 +805,7 @@
* will be removed in a future version of this API.
*/
+...@deprecated
final class StandardSessionContext
implements HttpSessionContext {
@@ -818,6 +819,7 @@
* must return an empty <code>Enumeration</code> and will be
* removed in a future version of the API.
*/
+ @Deprecated
public Enumeration<String> getIds() {
return (new Enumerator<String>(dummy));
}
@@ -833,6 +835,7 @@
* must return null and will be removed in a future version of
* the API.
*/
+ @Deprecated
public HttpSession getSession(String id) {
return (null);
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Thu Nov
5 00:46:07 2009
@@ -281,6 +281,7 @@
* @deprecated use getManagerTemplate().getClass().getName() instead.
* @return String
*/
+ @Deprecated
public String getManagerClassName() {
return managerTemplate.getClass().getName();
}
@@ -289,6 +290,7 @@
* @deprecated use nested <Manager> element inside the cluster
config instead.
* @param managerClassName String
*/
+ @Deprecated
public void setManagerClassName(String managerClassName) {
log.warn("setManagerClassName is deprecated, use nested <Manager>
element inside the <Cluster> element instead, this request will be ignored.");
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Thu Nov 5
00:46:07 2009
@@ -187,6 +187,7 @@
* setter for the <code>appName</code> member variable
* @deprecated JAAS should use the <code>Engine</code> (domain) name and
webpp/host overrides
*/
+ @Deprecated
public void setAppName(String name) {
appName = name;
}
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Thu Nov 5
00:46:07 2009
@@ -783,6 +783,7 @@
* instantiated for any reason
* @deprecated
*/
+ @Deprecated
public Session createSession() {
return createSession(null);
}
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Thu Nov
5 00:46:07 2009
@@ -1034,6 +1034,7 @@
* replacement. It will be removed in a future version of the
* Java Servlet API.
*/
+ @Deprecated
public HttpSessionContext getSessionContext() {
if (sessionContext == null)
@@ -1098,6 +1099,7 @@
* @deprecated As of Version 2.2, this method is replaced by
* <code>getAttribute()</code>
*/
+ @Deprecated
public Object getValue(String name) {
return (getAttribute(name));
@@ -1115,6 +1117,7 @@
* @deprecated As of Version 2.2, this method is replaced by
* <code>getAttributeNames()</code>
*/
+ @Deprecated
public String[] getValueNames() {
if (!isValidInternal())
@@ -1184,6 +1187,7 @@
* @deprecated As of Version 2.2, this method is replaced by
* <code>setAttribute()</code>
*/
+ @Deprecated
public void putValue(String name, Object value) {
setAttribute(name, value);
@@ -1257,6 +1261,7 @@
* @deprecated As of Version 2.2, this method is replaced by
* <code>removeAttribute()</code>
*/
+ @Deprecated
public void removeValue(String name) {
removeAttribute(name);
@@ -1725,6 +1730,7 @@
* interface will be removed in a future version of this API.
*/
+...@deprecated
final class StandardSessionContext implements HttpSessionContext {
@@ -1738,6 +1744,7 @@
* This method must return an empty <code>Enumeration</code>
* and will be removed in a future version of the API.
*/
+ @Deprecated
public Enumeration<String> getIds() {
return (new Enumerator<String>(dummy));
@@ -1755,6 +1762,7 @@
* This method must return null and will be removed in a
* future version of the API.
*/
+ @Deprecated
public HttpSession getSession(String id) {
return (null);
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java
Thu Nov 5 00:46:07 2009
@@ -104,6 +104,7 @@
/**
* @deprecated
*/
+ @Deprecated
public HttpSessionContext getSessionContext() {
return session.getSessionContext();
}
@@ -117,6 +118,7 @@
/**
* @deprecated
*/
+ @Deprecated
public Object getValue(String name) {
return session.getAttribute(name);
}
@@ -130,6 +132,7 @@
/**
* @deprecated
*/
+ @Deprecated
public String[] getValueNames() {
return session.getValueNames();
}
@@ -143,6 +146,7 @@
/**
* @deprecated
*/
+ @Deprecated
public void putValue(String name, Object value) {
session.setAttribute(name, value);
}
@@ -156,6 +160,7 @@
/**
* @deprecated
*/
+ @Deprecated
public void removeValue(String name) {
session.removeAttribute(name);
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Nov 5
00:46:07 2009
@@ -445,6 +445,7 @@
* working directory if it has not been set.
* @deprecated Use initDirs()
*/
+ @Deprecated
public void setCatalinaBase() {
initDirs();
}
@@ -454,6 +455,7 @@
* working directory if it has not been set.
* @deprecated Use initDirs()
*/
+ @Deprecated
public void setCatalinaHome() {
initDirs();
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Thu Nov 5
00:46:07 2009
@@ -428,6 +428,7 @@
* @return - four bytes in an array
* @deprecated use toBytes(boolean,byte[],int)
*/
+ @Deprecated
public static byte[] toBytes(boolean bool) {
byte[] b = new byte[1] ;
return toBytes(bool,b,0);
@@ -455,6 +456,7 @@
* @return - four bytes in an array
* @deprecated use toBytes(int,byte[],int)
*/
+ @Deprecated
public static byte[] toBytes(int n) {
return toBytes(n,new byte[4],0);
}
@@ -476,6 +478,7 @@
* @return - eight bytes in an array
* @deprecated use toBytes(long,byte[],int)
*/
+ @Deprecated
public static byte[] toBytes(long n) {
return toBytes(n,new byte[8],0);
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Thu Nov 5 00:46:07 2009
@@ -186,6 +186,7 @@
* @deprecated use setAddress
* @param addr String
*/
+ @Deprecated
public void setMcastAddr(String addr) {
setAddress(addr);
}
@@ -198,6 +199,7 @@
* @deprecated use getAddress
* @return String
*/
+ @Deprecated
public String getMcastAddr() {
return getAddress();
}
@@ -213,6 +215,7 @@
* @deprecated use getBind
* @return String
*/
+ @Deprecated
public String getMcastBindAddress() {
return getBind();
}
@@ -225,6 +228,7 @@
* @deprecated use setPort
* @param port int
*/
+ @Deprecated
public void setMcastPort(int port) {
setPort(port);
}
@@ -253,6 +257,7 @@
* @deprecated use getPort()
* @return int
*/
+ @Deprecated
public int getMcastPort() {
return getPort();
}
@@ -265,6 +270,7 @@
* @deprecated use setFrequency
* @param time long
*/
+ @Deprecated
public void setMcastFrequency(long time) {
setFrequency(time);
}
@@ -277,6 +283,7 @@
* @deprecated use getFrequency
* @return long
*/
+ @Deprecated
public long getMcastFrequency() {
return getFrequency();
}
@@ -297,6 +304,7 @@
* @deprecated use getDropTime
* @return long
*/
+ @Deprecated
public long getMcastDropTime() {
return getDropTime();
}
@@ -527,6 +535,7 @@
* @deprecated use getSoTimeout
* @return int
*/
+ @Deprecated
public int getMcastSoTimeout() {
return getSoTimeout();
}
@@ -539,6 +548,7 @@
* @deprecated use setSoTimeout
* @param mcastSoTimeout int
*/
+ @Deprecated
public void setMcastSoTimeout(int mcastSoTimeout) {
setSoTimeout(mcastSoTimeout);
}
@@ -552,6 +562,7 @@
* @deprecated use getTtl
* @return int
*/
+ @Deprecated
public int getMcastTTL() {
return getTtl();
}
@@ -572,6 +583,7 @@
* @deprecated use setTtl
* @param mcastTTL int
*/
+ @Deprecated
public void setMcastTTL(int mcastTTL) {
setTtl(mcastTTL);
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
Thu Nov 5 00:46:07 2009
@@ -132,6 +132,7 @@
* @deprecated use getMinThreads()/getMaxThreads()
* @return int
*/
+ @Deprecated
public int getTcpThreadCount() {
return getMaxThreads();
}
@@ -150,6 +151,7 @@
* @deprecated use setPort
* @param tcpListenPort int
*/
+ @Deprecated
public void setTcpListenPort(int tcpListenPort) {
setPort(tcpListenPort);
}
@@ -158,6 +160,7 @@
* @deprecated use setAddress
* @param tcpListenHost String
*/
+ @Deprecated
public void setTcpListenAddress(String tcpListenHost) {
setAddress(tcpListenHost);
}
@@ -174,6 +177,7 @@
* @deprecated use setMaxThreads/setMinThreads
* @param tcpThreadCount int
*/
+ @Deprecated
public void setTcpThreadCount(int tcpThreadCount) {
setMaxThreads(tcpThreadCount);
setMinThreads(tcpThreadCount);
@@ -285,6 +289,7 @@
* @deprecated use getPort
* @return int
*/
+ @Deprecated
public int getTcpListenPort() {
return getPort();
}
@@ -317,6 +322,7 @@
* @deprecated use getSelectorTimeout
* @return long
*/
+ @Deprecated
public long getTcpSelectorTimeout() {
return getSelectorTimeout();
}
@@ -337,6 +343,7 @@
* @deprecated use getAddress
* @return String
*/
+ @Deprecated
public String getTcpListenAddress() {
return getAddress();
}
@@ -414,6 +421,7 @@
* @deprecated use setSelectorTimeout
* @param selTimeout long
*/
+ @Deprecated
public void setTcpSelectorTimeout(long selTimeout) {
setSelectorTimeout(selTimeout);
}
Modified: tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java Thu Nov 5
00:46:07 2009
@@ -208,7 +208,8 @@
* @see #getEndColumn
*/
- public int getColumn() {
+ @Deprecated
+public int getColumn() {
return bufcolumn[bufpos];
}
@@ -217,7 +218,8 @@
* @see #getEndLine
*/
- public int getLine() {
+ @Deprecated
+public int getLine() {
return bufline[bufpos];
}
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Thu Nov
5 00:46:07 2009
@@ -340,6 +340,7 @@
*
* @deprecated This method has been deprecated with no replacement
*/
+ @Deprecated
public Servlet getServlet(String name) throws ServletException {
return (null);
@@ -362,6 +363,7 @@
*
* @deprecated This method has been deprecated with no replacement
*/
+ @Deprecated
public Enumeration<String> getServletNames() {
return (new Vector<String>().elements());
@@ -374,6 +376,7 @@
*
* @deprecated This method has been deprecated with no replacement
*/
+ @Deprecated
public Enumeration<Servlet> getServlets() {
return (new Vector<Servlet>().elements());
@@ -401,6 +404,7 @@
*
* @deprecated Use log(String,Throwable) instead
*/
+ @Deprecated
public void log(Exception exception, String message) {
log(message, exception);
Modified: tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java Thu
Nov 5 00:46:07 2009
@@ -522,6 +522,7 @@
* @param lastModified New last modified date value
* @deprecated
*/
+ @Deprecated
public void setLastModified(Date lastModified) {
setLastModifiedDate(lastModified);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java Thu Nov 5
00:46:07 2009
@@ -112,6 +112,7 @@
* method with <code>namespace</code> and <code>name</code>
* parameters instead.
*/
+ @Deprecated
public void begin(Attributes attributes) throws Exception {
// The default implementation does nothing
}
@@ -150,6 +151,7 @@
* with <code>namespace</code> and <code>name</code> parameters
* instead.
*/
+ @Deprecated
public void body(String text) throws Exception {
// The default implementation does nothing
}
@@ -185,6 +187,7 @@
* @deprecated Use the {...@link #end(String,String) end} method with
* <code>namespace</code> and <code>name</code> parameters instead.
*/
+ @Deprecated
public void end() throws Exception {
// The default implementation does nothing
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java Thu Nov
5 00:46:07 2009
@@ -50,6 +50,7 @@
* @deprecated The digester instance is now set in the {...@link
Digester#addRule} method.
* Use {...@link #SetNextRule(String methodName)} instead.
*/
+ @Deprecated
public SetNextRule(Digester digester, String methodName) {
this(methodName);
@@ -70,6 +71,7 @@
* @deprecated The digester instance is now set in the {...@link
Digester#addRule} method.
* Use {...@link #SetNextRule(String methodName,String paramType)} instead.
*/
+ @Deprecated
public SetNextRule(Digester digester, String methodName,
String paramType) {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
Thu Nov 5 00:46:07 2009
@@ -49,6 +49,7 @@
* @deprecated The digester instance is now set in the {...@link
Digester#addRule} method.
* Use {...@link #SetPropertiesRule()} instead.
*/
+ @Deprecated
public SetPropertiesRule(Digester digester) {
this();
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java Thu
Nov 5 00:46:07 2009
@@ -48,6 +48,7 @@
* @deprecated The digester instance is now set in the {...@link
Digester#addRule} method.
* Use {...@link #SetPropertyRule(String name, String value)} instead.
*/
+ @Deprecated
public SetPropertyRule(Digester digester, String name, String value) {
this(name, value);
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java Thu Nov
5 00:46:07 2009
@@ -50,6 +50,7 @@
* @deprecated The digester instance is now set in the {...@link
Digester#addRule} method.
* Use {...@link #SetRootRule(String methodName)} instead.
*/
+ @Deprecated
public SetRootRule(Digester digester, String methodName) {
this(methodName);
@@ -70,6 +71,7 @@
* @deprecated The digester instance is now set in the {...@link
Digester#addRule} method.
* Use {...@link #SetRootRule(String methodName,String paramType)} instead.
*/
+ @Deprecated
public SetRootRule(Digester digester, String methodName,
String paramType) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java?rev=832938&r1=832937&r2=832938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java Thu Nov
5 00:46:07 2009
@@ -50,6 +50,7 @@
* @deprecated The digester instance is now set in the {...@link
Digester#addRule} method.
* Use {...@link #SetTopRule(String methodName)} instead.
*/
+ @Deprecated
public SetTopRule(Digester digester, String methodName) {
this(methodName);
@@ -70,6 +71,7 @@
* @deprecated The digester instance is now set in the {...@link
Digester#addRule} method.
* Use {...@link #SetTopRule(String methodName, String paramType)} instead.
*/
+ @Deprecated
public SetTopRule(Digester digester, String methodName,
String paramType) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
