rename UserConfiguration to DefaultUserConfiguration to be able to extract an interface

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1414451 13f79535-47bb-0310-9956-ffa450edef68

30 files changed, 56 insertions, 57 deletions

diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
index fa50c4654..b8b057058 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
@@ -21,7 +21,7 @@ package org.apache.archiva.redback.authentication.ldap;
 
 import org.apache.archiva.redback.common.ldap.UserMapper;
 import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.redback.authentication.AuthenticationDataSource;
 import org.apache.archiva.redback.authentication.AuthenticationException;
@@ -65,7 +65,7 @@ public class LdapBindAuthenticator
 
     @Inject
     @Named( value = "userConfiguration" )
-    private UserConfiguration config;
+    private DefaultUserConfiguration config;
 
     @Inject
     private LdapCacheService ldapCacheService;
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
index d923b30cb..ba7d70010 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
@@ -56,7 +56,7 @@
     <property name="userConf" ref="userConfiguration"/>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration"
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
       init-method="initialize">
     <property name="configs">
       <list>
diff --git a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
index eeb1cf681..2d3caf682 100644
--- a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
+++ b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.common.jdo;
  */
 
 import org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory;
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.interpolation.InterpolationException;
 import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
@@ -48,7 +48,7 @@ public class UserConfigurableJdoFactory
 
     @Inject
     @Named( value = "userConfiguration" )
-    private UserConfiguration config;
+    private DefaultUserConfiguration config;
 
     private String getConfigString( String key, String currentValue, String defaultValue )
     {
@@ -116,12 +116,12 @@ public class UserConfigurableJdoFactory
         super.initialize();
     }
 
-    public UserConfiguration getConfig()
+    public DefaultUserConfiguration getConfig()
     {
         return config;
     }
 
-    public void setConfig( UserConfiguration config )
+    public void setConfig( DefaultUserConfiguration config )
     {
         this.config = config;
     }
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
index 3add782ae..5e65658b4 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.common.ldap;
  * under the License.
  */
 
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.apache.archiva.redback.users.User;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
@@ -81,7 +81,7 @@ public class LdapUserMapper
 
     @Inject
     @Named( value = "userConfiguration" )
-    private UserConfiguration userConf;
+    private DefaultUserConfiguration userConf;
 
     @PostConstruct
     public void initialize()
@@ -301,12 +301,12 @@ public class LdapUserMapper
             getPasswordAttribute() };
     }
 
-    public UserConfiguration getUserConf()
+    public DefaultUserConfiguration getUserConf()
     {
         return userConf;
     }
 
-    public void setUserConf( UserConfiguration userConf )
+    public void setUserConf( DefaultUserConfiguration userConf )
     {
         this.userConf = userConf;
     }
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
index 2d6861f6e..ff7403345 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.common.ldap.connection;
  * under the License.
  */
 
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
@@ -90,7 +90,7 @@ public class ConfigurableLdapConnectionFactory
 
     @Inject
     @Named( value = "userConfiguration" )
-    private UserConfiguration userConf;
+    private DefaultUserConfiguration userConf;
 
     // ----------------------------------------------------------------------
     // Component Lifecycle
@@ -267,12 +267,12 @@ public class ConfigurableLdapConnectionFactory
         this.extraProperties = extraProperties;
     }
 
-    public UserConfiguration getUserConf()
+    public DefaultUserConfiguration getUserConf()
     {
         return userConf;
     }
 
-    public void setUserConf( UserConfiguration userConf )
+    public void setUserConf( DefaultUserConfiguration userConf )
     {
         this.userConf = userConf;
     }
diff --git a/redback-common/redback-common-ldap/src/test/resources/spring-context.xml b/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
index 1181c9f3c..6bb89bcf2 100644
--- a/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
+++ b/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
@@ -23,7 +23,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="configs">
       <list>
         <value>src/test/resources/test.properties</value>
diff --git a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
index f6fd48651..bf1c43d5d 100644
--- a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
+++ b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
@@ -42,7 +42,7 @@ import java.util.List;
  *
  */
 @Service( "userConfiguration" )
-public class UserConfiguration
+public class DefaultUserConfiguration
 {
     private static final String DEFAULT_CONFIG_RESOURCE = "org/apache/archiva/redback/config-defaults.properties";
 
diff --git a/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java b/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
index 63aec7455..d87b52874 100644
--- a/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java
+++ b/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
@@ -20,7 +20,6 @@ package org.apache.archiva.redback.configuration;
  */
 
 import junit.framework.TestCase;
-import org.apache.archiva.redback.configuration.UserConfiguration;
 import org.codehaus.plexus.util.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,19 +30,19 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 /**
- * UserConfigurationTest
+ * DefaultUserConfigurationTest
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  *
  */
 @RunWith( SpringJUnit4ClassRunner.class )
 @ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
-public class UserConfigurationTest
+public class DefaultUserConfigurationTest
     extends TestCase
 {
 
     @Inject  @Named(value = "test")
-    UserConfiguration config;
+    DefaultUserConfiguration config;
 
     private void assertEmpty( String str )
     {
diff --git a/redback-configuration/src/test/resources/META-INF/spring-context.xml b/redback-configuration/src/test/resources/META-INF/spring-context.xml
index 05f746cd3..5db29e960 100644
--- a/redback-configuration/src/test/resources/META-INF/spring-context.xml
+++ b/redback-configuration/src/test/resources/META-INF/spring-context.xml
@@ -27,7 +27,7 @@
        default-lazy-init="true">
 
 
-  <bean name="test" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="test" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="configs">
       <list>
         <value>src/test/resources/props/test-another.properties</value>
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
index fce83a1b0..64c7ebb52 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.integration.checks.security;
  */
 
 import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.apache.archiva.redback.rbac.RBACManager;
 import org.apache.archiva.redback.role.RoleManager;
 import org.apache.archiva.redback.role.RoleManagerException;
@@ -68,7 +68,7 @@ public class AdminAutoCreateCheck
     private UserManager userManager;
 
     @Inject
-    private UserConfiguration config;
+    private DefaultUserConfiguration config;
 
     @Inject
     protected SecuritySystem securitySystem;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
index efba805ac..d5c8a4486 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
@@ -33,7 +33,7 @@ import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.policy.UserSecurityPolicy;
 import org.apache.archiva.redback.policy.UserValidationSettings;
@@ -66,7 +66,7 @@ public class MailerImpl
     private SecuritySystem securitySystem;
 
     @Inject  @Named(value="userConfiguration")
-    private UserConfiguration config;
+    private DefaultUserConfiguration config;
 
     public void sendAccountValidationEmail( Collection<String> recipients, AuthenticationKey authkey, String baseUrl )
     {
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
index eb5ed2ca7..d2e626f09 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
@@ -25,7 +25,7 @@ import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -50,7 +50,7 @@ public class VelocityMailGenerator
 
     @Inject
     @Named( value = "userConfiguration" )
-    private UserConfiguration config;
+    private DefaultUserConfiguration config;
 
     // FIXME use the spring directly 
     @Inject
@@ -130,12 +130,12 @@ public class VelocityMailGenerator
     }
 
 
-    public UserConfiguration getConfig()
+    public DefaultUserConfiguration getConfig()
     {
         return config;
     }
 
-    public void setConfig( UserConfiguration config )
+    public void setConfig( DefaultUserConfiguration config )
     {
         this.config = config;
     }
diff --git a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
index 6285b3562..2b706ba84 100644
--- a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
+++ b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
@@ -42,7 +42,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration#custom-url" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="userConfiguration#custom-url" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="configs">
       <list>
         <value>src/test/config/mail.properties</value>
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
index 0f1563133..3daca92ef 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
@@ -23,7 +23,7 @@ import net.sf.ehcache.CacheManager;
 import org.apache.archiva.redback.authentication.AuthenticationException;
 import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
 import org.apache.archiva.redback.components.cache.Cache;
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
 import org.apache.archiva.redback.integration.mail.Mailer;
 import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
@@ -87,7 +87,7 @@ public class DefaultUserService
     private SecuritySystem securitySystem;
 
     @Inject
-    private UserConfiguration config;
+    private DefaultUserConfiguration config;
 
     @Inject
     private RoleManager roleManager;
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
index 5d92085c5..0807c437d 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
@@ -19,9 +19,9 @@ package org.apache.archiva.redback.rest.services;
  * under the License.
  */
 
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.apache.archiva.redback.rbac.RBACManager;
 import org.apache.archiva.redback.users.UserManager;
-import org.apache.archiva.redback.configuration.UserConfiguration;
 import org.apache.archiva.redback.role.RoleManager;
 import org.apache.archiva.redback.rest.api.services.UserService;
 
@@ -44,7 +44,7 @@ public class FakeCreateAdminServiceImpl
     private UserManager userManager;
 
     @Inject
-    private UserConfiguration config;
+    private DefaultUserConfiguration config;
 
     @Inject
     private RoleManager roleManager;
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
index 24a2c9222..906a0fd48 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
@@ -27,7 +27,7 @@
            http://cxf.apache.org/jaxrs
            http://cxf.apache.org/schemas/jaxrs.xsd">
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration"
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
       init-method="initialize">
     <property name="configs">
       <list>
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
index 384e015a4..5d60d1dcf 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
@@ -40,7 +40,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
index 9b6c1e6b2..38e6ca73a 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
@@ -36,7 +36,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
index 87b23844c..ab0f46bca 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.policy;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 
 /**
  * Base class for cookie settings. These will only differ by their configuration keys.
@@ -35,7 +35,7 @@ public abstract class AbstractCookieSettings
     implements CookieSettings
 {
     @Inject @Named(value="userConfiguration")
-    protected UserConfiguration config;
+    protected DefaultUserConfiguration config;
 
     /**
      * Timeout (in minutes) for the sign on cookie.
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
index b393a7667..cc7d4cc3a 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.policy;
  * under the License.
  */
 
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.policy.rules.MustHavePasswordRule;
 import org.slf4j.Logger;
@@ -65,7 +65,7 @@ public class DefaultUserSecurityPolicy
 
     @Inject
     @Named( value = "userConfiguration" )
-    private UserConfiguration config;
+    private DefaultUserConfiguration config;
 
     @Inject
     @Named( value = "passwordEncoder#sha256" )
@@ -402,12 +402,12 @@ public class DefaultUserSecurityPolicy
         return signonCookieSettings;
     }
 
-    public UserConfiguration getConfig()
+    public DefaultUserConfiguration getConfig()
     {
         return config;
     }
 
-    public void setConfig( UserConfiguration config )
+    public void setConfig( DefaultUserConfiguration config )
     {
         this.config = config;
     }
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
index 9b913fc82..b86f532ea 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.policy;
  * under the License.
  */
 
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
@@ -36,7 +36,7 @@ public class DefaultUserValidationSettings
     implements UserValidationSettings
 {
     @Resource (name="userConfiguration")
-    private UserConfiguration config;
+    private DefaultUserConfiguration config;
 
     private boolean emailValidationRequired;
 
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
index 73183e0ed..ec965e890 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
@@ -16,7 +16,7 @@ package org.apache.archiva.redback.policy.rules;
  * limitations under the License.
  */
 
-import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.apache.archiva.redback.policy.PasswordRule;
 
 import javax.inject.Inject;
@@ -34,7 +34,7 @@ public abstract class AbstractPasswordRule
     protected boolean enabled = true;
 
     @Inject @Named (value="userConfiguration")
-    protected UserConfiguration config;
+    protected DefaultUserConfiguration config;
 
     public boolean isEnabled()
     {
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
index 205285159..bc04bd968 100755
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
@@ -38,7 +38,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
index 878d20ed2..9699fe7f7 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
@@ -41,7 +41,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
index 39f03401f..5fea76993 100755
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
@@ -37,7 +37,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
index f89806a21..9ffa44202 100644
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
@@ -70,7 +70,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
index 230f31465..5311b6249 100755
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
@@ -39,7 +39,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-system/src/test/resources/spring-context.xml b/redback-system/src/test/resources/spring-context.xml
index 9b6c1e6b2..38e6ca73a 100644
--- a/redback-system/src/test/resources/spring-context.xml
+++ b/redback-system/src/test/resources/spring-context.xml
@@ -36,7 +36,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 
diff --git a/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java b/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
index beee4dd84..f263eb1a2 100644
--- a/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
@@ -16,11 +16,11 @@ package org.apache.archiva.redback.users.configurable;
  * limitations under the License.
  */
 
+import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
 import org.apache.archiva.redback.users.AbstractUserManager;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.users.UserNotFoundException;
-import org.apache.archiva.redback.configuration.UserConfiguration;
 import org.apache.archiva.redback.users.UserQuery;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -40,7 +40,7 @@ public class ConfigurableUserManager
 {
     @Inject
     @Named( value = "userConfiguration" )
-    private UserConfiguration config;
+    private DefaultUserConfiguration config;
 
     @Inject
     private ApplicationContext applicationContext;
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
index 6b40351b5..2db3f24aa 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
@@ -34,7 +34,7 @@
     <property name="password" value=""/>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
+  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>