You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/11 10:24:26 UTC
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...
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;