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:03 UTC
svn commit: r1324624 - in /archiva/redback/redback-components/trunk/spring-cache: spring-cache-api/src/main/java/org/apache/ spring-cache-api/src/main/java/org/apache/archiva/ spring-cache-api/src/main/java/org/apache/archiva/redback/ spring-cache-api/...

Author: olamy
Date: Wed Apr 11 08:24:01 2012
New Revision: 1324624

URL: http://svn.apache.org/viewvc?rev=1324624&view=rev
Log:
use o.a.a package namespace

Added:
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/AbstractCacheStatistics.java
      - copied, changed from r1324617, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/AbstractCacheStatistics.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/Cache.java
      - copied, changed from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/Cache.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheException.java
      - copied, changed from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheException.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheHints.java
      - copied, changed from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheHints.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheStatistics.java
      - copied, changed from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheStatistics.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheableWrapper.java
      - copied, changed from r1324617, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheableWrapper.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/CacheBuilder.java
      - copied, changed from r1324617, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/CacheBuilder.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/DefaultCacheBuilder.java
      - copied, changed from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/DefaultCacheBuilder.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/factory/
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/factory/CacheCreator.java
      - copied, changed from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheCreator.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/factory/CacheFactory.java
      - copied, changed from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheFactory.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/impl/
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/impl/NoCacheCache.java
      - copied, changed from r1324617, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/impl/NoCacheCache.java
Removed:
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/AbstractCacheStatistics.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/Cache.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheException.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheHints.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheStatistics.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheableWrapper.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/CacheBuilder.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/DefaultCacheBuilder.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheCreator.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheFactory.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/impl/NoCacheCache.java
Modified:
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/codehaus/plexus/cache/ehcache/EhcacheCacheTest.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/codehaus/plexus/cache/hashmap/HashMapCacheTest.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/test/java/org/codehaus/plexus/cache/oscache/OsCacheCacheTest.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/AbstractCacheTestCase.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/AbstractTestWineService.java
    archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java

Copied: archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/AbstractCacheStatistics.java (from r1324617, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/AbstractCacheStatistics.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/AbstractCacheStatistics.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/AbstractCacheStatistics.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/AbstractCacheStatistics.java&r1=1324617&r2=1324624&rev=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/AbstractCacheStatistics.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/AbstractCacheStatistics.java Wed Apr 11 08:24:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache;
+package org.apache.archiva.redback.components.cache;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/Cache.java (from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/Cache.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/Cache.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/Cache.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/Cache.java&r1=1311448&r2=1324624&rev=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/Cache.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/Cache.java Wed Apr 11 08:24:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache;
+package org.apache.archiva.redback.components.cache;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheException.java (from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheException.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheException.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheException.java&r1=1311448&r2=1324624&rev=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheException.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheException.java Wed Apr 11 08:24:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache;
+package org.apache.archiva.redback.components.cache;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheHints.java (from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheHints.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheHints.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheHints.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheHints.java&r1=1311448&r2=1324624&rev=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheHints.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheHints.java Wed Apr 11 08:24:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache;
+package org.apache.archiva.redback.components.cache;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheStatistics.java (from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheStatistics.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheStatistics.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheStatistics.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheStatistics.java&r1=1311448&r2=1324624&rev=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheStatistics.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheStatistics.java Wed Apr 11 08:24:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache;
+package org.apache.archiva.redback.components.cache;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheableWrapper.java (from r1324617, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheableWrapper.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheableWrapper.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheableWrapper.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheableWrapper.java&r1=1324617&r2=1324624&rev=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheableWrapper.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/CacheableWrapper.java Wed Apr 11 08:24:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache;
+package org.apache.archiva.redback.components.cache;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/CacheBuilder.java (from r1324617, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/CacheBuilder.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/CacheBuilder.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/CacheBuilder.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/CacheBuilder.java&r1=1324617&r2=1324624&rev=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/CacheBuilder.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/CacheBuilder.java Wed Apr 11 08:24:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.builder;
+package org.apache.archiva.redback.components.cache.builder;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.codehaus.plexus.cache.builde
  * under the License.
  */
 
-import org.codehaus.plexus.cache.Cache;
+import org.apache.archiva.redback.components.cache.Cache;
 
 
 /**

Copied: archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/DefaultCacheBuilder.java (from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/DefaultCacheBuilder.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/DefaultCacheBuilder.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/DefaultCacheBuilder.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/DefaultCacheBuilder.java&r1=1311448&r2=1324624&rev=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/DefaultCacheBuilder.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/builder/DefaultCacheBuilder.java Wed Apr 11 08:24:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.builder;
+package org.apache.archiva.redback.components.cache.builder;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.codehaus.plexus.cache.builde
  * under the License.
  */
 
-import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.cache.impl.NoCacheCache;
+import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.redback.components.cache.impl.NoCacheCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
@@ -35,7 +35,7 @@ import javax.inject.Inject;
  *
  * @author Olivier Lamy
  * @version $Id$
- * @plexus.component role="org.codehaus.plexus.cache.builder.CacheBuilder" role-hint="default"
+ * @plexus.component role="org.apache.archiva.redback.components.cache.builder.CacheBuilder" role-hint="default"
  */
 @Service
 public class DefaultCacheBuilder

Copied: archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/factory/CacheCreator.java (from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheCreator.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/factory/CacheCreator.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/factory/CacheCreator.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheCreator.java&r1=1311448&r2=1324624&rev=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheCreator.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/factory/CacheCreator.java Wed Apr 11 08:24:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.factory;
+package org.apache.archiva.redback.components.cache.factory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,9 +19,9 @@ package org.codehaus.plexus.cache.factor
  * under the License.
  */
 
-import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.cache.CacheException;
-import org.codehaus.plexus.cache.CacheHints;
+import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.redback.components.cache.CacheException;
+import org.apache.archiva.redback.components.cache.CacheHints;
 
 /**
  * CacheCreator - an interface for CacheCreators

Copied: archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/factory/CacheFactory.java (from r1311448, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheFactory.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/factory/CacheFactory.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/factory/CacheFactory.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheFactory.java&r1=1311448&r2=1324624&rev=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheFactory.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/factory/CacheFactory.java Wed Apr 11 08:24:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.factory;
+package org.apache.archiva.redback.components.cache.factory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,10 +26,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.cache.CacheException;
-import org.codehaus.plexus.cache.CacheHints;
-import org.codehaus.plexus.cache.impl.NoCacheCache;
+import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.redback.components.cache.CacheHints;
+import org.apache.archiva.redback.components.cache.CacheException;
+import org.apache.archiva.redback.components.cache.impl.NoCacheCache;
 
 /**
  * CacheFactory - dynamic cache creation (and tracking) facility for non-plexus objects to use.

Copied: archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/impl/NoCacheCache.java (from r1324617, archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/impl/NoCacheCache.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/impl/NoCacheCache.java?p2=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/impl/NoCacheCache.java&p1=archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/impl/NoCacheCache.java&r1=1324617&r2=1324624&rev=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/codehaus/plexus/cache/impl/NoCacheCache.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/src/main/java/org/apache/archiva/redback/components/cache/impl/NoCacheCache.java Wed Apr 11 08:24:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.impl;
+package org.apache.archiva.redback.components.cache.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.codehaus.plexus.cache.impl;
  * under the License.
  */
 
-import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.cache.CacheStatistics;
+import org.apache.archiva.redback.components.cache.CacheStatistics;
+import org.apache.archiva.redback.components.cache.Cache;
 
 
 /**

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java Wed Apr 11 08:24:01 2012
@@ -24,7 +24,7 @@ import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
 import net.sf.ehcache.Status;
 import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
-import org.codehaus.plexus.cache.CacheStatistics;
+import org.apache.archiva.redback.components.cache.CacheStatistics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,10 +37,10 @@ import javax.annotation.PostConstruct;
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @version $Id$
  * 
- * @plexus.component role="org.codehaus.plexus.cache.Cache" role-hint="ehcache"
+ * @plexus.component role="org.apache.archiva.redback.components.cache.Cache" role-hint="ehcache"
  */
 public class EhcacheCache
-    implements org.codehaus.plexus.cache.Cache
+    implements org.apache.archiva.redback.components.cache.Cache
 {
     
     private Logger log = LoggerFactory.getLogger( getClass() );    

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java Wed Apr 11 08:24:01 2012
@@ -19,11 +19,11 @@ package org.codehaus.plexus.cache.ehcach
  * under the License.
  */
 
+import org.apache.archiva.redback.components.cache.Cache;
 import org.apache.commons.lang.SystemUtils;
-import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.cache.CacheException;
-import org.codehaus.plexus.cache.CacheHints;
-import org.codehaus.plexus.cache.factory.CacheCreator;
+import org.apache.archiva.redback.components.cache.CacheException;
+import org.apache.archiva.redback.components.cache.CacheHints;
+import org.apache.archiva.redback.components.cache.factory.CacheCreator;
 
 import java.io.File;
 

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/codehaus/plexus/cache/ehcache/EhcacheCacheTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/codehaus/plexus/cache/ehcache/EhcacheCacheTest.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/codehaus/plexus/cache/ehcache/EhcacheCacheTest.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/codehaus/plexus/cache/ehcache/EhcacheCacheTest.java Wed Apr 11 08:24:01 2012
@@ -16,7 +16,7 @@ package org.codehaus.plexus.cache.ehcach
  * limitations under the License.
  */
 
-import org.codehaus.plexus.cache.Cache;
+import org.apache.archiva.redback.components.cache.Cache;
 import org.codehaus.plexus.cache.test.AbstractCacheTestCase;
 
 import javax.inject.Inject;

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java Wed Apr 11 08:24:01 2012
@@ -19,10 +19,10 @@ package org.codehaus.plexus.cache.hashma
  * under the License.
  */
 
-import org.codehaus.plexus.cache.AbstractCacheStatistics;
-import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.cache.CacheStatistics;
-import org.codehaus.plexus.cache.CacheableWrapper;
+import org.apache.archiva.redback.components.cache.AbstractCacheStatistics;
+import org.apache.archiva.redback.components.cache.CacheableWrapper;
+import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.redback.components.cache.CacheStatistics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -55,7 +55,7 @@ import java.util.Map;
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @version $Id$
  * 
- * @plexus.component role="org.codehaus.plexus.cache.Cache" role-hint="hashmap"
+ * @plexus.component role="org.apache.archiva.redback.components.cache.Cache" role-hint="hashmap"
  */
 @Service("cache#hashmap")
 public class HashMapCache
@@ -330,7 +330,7 @@ public class HashMapCache
     }
 
     /** 
-     * @see org.codehaus.plexus.cache.Cache#getRefreshTime()
+     * @see org.apache.archiva.redback.components.cache.Cache#getRefreshTime()
      */
     public int getRefreshTime()
     {

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java Wed Apr 11 08:24:01 2012
@@ -19,10 +19,10 @@ package org.codehaus.plexus.cache.hashma
  * under the License.
  */
 
-import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.cache.CacheException;
-import org.codehaus.plexus.cache.CacheHints;
-import org.codehaus.plexus.cache.factory.CacheCreator;
+import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.redback.components.cache.CacheException;
+import org.apache.archiva.redback.components.cache.CacheHints;
+import org.apache.archiva.redback.components.cache.factory.CacheCreator;
 
 /**
  * HashMapCacheCreator

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/codehaus/plexus/cache/hashmap/HashMapCacheTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/codehaus/plexus/cache/hashmap/HashMapCacheTest.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/codehaus/plexus/cache/hashmap/HashMapCacheTest.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/codehaus/plexus/cache/hashmap/HashMapCacheTest.java Wed Apr 11 08:24:01 2012
@@ -16,7 +16,7 @@ package org.codehaus.plexus.cache.hashma
  * limitations under the License.
  */
 
-import org.codehaus.plexus.cache.Cache;
+import org.apache.archiva.redback.components.cache.Cache;
 import org.codehaus.plexus.cache.test.AbstractCacheTestCase;
 
 import javax.inject.Inject;

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java Wed Apr 11 08:24:01 2012
@@ -22,8 +22,8 @@ package org.codehaus.plexus.cache.oscach
 import com.opensymphony.oscache.base.CacheEntry;
 import com.opensymphony.oscache.base.NeedsRefreshException;
 import com.opensymphony.oscache.general.GeneralCacheAdministrator;
-import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.cache.CacheStatistics;
+import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.redback.components.cache.CacheStatistics;
 
 import javax.annotation.PostConstruct;
 import java.util.Iterator;
@@ -37,7 +37,7 @@ import java.util.Properties;
  * @version $Id$
  * @author <a href="mailto:olamy@codehaus.org">Olivier Lamy</a>
  * 
- * @plexus.component role="org.codehaus.plexus.cache.Cache" role-hint="oscache"
+ * @plexus.component role="org.apache.archiva.redback.components.cache.Cache" role-hint="oscache"
  */
 public class OsCacheCache
     implements Cache

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java Wed Apr 11 08:24:01 2012
@@ -19,11 +19,11 @@ package org.codehaus.plexus.cache.oscach
  * under the License.
  */
 
+import org.apache.archiva.redback.components.cache.CacheException;
+import org.apache.archiva.redback.components.cache.CacheHints;
 import org.apache.commons.lang.SystemUtils;
-import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.cache.CacheException;
-import org.codehaus.plexus.cache.CacheHints;
-import org.codehaus.plexus.cache.factory.CacheCreator;
+import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.redback.components.cache.factory.CacheCreator;
 
 import java.io.File;
 

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java Wed Apr 11 08:24:01 2012
@@ -19,8 +19,8 @@ package org.codehaus.plexus.cache.oscach
  * under the License.
  */
 
-import org.codehaus.plexus.cache.CacheStatistics;
-import org.codehaus.plexus.cache.AbstractCacheStatistics;
+import org.apache.archiva.redback.components.cache.CacheStatistics;
+import org.apache.archiva.redback.components.cache.AbstractCacheStatistics;
 
 import com.opensymphony.oscache.base.Cache;
 
@@ -42,7 +42,7 @@ public class OsCacheStatistics
     }
 
     /** 
-     * @see org.codehaus.plexus.cache.AbstractCacheStatistics#getSize()
+     * @see org.apache.archiva.redback.components.cache.AbstractCacheStatistics#getSize()
      */
     public long getSize()
     {

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/test/java/org/codehaus/plexus/cache/oscache/OsCacheCacheTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/test/java/org/codehaus/plexus/cache/oscache/OsCacheCacheTest.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/test/java/org/codehaus/plexus/cache/oscache/OsCacheCacheTest.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/test/java/org/codehaus/plexus/cache/oscache/OsCacheCacheTest.java Wed Apr 11 08:24:01 2012
@@ -16,7 +16,7 @@ package org.codehaus.plexus.cache.oscach
  * limitations under the License.
  */
 
-import org.codehaus.plexus.cache.Cache;
+import org.apache.archiva.redback.components.cache.Cache;
 import org.codehaus.plexus.cache.test.AbstractCacheTestCase;
 
 import javax.inject.Inject;

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/AbstractCacheTestCase.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/AbstractCacheTestCase.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/AbstractCacheTestCase.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/AbstractCacheTestCase.java Wed Apr 11 08:24:01 2012
@@ -20,10 +20,10 @@ package org.codehaus.plexus.cache.test;
  */
 
 import junit.framework.TestCase;
-import org.codehaus.plexus.cache.Cache;
-import org.codehaus.plexus.cache.CacheException;
-import org.codehaus.plexus.cache.CacheStatistics;
-import org.codehaus.plexus.cache.factory.CacheFactory;
+import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.redback.components.cache.CacheStatistics;
+import org.apache.archiva.redback.components.cache.CacheException;
+import org.apache.archiva.redback.components.cache.factory.CacheFactory;
 import org.codehaus.plexus.cache.test.examples.wine.Wine;
 import org.junit.Before;
 import org.junit.Test;

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/AbstractTestWineService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/AbstractTestWineService.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/AbstractTestWineService.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/AbstractTestWineService.java Wed Apr 11 08:24:01 2012
@@ -20,7 +20,7 @@ package org.codehaus.plexus.cache.test.e
  */
 
 import junit.framework.TestCase;
-import org.codehaus.plexus.cache.Cache;
+import org.apache.archiva.redback.components.cache.Cache;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;

Modified: archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java?rev=1324624&r1=1324623&r2=1324624&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java (original)
+++ archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java Wed Apr 11 08:24:01 2012
@@ -19,7 +19,7 @@ package org.codehaus.plexus.cache.test.e
  * under the License.
  */
 
-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;