Return-Path: 
 <commits-return-6488-apmail-archiva-commits-archive=archiva.apache.org@archiva.apache.org>
X-Original-To: apmail-archiva-commits-archive@www.apache.org
Delivered-To: apmail-archiva-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2EDC69F95
	for <apmail-archiva-commits-archive@www.apache.org>;
 Wed, 11 Apr 2012 08:24:53 +0000 (UTC)
Received: (qmail 54187 invoked by uid 500); 11 Apr 2012 08:24:53 -0000
Delivered-To: apmail-archiva-commits-archive@archiva.apache.org
Received: (qmail 54160 invoked by uid 500); 11 Apr 2012 08:24:53 -0000
Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@archiva.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@archiva.apache.org>
List-Post: <mailto:commits@archiva.apache.org>
List-Id: <commits.archiva.apache.org>
Reply-To: dev@archiva.apache.org
Delivered-To: mailing list commits@archiva.apache.org
Received: (qmail 54151 invoked by uid 99); 11 Apr 2012 08:24:52 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Apr 2012 08:24:52 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Apr 2012 08:24:48 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 17EDA238897D
	for <commits@archiva.apache.org>; Wed, 11 Apr 2012 08:24:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1324625 - in /archiva/redback/redback-core/trunk:
 redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/
 redback-integrations/redback-struts2/redback-struts2-integration/src/main/jav...
Date: Wed, 11 Apr 2012 08:24:26 -0000
To: commits@archiva.apache.org
From: olamy@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120411082427.17EDA238897D@eris.apache.org>

Author: olamy
Date: Wed Apr 11 08:24:26 2012
New Revision: 1324625

URL: http://svn.apache.org/viewvc?rev=1324625&view=rev
Log:
spring-cache move to o.a.a namespace

Modified:
    archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
    archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
    archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
    archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java?rev=1324625&r1=1324624&r2=1324625&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java Wed Apr 11 08:24:26 2012
@@ -20,6 +20,7 @@ package org.apache.archiva.redback.rest.
  */
 
 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.R
 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;

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java?rev=1324625&r1=1324624&r2=1324625&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java Wed Apr 11 08:24:26 2012
@@ -19,9 +19,9 @@ package org.apache.archiva.redback.strut
  * 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;

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml?rev=1324625&r1=1324624&r2=1324625&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml Wed Apr 11 08:24:26 2012
@@ -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>

Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java?rev=1324625&r1=1324624&r2=1324625&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java Wed Apr 11 08:24:26 2012
@@ -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;

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java?rev=1324625&r1=1324624&r2=1324625&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java Wed Apr 11 08:24:26 2012
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.rbac.
  * 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.R
 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;

Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java?rev=1324625&r1=1324624&r2=1324625&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java Wed Apr 11 08:24:26 2012
@@ -19,11 +19,11 @@ package org.apache.archiva.redback.users
  * 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;

Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java?rev=1324625&r1=1324624&r2=1324625&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java Wed Apr 11 08:24:26 2012
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.users
  */
 
 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;