From 1bed80cc7ecdac840d76b1735e3a43f2bdf6f5fa Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 7 Dec 2010 15:42:32 +0000 Subject: [PATCH] Fix modifier order in org.apache.catalina.* git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1043105 13f79535-47bb-0310-9956-ffa450edef68 --- .../authenticator/DigestAuthenticator.java | 2 +- .../catalina/core/ApplicationFilterChain.java | 4 ++-- .../org/apache/catalina/filters/ExpiresFilter.java | 4 ++-- .../apache/catalina/filters/RemoteIpFilter.java | 2 +- java/org/apache/catalina/mbeans/MBeanUtils.java | 4 ++-- java/org/apache/catalina/realm/JNDIRealm.java | 10 ++++----- java/org/apache/catalina/realm/RealmBase.java | 2 +- .../catalina/security/SecurityClassLoad.java | 16 +++++++-------- .../apache/catalina/security/SecurityConfig.java | 4 ++-- .../org/apache/catalina/security/SecurityUtil.java | 24 +++++++++++----------- .../catalina/ssi/ResponseIncludeWrapper.java | 2 +- java/org/apache/catalina/ssi/SSIEcho.java | 4 ++-- java/org/apache/catalina/ssi/SSIExec.java | 2 +- java/org/apache/catalina/ssi/SSIFsize.java | 4 ++-- java/org/apache/catalina/ssi/SSIMediator.java | 6 +++--- java/org/apache/catalina/ssi/SSIProcessor.java | 6 +++--- .../apache/catalina/tribes/util/StringManager.java | 2 +- java/org/apache/catalina/util/Base64.java | 20 +++++++++--------- java/org/apache/catalina/util/DateTool.java | 20 +++++++++--------- java/org/apache/catalina/util/IOTools.java | 2 +- java/org/apache/catalina/util/LifecycleBase.java | 8 ++++---- java/org/apache/catalina/util/MIME2Java.java | 4 ++-- 22 files changed, 76 insertions(+), 76 deletions(-) diff --git a/java/org/apache/catalina/authenticator/DigestAuthenticator.java b/java/org/apache/catalina/authenticator/DigestAuthenticator.java index f6ed2c27b..3afcf41d0 100644 --- a/java/org/apache/catalina/authenticator/DigestAuthenticator.java +++ b/java/org/apache/catalina/authenticator/DigestAuthenticator.java @@ -87,7 +87,7 @@ public class DigestAuthenticator /** * MD5 message digest provider. */ - protected volatile static MessageDigest md5Helper; + protected static volatile MessageDigest md5Helper; /** diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java b/java/org/apache/catalina/core/ApplicationFilterChain.java index 38d14aecd..5fcd27818 100644 --- a/java/org/apache/catalina/core/ApplicationFilterChain.java +++ b/java/org/apache/catalina/core/ApplicationFilterChain.java @@ -57,8 +57,8 @@ import org.apache.tomcat.util.res.StringManager; final class ApplicationFilterChain implements FilterChain, CometFilterChain { // Used to enforce requirements of SRV.8.2 / SRV.14.2.5.1 - private final static ThreadLocal lastServicedRequest; - private final static ThreadLocal lastServicedResponse; + private static final ThreadLocal lastServicedRequest; + private static final ThreadLocal lastServicedResponse; static { if (ApplicationDispatcher.WRAP_SAME_OBJECT) { diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java b/java/org/apache/catalina/filters/ExpiresFilter.java index f23703867..dfed484a0 100644 --- a/java/org/apache/catalina/filters/ExpiresFilter.java +++ b/java/org/apache/catalina/filters/ExpiresFilter.java @@ -418,9 +418,9 @@ public class ExpiresFilter extends FilterBase { return new Duration(amount, DurationUnit.SECOND); } - final protected int amount; + protected final int amount; - final protected DurationUnit unit; + protected final DurationUnit unit; public Duration(int amount, DurationUnit unit) { super(); diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java b/java/org/apache/catalina/filters/RemoteIpFilter.java index faabbc76b..132284757 100644 --- a/java/org/apache/catalina/filters/RemoteIpFilter.java +++ b/java/org/apache/catalina/filters/RemoteIpFilter.java @@ -417,7 +417,7 @@ import org.apache.juli.logging.LogFactory; public class RemoteIpFilter implements Filter { public static class XForwardedRequest extends HttpServletRequestWrapper { - final static ThreadLocal threadLocalDateFormats = new ThreadLocal() { + static final ThreadLocal threadLocalDateFormats = new ThreadLocal() { @Override protected SimpleDateFormat[] initialValue() { return new SimpleDateFormat[] { diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java b/java/org/apache/catalina/mbeans/MBeanUtils.java index 7a62c2d24..2fd65a7fa 100644 --- a/java/org/apache/catalina/mbeans/MBeanUtils.java +++ b/java/org/apache/catalina/mbeans/MBeanUtils.java @@ -1022,7 +1022,7 @@ public class MBeanUtils { * Create and configure (if necessary) and return the registry of * managed object descriptions. */ - public synchronized static Registry createRegistry() { + public static synchronized Registry createRegistry() { if (registry == null) { registry = Registry.getRegistry(null, null); @@ -1052,7 +1052,7 @@ public class MBeanUtils { * MBeanServer with which we will be * registering our DynamicMBean implementations. */ - public synchronized static MBeanServer createServer() { + public static synchronized MBeanServer createServer() { if (mserver == null) { try { diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java index ab9e73b8d..0e9b45f2e 100644 --- a/java/org/apache/catalina/realm/JNDIRealm.java +++ b/java/org/apache/catalina/realm/JNDIRealm.java @@ -224,7 +224,7 @@ public class JNDIRealm extends RealmBase { * Constant that holds the name of the environment property for specifying * the manner in which aliases should be dereferenced. */ - public final static String DEREF_ALIASES = "java.naming.ldap.derefAliases"; + public static final String DEREF_ALIASES = "java.naming.ldap.derefAliases"; /** * Descriptive information about this Realm implementation. @@ -2222,10 +2222,10 @@ public class JNDIRealm extends RealmBase { */ protected static class User { - final private String username; - final private String dn; - final private String password; - final private List roles; + private final String username; + private final String dn; + private final String password; + private final List roles; public User(String username, String dn, String password, List roles) { diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java index d9bd807c1..7a6532a8b 100644 --- a/java/org/apache/catalina/realm/RealmBase.java +++ b/java/org/apache/catalina/realm/RealmBase.java @@ -1192,7 +1192,7 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm { * @param algorithm Algorithm used to do the digest * @param encoding Character encoding of the string to digest */ - public final static String Digest(String credentials, String algorithm, + public static final String Digest(String credentials, String algorithm, String encoding) { try { diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java b/java/org/apache/catalina/security/SecurityClassLoad.java index 773b4852d..abe484a28 100644 --- a/java/org/apache/catalina/security/SecurityClassLoad.java +++ b/java/org/apache/catalina/security/SecurityClassLoad.java @@ -48,7 +48,7 @@ public final class SecurityClassLoad { } - private final static void loadCorePackage(ClassLoader loader) + private static final void loadCorePackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.core."; loader.loadClass @@ -96,7 +96,7 @@ public final class SecurityClassLoad { } - private final static void loadLoaderPackage(ClassLoader loader) + private static final void loadLoaderPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.loader."; loader.loadClass @@ -105,7 +105,7 @@ public final class SecurityClassLoad { } - private final static void loadSessionPackage(ClassLoader loader) + private static final void loadSessionPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.session."; loader.loadClass @@ -119,7 +119,7 @@ public final class SecurityClassLoad { } - private final static void loadUtilPackage(ClassLoader loader) + private static final void loadUtilPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.util."; loader.loadClass(basePackage + "Enumerator"); @@ -127,20 +127,20 @@ public final class SecurityClassLoad { } - private final static void loadCoyotePackage(ClassLoader loader) + private static final void loadCoyotePackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.coyote."; loader.loadClass(basePackage + "http11.AbstractOutputBuffer$1"); } - private final static void loadJavaxPackage(ClassLoader loader) + private static final void loadJavaxPackage(ClassLoader loader) throws Exception { loader.loadClass("javax.servlet.http.Cookie"); } - private final static void loadConnectorPackage(ClassLoader loader) + private static final void loadConnectorPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.connector."; loader.loadClass @@ -223,7 +223,7 @@ public final class SecurityClassLoad { "Response$3"); } - private final static void loadTomcatPackage(ClassLoader loader) + private static final void loadTomcatPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.tomcat."; // Make sure system property is read at this point diff --git a/java/org/apache/catalina/security/SecurityConfig.java b/java/org/apache/catalina/security/SecurityConfig.java index 9fcd4dd04..64488d641 100644 --- a/java/org/apache/catalina/security/SecurityConfig.java +++ b/java/org/apache/catalina/security/SecurityConfig.java @@ -33,13 +33,13 @@ public final class SecurityConfig{ org.apache.juli.logging.LogFactory.getLog( SecurityConfig.class ); - private final static String PACKAGE_ACCESS = "sun.," + private static final String PACKAGE_ACCESS = "sun.," + "org.apache.catalina." + ",org.apache.jasper." + ",org.apache.coyote." + ",org.apache.tomcat."; - private final static String PACKAGE_DEFINITION= "java.,sun." + private static final String PACKAGE_DEFINITION= "java.,sun." + ",org.apache.catalina." + ",org.apache.coyote." + ",org.apache.tomcat." diff --git a/java/org/apache/catalina/security/SecurityUtil.java b/java/org/apache/catalina/security/SecurityUtil.java index 8aad81a96..ae4a3bccb 100644 --- a/java/org/apache/catalina/security/SecurityUtil.java +++ b/java/org/apache/catalina/security/SecurityUtil.java @@ -50,19 +50,19 @@ import org.apache.tomcat.util.res.StringManager; public final class SecurityUtil{ - private final static int INIT= 0; - private final static int SERVICE = 1; - private final static int DOFILTER = 1; - private final static int EVENT = 2; - private final static int DOFILTEREVENT = 2; - private final static int DESTROY = 3; + private static final int INIT= 0; + private static final int SERVICE = 1; + private static final int DOFILTER = 1; + private static final int EVENT = 2; + private static final int DOFILTEREVENT = 2; + private static final int DESTROY = 3; - private final static String INIT_METHOD = "init"; - private final static String DOFILTER_METHOD = "doFilter"; - private final static String SERVICE_METHOD = "service"; - private final static String EVENT_METHOD = "event"; - private final static String DOFILTEREVENT_METHOD = "doFilterEvent"; - private final static String DESTROY_METHOD = "destroy"; + private static final String INIT_METHOD = "init"; + private static final String DOFILTER_METHOD = "doFilter"; + private static final String SERVICE_METHOD = "service"; + private static final String EVENT_METHOD = "event"; + private static final String DOFILTEREVENT_METHOD = "doFilterEvent"; + private static final String DESTROY_METHOD = "destroy"; /** * Cache every object for which we are creating method on it. diff --git a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java index d2fffb2cf..82ebbf9b3 100644 --- a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java +++ b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java @@ -48,7 +48,7 @@ public class ResponseIncludeWrapper extends HttpServletResponseWrapper { private static final String CONTENT_TYPE = "content-type"; private static final String LAST_MODIFIED = "last-modified"; private static final DateFormat RFC1123_FORMAT; - private final static String RFC1123_PATTERN = "EEE, dd MMM yyyy HH:mm:ss z"; + private static final String RFC1123_PATTERN = "EEE, dd MMM yyyy HH:mm:ss z"; protected long lastModified = -1; private String contentType = null; diff --git a/java/org/apache/catalina/ssi/SSIEcho.java b/java/org/apache/catalina/ssi/SSIEcho.java index 5deb3d909..07ec11f7f 100644 --- a/java/org/apache/catalina/ssi/SSIEcho.java +++ b/java/org/apache/catalina/ssi/SSIEcho.java @@ -28,8 +28,8 @@ import java.io.PrintWriter; * @version $Id$ */ public class SSIEcho implements SSICommand { - protected final static String DEFAULT_ENCODING = "entity"; - protected final static String MISSING_VARIABLE_VALUE = "(none)"; + protected static final String DEFAULT_ENCODING = "entity"; + protected static final String MISSING_VARIABLE_VALUE = "(none)"; /** diff --git a/java/org/apache/catalina/ssi/SSIExec.java b/java/org/apache/catalina/ssi/SSIExec.java index 683167c5d..83922741e 100644 --- a/java/org/apache/catalina/ssi/SSIExec.java +++ b/java/org/apache/catalina/ssi/SSIExec.java @@ -35,7 +35,7 @@ import org.apache.catalina.util.IOTools; */ public class SSIExec implements SSICommand { protected SSIInclude ssiInclude = new SSIInclude(); - protected final static int BUFFER_SIZE = 1024; + protected static final int BUFFER_SIZE = 1024; /** diff --git a/java/org/apache/catalina/ssi/SSIFsize.java b/java/org/apache/catalina/ssi/SSIFsize.java index 36eb72aa4..af0415433 100644 --- a/java/org/apache/catalina/ssi/SSIFsize.java +++ b/java/org/apache/catalina/ssi/SSIFsize.java @@ -30,8 +30,8 @@ import java.text.DecimalFormat; * @version $Id$ */ public final class SSIFsize implements SSICommand { - protected final static int ONE_KILOBYTE = 1024; - protected final static int ONE_MEGABYTE = 1024 * 1024; + protected static final int ONE_KILOBYTE = 1024; + protected static final int ONE_MEGABYTE = 1024 * 1024; /** diff --git a/java/org/apache/catalina/ssi/SSIMediator.java b/java/org/apache/catalina/ssi/SSIMediator.java index 2da24fe5f..5c5941d3e 100644 --- a/java/org/apache/catalina/ssi/SSIMediator.java +++ b/java/org/apache/catalina/ssi/SSIMediator.java @@ -42,9 +42,9 @@ import org.apache.tomcat.util.http.HttpMessages; * @version $Id$ */ public class SSIMediator { - protected final static String DEFAULT_CONFIG_ERR_MSG = "[an error occurred while processing this directive]"; - protected final static String DEFAULT_CONFIG_TIME_FMT = "%A, %d-%b-%Y %T %Z"; - protected final static String DEFAULT_CONFIG_SIZE_FMT = "abbrev"; + protected static final String DEFAULT_CONFIG_ERR_MSG = "[an error occurred while processing this directive]"; + protected static final String DEFAULT_CONFIG_TIME_FMT = "%A, %d-%b-%Y %T %Z"; + protected static final String DEFAULT_CONFIG_SIZE_FMT = "abbrev"; protected static URLEncoder urlEncoder; protected String configErrMsg = DEFAULT_CONFIG_ERR_MSG; protected String configTimeFmt = DEFAULT_CONFIG_TIME_FMT; diff --git a/java/org/apache/catalina/ssi/SSIProcessor.java b/java/org/apache/catalina/ssi/SSIProcessor.java index b9ed30681..32fbb8171 100644 --- a/java/org/apache/catalina/ssi/SSIProcessor.java +++ b/java/org/apache/catalina/ssi/SSIProcessor.java @@ -37,10 +37,10 @@ import org.apache.catalina.util.IOTools; */ public class SSIProcessor { /** The start pattern */ - protected final static String COMMAND_START = ""; - protected final static int BUFFER_SIZE = 4096; + protected static final String COMMAND_END = "-->"; + protected static final int BUFFER_SIZE = 4096; protected SSIExternalResolver ssiExternalResolver; protected HashMap commands = new HashMap(); diff --git a/java/org/apache/catalina/tribes/util/StringManager.java b/java/org/apache/catalina/tribes/util/StringManager.java index 15cb1af5c..cf2cbd86d 100644 --- a/java/org/apache/catalina/tribes/util/StringManager.java +++ b/java/org/apache/catalina/tribes/util/StringManager.java @@ -159,7 +159,7 @@ public class StringManager { * * @param packageName The package name */ - public synchronized static final StringManager getManager(String packageName) { + public static final synchronized StringManager getManager(String packageName) { StringManager mgr = managers.get(packageName); if (mgr == null) { mgr = new StringManager(packageName); diff --git a/java/org/apache/catalina/util/Base64.java b/java/org/apache/catalina/util/Base64.java index f53a092cd..fd4f3d0b2 100644 --- a/java/org/apache/catalina/util/Base64.java +++ b/java/org/apache/catalina/util/Base64.java @@ -34,16 +34,16 @@ import org.apache.tomcat.util.buf.CharChunk; */ public final class Base64 { - static private final int BASELENGTH = 255; - static private final int LOOKUPLENGTH = 64; - static private final int TWENTYFOURBITGROUP = 24; - static private final int EIGHTBIT = 8; - static private final int SIXTEENBIT = 16; - static private final int FOURBYTE = 4; - static private final int SIGN = -128; - static private final byte PAD = (byte) '='; - static private byte [] base64Alphabet = new byte[BASELENGTH]; - static private byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH]; + private static final int BASELENGTH = 255; + private static final int LOOKUPLENGTH = 64; + private static final int TWENTYFOURBITGROUP = 24; + private static final int EIGHTBIT = 8; + private static final int SIXTEENBIT = 16; + private static final int FOURBYTE = 4; + private static final int SIGN = -128; + private static final byte PAD = (byte) '='; + private static byte [] base64Alphabet = new byte[BASELENGTH]; + private static byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH]; static { diff --git a/java/org/apache/catalina/util/DateTool.java b/java/org/apache/catalina/util/DateTool.java index b68423be1..82cd8a39b 100644 --- a/java/org/apache/catalina/util/DateTool.java +++ b/java/org/apache/catalina/util/DateTool.java @@ -37,17 +37,17 @@ public class DateTool { /** * US locale - all HTTP dates are in English */ - public final static Locale LOCALE_US = Locale.US; + public static final Locale LOCALE_US = Locale.US; /** * GMT timezone - all HTTP dates are on GMT */ - public final static TimeZone GMT_ZONE = TimeZone.getTimeZone("GMT"); + public static final TimeZone GMT_ZONE = TimeZone.getTimeZone("GMT"); /** * format for RFC 1123 date string -- "Sun, 06 Nov 1994 08:49:37 GMT" */ - public final static String RFC1123_PATTERN = + public static final String RFC1123_PATTERN = "EEE, dd MMM yyyyy HH:mm:ss z"; /** @@ -57,22 +57,22 @@ public class DateTool { "EEE, dd MMM yyyy HH:mm:ss zzz"; // format for RFC 1036 date string -- "Sunday, 06-Nov-94 08:49:37 GMT" - private final static String rfc1036Pattern = + private static final String rfc1036Pattern = "EEEEEEEEE, dd-MMM-yy HH:mm:ss z"; // format for C asctime() date string -- "Sun Nov 6 08:49:37 1994" - private final static String asctimePattern = + private static final String asctimePattern = "EEE MMM d HH:mm:ss yyyyy"; /** * Pattern used for old cookies */ - public final static String OLD_COOKIE_PATTERN = "EEE, dd-MMM-yyyy HH:mm:ss z"; + public static final String OLD_COOKIE_PATTERN = "EEE, dd-MMM-yyyy HH:mm:ss z"; /** * DateFormat to be used to format dates */ - public final static ThreadLocal rfc1123Format = new ThreadLocal() { + public static final ThreadLocal rfc1123Format = new ThreadLocal() { @Override public DateFormat initialValue() { DateFormat result = new SimpleDateFormat(RFC1123_PATTERN, LOCALE_US); @@ -84,7 +84,7 @@ public class DateTool { /** * DateFormat to be used to format old netscape cookies */ - public final static ThreadLocal oldCookieFormat = new ThreadLocal() { + public static final ThreadLocal oldCookieFormat = new ThreadLocal() { @Override public DateFormat initialValue() { DateFormat result = new SimpleDateFormat(OLD_COOKIE_PATTERN, LOCALE_US); @@ -94,7 +94,7 @@ public class DateTool { }; - public final static ThreadLocal rfc1036Format = new ThreadLocal() { + public static final ThreadLocal rfc1036Format = new ThreadLocal() { @Override public DateFormat initialValue() { DateFormat result = new SimpleDateFormat(rfc1036Pattern, LOCALE_US); @@ -103,7 +103,7 @@ public class DateTool { } }; - public final static ThreadLocal asctimeFormat = new ThreadLocal() { + public static final ThreadLocal asctimeFormat = new ThreadLocal() { @Override public DateFormat initialValue() { DateFormat result = new SimpleDateFormat(asctimePattern, LOCALE_US); diff --git a/java/org/apache/catalina/util/IOTools.java b/java/org/apache/catalina/util/IOTools.java index 1838bd29e..0da38f2ab 100644 --- a/java/org/apache/catalina/util/IOTools.java +++ b/java/org/apache/catalina/util/IOTools.java @@ -29,7 +29,7 @@ import java.io.Writer; * @author Dan Sandberg */ public class IOTools { - protected final static int DEFAULT_BUFFER_SIZE=4*1024; //4k + protected static final int DEFAULT_BUFFER_SIZE=4*1024; //4k private IOTools() { //Ensure non-instantiability diff --git a/java/org/apache/catalina/util/LifecycleBase.java b/java/org/apache/catalina/util/LifecycleBase.java index 90502cf59..b64492e64 100644 --- a/java/org/apache/catalina/util/LifecycleBase.java +++ b/java/org/apache/catalina/util/LifecycleBase.java @@ -91,7 +91,7 @@ public abstract class LifecycleBase implements Lifecycle { @Override - public synchronized final void init() throws LifecycleException { + public final synchronized void init() throws LifecycleException { if (!state.equals(LifecycleState.NEW)) { invalidTransition(Lifecycle.BEFORE_INIT_EVENT); } @@ -109,7 +109,7 @@ public abstract class LifecycleBase implements Lifecycle { * {@inheritDoc} */ @Override - public synchronized final void start() throws LifecycleException { + public final synchronized void start() throws LifecycleException { if (LifecycleState.STARTING_PREP.equals(state) || LifecycleState.STARTING.equals(state) || @@ -182,7 +182,7 @@ public abstract class LifecycleBase implements Lifecycle { * {@inheritDoc} */ @Override - public synchronized final void stop() throws LifecycleException { + public final synchronized void stop() throws LifecycleException { if (LifecycleState.STOPPING_PREP.equals(state) || LifecycleState.STOPPING.equals(state) || @@ -247,7 +247,7 @@ public abstract class LifecycleBase implements Lifecycle { @Override - public synchronized final void destroy() throws LifecycleException { + public final synchronized void destroy() throws LifecycleException { if (LifecycleState.DESTROYING.equals(state) || LifecycleState.DESTROYED.equals(state)) { diff --git a/java/org/apache/catalina/util/MIME2Java.java b/java/org/apache/catalina/util/MIME2Java.java index 89bec180c..548517879 100644 --- a/java/org/apache/catalina/util/MIME2Java.java +++ b/java/org/apache/catalina/util/MIME2Java.java @@ -472,8 +472,8 @@ import java.util.Locale; */ public class MIME2Java { - static private Hashtable s_enchash; - static private Hashtable s_revhash; + private static Hashtable s_enchash; + private static Hashtable s_revhash; static { s_enchash = new Hashtable(); -- 2.11.0