You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/03/09 13:08:18 UTC
svn commit: r920820 - in /tomcat/trunk/java/org/apache/catalina/realm:
CombinedRealm.java DataSourceRealm.java JAASMemoryLoginModule.java
JAASRealm.java JDBCRealm.java MemoryRealm.java UserDatabaseRealm.java
Author: markt
Date: Tue Mar 9 12:08:17 2010
New Revision: 920820
URL: http://svn.apache.org/viewvc?rev=920820&view=rev
Log:
Remove unnecessary duplication
Modified:
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=920820&r1=920819&r2=920820&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Tue Mar 9 12:08:17 2010
@@ -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 Realm
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<Realm> realms = new LinkedList<Realm>();
Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=920820&r1=920819&r2=920820&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Tue Mar 9 12:08:17 2010
@@ -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;
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=920820&r1=920819&r2=920820&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Tue Mar 9 12:08:17 2010
@@ -36,7 +36,6 @@ import javax.security.auth.login.LoginEx
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 exten
/**
- * The string manager for this package.
- */
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
-
- /**
* The state information that is shared with other configured
* <code>LoginModule</code> instances.
*/
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=920820&r1=920819&r2=920820&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Tue Mar 9 12:08:17 2010
@@ -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<String> userClasses = new ArrayList<String>();
Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=920820&r1=920819&r2=920820&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Tue Mar 9 12:08:17 2010
@@ -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;
Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=920820&r1=920819&r2=920820&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java Tue Mar 9 12:08:17 2010
@@ -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 RealmB
new HashMap<String,GenericPrincipal>();
- /**
- * The string manager for this package.
- */
- private static final StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java?rev=920820&r1=920819&r2=920820&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java Tue Mar 9 12:08:17 2010
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org