Author: markt Date: Thu Aug 16 19:16:57 2012 New Revision: 1373986 URL: http://svn.apache.org/viewvc?rev=1373986&view=rev Log: Remove unused code
Modified: tomcat/trunk/java/org/apache/coyote/ajp/Constants.java Modified: tomcat/trunk/java/org/apache/coyote/ajp/Constants.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/Constants.java?rev=1373986&r1=1373985&r2=1373986&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/Constants.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/Constants.java Thu Aug 16 19:16:57 2012 @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.coyote.ajp; import java.util.Hashtable; import org.apache.tomcat.util.buf.ByteChunk; - /** * Constants. * @@ -29,10 +27,6 @@ import org.apache.tomcat.util.buf.ByteCh */ public final class Constants { - - // -------------------------------------------------------------- Constants - - /** * Package name. */ @@ -40,17 +34,7 @@ public final class Constants { public static final int DEFAULT_CONNECTION_LINGER = -1; public static final int DEFAULT_CONNECTION_TIMEOUT = -1; - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 300000; public static final boolean DEFAULT_TCP_NO_DELAY = true; - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final boolean DEFAULT_USE_SENDFILE = false; // Prefix codes for message types from server to container public static final byte JK_AJP13_FORWARD_REQUEST = 2; @@ -89,11 +73,6 @@ public final class Constants { public static final byte SC_A_SSL_CERT = 7; public static final byte SC_A_SSL_CIPHER = 8; public static final byte SC_A_SSL_SESSION = 9; - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte SC_A_SSL_KEYSIZE = 11; public static final byte SC_A_SSL_KEY_SIZE = 11; public static final byte SC_A_SECRET = 12; public static final byte SC_A_STORED_METHOD = 13; @@ -281,46 +260,6 @@ public final class Constants { /** - * CR. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte CR = (byte) '\r'; - - - /** - * LF. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte LF = (byte) '\n'; - - - /** - * SP. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte SP = (byte) ' '; - - - /** - * HT. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte HT = (byte) '\t'; - - - /** - * COLON. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte COLON = (byte) ':'; - - - /** * 'A'. */ public static final byte A = (byte) 'A'; @@ -332,186 +271,13 @@ public final class Constants { public static final byte a = (byte) 'a'; - /** - * 'Z'. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte Z = (byte) 'Z'; - - - /** - * '?'. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte QUESTION = (byte) '?'; - - - /** - * Lower case offset. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte LC_OFFSET = A - a; - - - /** - * Default HTTP header buffer size. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final int DEFAULT_HTTP_HEADER_BUFFER_SIZE = 48 * 1024; - - /* Various constant "strings" */ - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte[] CRLF_BYTES = ByteChunk.convertToBytes(CRLF); - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte[] COLON_BYTES = ByteChunk.convertToBytes(": "); - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final String CONNECTION = "Connection"; public static final String CLOSE = "close"; - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte[] CLOSE_BYTES = - ByteChunk.convertToBytes(CLOSE); public static final String KEEPALIVE = "keep-alive"; - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte[] KEEPALIVE_BYTES = - ByteChunk.convertToBytes(KEEPALIVE); - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final String CHUNKED = "chunked"; - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte[] ACK_BYTES = - ByteChunk.convertToBytes("HTTP/1.1 100 Continue" + CRLF + CRLF); - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final String TRANSFERENCODING = "Transfer-Encoding"; - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte[] _200_BYTES = - ByteChunk.convertToBytes("200"); - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte[] _400_BYTES = - ByteChunk.convertToBytes("400"); - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte[] _404_BYTES = - ByteChunk.convertToBytes("404"); - - - /** - * Identity filters (input and output). - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final int IDENTITY_FILTER = 0; - - - /** - * Chunked filters (input and output). - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final int CHUNKED_FILTER = 1; - - - /** - * Void filters (input and output). - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final int VOID_FILTER = 2; - - - /** - * GZIP filter (output). - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final int GZIP_FILTER = 3; - - - /** - * Buffered filter (input) - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final int BUFFERED_FILTER = 3; - - - /** - * HTTP/1.0. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final String HTTP_10 = "HTTP/1.0"; /** * HTTP/1.1. */ public static final String HTTP_11 = "HTTP/1.1"; - /** - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final byte[] HTTP_11_BYTES = - ByteChunk.convertToBytes(HTTP_11); - - - /** - * GET. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final String GET = "GET"; - - - /** - * HEAD. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final String HEAD = "HEAD"; - - - /** - * POST. - * @deprecated Unused - will be removed in 8.0.x - */ - @Deprecated - public static final String POST = "POST"; - - } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org