From f5554e04525667ba0c1ebb61dc5e0af5bf6b11e1 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 4 Jan 2013 14:56:08 +0000 Subject: [PATCH] align constants names git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1428909 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/redback/configuration/UserConfigurationKeys.java | 4 ++-- .../archiva/redback/policy/RememberMeCookieSettings.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java index d6f0fd93..b6d401d9 100644 --- a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java +++ b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java @@ -46,9 +46,9 @@ public interface UserConfigurationKeys String REMEMBER_ME_ENABLED = "security.rememberme.enabled"; - String REMEMBERME_TIMEOUT = "security.rememberme.timeout"; + String REMEMBER_ME_TIMEOUT = "security.rememberme.timeout"; - String REMEMBERME_SECURE = "security.rememberme.secure"; + String REMEMBER_ME_SECURE = "security.rememberme.secure"; String SIGNON_DOMAIN = "security.signon.domain"; diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java index d43f9f9a..130d348b 100644 --- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java +++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java @@ -20,7 +20,6 @@ */ import org.apache.archiva.redback.configuration.UserConfigurationKeys; -import org.apache.archiva.redback.policy.AbstractCookieSettings; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @@ -44,10 +43,10 @@ public boolean isEnabled() @PostConstruct public void initialize() { - this.cookieTimeout = config.getInt( UserConfigurationKeys.REMEMBERME_TIMEOUT ); + this.cookieTimeout = config.getInt( UserConfigurationKeys.REMEMBER_ME_TIMEOUT ); this.domain = config.getString( UserConfigurationKeys.REMEMBER_ME_DOMAIN ); this.path = config.getString( UserConfigurationKeys.REMEMBER_ME_PATH ); this.enabled = config.getBoolean( UserConfigurationKeys.REMEMBER_ME_ENABLED ); - config.getBoolean( UserConfigurationKeys.REMEMBERME_SECURE, false ); + config.getBoolean( UserConfigurationKeys.REMEMBER_ME_SECURE, false ); } }