Author: markt Date: Wed Jan 5 14:28:30 2011 New Revision: 1055469 URL: http://svn.apache.org/viewvc?rev=1055469&view=rev Log: Remove unnecessary code. Valves in this package can use the StringManager defined in ValveBase
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1055469&r1=1055468&r2=1055469&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Wed Jan 5 14:28:30 2011 @@ -46,7 +46,6 @@ import org.apache.coyote.RequestInfo; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.ExceptionUtils; -import org.apache.tomcat.util.res.StringManager; /** @@ -190,13 +189,6 @@ public class AccessLogValve extends Valv /** - * The string manager for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * The suffix that is added to log file filenames. */ protected String suffix = ""; Modified: tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=1055469&r1=1055468&r2=1055469&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java Wed Jan 5 14:28:30 2011 @@ -41,7 +41,6 @@ import org.apache.catalina.comet.CometPr import org.apache.catalina.connector.CometEventImpl; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.tomcat.util.res.StringManager; /** @@ -74,13 +73,6 @@ public class CometConnectionManagerValve /** - * The string manager for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * List of current Comet connections. */ protected List<Request> cometRequests = Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1055469&r1=1055468&r2=1055469&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Wed Jan 5 14:28:30 2011 @@ -31,7 +31,6 @@ import org.apache.catalina.connector.Res import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.ServerInfo; import org.apache.tomcat.util.ExceptionUtils; -import org.apache.tomcat.util.res.StringManager; /** * <p>Implementation of a Valve that outputs HTML error pages.</p> @@ -66,13 +65,6 @@ public class ErrorReportValve extends Va "org.apache.catalina.valves.ErrorReportValve/1.0"; - /** - * The StringManager for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - // ------------------------------------------------------------- Properties Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1055469&r1=1055468&r2=1055469&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Wed Jan 5 14:28:30 2011 @@ -35,7 +35,6 @@ import org.apache.catalina.LifecycleStat import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.tomcat.util.ExceptionUtils; -import org.apache.tomcat.util.res.StringManager; /** * <p> @@ -219,12 +218,6 @@ public final class JDBCAccessLogValve ex "org.apache.catalina.valves.JDBCAccessLogValve/1.1"; - /** - * The string manager for this package. - */ - private static final StringManager sm = StringManager.getManager(Constants.Package); - - // ------------------------------------------------------------- Properties /** Modified: tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java?rev=1055469&r1=1055468&r2=1055469&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java Wed Jan 5 14:28:30 2011 @@ -31,7 +31,6 @@ import org.apache.catalina.Store; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.session.PersistentManager; -import org.apache.tomcat.util.res.StringManager; /** @@ -64,13 +63,6 @@ public class PersistentValve extends Val "org.apache.catalina.valves.PersistentValve/1.0"; - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - // ------------------------------------------------------------- Properties Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1055469&r1=1055468&r2=1055469&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Wed Jan 5 14:28:30 2011 @@ -31,7 +31,6 @@ import org.apache.catalina.connector.Req import org.apache.catalina.connector.Response; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -import org.apache.tomcat.util.res.StringManager; /** * <p> @@ -360,11 +359,6 @@ public class RemoteIpValve extends Valve private static final Log log = LogFactory.getLog(RemoteIpValve.class); /** - * The StringManager for this package. - */ - protected static final StringManager sm = StringManager.getManager(Constants.Package); - - /** * Convert a given comma delimited list of regular expressions into an array of compiled {...@link Pattern} * * @return array of patterns (not <code>null</code>) Modified: tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java?rev=1055469&r1=1055468&r2=1055469&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java Wed Jan 5 14:28:30 2011 @@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRes import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.tomcat.util.res.StringManager; /** * Implementation of a Valve that performs filtering based on comparing the @@ -83,13 +82,6 @@ public abstract class RequestFilterValve "org.apache.catalina.valves.RequestFilterValve/1.0"; - /** - * The StringManager for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - // ----------------------------------------------------- Instance Variables --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org