Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A7E087E4D for ; Mon, 24 Oct 2011 21:46:48 +0000 (UTC) Received: (qmail 25158 invoked by uid 500); 24 Oct 2011 21:46:47 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 25085 invoked by uid 500); 24 Oct 2011 21:46:47 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 25076 invoked by uid 99); 24 Oct 2011 21:46:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Oct 2011 21:46:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Oct 2011 21:46:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 12F3F23888CD for ; Mon, 24 Oct 2011 21:46:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1188399 - in /tomcat/trunk/java/org/apache/catalina: authenticator/ connector/ Date: Mon, 24 Oct 2011 21:46:25 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111024214626.12F3F23888CD@eris.apache.org> Author: markt Date: Mon Oct 24 21:46:24 2011 New Revision: 1188399 URL: http://svn.apache.org/viewvc?rev=1188399&view=rev Log: Review javax.* and o.a.catalina.[ant-connectors] for unused code using UCDetector and mark unused code as deprecated. Modified: tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java tomcat/trunk/java/org/apache/catalina/connector/Request.java tomcat/trunk/java/org/apache/catalina/connector/Response.java Modified: tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java?rev=1188399&r1=1188398&r2=1188399&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java Mon Oct 24 21:46:24 2011 @@ -25,9 +25,13 @@ public class Constants { // Authentication methods for login configuration // Servlet spec schemes + @Deprecated public static final String BASIC_METHOD = "BASIC"; + @Deprecated public static final String CERT_METHOD = "CLIENT_CERT"; + @Deprecated public static final String DIGEST_METHOD = "DIGEST"; + @Deprecated public static final String FORM_METHOD = "FORM"; // Vendor specific schemes public static final String SPNEGO_METHOD = "SPNEGO"; Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1188399&r1=1188398&r2=1188399&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Mon Oct 24 21:46:24 2011 @@ -93,6 +93,7 @@ public class SingleSignOn extends ValveB /** * The string manager for this package. */ + @Deprecated protected static final StringManager sm = StringManager.getManager(Constants.Package); Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1188399&r1=1188398&r2=1188399&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Mon Oct 24 21:46:24 2011 @@ -185,6 +185,7 @@ public class InputBuffer extends Reader * * @return the associated Coyote request */ + @Deprecated public Request getRequest() { return this.coyoteRequest; } Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=1188399&r1=1188398&r2=1188399&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Mon Oct 24 21:46:24 2011 @@ -85,6 +85,7 @@ public class MapperListener extends Life // --------------------------------------------------------- Public Methods + @Deprecated public String getConnectorName() { return this.connector.toString(); } Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1188399&r1=1188398&r2=1188399&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Mon Oct 24 21:46:24 2011 @@ -178,6 +178,7 @@ public class OutputBuffer extends Writer * * @return the associated Coyote response */ + @Deprecated public Response getResponse() { return this.coyoteResponse; } 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=1188399&r1=1188398&r2=1188399&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Mon Oct 24 21:46:24 2011 @@ -280,6 +280,7 @@ public class Request /** * Session parsed flag. */ + @Deprecated protected boolean sessionParsed = false; @@ -531,9 +532,11 @@ public class Request pathParameters.clear(); } + @Deprecated protected boolean isProcessing() { return coyoteRequest.isProcessing(); } + /** * Clear cached encoders (to save memory for Comet requests). */ @@ -639,6 +642,7 @@ public class Request * * @param host The newly associated Host */ + @Deprecated public void setHost(Host host) { mappingData.host = host; } @@ -801,6 +805,7 @@ public class Request * Return an Iterator containing the String names of all notes bindings * that exist for this request. */ + @Deprecated public Iterator getNoteNames() { return notes.keySet().iterator(); } @@ -875,6 +880,7 @@ public class Request * * @param name The server name */ + @Deprecated public void setServerName(String name) { coyoteRequest.serverName().setString(name); } @@ -1756,6 +1762,7 @@ public class Request * @param name Name of this request parameter * @param values Corresponding values for this request parameter */ + @Deprecated public void addParameter(String name, String values[]) { coyoteRequest.getParameters().addParameterValues(name, values); } @@ -1773,6 +1780,7 @@ public class Request /** * Clear the collection of Headers associated with this Request. */ + @Deprecated public void clearHeaders() { // Not used } @@ -1789,6 +1797,7 @@ public class Request /** * Clear the collection of parameters associated with this Request. */ + @Deprecated public void clearParameters() { // Not used } @@ -1813,6 +1822,7 @@ public class Request * * @param path The context path */ + @Deprecated public void setContextPath(String path) { if (path == null) { @@ -1906,6 +1916,7 @@ public class Request * * @return the URL decoded request URI */ + @Deprecated public MessageBytes getDecodedRequestURIMB() { return coyoteRequest.decodedURI(); } @@ -1918,6 +1929,7 @@ public class Request * * @param path The servlet path */ + @Deprecated public void setServletPath(String path) { if (path != null) { mappingData.wrapperPath.setString(path); @@ -1980,6 +1992,7 @@ public class Request * * @return the context path */ + @Deprecated public MessageBytes getContextPathMB() { return mappingData.contextPath; } @@ -2003,6 +2016,7 @@ public class Request /** * Set the set of cookies received with this Request. */ + @Deprecated public void setCookies(Cookie[] cookies) { this.cookies = cookies; @@ -2114,6 +2128,7 @@ public class Request * * @return the path info */ + @Deprecated public MessageBytes getPathInfoMB() { return mappingData.pathInfo; } @@ -2246,6 +2261,7 @@ public class Request * * @return the servlet path */ + @Deprecated public MessageBytes getServletPathMB() { return mappingData.wrapperPath; } @@ -2542,6 +2558,7 @@ public class Request * Not part of Servlet 3 spec but probably should be. * @return true if the requested session ID was obtained from the SSL session */ + @Deprecated public boolean isRequestedSessionIdFromSSL() { return requestedSessionSSL; } 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=1188399&r1=1188398&r2=1188399&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Mon Oct 24 21:46:24 2011 @@ -120,6 +120,7 @@ public class Response /** * Return the Connector through which this Request was received. */ + @Deprecated public Connector getConnector() { return (this.connector); } @@ -160,6 +161,7 @@ public class Response /** * Get the Coyote response. */ + @Deprecated public org.apache.coyote.Response getCoyoteResponse() { return (coyoteResponse); } @@ -180,6 +182,7 @@ public class Response * * @param context The newly associated Context */ + @Deprecated public void setContext(Context context) { request.setContext(context); } @@ -346,6 +349,7 @@ public class Response /** * Return the "processing inside an include" flag. */ + @Deprecated public boolean getIncluded() { return included; } @@ -357,6 +361,7 @@ public class Response * @param included true if we are currently inside a * RequestDispatcher.include(), else false */ + @Deprecated public void setIncluded(boolean included) { this.included = included; } @@ -404,6 +409,7 @@ public class Response /** * Return the output stream associated with this Response. */ + @Deprecated public OutputStream getStream() { if (outputStream == null) { outputStream = new CoyoteOutputStream(outputBuffer); @@ -460,6 +466,7 @@ public class Response * * @exception IOException if an input/output error occurs */ + @Deprecated public ServletOutputStream createOutputStream() throws IOException { // Probably useless @@ -953,6 +960,7 @@ public class Response * @exception IllegalStateException if this response has already been * committed */ + @Deprecated public void reset(int status, String message) { reset(); setStatus(status, message); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org