spring-cache move to o.a.a namespace

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

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
index edb19e7144b288cdee0ca01dfd4698692d18679c..fb4116fae08b3598d64e697a668063b7b480b3da 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
@@ -20,6 +20,7 @@ package org.apache.archiva.redback.rest.services;
  */
 
 import net.sf.ehcache.CacheManager;
+import org.apache.archiva.redback.components.cache.Cache;
 import org.apache.archiva.redback.configuration.UserConfiguration;
 import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.policy.AccountLockedException;
@@ -31,7 +32,6 @@ import org.apache.archiva.redback.role.RoleManagerException;
 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.apache.archiva.redback.keys.KeyManager;

diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
index 098a200cf562e01bd0bab3e9004070e5bc4410cc..e2daf81d90efad250e60c82ec03694b86fe541a7 100644 (file)
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
@@ -19,9 +19,9 @@ package org.apache.archiva.redback.struts2.action;
  * under the License.
  */
 
+import org.apache.archiva.redback.components.cache.Cache;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.dispatcher.SessionMap;
-import org.codehaus.plexus.cache.Cache;
 import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
 import org.apache.archiva.redback.integration.interceptor.SecureActionException;
 import org.apache.archiva.redback.integration.util.AutoLoginCookies;

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 6436aad336508ec76df2d507ecd9a72f1cb2cb5d..a47f5c918cb218f2257dfe091e8eb1551e4391a1 100755 (executable)
--- 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
@@ -55,37 +55,37 @@
           <field-name>rbacImpl</field-name>
         </requirement>
         <requirement>
-          <role>org.codehaus.plexus.cache.Cache</role>
+          <role>org.apache.archiva.redback.components.cache.Cache</role>
           <role-hint>operations</role-hint>
           <field-name>operationsCache</field-name>
         </requirement>
         <requirement>
-          <role>org.codehaus.plexus.cache.Cache</role>
+          <role>org.apache.archiva.redback.components.cache.Cache</role>
           <role-hint>permissions</role-hint>
           <field-name>permissionsCache</field-name>
         </requirement>
         <requirement>
-          <role>org.codehaus.plexus.cache.Cache</role>
+          <role>org.apache.archiva.redback.components.cache.Cache</role>
           <role-hint>resources</role-hint>
           <field-name>resourcesCache</field-name>
         </requirement>
         <requirement>
-          <role>org.codehaus.plexus.cache.Cache</role>
+          <role>org.apache.archiva.redback.components.cache.Cache</role>
           <role-hint>roles</role-hint>
           <field-name>rolesCache</field-name>
         </requirement>
         <requirement>
-          <role>org.codehaus.plexus.cache.Cache</role>
+          <role>org.apache.archiva.redback.components.cache.Cache</role>
           <role-hint>userAssignments</role-hint>
           <field-name>userAssignmentsCache</field-name>
         </requirement>
         <requirement>
-          <role>org.codehaus.plexus.cache.Cache</role>
+          <role>org.apache.archiva.redback.components.cache.Cache</role>
           <role-hint>userPermissions</role-hint>
           <field-name>userPermissionsCache</field-name>
         </requirement>
         <requirement>
-          <role>org.codehaus.plexus.cache.Cache</role>
+          <role>org.apache.archiva.redback.components.cache.Cache</role>
           <role-hint>effectiveRoleSet</role-hint>
           <field-name>effectiveRoleSetCache</field-name>
         </requirement>
@@ -109,7 +109,7 @@
           <field-name>userImpl</field-name>
         </requirement>
         <requirement>
-          <role>org.codehaus.plexus.cache.Cache</role>
+          <role>org.apache.archiva.redback.components.cache.Cache</role>
           <role-hint>users</role-hint>
           <field-name>usersCache</field-name>
         </requirement>
@@ -133,7 +133,7 @@
           <field-name>keyImpl</field-name>
         </requirement>
         <requirement>
-          <role>org.codehaus.plexus.cache.Cache</role>
+          <role>org.apache.archiva.redback.components.cache.Cache</role>
           <role-hint>keys</role-hint>
           <field-name>keysCache</field-name>
         </requirement>

diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
index bf81a5baa7f7706e65a3555c13fde9cef6297918..20730d2584627b68e4e7f165351ec676896a2ff8 100644 (file)
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
@@ -24,7 +24,7 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.codehaus.plexus.cache.Cache;
+import org.apache.archiva.redback.components.cache.Cache;
 import org.apache.archiva.redback.keys.AbstractKeyManager;
 import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.keys.KeyManager;

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/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
index 78827f46d5e486bc7251622cf58f856f52722fb0..fe80b4c9e1d9aebe4ec38fc8541bf76c76e6c533 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/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
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.rbac.cached;
  * under the License.
  */
 
+import org.apache.archiva.redback.components.cache.Cache;
 import org.apache.archiva.redback.rbac.Operation;
 import org.apache.archiva.redback.rbac.RBACManagerListener;
 import org.apache.archiva.redback.rbac.RbacManagerException;
@@ -27,7 +28,6 @@ import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
 import org.apache.archiva.redback.rbac.Resource;
 import org.apache.archiva.redback.rbac.Role;
 import org.apache.archiva.redback.rbac.UserAssignment;
-import org.codehaus.plexus.cache.Cache;
 import org.apache.archiva.redback.rbac.Permission;
 import org.apache.archiva.redback.rbac.RBACManager;
 import org.slf4j.Logger;

diff --git a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
index 822f76c9518c11fa9ac5107ec638f0735b6e5a72..5de746590a2f6882d3dd13b3c8dd52631a2af173 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
@@ -19,11 +19,11 @@ package org.apache.archiva.redback.users.cached;
  * under the License.
  */
 
+import org.apache.archiva.redback.components.cache.Cache;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserManagerListener;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.apache.archiva.redback.users.UserQuery;
-import org.codehaus.plexus.cache.Cache;
 import org.apache.archiva.redback.users.UserManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
index b9b50dc7125f27481762a22c5562c873fc57f358..c39565e6219c77e4fd19390c52dee7266542c97d 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.users.ldap.service;
  */
 
 import org.apache.archiva.redback.common.ldap.LdapUser;
-import org.codehaus.plexus.cache.builder.CacheBuilder;
+import org.apache.archiva.redback.components.cache.builder.CacheBuilder;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;