Author: markt
Date: Tue Oct 20 09:02:28 2015
New Revision: 1709550
URL: http://svn.apache.org/viewvc?rev=1709550&view=rev
Log:
Clean-up
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/trunk/java/org/apache/coyote/Constants.java
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/Response.java
tomcat/trunk/java/org/apache/coyote/http11/Constants.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1709550&r1=1709549&r2=1709550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Oct 20
09:02:28 2015
@@ -36,7 +36,7 @@ import org.apache.tomcat.util.res.String
*/
public abstract class AbstractProcessor extends AbstractProcessorLight
implements ActionHook {
- protected static final StringManager sm =
StringManager.getManager(Constants.Package);
+ private static final StringManager sm =
StringManager.getManager(AbstractProcessor.class);
protected Adapter adapter;
protected final AsyncStateMachine asyncStateMachine;
Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1709550&r1=1709549&r2=1709550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] Tue Oct
20 09:02:28 2015
@@ -102,8 +102,7 @@ public class AsyncStateMachine {
/**
* The string manager for this package.
*/
- private static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ private static final StringManager sm =
StringManager.getManager(AsyncStateMachine.class);
private static enum AsyncState {
DISPATCHED (false, false, false, false, false),
Modified: tomcat/trunk/java/org/apache/coyote/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Constants.java?rev=1709550&r1=1709549&r2=1709550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Constants.java Tue Oct 20 09:02:28 2015
@@ -16,7 +16,6 @@
*/
package org.apache.coyote;
-
/**
* Constants.
*
@@ -24,11 +23,6 @@ package org.apache.coyote;
*/
public final class Constants {
-
- // -------------------------------------------------------------- Constants
-
- public static final String Package = "org.apache.coyote";
-
public static final String DEFAULT_CHARACTER_ENCODING="ISO-8859-1";
public static final int MAX_NOTES = 32;
@@ -51,16 +45,14 @@ public final class Constants {
/**
* Has security been turned on?
*/
- public static final boolean IS_SECURITY_ENABLED =
- (System.getSecurityManager() != null);
+ public static final boolean IS_SECURITY_ENABLED =
(System.getSecurityManager() != null);
/**
* The request attribute that is set to the value of {@code Boolean.TRUE}
* if connector processing this request supports use of sendfile.
*/
- public static final String SENDFILE_SUPPORTED_ATTR =
- "org.apache.tomcat.sendfile.support";
+ public static final String SENDFILE_SUPPORTED_ATTR =
"org.apache.tomcat.sendfile.support";
/**
@@ -69,8 +61,7 @@ public final class Constants {
* by sendfile. The value should be {@code java.lang.String}
* that is {@code File.getCanonicalPath()} of the file to be served.
*/
- public static final String SENDFILE_FILENAME_ATTR =
- "org.apache.tomcat.sendfile.filename";
+ public static final String SENDFILE_FILENAME_ATTR =
"org.apache.tomcat.sendfile.filename";
/**
@@ -80,8 +71,7 @@ public final class Constants {
* {@code java.lang.Long}. To serve complete file
* the value should be {@code Long.valueOf(0)}.
*/
- public static final String SENDFILE_FILE_START_ATTR =
- "org.apache.tomcat.sendfile.start";
+ public static final String SENDFILE_FILE_START_ATTR =
"org.apache.tomcat.sendfile.start";
/**
@@ -91,8 +81,7 @@ public final class Constants {
* {@code java.lang.Long}. To serve complete file
* the value should be equal to the length of the file.
*/
- public static final String SENDFILE_FILE_END_ATTR =
- "org.apache.tomcat.sendfile.end";
+ public static final String SENDFILE_FILE_END_ATTR =
"org.apache.tomcat.sendfile.end";
/**
@@ -102,6 +91,5 @@ public final class Constants {
* request is received via one or more proxies. It is typically provided
via
* the X-Forwarded-For HTTP header.
*/
- public static final String REMOTE_ADDR_ATTRIBUTE =
- "org.apache.tomcat.remoteAddr";
+ public static final String REMOTE_ADDR_ATTRIBUTE =
"org.apache.tomcat.remoteAddr";
}
Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1709550&r1=1709549&r2=1709550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Tue Oct 20 09:02:28 2015
@@ -60,8 +60,7 @@ import org.apache.tomcat.util.res.String
*/
public final class Request {
- private static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ private static final StringManager sm =
StringManager.getManager(Request.class);
// Expected maximum typica number of cookies per request.
private static final int INITIAL_COOKIE_SIZE = 4;
Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1709550&r1=1709549&r2=1709550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Tue Oct 20 09:02:28 2015
@@ -42,8 +42,7 @@ import org.apache.tomcat.util.res.String
*/
public final class Response {
- private static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ private static final StringManager sm =
StringManager.getManager(Response.class);
// ----------------------------------------------------- Class Variables
Modified: tomcat/trunk/java/org/apache/coyote/http11/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Constants.java?rev=1709550&r1=1709549&r2=1709550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Constants.java Tue Oct 20
09:02:28 2015
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.coyote.http11;
import org.apache.tomcat.util.buf.ByteChunk;
-
/**
* Constants.
*
@@ -27,15 +25,6 @@ import org.apache.tomcat.util.buf.ByteCh
*/
public final class Constants {
-
- // -------------------------------------------------------------- Constants
-
-
- /**
- * Package name.
- */
- public static final String Package = "org.apache.coyote.http11";
-
public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
@@ -81,13 +70,13 @@ public final class Constants {
*/
public static final byte COLON = (byte) ':';
+
/**
* SEMI_COLON.
*/
public static final byte SEMI_COLON = (byte) ';';
-
/**
* 'A'.
*/
@@ -121,21 +110,16 @@ public final class Constants {
/* Various constant "strings" */
public static final String CONNECTION = "Connection";
public static final String CLOSE = "close";
- public static final byte[] CLOSE_BYTES =
- ByteChunk.convertToBytes(CLOSE);
+ public static final byte[] CLOSE_BYTES = ByteChunk.convertToBytes(CLOSE);
public static final String KEEPALIVE = "keep-alive";
- public static final byte[] KEEPALIVE_BYTES =
- ByteChunk.convertToBytes(KEEPALIVE);
+ public static final byte[] KEEPALIVE_BYTES =
ByteChunk.convertToBytes(KEEPALIVE);
public static final String CHUNKED = "chunked";
public static final byte[] ACK_BYTES =
- ByteChunk.convertToBytes("HTTP/1.1 100 Continue" + CRLF + CRLF);
+ ByteChunk.convertToBytes("HTTP/1.1 100 Continue" + CRLF + CRLF);
public static final String TRANSFERENCODING = "Transfer-Encoding";
- public static final byte[] _200_BYTES =
- ByteChunk.convertToBytes("200");
- public static final byte[] _400_BYTES =
- ByteChunk.convertToBytes("400");
- public static final byte[] _404_BYTES =
- ByteChunk.convertToBytes("404");
+ public static final byte[] _200_BYTES = ByteChunk.convertToBytes("200");
+ public static final byte[] _400_BYTES = ByteChunk.convertToBytes("400");
+ public static final byte[] _404_BYTES = ByteChunk.convertToBytes("404");
/**
@@ -178,8 +162,7 @@ public final class Constants {
* HTTP/1.1.
*/
public static final String HTTP_11 = "HTTP/1.1";
- public static final byte[] HTTP_11_BYTES =
- ByteChunk.convertToBytes(HTTP_11);
+ public static final byte[] HTTP_11_BYTES =
ByteChunk.convertToBytes(HTTP_11);
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
