extract an interface to be able to override the impl in archiva

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

3 files changed, 8 insertions, 8 deletions

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 64c7ebb52..fce83a1b0 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.DefaultUserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
 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 DefaultUserConfiguration config;
+    private UserConfiguration 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 d5c8a4486..efba805ac 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.DefaultUserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
 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 DefaultUserConfiguration config;
+    private UserConfiguration 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 d2e626f09..ce97cc452 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
@@ -19,13 +19,13 @@ package org.apache.archiva.redback.integration.mail;
  * under the License.
  */
 
+import org.apache.archiva.redback.configuration.UserConfiguration;
 import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.velocity.VelocityContext;
 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.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 DefaultUserConfiguration config;
+    private UserConfiguration config;
 
     // FIXME use the spring directly 
     @Inject
@@ -130,12 +130,12 @@ public class VelocityMailGenerator
     }
 
 
-    public DefaultUserConfiguration getConfig()
+    public UserConfiguration getConfig()
     {
         return config;
     }
 
-    public void setConfig( DefaultUserConfiguration config )
+    public void setConfig( UserConfiguration config )
     {
         this.config = config;
     }