From 45216d20ea33d74e3b5c8411ce69c3edc5fbb951 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 11 Apr 2012 08:26:27 +0000
Subject: [PATCH] spring-cache move to o.a.a namespace

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1324627 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva/policies/urlcache/DefaultUrlFailureCache.java     | 2 +-
 .../src/main/resources/META-INF/spring-context.xml            | 2 +-
 .../archiva/rest/services/DefaultSystemStatusService.java     | 4 ++--
 .../apache/archiva/web/action/admin/SystemStatusAction.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
index 12281e632..d5da703f9 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
@@ -19,7 +19,7 @@ package org.apache.archiva.policies.urlcache;
  * under the License.
  */
 
-import org.codehaus.plexus.cache.Cache;
+import org.apache.archiva.redback.components.cache.Cache;
 
 import java.util.Date;
 
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
index bf569ffd3..cf5bda1c8 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
@@ -34,7 +34,7 @@
         class="org.apache.archiva.policies.urlcache.DefaultUrlFailureCache" lazy-init="true">
     <!-- collaborators and configuration for this bean go here -->
     <constructor-arg ref="url-failures-cache"
-                     type="org.codehaus.plexus.cache.Cache"/>
+                     type="org.apache.archiva.redback.components.cache.Cache"/>
   </bean>
 
   <bean id="url-failures-cache" class="org.codehaus.plexus.cache.ehcache.EhcacheCache" lazy-init="true"
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
index 404f3434c..60c9de77d 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
@@ -18,6 +18,7 @@ package org.apache.archiva.rest.services;
  * under the License.
  */
 
+import org.apache.archiva.redback.components.cache.Cache;
 import org.apache.archiva.repository.scanner.RepositoryScanner;
 import org.apache.archiva.repository.scanner.RepositoryScannerInstance;
 import org.apache.archiva.rest.api.model.CacheEntry;
@@ -27,8 +28,7 @@ import org.apache.archiva.rest.api.model.RepositoryScannerStatistics;
 import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
 import org.apache.archiva.rest.api.services.SystemStatusService;
 import org.apache.archiva.rest.services.utils.ConsumerScanningStatisticsComparator;
-import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.cache.CacheStatistics;
+import org.apache.archiva.redback.components.cache.CacheStatistics;
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
 import org.springframework.context.ApplicationContext;
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java
index 2b78671d0..00c1143ea 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java
@@ -24,7 +24,7 @@ import org.apache.archiva.repository.scanner.RepositoryScanner;
 import org.apache.archiva.security.common.ArchivaRoleConstants;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.web.action.AbstractActionSupport;
-import org.codehaus.plexus.cache.Cache;
+import org.apache.archiva.redback.components.cache.Cache;
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.apache.archiva.redback.integration.interceptor.SecureAction;
 import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;