From eec9033b6b4a93f71ab35b66a3ffc0f67925724e Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sat, 7 Apr 2012 21:51:32 +0000
Subject: package move to o.a.a.r module redback-keys-api

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310880 13f79535-47bb-0310-9956-ffa450edef68
---
 .../redback/management/DataManagementTool.java     |   2 +-
 .../redback/management/JdoDataManagementTool.java  |   7 +-
 .../redback/management/DataManagementTest.java     |   7 +-
 .../redback/integration/mail/MailGenerator.java    |   2 +-
 .../codehaus/redback/integration/mail/Mailer.java  |   2 +-
 .../redback/integration/mail/MailerImpl.java       |   2 +-
 .../integration/mail/VelocityMailGenerator.java    |   2 +-
 .../redback/integration/util/AutoLoginCookies.java |   8 +-
 .../integration/mail/MailGeneratorTest.java        |   7 +-
 .../redback/rest/services/DefaultLoginService.java |   4 +-
 .../rest/services/DefaultPasswordService.java      |   4 +-
 .../redback/rest/services/DefaultUserService.java  |   8 +-
 .../plexus/redback/struts2/action/LoginAction.java |   6 +-
 .../struts2/action/PasswordResetAction.java        |   6 +-
 .../redback/struts2/action/RegisterAction.java     |   4 +-
 .../struts2/action/admin/BackupRestoreAction.java  |   2 +-
 .../struts2/interceptor/AutoLoginInterceptor.java  |   2 +-
 .../struts2/action/admin/AssignmentsActionTest.xml |   4 +-
 .../struts2/action/admin/UserEditActionTest.xml    |   4 +-
 .../src/test/resources/spring-context.xml          |   4 +-
 .../keystore/KeyStoreAuthenticator.java            |   8 +-
 .../archiva/redback/keys/AbstractKeyManager.java   | 171 +++++++++++++++++++++
 .../archiva/redback/keys/AuthenticationKey.java    |  60 ++++++++
 .../apache/archiva/redback/keys/KeyManager.java    |  94 +++++++++++
 .../archiva/redback/keys/KeyManagerException.java  |  52 +++++++
 .../archiva/redback/keys/KeyNotFoundException.java |  50 ++++++
 .../plexus/redback/keys/AbstractKeyManager.java    | 171 ---------------------
 .../plexus/redback/keys/AuthenticationKey.java     |  53 -------
 .../codehaus/plexus/redback/keys/KeyManager.java   |  94 -----------
 .../plexus/redback/keys/KeyManagerException.java   |  52 -------
 .../plexus/redback/keys/KeyNotFoundException.java  |  48 ------
 .../archiva/redback/keys/KeyManagerTest.java       |  98 ++++++++++++
 .../plexus/redback/keys/KeyManagerTest.java        |  94 -----------
 .../redback/keys/cached/CachedKeyManager.java      |  11 +-
 .../redback/keys/cached/CachedKeyManagerTest.java  |   2 +-
 .../plexus/redback/keys/jdo/JdoKeyManager.java     |   8 +-
 .../redback-keys-jdo/src/main/mdo/keys.mdo         |   4 +-
 .../plexus/redback/keys/jdo/JdoKeyManagerTest.java |   2 +-
 .../keys/memory/MemoryAuthenticationKey.java       |   2 +-
 .../redback/keys/memory/MemoryKeyManager.java      |   8 +-
 .../redback/keys/memory/MemoryKeyManagerTest.java  |   2 +-
 .../plexus/redback/keys/KeyManagerTestCase.java    |   4 +
 .../redback/system/DefaultSecuritySystem.java      |   2 +-
 .../plexus/redback/system/SecuritySystem.java      |   2 +-
 44 files changed, 596 insertions(+), 583 deletions(-)
 create mode 100644 redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
 create mode 100644 redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
 create mode 100644 redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
 create mode 100644 redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java
 create mode 100644 redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
 delete mode 100644 redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AbstractKeyManager.java
 delete mode 100644 redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AuthenticationKey.java
 delete mode 100644 redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManager.java
 delete mode 100644 redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerException.java
 delete mode 100644 redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyNotFoundException.java
 create mode 100644 redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java
 delete mode 100644 redback-keys/redback-keys-api/src/test/java/org/codehaus/plexus/redback/keys/KeyManagerTest.java

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 3df18005b..2c72d8ada 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 c0cb68933..c9460d920 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 654089204..d8ba8b8e6 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 7796a86ca..847258298 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 3aa3240f9..04aff2252 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 0c30a13d5..e1e3f70fd 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 10b941285..c714d1562 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 a78611d8c..d0af0df70 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 5814ffe9c..f6f698914 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 e81e83a30..f9cf65066 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 00a9c4d36..f3088184b 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 7272a5293..cf167faf4 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 4d1be692a..ccf43e893 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 e450e3ac8..81235f95c 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 414997658..f5873e128 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 04fbaa7f0..871da592f 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 40d2ce61a..3677c7e6a 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 79fb9a89d..1705a1fc1 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 79fb9a89d..1705a1fc1 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 62e3d199b..aa9e46143 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 217422e70..f2906879d 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/apache/archiva/redback/keys/AbstractKeyManager.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
new file mode 100644
index 000000000..e5d74bc69
--- /dev/null
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
@@ -0,0 +1,171 @@
+package org.apache.archiva.redback.keys;
+
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Random;
+import java.util.TimeZone;
+
+import org.codehaus.plexus.digest.Hex;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * AbstractKeyManager 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public abstract class AbstractKeyManager
+    implements KeyManager
+{
+    protected Logger log = LoggerFactory.getLogger( getClass() );
+    
+    private static final int KEY_LENGTH = 16;
+
+    private static final boolean SECURE = true;
+
+    private boolean randomMode = SECURE;
+
+    private SecureRandom secureRandom;
+
+    private Random random;
+
+    /**
+     * Generate a UUID using <a href="http://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a> UUID generation of a 
+     * type 4 or randomly generated UUID.
+     * 
+     * @return the 32 character long UUID string.
+     * @throws KeyManagerException
+     */
+    protected String generateUUID()
+        throws KeyManagerException
+    {
+        byte vfour[] = new byte[KEY_LENGTH];
+
+        if ( isRandomMode() == SECURE )
+        {
+            if ( secureRandom == null )
+            {
+                try
+                {
+                    secureRandom = SecureRandom.getInstance( "SHA1PRNG" );
+                }
+                catch ( NoSuchAlgorithmException e )
+                {
+                    setRandomMode( !SECURE );
+                    log.warn( "Unable to use SecureRandom", e );
+                }
+            }
+
+            if ( isRandomMode() == SECURE )
+            {
+                secureRandom.nextBytes( vfour );
+            }
+        }
+
+        if ( isRandomMode() != SECURE )
+        {
+            if ( random == null )
+            {
+                random = new Random();
+            }
+
+            random.nextBytes( vfour );
+        }
+
+        vfour[6] &= 0x0F;
+        vfour[6] |= ( 4 << 4 );
+        vfour[8] &= 0x3F;
+        vfour[8] |= 0x80;
+
+        return Hex.encode( vfour );
+    }
+
+    /**
+     * Tests the key to see if it is expired or not.
+     * 
+     * If the key is expired, a call to {@link #removeExpiredKey(AuthenticationKey)} is issued,
+     * and a {@link KeyNotFoundException} is thrown.
+     * 
+     * @param authkey the key to test.
+     * @throws KeyNotFoundException if the key is expired.
+     * @throws KeyManagerException if there was a problem removing the key.
+     */
+    protected void assertNotExpired( AuthenticationKey authkey )
+        throws KeyNotFoundException, KeyManagerException
+    {
+        if ( authkey.getDateExpires() == null )
+        {
+            // No expiration means a permanent entry.
+            return;
+        }
+    
+        // Test for expiration.
+        Calendar now = getNowGMT();
+        Calendar expiration = getNowGMT();
+        expiration.setTime( authkey.getDateExpires() );
+    
+        if ( now.after( expiration ) )
+        {
+            deleteKey( authkey );
+            throw new KeyNotFoundException( "Key [" + authkey.getKey() + "] has expired." );
+        }
+    }
+
+    protected Calendar getNowGMT()
+    {
+        return Calendar.getInstance( TimeZone.getTimeZone( "GMT" ) );
+    }
+
+    public void setRandomMode( boolean randomMode )
+    {
+        this.randomMode = randomMode;
+    }
+
+    public boolean isRandomMode()
+    {
+        return randomMode;
+    }
+
+    public void removeExpiredKeys()
+        throws KeyManagerException
+    {
+        List<AuthenticationKey> allKeys = getAllKeys();
+
+        Calendar now = getNowGMT();
+        Calendar expiration = getNowGMT();
+
+        log.info( "Removing expired keys." );
+        for ( AuthenticationKey authkey : allKeys )
+        {
+            if ( authkey.getDateExpires() != null )
+            {
+                expiration.setTime( authkey.getDateExpires() );
+
+                if ( now.after( expiration ) )
+                {
+                    deleteKey( authkey );
+                }
+            }
+        }
+        log.info( "Expired keys removed." );
+    }
+}
diff --git a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
new file mode 100644
index 000000000..1ddf00d89
--- /dev/null
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
@@ -0,0 +1,60 @@
+package org.apache.archiva.redback.keys;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Date;
+
+/**
+ * AuthenticationKey is an object representing a key established to
+ * automatically authenticate a user without the user providing typical
+ * login credentials.
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public interface AuthenticationKey
+{
+    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
+     */
+    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/apache/archiva/redback/keys/KeyManager.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
new file mode 100644
index 000000000..4853080a4
--- /dev/null
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
@@ -0,0 +1,94 @@
+package org.apache.archiva.redback.keys;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.List;
+
+/**
+ * KeyManager
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public interface KeyManager
+{
+
+
+    /**
+     * String identifying the key manager implementation.
+     *
+     * @return the key manager implementation id.
+     */
+    String getId();
+
+    /**
+     * Attempt to find a specific key in the store.
+     * <p/>
+     * NOTE: Implementations of this interface should never return an expired key.
+     *
+     * @param key the key to find.
+     * @return the actual key found.
+     * @throws KeyNotFoundException when the requested, unexpired, key cannot be found.
+     * @throws KeyManagerException  when there is a fundamental problem with the KeyManager implementation.
+     */
+    AuthenticationKey findKey( String key )
+        throws KeyNotFoundException, KeyManagerException;
+
+    /**
+     * Create a key (and save it to the store) for the specified principal.
+     *
+     * @param principal         the principal to generate the key for.
+     * @param purpose           the purpose of the key. (Example: "selfservice password reset", "new user validation",
+     *                          "remember me")  This is a purely informational field .
+     * @param expirationMinutes the amount in minutes until this key expires. (-1 means no expiration)
+     * @return the key created
+     * @throws KeyManagerException if there is a fundamental problem with the KeyManager implementation.
+     */
+    AuthenticationKey createKey( String principal, String purpose, int expirationMinutes )
+        throws KeyManagerException;
+
+    /**
+     * Delete a key from the underlying store.
+     *
+     * @param key the key to delete.
+     */
+    void deleteKey( AuthenticationKey key )
+        throws KeyManagerException;
+
+    /**
+     * Delete a key from the underlying store.
+     *
+     * @param key the key to delete.
+     */
+    void deleteKey( String key )
+        throws KeyManagerException;
+
+    List<AuthenticationKey> getAllKeys();
+
+    AuthenticationKey addKey( AuthenticationKey key );
+
+    void eraseDatabase();
+
+    /**
+     * Remove all keys that are expired.
+     */
+    void removeExpiredKeys()
+        throws KeyManagerException;
+}
diff --git a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java
new file mode 100644
index 000000000..1cf53446c
--- /dev/null
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java
@@ -0,0 +1,52 @@
+package org.apache.archiva.redback.keys;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * KeyManagerException 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class KeyManagerException
+    extends Exception
+{
+
+    public KeyManagerException()
+    {
+        super();
+    }
+
+    public KeyManagerException( String message, Throwable cause )
+    {
+        super( message, cause );
+    }
+
+    public KeyManagerException( String message )
+    {
+        super( message );
+    }
+
+    public KeyManagerException( Throwable cause )
+    {
+        super( cause );
+    }
+
+}
diff --git a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
new file mode 100644
index 000000000..f43d2486b
--- /dev/null
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
@@ -0,0 +1,50 @@
+package org.apache.archiva.redback.keys;
+
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.archiva.redback.keys.KeyManagerException;
+
+/**
+ * KeyNotFoundException 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class KeyNotFoundException
+    extends KeyManagerException
+{
+    public KeyNotFoundException()
+    {
+        super();
+    }
+
+    public KeyNotFoundException( String message, Throwable cause )
+    {
+        super( message, cause );
+    }
+
+    public KeyNotFoundException( String message )
+    {
+        super( message );
+    }
+
+    public KeyNotFoundException( Throwable cause )
+    {
+        super( cause );
+    }
+
+}
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/codehaus/plexus/redback/keys/AbstractKeyManager.java
deleted file mode 100644
index 845417fba..000000000
--- a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AbstractKeyManager.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.codehaus.plexus.redback.keys;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Random;
-import java.util.TimeZone;
-
-import org.codehaus.plexus.digest.Hex;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * AbstractKeyManager 
- *
- * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
- */
-public abstract class AbstractKeyManager
-    implements KeyManager
-{
-    protected Logger log = LoggerFactory.getLogger( getClass() );
-    
-    private static final int KEY_LENGTH = 16;
-
-    private static final boolean SECURE = true;
-
-    private boolean randomMode = SECURE;
-
-    private SecureRandom secureRandom;
-
-    private Random random;
-
-    /**
-     * Generate a UUID using <a href="http://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a> UUID generation of a 
-     * type 4 or randomly generated UUID.
-     * 
-     * @return the 32 character long UUID string.
-     * @throws KeyManagerException
-     */
-    protected String generateUUID()
-        throws KeyManagerException
-    {
-        byte vfour[] = new byte[KEY_LENGTH];
-
-        if ( isRandomMode() == SECURE )
-        {
-            if ( secureRandom == null )
-            {
-                try
-                {
-                    secureRandom = SecureRandom.getInstance( "SHA1PRNG" );
-                }
-                catch ( NoSuchAlgorithmException e )
-                {
-                    setRandomMode( !SECURE );
-                    log.warn( "Unable to use SecureRandom", e );
-                }
-            }
-
-            if ( isRandomMode() == SECURE )
-            {
-                secureRandom.nextBytes( vfour );
-            }
-        }
-
-        if ( isRandomMode() != SECURE )
-        {
-            if ( random == null )
-            {
-                random = new Random();
-            }
-
-            random.nextBytes( vfour );
-        }
-
-        vfour[6] &= 0x0F;
-        vfour[6] |= ( 4 << 4 );
-        vfour[8] &= 0x3F;
-        vfour[8] |= 0x80;
-
-        return Hex.encode( vfour );
-    }
-
-    /**
-     * Tests the key to see if it is expired or not.
-     * 
-     * If the key is expired, a call to {@link #removeExpiredKey(AuthenticationKey)} is issued,
-     * and a {@link KeyNotFoundException} is thrown.
-     * 
-     * @param authkey the key to test.
-     * @throws KeyNotFoundException if the key is expired.
-     * @throws KeyManagerException if there was a problem removing the key.
-     */
-    protected void assertNotExpired( AuthenticationKey authkey )
-        throws KeyNotFoundException, KeyManagerException
-    {
-        if ( authkey.getDateExpires() == null )
-        {
-            // No expiration means a permanent entry.
-            return;
-        }
-    
-        // Test for expiration.
-        Calendar now = getNowGMT();
-        Calendar expiration = getNowGMT();
-        expiration.setTime( authkey.getDateExpires() );
-    
-        if ( now.after( expiration ) )
-        {
-            deleteKey( authkey );
-            throw new KeyNotFoundException( "Key [" + authkey.getKey() + "] has expired." );
-        }
-    }
-
-    protected Calendar getNowGMT()
-    {
-        return Calendar.getInstance( TimeZone.getTimeZone( "GMT" ) );
-    }
-
-    public void setRandomMode( boolean randomMode )
-    {
-        this.randomMode = randomMode;
-    }
-
-    public boolean isRandomMode()
-    {
-        return randomMode;
-    }
-
-    public void removeExpiredKeys()
-        throws KeyManagerException
-    {
-        List<AuthenticationKey> allKeys = getAllKeys();
-
-        Calendar now = getNowGMT();
-        Calendar expiration = getNowGMT();
-
-        log.info( "Removing expired keys." );
-        for ( AuthenticationKey authkey : allKeys )
-        {
-            if ( authkey.getDateExpires() != null )
-            {
-                expiration.setTime( authkey.getDateExpires() );
-
-                if ( now.after( expiration ) )
-                {
-                    deleteKey( authkey );
-                }
-            }
-        }
-        log.info( "Expired keys removed." );
-    }
-}
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/codehaus/plexus/redback/keys/AuthenticationKey.java
deleted file mode 100644
index 96d152e59..000000000
--- a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/AuthenticationKey.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.codehaus.plexus.redback.keys;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.Date;
-
-/**
- * AuthenticationKey is an object representing a key established to 
- * automatically authenticate a user without the user providing typical
- * 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();
-    
-    /**
-     * A String representation of what the purpose of existence is for this key.
-     * 
-     * 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 );
-}
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/codehaus/plexus/redback/keys/KeyManager.java
deleted file mode 100644
index 2a93e2153..000000000
--- a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManager.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.codehaus.plexus.redback.keys;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.List;
-
-/**
- * KeyManager
- *
- * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
- */
-public interface KeyManager
-{
-
-
-    /**
-     * String identifying the key manager implementation.
-     *
-     * @return the key manager implementation id.
-     */
-    String getId();
-
-    /**
-     * Attempt to find a specific key in the store.
-     * <p/>
-     * NOTE: Implementations of this interface should never return an expired key.
-     *
-     * @param key the key to find.
-     * @return the actual key found.
-     * @throws KeyNotFoundException when the requested, unexpired, key cannot be found.
-     * @throws KeyManagerException  when there is a fundamental problem with the KeyManager implementation.
-     */
-    AuthenticationKey findKey( String key )
-        throws KeyNotFoundException, KeyManagerException;
-
-    /**
-     * Create a key (and save it to the store) for the specified principal.
-     *
-     * @param principal         the principal to generate the key for.
-     * @param purpose           the purpose of the key. (Example: "selfservice password reset", "new user validation",
-     *                          "remember me")  This is a purely informational field .
-     * @param expirationMinutes the amount in minutes until this key expires. (-1 means no expiration)
-     * @return the key created
-     * @throws KeyManagerException if there is a fundamental problem with the KeyManager implementation.
-     */
-    AuthenticationKey createKey( String principal, String purpose, int expirationMinutes )
-        throws KeyManagerException;
-
-    /**
-     * Delete a key from the underlying store.
-     *
-     * @param key the key to delete.
-     */
-    void deleteKey( AuthenticationKey key )
-        throws KeyManagerException;
-
-    /**
-     * Delete a key from the underlying store.
-     *
-     * @param key the key to delete.
-     */
-    void deleteKey( String key )
-        throws KeyManagerException;
-
-    List<AuthenticationKey> getAllKeys();
-
-    AuthenticationKey addKey( AuthenticationKey key );
-
-    void eraseDatabase();
-
-    /**
-     * Remove all keys that are expired.
-     */
-    void removeExpiredKeys()
-        throws KeyManagerException;
-}
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/codehaus/plexus/redback/keys/KeyManagerException.java
deleted file mode 100644
index ed3f0b17d..000000000
--- a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyManagerException.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.codehaus.plexus.redback.keys;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * KeyManagerException 
- *
- * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
- */
-public class KeyManagerException
-    extends Exception
-{
-
-    public KeyManagerException()
-    {
-        super();
-    }
-
-    public KeyManagerException( String message, Throwable cause )
-    {
-        super( message, cause );
-    }
-
-    public KeyManagerException( String message )
-    {
-        super( message );
-    }
-
-    public KeyManagerException( Throwable cause )
-    {
-        super( cause );
-    }
-
-}
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/codehaus/plexus/redback/keys/KeyNotFoundException.java
deleted file mode 100644
index 0a541aa32..000000000
--- a/redback-keys/redback-keys-api/src/main/java/org/codehaus/plexus/redback/keys/KeyNotFoundException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.codehaus.plexus.redback.keys;
-
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * KeyNotFoundException 
- *
- * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
- */
-public class KeyNotFoundException
-    extends KeyManagerException
-{
-    public KeyNotFoundException()
-    {
-        super();
-    }
-
-    public KeyNotFoundException( String message, Throwable cause )
-    {
-        super( message, cause );
-    }
-
-    public KeyNotFoundException( String message )
-    {
-        super( message );
-    }
-
-    public KeyNotFoundException( Throwable cause )
-    {
-        super( cause );
-    }
-
-}
diff --git a/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java b/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java
new file mode 100644
index 000000000..56258bd13
--- /dev/null
+++ b/redback-keys/redback-keys-api/src/test/java/org/apache/archiva/redback/keys/KeyManagerTest.java
@@ -0,0 +1,98 @@
+package org.apache.archiva.redback.keys;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+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
+{
+    private final class AbstractKeyManagerExtension
+        extends AbstractKeyManager
+    {
+        public AuthenticationKey addKey( AuthenticationKey key )
+        {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        public AuthenticationKey createKey( String principal, String purpose, int expirationMinutes )
+            throws KeyManagerException
+        {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        public void deleteKey( AuthenticationKey key )
+            throws KeyManagerException
+        {
+            // TODO Auto-generated method stub
+
+        }
+
+        public void deleteKey( String key )
+            throws KeyManagerException
+        {
+            // TODO Auto-generated method stub
+
+        }
+
+        public void eraseDatabase()
+        {
+            // TODO Auto-generated method stub
+
+        }
+
+        public AuthenticationKey findKey( String key )
+            throws KeyNotFoundException, KeyManagerException
+        {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        public List<AuthenticationKey> getAllKeys()
+        {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        public String getId()
+        {
+            // TODO Auto-generated method stub
+            return null;
+        }
+    }
+
+    public void testUUID()
+        throws KeyManagerException
+    {
+        AbstractKeyManager manager = new AbstractKeyManagerExtension();
+
+        // verifies we can get the provider after change not to require Sun one
+        assertNotNull( manager.generateUUID() );
+        assertTrue( manager.isRandomMode() );
+    }
+}
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/codehaus/plexus/redback/keys/KeyManagerTest.java
deleted file mode 100644
index d0946ce2e..000000000
--- a/redback-keys/redback-keys-api/src/test/java/org/codehaus/plexus/redback/keys/KeyManagerTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.codehaus.plexus.redback.keys;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-public class KeyManagerTest
-    extends TestCase
-{
-    private final class AbstractKeyManagerExtension
-        extends AbstractKeyManager
-    {
-        public AuthenticationKey addKey( AuthenticationKey key )
-        {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        public AuthenticationKey createKey( String principal, String purpose, int expirationMinutes )
-            throws KeyManagerException
-        {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        public void deleteKey( AuthenticationKey key )
-            throws KeyManagerException
-        {
-            // TODO Auto-generated method stub
-
-        }
-
-        public void deleteKey( String key )
-            throws KeyManagerException
-        {
-            // TODO Auto-generated method stub
-
-        }
-
-        public void eraseDatabase()
-        {
-            // TODO Auto-generated method stub
-
-        }
-
-        public AuthenticationKey findKey( String key )
-            throws KeyNotFoundException, KeyManagerException
-        {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        public List<AuthenticationKey> getAllKeys()
-        {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        public String getId()
-        {
-            // TODO Auto-generated method stub
-            return null;
-        }
-    }
-
-    public void testUUID()
-        throws KeyManagerException
-    {
-        AbstractKeyManager manager = new AbstractKeyManagerExtension();
-
-        // verifies we can get the provider after change not to require Sun one
-        assertNotNull( manager.generateUUID() );
-        assertTrue( manager.isRandomMode() );
-    }
-}
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 43e8e416d..7c1ea5c97 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 39c9a92cf..aaea86289 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 d159b83dc..3235841c7 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 15557f468..e0986c0f9 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 fa7573970..ec6a16de0 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 569015224..ead07ca59 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 3934e5887..4823f8133 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 4459ff4b1..e1a502e03 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 d2ee02e74..adc3224e8 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 862c66f05..553b839ed 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 13c5b4cec..4b888c272 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;
-- 
cgit v1.2.3