Remove unnecessary code. Valves in this package can use the StringManager defined...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1055469 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java
index b71a89b..fe3bf39 100644 (file)
--- a/java/org/apache/catalina/valves/AccessLogValve.java
+++ b/java/org/apache/catalina/valves/AccessLogValve.java
@@ -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 ValveBase implements AccessLog {
 
 
     /**
-     * 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 = "";

diff --git a/java/org/apache/catalina/valves/CometConnectionManagerValve.java b/java/org/apache/catalina/valves/CometConnectionManagerValve.java
index 29226a7..0036698 100644 (file)
--- a/java/org/apache/catalina/valves/CometConnectionManagerValve.java
+++ b/java/org/apache/catalina/valves/CometConnectionManagerValve.java
@@ -41,7 +41,6 @@ import org.apache.catalina.comet.CometProcessor;
 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 extends ValveBase
 
 
     /**
-     * The string manager for this package.
-     */
-    protected static final StringManager sm =
-        StringManager.getManager(Constants.Package);
-
-
-    /**
      * List of current Comet connections.
      */
     protected List<Request> cometRequests =

diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java b/java/org/apache/catalina/valves/ErrorReportValve.java
index 5ad3e1e..335eb66 100644 (file)
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -31,7 +31,6 @@ import org.apache.catalina.connector.Response;
 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 ValveBase {
         "org.apache.catalina.valves.ErrorReportValve/1.0";
 
 
-    /**
-     * The StringManager for this package.
-     */
-    protected static final StringManager sm =
-        StringManager.getManager(Constants.Package);
-
-
     // ------------------------------------------------------------- Properties
 
 

diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index d8e9493..6601df2 100644 (file)
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -35,7 +35,6 @@ import org.apache.catalina.LifecycleState;
 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 extends ValveBase implements AccessLog {
         "org.apache.catalina.valves.JDBCAccessLogValve/1.1";
 
 
-    /**
-     * The string manager for this package.
-     */
-    private static final StringManager sm = StringManager.getManager(Constants.Package);
-
-
     // ------------------------------------------------------------- Properties
  
     /**

diff --git a/java/org/apache/catalina/valves/PersistentValve.java b/java/org/apache/catalina/valves/PersistentValve.java
index ad290fb..3bf1fe5 100644 (file)
--- a/java/org/apache/catalina/valves/PersistentValve.java
+++ b/java/org/apache/catalina/valves/PersistentValve.java
@@ -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 ValveBase {
         "org.apache.catalina.valves.PersistentValve/1.0";
 
 
-    /**
-     * The string manager for this package.
-     */
-    private static final StringManager sm =
-        StringManager.getManager(Constants.Package);
-
-
     // ------------------------------------------------------------- Properties
 
 

diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java b/java/org/apache/catalina/valves/RemoteIpValve.java
index 774cf78..9a113c4 100644 (file)
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -31,7 +31,6 @@ import org.apache.catalina.connector.Request;
 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 ValveBase {
     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>)

diff --git a/java/org/apache/catalina/valves/RequestFilterValve.java b/java/org/apache/catalina/valves/RequestFilterValve.java
index 55e6e9a..08d100a 100644 (file)
--- a/java/org/apache/catalina/valves/RequestFilterValve.java
+++ b/java/org/apache/catalina/valves/RequestFilterValve.java
@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletResponse;
 
 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