diff --git a/redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java b/redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java
index 3df18005..2c72d8ad 100644
--- a/redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java
+++ b/redback-data-management/src/main/java/org/apache/archiva/redback/management/DataManagementTool.java
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.management;
  */
 
 import org.apache.archiva.redback.users.UserManager;
-import org.codehaus.plexus.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.KeyManager;
 import org.codehaus.plexus.redback.rbac.RBACManager;
 import org.codehaus.plexus.redback.rbac.RbacManagerException;
 
diff --git a/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java b/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
index c0cb6893..c9460d92 100644
--- a/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
+++ b/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
@@ -34,11 +34,10 @@ import java.util.Map;
 
 import javax.xml.stream.XMLStreamException;
 
-import org.apache.archiva.redback.management.DataManagementTool;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManager;
 import org.apache.archiva.redback.users.UserManager;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyManagerException;
 import org.codehaus.plexus.redback.keys.jdo.AuthenticationKeyDatabase;
 import org.codehaus.plexus.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxReader;
 import org.codehaus.plexus.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxWriter;
diff --git a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
index 65408920..d8ba8b8e 100644
--- a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
+++ b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
@@ -21,12 +21,11 @@ package org.apache.archiva.redback.management;
 
 import junit.framework.TestCase;
 import org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory;
-import org.apache.archiva.redback.management.DataManagementTool;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManager;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.commons.lang.SystemUtils;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyManagerException;
 import org.codehaus.plexus.redback.rbac.Permission;
 import org.codehaus.plexus.redback.rbac.RBACManager;
 import org.codehaus.plexus.redback.rbac.RbacManagerException;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java
index 7796a86c..84725829 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java
@@ -19,7 +19,7 @@ package org.codehaus.redback.integration.mail;
  * under the License.
  */
 
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.AuthenticationKey;
 
 /**
  * Mail generator component.
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java
index 3aa3240f..04aff225 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java
@@ -19,7 +19,7 @@ package org.codehaus.redback.integration.mail;
  * under the License.
  */
 
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.AuthenticationKey;
 
 import java.util.Collection;
 
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java
index 0c30a13d..e1e3f70f 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java
@@ -34,7 +34,7 @@ import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 
 import org.apache.archiva.redback.configuration.UserConfiguration;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
 import org.codehaus.plexus.redback.policy.UserValidationSettings;
 import org.codehaus.plexus.redback.system.SecuritySystem;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java
index 10b94128..c714d156 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java
@@ -19,13 +19,13 @@ package org.codehaus.redback.integration.mail;
  * under the License.
  */
 
+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.UserConfiguration;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java
index a78611d8..d0af0df7 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java
@@ -24,10 +24,10 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
-import org.codehaus.plexus.redback.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
 import org.codehaus.plexus.redback.policy.CookieSettings;
 import org.codehaus.plexus.redback.system.SecuritySystem;
 import org.codehaus.plexus.util.StringUtils;
diff --git a/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java b/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java
index 5814ffe9..f6f69891 100644
--- a/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java
+++ b/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java
@@ -21,11 +21,10 @@ package org.codehaus.redback.integration.mail;
 
 import junit.framework.TestCase;
 import net.sf.ehcache.CacheManager;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManager;
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
-import org.codehaus.plexus.jdo.JdoFactory;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyManagerException;
 import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
 import org.jpox.SchemaTool;
 import org.junit.Before;
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
index e81e83a3..f9cf6506 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
@@ -19,10 +19,10 @@ package org.codehaus.redback.rest.services;
  * under the License.
  */
 import org.apache.archiva.redback.authentication.AuthenticationException;
+import org.apache.archiva.redback.keys.KeyManager;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey;
 import org.codehaus.plexus.redback.keys.memory.MemoryAuthenticationKey;
 import org.codehaus.plexus.redback.keys.memory.MemoryKeyManager;
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
index 00a9c4d3..f3088184 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
@@ -20,8 +20,8 @@ package org.codehaus.redback.rest.services;
 
 import org.apache.archiva.redback.users.User;
 import org.apache.commons.lang.StringUtils;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManagerException;
 import org.codehaus.plexus.redback.policy.PasswordEncoder;
 import org.codehaus.plexus.redback.policy.PasswordRuleViolationException;
 import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
index 7272a529..cf167faf 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
@@ -21,16 +21,16 @@ package org.codehaus.redback.rest.services;
 
 import net.sf.ehcache.CacheManager;
 import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.cache.Cache;
 import org.apache.archiva.redback.authentication.AuthenticationException;
 import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
-import org.codehaus.plexus.redback.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
 import org.codehaus.plexus.redback.policy.AccountLockedException;
 import org.codehaus.plexus.redback.policy.MustChangePasswordException;
 import org.codehaus.plexus.redback.policy.PasswordEncoder;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
index 4d1be692..ccf43e89 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
@@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.struts2.action;
  * under the License.
  */
 
+import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.users.User;
 import org.apache.struts2.ServletActionContext;
 import org.apache.archiva.redback.authentication.AuthenticationConstants;
@@ -28,9 +29,8 @@ import org.apache.archiva.redback.authentication.AuthenticationResult;
 import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
 import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
 import org.apache.archiva.redback.configuration.UserConfiguration;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
-import org.codehaus.plexus.redback.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
 import org.codehaus.plexus.redback.policy.AccountLockedException;
 import org.codehaus.plexus.redback.policy.MustChangePasswordException;
 import org.codehaus.plexus.redback.system.SecuritySession;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java
index e450e3ac..81235f95 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java
@@ -19,11 +19,11 @@ package org.codehaus.plexus.redback.struts2.action;
  * under the License.
  */
 
+import org.apache.archiva.redback.keys.KeyManager;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManagerException;
 import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
 import org.codehaus.plexus.redback.system.SecuritySystem;
 import org.apache.archiva.redback.users.User;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
index 41499765..f5873e12 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
@@ -19,9 +19,9 @@ package org.codehaus.plexus.redback.struts2.action;
  * under the License.
  */
 
+import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.users.User;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyManagerException;
 import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
 import org.codehaus.plexus.redback.role.RoleManager;
 import org.codehaus.plexus.redback.role.RoleManagerException;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java
index 04fbaa7f..871da592 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java
@@ -21,7 +21,7 @@ package org.codehaus.plexus.redback.struts2.action.admin;
 
 import com.opensymphony.xwork2.Preparable;
 import org.apache.commons.lang.StringUtils;
-import org.codehaus.plexus.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.KeyManager;
 import org.apache.archiva.redback.management.DataManagementTool;
 import org.codehaus.plexus.redback.rbac.RBACManager;
 import org.codehaus.plexus.redback.rbac.Resource;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java
index 40d2ce61..3677c7e6 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java
@@ -22,11 +22,11 @@ package org.codehaus.plexus.redback.struts2.interceptor;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.interceptor.Interceptor;
+import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.struts2.ServletActionContext;
 import org.apache.archiva.redback.authentication.AuthenticationException;
 import org.apache.archiva.redback.authentication.AuthenticationResult;
 import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
 import org.codehaus.plexus.redback.policy.AccountLockedException;
 import org.codehaus.plexus.redback.policy.MustChangePasswordException;
 import org.codehaus.plexus.redback.system.SecuritySession;
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml
index 79fb9a89..1705a1fc 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml
@@ -87,13 +87,13 @@
       </requirements>
     </component>
     <component>
-      <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+      <role>org.apache.archiva.redback.keys.KeyManager</role>
       <role-hint>cached</role-hint>
       <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
       <description>CachedKeyManager</description>
       <requirements>
         <requirement>
-          <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+          <role>org.apache.archiva.redback.keys.KeyManager</role>
           <role-hint>memory</role-hint>
           <field-name>keyImpl</field-name>
         </requirement>
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml
index 79fb9a89..1705a1fc 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml
@@ -87,13 +87,13 @@
       </requirements>
     </component>
     <component>
-      <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+      <role>org.apache.archiva.redback.keys.KeyManager</role>
       <role-hint>cached</role-hint>
       <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
       <description>CachedKeyManager</description>
       <requirements>
         <requirement>
-          <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+          <role>org.apache.archiva.redback.keys.KeyManager</role>
           <role-hint>memory</role-hint>
           <field-name>keyImpl</field-name>
         </requirement>
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
index 62e3d199..aa9e4614 100755
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
@@ -122,13 +122,13 @@
   </bean>
   <!--
     <component>
-      <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+      <role>org.apache.archiva.redback.keys.KeyManager</role>
       <role-hint>cached</role-hint>
       <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation>
       <description>CachedKeyManager</description>
       <requirements>
         <requirement>
-          <role>org.codehaus.plexus.redback.keys.KeyManager</role>
+          <role>org.apache.archiva.redback.keys.KeyManager</role>
           <role-hint>memory</role-hint>
           <field-name>keyImpl</field-name>
         </requirement>
diff --git a/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java b/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java
index 217422e7..f2906879 100644
--- a/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java
+++ b/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java
@@ -24,10 +24,10 @@ import org.apache.archiva.redback.authentication.AuthenticationException;
 import org.apache.archiva.redback.authentication.AuthenticationResult;
 import org.apache.archiva.redback.authentication.Authenticator;
 import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
-import org.codehaus.plexus.redback.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
 import org.codehaus.plexus.redback.policy.AccountLockedException;
 import org.codehaus.plexus.redback.policy.MustChangePasswordException;
 import org.apache.archiva.redback.users.User;
diff --git a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AbstractKeyManager.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
similarity index 99%
rename from redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AbstractKeyManager.java
rename to redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
index 845417fb..e5d74bc6 100644
--- a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AbstractKeyManager.java
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys;
+package org.apache.archiva.redback.keys;
 
 /*
  * Copyright 2001-2006 The Apache Software Foundation.
diff --git a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AuthenticationKey.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
similarity index 71%
rename from redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AuthenticationKey.java
rename to redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
index 96d152e5..1ddf00d8 100644
--- a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AuthenticationKey.java
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys;
+package org.apache.archiva.redback.keys;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,32 +22,39 @@ package org.codehaus.plexus.redback.keys;
 import java.util.Date;
 
 /**
- * AuthenticationKey is an object representing a key established to 
+ * AuthenticationKey is an object representing a key established to
  * automatically authenticate a user without the user providing typical
- * login credentials.  
+ * login credentials.
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @version $Id$
  */
 public interface AuthenticationKey
 {
-    public Date getDateCreated();
-    public Date getDateExpires();
-    public String getForPrincipal();
-    public String getKey();
-    
+    Date getDateCreated();
+
+    Date getDateExpires();
+
+    String getForPrincipal();
+
+    String getKey();
+
     /**
      * A String representation of what the purpose of existence is for this key.
-     * 
+     * <p/>
      * Examples: "selfservice password reset", "inter system communications", "remember me"
-     * 
+     *
      * @return
      */
-    public String getPurpose();
-    
-    public void setDateCreated( Date dateCreated );
-    public void setDateExpires( Date dateExpires );
-    public void setForPrincipal( String forPrincipal );
-    public void setKey( String key );
-    public void setPurpose( String requestedFrom );
+    String getPurpose();
+
+    void setDateCreated( Date dateCreated );
+
+    void setDateExpires( Date dateExpires );
+
+    void setForPrincipal( String forPrincipal );
+
+    void setKey( String key );
+
+    void setPurpose( String requestedFrom );
 }
diff --git a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManager.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
similarity index 98%
rename from redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManager.java
rename to redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
index 2a93e215..4853080a 100644
--- a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManager.java
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys;
+package org.apache.archiva.redback.keys;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerException.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java
similarity index 96%
rename from redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerException.java
rename to redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java
index ed3f0b17..1cf53446 100644
--- a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerException.java
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys;
+package org.apache.archiva.redback.keys;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyNotFoundException.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
similarity index 91%
rename from redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyNotFoundException.java
rename to redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
index 0a541aa3..f43d2486 100644
--- a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyNotFoundException.java
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys;
+package org.apache.archiva.redback.keys;
 
 /*
  * Copyright 2001-2006 The Apache Software Foundation.
@@ -16,6 +16,8 @@ package org.codehaus.plexus.redback.keys;
  * limitations under the License.
  */
 
+import org.apache.archiva.redback.keys.KeyManagerException;
+
 /**
  * KeyNotFoundException 
  *
diff --git a/redback-keys/redback-keys-api/src/test/java/org/codehaus/plexus/redback/keys/KeyManagerTest.java b/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java
similarity index 90%
rename from redback-keys/redback-keys-api/src/test/java/org/codehaus/plexus/redback/keys/KeyManagerTest.java
rename to redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java
index d0946ce2..56258bd1 100644
--- a/redback-keys/redback-keys-api/src/test/java/org/codehaus/plexus/redback/keys/KeyManagerTest.java
+++ b/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys;
+package org.apache.archiva.redback.keys;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,10 @@ package org.codehaus.plexus.redback.keys;
 import java.util.List;
 
 import junit.framework.TestCase;
+import org.apache.archiva.redback.keys.AbstractKeyManager;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
 
 public class KeyManagerTest
     extends TestCase
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java
index 43e8e416..7c1ea5c9 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManager.java
@@ -21,16 +21,15 @@ package org.codehaus.plexus.redback.keys.cached;
 
 import java.util.List;
 
-import javax.annotation.Resource;
 import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.redback.keys.AbstractKeyManager;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManager;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
-import org.codehaus.plexus.redback.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.AbstractKeyManager;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java
index 39c9a92c..aaea8628 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/codehaus/plexus/redback/keys/cached/CachedKeyManagerTest.java
@@ -20,7 +20,7 @@ package org.codehaus.plexus.redback.keys.cached;
  */
 
 import net.sf.ehcache.CacheManager;
-import org.codehaus.plexus.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.KeyManager;
 import org.codehaus.plexus.redback.keys.KeyManagerTestCase;
 import org.junit.Before;
 
diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java
index d159b83d..3235841c 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManager.java
@@ -19,14 +19,14 @@ package org.codehaus.plexus.redback.keys.jdo;
  * under the License.
  */
 
+import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.codehaus.plexus.jdo.JdoFactory;
 import org.codehaus.plexus.jdo.PlexusJdoUtils;
 import org.codehaus.plexus.jdo.PlexusObjectNotFoundException;
 import org.codehaus.plexus.jdo.PlexusStoreException;
-import org.codehaus.plexus.redback.keys.AbstractKeyManager;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
-import org.codehaus.plexus.redback.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.AbstractKeyManager;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
 import org.codehaus.plexus.util.StringUtils;
 import org.jpox.PersistenceManagerFactoryImpl;
 import org.springframework.stereotype.Service;
diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
index 15557f46..e0986c0f 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
@@ -50,10 +50,10 @@
       <name>JdoAuthenticationKey</name>
       <version>1.0.0+</version>
       <interfaces>
-        <interface>org.codehaus.plexus.redback.keys.AuthenticationKey</interface>
+        <interface>org.apache.archiva.redback.keys.AuthenticationKey</interface>
       </interfaces>
       <description>
-        @plexus.component role="org.codehaus.plexus.redback.keys.AuthenticationKey"
+        @plexus.component role="org.apache.archiva.redback.keys.AuthenticationKey"
         role-hint="jdo"
       </description>
       <fields>
diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java
index fa757397..ec6a16de 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/codehaus/plexus/redback/keys/jdo/JdoKeyManagerTest.java
@@ -19,8 +19,8 @@ package org.codehaus.plexus.redback.keys.jdo;
  * under the License.
  */
 
+import org.apache.archiva.redback.keys.KeyManager;
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
-import org.codehaus.plexus.redback.keys.KeyManager;
 import org.codehaus.plexus.redback.keys.KeyManagerTestCase;
 import org.jpox.SchemaTool;
 import org.junit.Before;
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java
index 56901522..ead07ca5 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java
@@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.keys.memory;
  * under the License.
  */
 
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.AuthenticationKey;
 
 import java.util.Date;
 
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java
index 3934e588..4823f813 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java
@@ -19,10 +19,10 @@ package org.codehaus.plexus.redback.keys.memory;
  * under the License.
  */
 
-import org.codehaus.plexus.redback.keys.AbstractKeyManager;
-import org.codehaus.plexus.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.redback.keys.KeyManagerException;
-import org.codehaus.plexus.redback.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.AbstractKeyManager;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
 import org.codehaus.plexus.util.StringUtils;
 import org.springframework.stereotype.Service;
 
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java
index 4459ff4b..e1a502e0 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManagerTest.java
@@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.keys.memory;
  * under the License.
  */
 
-import org.codehaus.plexus.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.KeyManager;
 import org.codehaus.plexus.redback.keys.KeyManagerTestCase;
 import org.junit.Before;
 
diff --git a/redback-keys/redback-keys-tests/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerTestCase.java b/redback-keys/redback-keys-tests/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerTestCase.java
index d2ee02e7..adc3224e 100644
--- a/redback-keys/redback-keys-tests/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerTestCase.java
+++ b/redback-keys/redback-keys-tests/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerTestCase.java
@@ -17,6 +17,10 @@ package org.codehaus.plexus.redback.keys;
  */
 
 import junit.framework.TestCase;
+import org.apache.archiva.redback.keys.AuthenticationKey;
+import org.apache.archiva.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.KeyManagerException;
+import org.apache.archiva.redback.keys.KeyNotFoundException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java b/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java
index 862c66f0..553b839e 100644
--- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java
+++ b/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java
@@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.system;
  * under the License.
  */
 
+import org.apache.archiva.redback.keys.KeyManager;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.users.UserNotFoundException;
@@ -30,7 +31,6 @@ import org.apache.archiva.redback.authorization.AuthorizationDataSource;
 import org.apache.archiva.redback.authorization.AuthorizationException;
 import org.apache.archiva.redback.authorization.AuthorizationResult;
 import org.apache.archiva.redback.authorization.Authorizer;
-import org.codehaus.plexus.redback.keys.KeyManager;
 import org.codehaus.plexus.redback.policy.AccountLockedException;
 import org.codehaus.plexus.redback.policy.MustChangePasswordException;
 import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java b/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java
index 13c5b4ce..4b888c27 100644
--- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java
+++ b/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java
@@ -24,7 +24,7 @@ import org.apache.archiva.redback.authentication.AuthenticationDataSource;
 import org.apache.archiva.redback.authentication.AuthenticationException;
 import org.apache.archiva.redback.authorization.AuthorizationException;
 import org.apache.archiva.redback.authorization.AuthorizationResult;
-import org.codehaus.plexus.redback.keys.KeyManager;
+import org.apache.archiva.redback.keys.KeyManager;
 import org.codehaus.plexus.redback.policy.AccountLockedException;
 import org.codehaus.plexus.redback.policy.MustChangePasswordException;
 import org.codehaus.plexus.redback.policy.UserSecurityPolicy;