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 91365c1f..cd3591c1 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
@@ -23,7 +23,7 @@
     <component>
       <role>org.apache.archiva.redback.rbac.RBACManager</role>
       <role-hint>cached</role-hint>
-      <implementation>org.codehaus.plexus.redback.rbac.cached.CachedRbacManager</implementation>
+      <implementation>org.apache.archiva.redback.rbac.cached.CachedRbacManager</implementation>
       <description>CachedRbacManager is a wrapped RBACManager with caching.</description>
       <requirements>
         <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 91365c1f..cd3591c1 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
@@ -23,7 +23,7 @@
     <component>
       <role>org.apache.archiva.redback.rbac.RBACManager</role>
       <role-hint>cached</role-hint>
-      <implementation>org.codehaus.plexus.redback.rbac.cached.CachedRbacManager</implementation>
+      <implementation>org.apache.archiva.redback.rbac.cached.CachedRbacManager</implementation>
       <description>CachedRbacManager is a wrapped RBACManager with caching.</description>
       <requirements>
         <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 a438cb1d..6436aad3 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
@@ -37,7 +37,7 @@
     <property name="password" value=""/>
   </bean>
 
-  <bean name="rBACManager#cached" class="org.codehaus.plexus.redback.rbac.cached.CachedRbacManager">
+  <bean name="rBACManager#cached" class="org.apache.archiva.redback.rbac.cached.CachedRbacManager">
     <property name="rbacImpl" ref="rBACManager#memory"/>
   </bean>
 
@@ -46,7 +46,7 @@
     <component>
       <role>org.apache.archiva.redback.rbac.RBACManager</role>
       <role-hint>cached</role-hint>
-      <implementation>org.codehaus.plexus.redback.rbac.cached.CachedRbacManager</implementation>
+      <implementation>org.apache.archiva.redback.rbac.cached.CachedRbacManager</implementation>
       <description>CachedRbacManager is a wrapped RBACManager with caching.</description>
       <requirements>
         <requirement>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
similarity index 99%
rename from redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManager.java
rename to redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
index e18568bb..78827f46 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.rbac.cached;
+package org.apache.archiva.redback.rbac.cached;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
index c5b7971a..9e667728 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
@@ -29,7 +29,7 @@
 
   <context:annotation-config />
   <context:component-scan 
-    base-package="org.codehaus.plexus.redback.rbac.cached"/>
+    base-package="org.apache.archiva.redback.rbac.cached"/>
 
   <bean name="cache#operations" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
       init-method="initialize">
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManagerPerformanceTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
similarity index 93%
rename from redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
rename to redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
index f2d17b97..7ec39ce8 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.rbac.cached;
+package org.apache.archiva.redback.rbac.cached;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,7 @@ package org.codehaus.plexus.redback.rbac.cached;
  */
 
 import org.apache.archiva.redback.rbac.RBACManager;
+import org.apache.archiva.redback.rbac.cached.CachedRbacManager;
 import org.codehaus.plexus.redback.tests.AbstractRbacManagerPerformanceTestCase;
 import org.junit.After;
 import org.junit.Before;
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManagerTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
similarity index 94%
rename from redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManagerTest.java
rename to redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
index 67ee0fe7..309e292b 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/codehaus/plexus/redback/rbac/cached/CachedRbacManagerTest.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.rbac.cached;
+package org.apache.archiva.redback.rbac.cached;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@ package org.codehaus.plexus.redback.rbac.cached;
 
 import net.sf.ehcache.CacheManager;
 import org.apache.archiva.redback.rbac.RBACManager;
+import org.apache.archiva.redback.rbac.cached.CachedRbacManager;
 import org.codehaus.plexus.redback.tests.AbstractRbacManagerTestCase;
 import org.junit.Before;
 
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
index 8928117c..cd7d00cb 100755
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
@@ -20,11 +20,8 @@
   -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/context 
-           http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
        default-lazy-init="false">
 
   <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
@@ -50,7 +47,7 @@
 
   <alias name="commons-configuration" alias="test-conf"/>
 
-  <bean name= "rBACManager#cached" class="org.codehaus.plexus.redback.rbac.cached.CachedRbacManager">
+  <bean name= "rBACManager#cached" class="org.apache.archiva.redback.rbac.cached.CachedRbacManager">
     <property name="rbacImpl" ref="rBACManager#memory"/>
     <property name="effectiveRoleSetCache" ref="cache#effectiveRoleSet"/>
     <property name="operationsCache" ref="cache#operations"/>