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:26:27 UTC
svn commit: r1324627 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/
archiva-base/archiva-policies/src/main/resources/META-INF/
archiva-web/archiva-rest/archiva-rest-services/src/ma...
Author: olamy
Date: Wed Apr 11 08:26:27 2012
New Revision: 1324627
URL: http://svn.apache.org/viewvc?rev=1324627&view=rev
Log:
spring-cache move to o.a.a namespace
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java?rev=1324627&r1=1324626&r2=1324627&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java Wed Apr 11 08:26:27 2012
@@ -19,7 +19,7 @@ package org.apache.archiva.policies.urlc
* under the License.
*/
-import org.codehaus.plexus.cache.Cache;
+import org.apache.archiva.redback.components.cache.Cache;
import java.util.Date;
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml?rev=1324627&r1=1324626&r2=1324627&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml Wed Apr 11 08:26:27 2012
@@ -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"
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java?rev=1324627&r1=1324626&r2=1324627&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java Wed Apr 11 08:26:27 2012
@@ -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
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;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java?rev=1324627&r1=1324626&r2=1324627&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java Wed Apr 11 08:26:27 2012
@@ -24,7 +24,7 @@ import org.apache.archiva.repository.sca
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;