From: markt Date: Tue, 9 Mar 2010 12:08:17 +0000 (+0000) Subject: Remove unnecessary duplication X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7ce10940ecf893033e48d1d90217024c7574587a;p=tomcat7.0 Remove unnecessary duplication git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@920820 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/realm/CombinedRealm.java b/java/org/apache/catalina/realm/CombinedRealm.java index 64e9affe0..0207f7bdd 100644 --- a/java/org/apache/catalina/realm/CombinedRealm.java +++ b/java/org/apache/catalina/realm/CombinedRealm.java @@ -31,7 +31,6 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleException; import org.apache.catalina.Realm; import org.apache.catalina.util.LifecycleBase; -import org.apache.tomcat.util.res.StringManager; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -46,12 +45,6 @@ public class CombinedRealm extends RealmBase { private static final Log log = LogFactory.getLog(CombinedRealm.class); /** - * The string manager for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - /** * The list of Realms contained by this Realm. */ protected List realms = new LinkedList(); diff --git a/java/org/apache/catalina/realm/DataSourceRealm.java b/java/org/apache/catalina/realm/DataSourceRealm.java index 239184d57..7b491a718 100644 --- a/java/org/apache/catalina/realm/DataSourceRealm.java +++ b/java/org/apache/catalina/realm/DataSourceRealm.java @@ -33,7 +33,6 @@ import org.apache.naming.ContextBindings; import org.apache.catalina.LifecycleException; import org.apache.catalina.core.StandardServer; import org.apache.catalina.util.LifecycleBase; -import org.apache.tomcat.util.res.StringManager; /** * @@ -99,13 +98,6 @@ public class DataSourceRealm /** - * The string manager for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * The column in the user table that holds the user's credentials */ protected String userCredCol = null; diff --git a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java index bb91042c4..15bfebbf1 100644 --- a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java +++ b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java @@ -36,7 +36,6 @@ import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; import org.apache.catalina.authenticator.Constants; -import org.apache.tomcat.util.res.StringManager; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.digester.Digester; @@ -111,12 +110,6 @@ public class JAASMemoryLoginModule extends MemoryRealm implements LoginModule { /** - * The string manager for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - /** * The state information that is shared with other configured * LoginModule instances. */ diff --git a/java/org/apache/catalina/realm/JAASRealm.java b/java/org/apache/catalina/realm/JAASRealm.java index ad4e6170d..c6b3d906e 100644 --- a/java/org/apache/catalina/realm/JAASRealm.java +++ b/java/org/apache/catalina/realm/JAASRealm.java @@ -36,7 +36,6 @@ import org.apache.catalina.Container; import org.apache.catalina.LifecycleException; import org.apache.catalina.authenticator.Constants; import org.apache.catalina.util.LifecycleBase; -import org.apache.tomcat.util.res.StringManager; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -161,13 +160,6 @@ public class JAASRealm /** - * The string manager for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * The set of user class names, split out for easy processing. */ protected List userClasses = new ArrayList(); diff --git a/java/org/apache/catalina/realm/JDBCRealm.java b/java/org/apache/catalina/realm/JDBCRealm.java index b5b558ced..cda6a1886 100644 --- a/java/org/apache/catalina/realm/JDBCRealm.java +++ b/java/org/apache/catalina/realm/JDBCRealm.java @@ -30,7 +30,6 @@ import java.util.Properties; import org.apache.catalina.LifecycleException; import org.apache.catalina.util.LifecycleBase; -import org.apache.tomcat.util.res.StringManager; /** @@ -127,13 +126,6 @@ public class JDBCRealm /** - * The string manager for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** * The column in the user table that holds the user's credentials */ protected String userCredCol = null; diff --git a/java/org/apache/catalina/realm/MemoryRealm.java b/java/org/apache/catalina/realm/MemoryRealm.java index ff320872b..96df059db 100644 --- a/java/org/apache/catalina/realm/MemoryRealm.java +++ b/java/org/apache/catalina/realm/MemoryRealm.java @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.Map; import org.apache.catalina.LifecycleException; import org.apache.catalina.util.LifecycleBase; -import org.apache.tomcat.util.res.StringManager; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.digester.Digester; @@ -87,13 +86,6 @@ public class MemoryRealm extends RealmBase { new HashMap(); - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java b/java/org/apache/catalina/realm/UserDatabaseRealm.java index 3b50dbe64..23b949f46 100644 --- a/java/org/apache/catalina/realm/UserDatabaseRealm.java +++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java @@ -33,7 +33,6 @@ import org.apache.catalina.User; import org.apache.catalina.UserDatabase; import org.apache.catalina.core.StandardServer; import org.apache.catalina.util.LifecycleBase; -import org.apache.tomcat.util.res.StringManager; /** @@ -82,13 +81,6 @@ public class UserDatabaseRealm protected String resourceName = "UserDatabase"; - /** - * The string manager for this package. - */ - private static final StringManager sm = - StringManager.getManager(Constants.Package); - - // ------------------------------------------------------------- Properties