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:41:40 UTC
svn commit: r1771266 - in /tomcat/trunk: java/org/apache/catalina/realm/
java/org/apache/catalina/startup/ test/org/apache/catalina/startup/
Author: markt
Date: Fri Nov 25 09:41:40 2016
New Revision: 1771266
URL: http://svn.apache.org/viewvc?rev=1771266&view=rev
Log:
Deprecate RealmBase.getName()
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/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
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=1771266&r1=1771265&r2=1771266&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:41:40 2016
@@ -52,7 +52,9 @@ public class CombinedRealm extends Realm
/**
* Descriptive information about this Realm implementation.
+ * @deprecated This will be removed in Tomcat 9 onwards.
*/
+ @Deprecated
protected static final String name = "CombinedRealm";
/**
@@ -392,6 +394,7 @@ public class CombinedRealm extends Realm
}
@Override
+ @Deprecated
protected String getName() {
return name;
}
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=1771266&r1=1771265&r2=1771266&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:41:40 2016
@@ -73,7 +73,9 @@ 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";
@@ -400,14 +402,10 @@ public class DataSourceRealm extends Rea
return null;
}
- /**
- * Return a short name for this Realm implementation.
- */
@Override
+ @Deprecated
protected String getName() {
-
- return (name);
-
+ return 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=1771266&r1=1771265&r2=1771266&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:41:40 2016
@@ -141,7 +141,9 @@ 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";
@@ -468,14 +470,11 @@ public class JAASRealm extends RealmBase
}
}
- /**
- * @return a short name for this <code>Realm</code> implementation.
- */
+
@Override
+ @Deprecated
protected String getName() {
-
- return (name);
-
+ return name;
}
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=1771266&r1=1771265&r2=1771266&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:41:40 2016
@@ -93,7 +93,9 @@ 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";
@@ -500,14 +502,10 @@ public class JDBCRealm
}
- /**
- * @return a short name for this Realm implementation.
- */
@Override
+ @Deprecated
protected String getName() {
-
- return (name);
-
+ return 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=1771266&r1=1771265&r2=1771266&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:41:40 2016
@@ -236,7 +236,9 @@ 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";
@@ -2167,14 +2169,10 @@ public class JNDIRealm extends RealmBase
}
- /**
- * @return a short name for this Realm implementation.
- */
@Override
+ @Deprecated
protected String getName() {
-
return name;
-
}
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=1771266&r1=1771265&r2=1771266&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:41:40 2016
@@ -57,7 +57,9 @@ 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";
@@ -206,14 +208,10 @@ public class MemoryRealm extends RealmB
}
- /**
- * @return a short name for this Realm implementation.
- */
@Override
+ @Deprecated
protected String getName() {
-
- return (name);
-
+ return 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=1771266&r1=1771265&r2=1771266&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:41:40 2016
@@ -28,6 +28,7 @@ public class NullRealm extends RealmBase
private static final String NAME = "NullRealm";
@Override
+ @Deprecated
protected String getName() {
return NAME;
}
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=1771266&r1=1771265&r2=1771266&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:41:40 2016
@@ -1166,7 +1166,11 @@ 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();
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=1771266&r1=1771265&r2=1771266&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:41:40 2016
@@ -61,7 +61,9 @@ 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";
@@ -155,14 +157,10 @@ public class UserDatabaseRealm
// ------------------------------------------------------ Protected Methods
- /**
- * Return a short name for this Realm implementation.
- */
@Override
+ @Deprecated
protected String getName() {
-
- return (name);
-
+ return 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=1771266&r1=1771265&r2=1771266&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:41:40 2016
@@ -649,6 +649,7 @@ public class Tomcat {
private class SimpleRealm extends RealmBase {
@Override
+ @Deprecated
protected String getName() {
return "Simple";
}
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=1771266&r1=1771265&r2=1771266&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:41:40 2016
@@ -47,6 +47,7 @@ public final class TesterMapRealm extend
}
@Override
+ @Deprecated
protected String getName() {
return "MapRealm";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org