This is an automated email from the ASF dual-hosted git repository. dklco pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-auth-form.git
The following commit(s) were added to refs/heads/master by this push: new 3eaa922 Updating to consistently use the annotation method defaults rather than the annotation defaultValue 3eaa922 is described below commit 3eaa922bdc0b66cdc3f4f8edf0862067cdd1bfc3 Author: Dan Klco <dk...@apache.org> AuthorDate: Thu May 17 10:26:43 2018 -0700 Updating to consistently use the annotation method defaults rather than the annotation defaultValue --- .../form/impl/FormAuthenticationHandlerConfig.java | 67 ++++++++++++---------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerConfig.java b/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerConfig.java index cbc0d86..719d0dd 100644 --- a/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerConfig.java +++ b/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerConfig.java @@ -31,56 +31,61 @@ import org.osgi.service.metatype.annotations.Option; @ObjectClassDefinition(name = "%auth.form.name", description = "%auth.form.description") public @interface FormAuthenticationHandlerConfig { + public static final int DEFAULT_JAAS_RANKING = 1000; public static final String AUTH_STORAGE_SESSION_ATTRIBUTE = "session"; + public static final String DEEFAULT_JAAS_CONTROL_FLAG = "sufficient"; + public static final String DEFAULT_AUTH_CREDENTIALS_NAME = "sling.formauth"; + public static final String DEFAULT_AUTH_FORM_STORAGE = "cookie"; public static final int DEFAULT_AUTH_TIMEOUT = 30; + public static final String DEFAULT_JAAS_REALM_NAME = "jackrabbit.oak"; + public static final String DEFAULT_FORM_TOKEN_FILE = "cookie-tokens.bin"; - @AttributeDefinition(defaultValue = "sling.formauth", name = "%authName.name", description = "%authName.description") - String form_auth_name(); + @AttributeDefinition(name = "%authName.name", description = "%authName.description") + String form_auth_name() default DEFAULT_AUTH_CREDENTIALS_NAME; - @AttributeDefinition(defaultValue = "cookie", options = { @Option(label = "Cookie", value = "cookie"), + @AttributeDefinition(options = { @Option(label = "Cookie", value = DEFAULT_AUTH_FORM_STORAGE), @Option(label = "Session Attribute", value = AUTH_STORAGE_SESSION_ATTRIBUTE) }, name = "%authStorage.name", description = "%authStorage.description") - String form_auth_storage(); + String form_auth_storage() default DEFAULT_AUTH_FORM_STORAGE; - @AttributeDefinition(defaultValue = "30", type = AttributeType.INTEGER, name = "%authTimeout.name", description = "%authTimeout.description") - int form_auth_timeout(); + @AttributeDefinition(type = AttributeType.INTEGER, name = "%authTimeout.name", description = "%authTimeout.description") + int form_auth_timeout() default DEFAULT_AUTH_TIMEOUT; - @AttributeDefinition(defaultValue = "sling.formauth", name = "%credentialsName.name", description = "%credentialsName.description") - String form_credentials_name(); + @AttributeDefinition(name = "%credentialsName.name", description = "%credentialsName.description") + String form_credentials_name() default DEFAULT_AUTH_CREDENTIALS_NAME; @AttributeDefinition(name = "%defaultCookieDomain.name", description = "%defaultCookieDomain.description") - String form_default_cookie_domain(); + String form_default_cookie_domain() default ""; - @AttributeDefinition(defaultValue = AuthenticationFormServlet.SERVLET_PATH, name = "%loginForm.name", description = "%loginForm.description") - String form_login_form(); + @AttributeDefinition(name = "%loginForm.name", description = "%loginForm.description") + String form_login_form() default AuthenticationFormServlet.SERVLET_PATH; - @AttributeDefinition(defaultValue = "false", type = AttributeType.BOOLEAN, name = "%onexpireLogin.name", description = "%onexpireLogin.description") - boolean form_onexpire_login(); + @AttributeDefinition(name = "%onexpireLogin.name", description = "%onexpireLogin.description") + boolean form_onexpire_login() default false; - @AttributeDefinition(defaultValue = "false", type = AttributeType.BOOLEAN, name = "%tokenFileFastseed.name", description = "%tokenFileFastseed.description") - boolean form_token_fastseed(); + @AttributeDefinition(type = AttributeType.BOOLEAN, name = "%tokenFileFastseed.name", description = "%tokenFileFastseed.description") + boolean form_token_fastseed() default false; - @AttributeDefinition(defaultValue = "cookie-tokens.bin", name = "%tokenFile.name", description = "%tokenFile.description") - String form_token_file(); + @AttributeDefinition(name = "%tokenFile.name", description = "%tokenFile.description") + String form_token_file() default DEFAULT_FORM_TOKEN_FILE; - @AttributeDefinition(defaultValue = "sufficient", options = { @Option(label = "Optional", value = "optional"), + @AttributeDefinition(options = { @Option(label = "Optional", value = "optional"), @Option(label = "Required", value = "required"), @Option(label = "Requisite", value = "requisite"), - @Option(label = "Sufficient", value = "sufficient") }, name = "%jaasControlFlag.name", description = "%jaasControlFlag.description") - String jaas_controlFlag(); + @Option(label = "Sufficient", value = DEEFAULT_JAAS_CONTROL_FLAG) }, name = "%jaasControlFlag.name", description = "%jaasControlFlag.description") + String jaas_controlFlag() default DEEFAULT_JAAS_CONTROL_FLAG; - @AttributeDefinition(defaultValue = "1000", type = AttributeType.INTEGER, name = "%jaasRanking.name", description = "%jaasRanking.description") - int jaas_ranking(); + @AttributeDefinition(type = AttributeType.INTEGER, name = "%jaasRanking.name", description = "%jaasRanking.description") + int jaas_ranking() default DEFAULT_JAAS_RANKING; - @AttributeDefinition(defaultValue = "jackrabbit.oak", name = "%jaasRealm.name", description = "%jaasRealm.description") - String jaas_realmName(); + @AttributeDefinition(name = "%jaasRealm.name", description = "%jaasRealm.description") + String jaas_realmName() default DEFAULT_JAAS_REALM_NAME; - @AttributeDefinition(defaultValue = { - "/" }, cardinality = Integer.MAX_VALUE, name = "%path.name", description = "%path.description") - String[] path(); + @AttributeDefinition(cardinality = Integer.MAX_VALUE, name = "%path.name", description = "%path.description") + String[] path() default { "/" }; - @AttributeDefinition(defaultValue = "0", type = AttributeType.INTEGER, name = "%service.ranking.name", description = "%service.ranking.description") - int service_ranking(); + @AttributeDefinition(type = AttributeType.INTEGER, name = "%service.ranking.name", description = "%service.ranking.description") + int service_ranking() default 0; - @AttributeDefinition(defaultValue = "false", type = AttributeType.BOOLEAN, name = "%useInclude.name", description = "%useInclude.description") - boolean useInclude(); + @AttributeDefinition(type = AttributeType.BOOLEAN, name = "%useInclude.name", description = "%useInclude.description") + boolean useInclude() default false; } -- To stop receiving notification emails like this one, please contact dk...@apache.org.