Author: markt
Date: Wed Jun 29 19:54:08 2016
New Revision: 1750707
URL: http://svn.apache.org/viewvc?rev=1750707&view=rev
Log:
Make the o.a.c.realm.Constants class unused and deprecated it.
Modified:
tomcat/trunk/java/org/apache/catalina/realm/Constants.java
tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
tomcat/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/Constants.java?rev=1750707&r1=1750706&r2=1750707&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/Constants.java Wed Jun 29 19:54:08 2016
@@ -14,22 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.realm;
-
/**
* Manifest constants for this Java package.
*
- *
* @author Craig R. McClanahan
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9
*/
+@Deprecated
public final class Constants {
public static final String Package = "org.apache.catalina.realm";
- // Authentication methods for login configuration
+ // Authentication methods for login configuration
public static final String FORM_METHOD = "FORM";
// Form based authentication constants
Modified: tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java?rev=1750707&r1=1750706&r2=1750707&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java Wed Jun 29 19:54:08 2016
@@ -30,7 +30,8 @@ import org.apache.tomcat.util.res.String
*/
public abstract class DigestCredentialHandlerBase implements CredentialHandler {
- protected static final StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm =
+ StringManager.getManager(DigestCredentialHandlerBase.class);
public static final int DEFAULT_SALT_LENGTH = 32;
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java?rev=1750707&r1=1750706&r2=1750707&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java Wed Jun 29 19:54:08 2016
@@ -110,8 +110,7 @@ public class JAASCallbackHandler impleme
/**
* The string manager for this package.
*/
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(JAASCallbackHandler.class);
/**
* The password to be authenticated with.
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=1750707&r1=1750706&r2=1750707&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Wed Jun 29 19:54:08 2016
@@ -31,6 +31,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Container;
@@ -106,8 +107,7 @@ public abstract class RealmBase extends
/**
* The string manager for this package.
*/
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(RealmBase.class);
/**
@@ -963,7 +963,7 @@ public abstract class RealmBase extends
log.debug(" No applicable user data constraint defined");
return true;
}
- if (userConstraint.equals(Constants.NONE_TRANSPORT)) {
+ if (userConstraint.equals(TransportGuarantee.NONE.name())) {
if (log.isDebugEnabled())
log.debug(" User data constraint has no restrictions");
return true;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org