This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 17ffce9c91f76d08ea63c8aae19e654c5014cdb5 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Dec 5 19:59:47 2019 +0000 Clean-up. No functional change. --- .../apache/catalina/authenticator/Constants.java | 44 ++++++---------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/java/org/apache/catalina/authenticator/Constants.java b/java/org/apache/catalina/authenticator/Constants.java index 5e75c2c..d5126cc 100644 --- a/java/org/apache/catalina/authenticator/Constants.java +++ b/java/org/apache/catalina/authenticator/Constants.java @@ -14,11 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.authenticator; - public class Constants { // Authentication methods for login configuration // Servlet spec schemes are defined in HttpServletRequest @@ -33,23 +30,18 @@ public class Constants { // SPNEGO authentication constants public static final String KRB5_CONF_PROPERTY = "java.security.krb5.conf"; public static final String DEFAULT_KRB5_CONF = "conf/krb5.ini"; - public static final String JAAS_CONF_PROPERTY = - "java.security.auth.login.config"; + public static final String JAAS_CONF_PROPERTY = "java.security.auth.login.config"; public static final String DEFAULT_JAAS_CONF = "conf/jaas.conf"; - public static final String DEFAULT_LOGIN_MODULE_NAME = - "com.sun.security.jgss.krb5.accept"; + public static final String DEFAULT_LOGIN_MODULE_NAME = "com.sun.security.jgss.krb5.accept"; /** * @deprecated Unused. Will be removed in Tomcat 9. */ @Deprecated - public static final String USE_SUBJECT_CREDS_ONLY_PROPERTY = - "javax.security.auth.useSubjectCredsOnly"; + public static final String USE_SUBJECT_CREDS_ONLY_PROPERTY = "javax.security.auth.useSubjectCredsOnly"; // Cookie name for single sign on support - public static final String SINGLE_SIGN_ON_COOKIE = - System.getProperty( - "org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME", - "JSESSIONIDSSO"); + public static final String SINGLE_SIGN_ON_COOKIE = System.getProperty( + "org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME", "JSESSIONIDSSO"); // --------------------------------------------------------- Request Notes @@ -58,17 +50,13 @@ public class Constants { * The notes key to track the single-sign-on identity with which this * request is associated. */ - public static final String REQ_SSOID_NOTE = - "org.apache.catalina.request.SSOID"; + public static final String REQ_SSOID_NOTE = "org.apache.catalina.request.SSOID"; - - public static final String REQ_JASPIC_SUBJECT_NOTE = - "org.apache.catalina.authenticator.jaspic.SUBJECT"; + public static final String REQ_JASPIC_SUBJECT_NOTE = "org.apache.catalina.authenticator.jaspic.SUBJECT"; // ---------------------------------------------------------- Session Notes - /** * If the <code>cache</code> property of our authenticator is set, and * the current request is part of a session, authentication information @@ -76,19 +64,15 @@ public class Constants { * <code>Realm.authenticate()</code>, under the following keys: */ - /** * The notes key for the password used to authenticate this user. */ - public static final String SESS_PASSWORD_NOTE = - "org.apache.catalina.session.PASSWORD"; - + public static final String SESS_PASSWORD_NOTE = "org.apache.catalina.session.PASSWORD"; /** * The notes key for the username used to authenticate this user. */ - public static final String SESS_USERNAME_NOTE = - "org.apache.catalina.session.USERNAME"; + public static final String SESS_USERNAME_NOTE = "org.apache.catalina.session.USERNAME"; /** @@ -96,20 +80,14 @@ public class Constants { * cache required information prior to the completion of authentication. */ - /** * The previously authenticated principal (if caching is disabled). */ - public static final String FORM_PRINCIPAL_NOTE = - "org.apache.catalina.authenticator.PRINCIPAL"; - + public static final String FORM_PRINCIPAL_NOTE = "org.apache.catalina.authenticator.PRINCIPAL"; /** * The original request information, to which the user will be * redirected if authentication succeeds. */ - public static final String FORM_REQUEST_NOTE = - "org.apache.catalina.authenticator.REQUEST"; - - + public static final String FORM_REQUEST_NOTE = "org.apache.catalina.authenticator.REQUEST"; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org