Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2012-04-11 08:24:26 +00:00
parent 49f64b72e3
commit 14369f149d
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
View File

@ -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;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
View File

@ -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;

18
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
View File

@ -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;

2
redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
View File

@ -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;

2
redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
View File

@ -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;

2
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
View File

@ -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;