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 2016/11/25 09:48:26 UTC
svn commit: r1771269 - in /tomcat/trunk: java/org/apache/catalina/realm/
java/org/apache/catalina/startup/ test/org/apache/catalina/startup/
webapps/docs/
Author: markt
Date: Fri Nov 25 09:48:26 2016
New Revision: 1771269
URL: http://svn.apache.org/viewvc?rev=1771269&view=rev
Log:
Remove deprecated RealmBase.getName() and associated code.
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/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/NullRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java
tomcat/trunk/webapps/docs/changelog.xml
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=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Fri Nov 25 09:48:26 2016
@@ -51,13 +51,6 @@ public class CombinedRealm extends Realm
protected final List<Realm> realms = new LinkedList<>();
/**
- * Descriptive information about this Realm implementation.
- * @deprecated This will be removed in Tomcat 9 onwards.
- */
- @Deprecated
- protected static final String name = "CombinedRealm";
-
- /**
* Add a realm to the list of realms that will be used to authenticate
* users.
* @param theRealm realm which should be wrapped by the combined realm
@@ -394,12 +387,6 @@ public class CombinedRealm extends Realm
}
@Override
- @Deprecated
- protected String getName() {
- return name;
- }
-
- @Override
protected String getPassword(String username) {
// This method should never be called
// Stack trace will show where this was called from
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=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Fri Nov 25 09:48:26 2016
@@ -72,14 +72,6 @@ public class DataSourceRealm extends Rea
/**
- * Descriptive information about this Realm implementation.
- * @deprecated This will be removed in Tomcat 9 onwards.
- */
- @Deprecated
- protected static final String name = "DataSourceRealm";
-
-
- /**
* The column in the user role table that names a role
*/
protected String roleNameCol = null;
@@ -402,12 +394,6 @@ public class DataSourceRealm extends Rea
return null;
}
- @Override
- @Deprecated
- protected String getName() {
- return name;
- }
-
/**
* @return the password associated with the given principal's user name.
*/
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=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Nov 25 09:48:26 2016
@@ -140,14 +140,6 @@ public class JAASRealm extends RealmBase
/**
- * Descriptive information about this <code>Realm</code> implementation.
- * @deprecated This will be removed in Tomcat 9 onwards.
- */
- @Deprecated
- protected static final String name = "JAASRealm";
-
-
- /**
* The list of role class names, split out for easy processing.
*/
protected final List<String> roleClasses = new ArrayList<>();
@@ -471,13 +463,6 @@ public class JAASRealm extends RealmBase
}
- @Override
- @Deprecated
- protected String getName() {
- return name;
- }
-
-
/**
* @return the password associated with the given principal's user name. This
* always returns null as the JAASRealm has no way of obtaining this
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=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Fri Nov 25 09:48:26 2016
@@ -92,14 +92,6 @@ public class JDBCRealm
/**
- * Descriptive information about this Realm implementation.
- * @deprecated This will be removed in Tomcat 9 onwards.
- */
- @Deprecated
- protected static final String name = "JDBCRealm";
-
-
- /**
* The PreparedStatement to use for authenticating users.
*/
protected PreparedStatement preparedCredentials = null;
@@ -502,13 +494,6 @@ public class JDBCRealm
}
- @Override
- @Deprecated
- protected String getName() {
- return name;
- }
-
-
/**
* Get the password for the specified user.
* @param username The user name
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Fri Nov 25 09:48:26 2016
@@ -235,14 +235,6 @@ public class JNDIRealm extends RealmBase
/**
- * Descriptive information about this Realm implementation.
- * @deprecated This will be removed in Tomcat 9 onwards.
- */
- @Deprecated
- protected static final String name = "JNDIRealm";
-
-
- /**
* The protocol that will be used in the communication with the
* directory server.
*/
@@ -2169,13 +2161,6 @@ public class JNDIRealm extends RealmBase
}
- @Override
- @Deprecated
- protected String getName() {
- return name;
- }
-
-
/**
* Get the password for the specified user.
* @param username The user name
Modified: tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java?rev=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java Fri Nov 25 09:48:26 2016
@@ -47,11 +47,6 @@ public class LockOutRealm extends Combin
private static final Log log = LogFactory.getLog(LockOutRealm.class);
/**
- * Descriptive information about this Realm implementation.
- */
- protected static final String name = "LockOutRealm";
-
- /**
* The number of times in a row a user has to fail authentication to be
* locked out. Defaults to 5.
*/
@@ -334,12 +329,6 @@ public class LockOutRealm extends Combin
}
- @Override
- protected String getName() {
- return name;
- }
-
-
/**
* Set the period for which an account will be locked.
* @param lockOutTime the lockOutTime to set
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=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java Fri Nov 25 09:48:26 2016
@@ -56,14 +56,6 @@ public class MemoryRealm extends RealmB
/**
- * Descriptive information about this Realm implementation.
- * @deprecated This will be removed in Tomcat 9 onwards.
- */
- @Deprecated
- protected static final String name = "MemoryRealm";
-
-
- /**
* The pathname (absolute or relative to Catalina's current working
* directory) of the XML file containing our database information.
*/
@@ -208,13 +200,6 @@ public class MemoryRealm extends RealmB
}
- @Override
- @Deprecated
- protected String getName() {
- return name;
- }
-
-
/**
* @return the password associated with the given principal's user name.
*/
Modified: tomcat/trunk/java/org/apache/catalina/realm/NullRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/NullRealm.java?rev=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/NullRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/NullRealm.java Fri Nov 25 09:48:26 2016
@@ -25,14 +25,6 @@ import java.security.Principal;
*/
public class NullRealm extends RealmBase {
- private static final String NAME = "NullRealm";
-
- @Override
- @Deprecated
- protected String getName() {
- return NAME;
- }
-
@Override
protected String getPassword(String username) {
// Always return null
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Fri Nov 25 09:48:26 2016
@@ -1164,17 +1164,6 @@ public abstract class RealmBase extends
/**
- * @return a short name for this Realm implementation, for use in
- * log messages.
- *
- * @deprecated This will be removed in Tomcat 9 onwards. Use
- * {@link Class#getSimpleName()} instead.
- */
- @Deprecated
- protected abstract String getName();
-
-
- /**
* Get the password for the specified user.
* @param username The user name
* @return the password associated with the given principal's user name.
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=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java Fri Nov 25 09:48:26 2016
@@ -60,14 +60,6 @@ public class UserDatabaseRealm
/**
- * Descriptive information about this Realm implementation.
- * @deprecated This will be removed in Tomcat 9 onwards.
- */
- @Deprecated
- protected static final String name = "UserDatabaseRealm";
-
-
- /**
* The global JNDI name of the <code>UserDatabase</code> resource
* we will be utilizing.
*/
@@ -154,15 +146,8 @@ public class UserDatabaseRealm
return false;
}
- // ------------------------------------------------------ Protected Methods
-
-
- @Override
- @Deprecated
- protected String getName() {
- return name;
- }
+ // ------------------------------------------------------ Protected Methods
/**
* Return the password associated with the given principal's user name.
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Nov 25 09:48:26 2016
@@ -648,11 +648,6 @@ public class Tomcat {
private class SimpleRealm extends RealmBase {
- @Override
- @Deprecated
- protected String getName() {
- return "Simple";
- }
@Override
protected String getPassword(String username) {
Modified: tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java?rev=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java Fri Nov 25 09:48:26 2016
@@ -47,12 +47,6 @@ public final class TesterMapRealm extend
}
@Override
- @Deprecated
- protected String getName() {
- return "MapRealm";
- }
-
- @Override
protected String getPassword(String username) {
return users.get(username);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1771269&r1=1771268&r2=1771269&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 25 09:48:26 2016
@@ -112,6 +112,11 @@
Refactor Catalina interfaces to make wider use of the
<code>Contained</code> interface and reduce duplication. (markt)
</scode>
+ <scode>
+ Remove the <code>getName()</code> method from <code>RealmBase</code>
+ along with the various constants used by the sub-classes to store the
+ return value. (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org