use o.a.a package namespace for spring-cache-hashmap component
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1324644 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java b/spring-cache-providers/spring-cache-hashmap/src/main/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCache.java
similarity index 99%
rename from spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java
rename to spring-cache-providers/spring-cache-hashmap/src/main/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCache.java
index e28f2df..61569f0 100644
--- a/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java
+++ b/spring-cache-providers/spring-cache-hashmap/src/main/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCache.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.hashmap;
+package org.apache.archiva.redback.components.cache.hashmap;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java b/spring-cache-providers/spring-cache-hashmap/src/main/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCacheCreator.java
similarity index 95%
rename from spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java
rename to spring-cache-providers/spring-cache-hashmap/src/main/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCacheCreator.java
index 88d3e23..0e2e305 100644
--- a/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java
+++ b/spring-cache-providers/spring-cache-hashmap/src/main/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCacheCreator.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.hashmap;
+package org.apache.archiva.redback.components.cache.hashmap;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/spring-cache-providers/spring-cache-hashmap/src/main/resources/META-INF/plexus-cache.properties b/spring-cache-providers/spring-cache-hashmap/src/main/resources/META-INF/plexus-cache.properties
index a56887b..9ab7360 100644
--- a/spring-cache-providers/spring-cache-hashmap/src/main/resources/META-INF/plexus-cache.properties
+++ b/spring-cache-providers/spring-cache-hashmap/src/main/resources/META-INF/plexus-cache.properties
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-cache.creator=org.codehaus.plexus.cache.hashmap.HashMapCacheCreator
\ No newline at end of file
+cache.creator=org.apache.archiva.redback.components.cache.hashmap.HashMapCacheCreator
\ No newline at end of file
diff --git a/spring-cache-providers/spring-cache-hashmap/src/main/resources/META-INF/spring-context.xml b/spring-cache-providers/spring-cache-hashmap/src/main/resources/META-INF/spring-context.xml
index 4814e77..de928d6 100644
--- a/spring-cache-providers/spring-cache-hashmap/src/main/resources/META-INF/spring-context.xml
+++ b/spring-cache-providers/spring-cache-hashmap/src/main/resources/META-INF/spring-context.xml
@@ -28,6 +28,6 @@
<context:annotation-config />
<context:component-scan
- base-package="org.codehaus.plexus.cache.hashmap"/>
+ base-package="org.apache.archiva.redback.components.cache.hashmap"/>
</beans>
\ No newline at end of file
diff --git a/spring-cache-providers/spring-cache-hashmap/src/test/java/org/codehaus/plexus/cache/hashmap/HashMapCacheTest.java b/spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCacheTest.java
similarity index 93%
rename from spring-cache-providers/spring-cache-hashmap/src/test/java/org/codehaus/plexus/cache/hashmap/HashMapCacheTest.java
rename to spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCacheTest.java
index 810c680..e483658 100644
--- a/spring-cache-providers/spring-cache-hashmap/src/test/java/org/codehaus/plexus/cache/hashmap/HashMapCacheTest.java
+++ b/spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCacheTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.hashmap;
+package org.apache.archiva.redback.components.cache.hashmap;
/*
* Copyright 2001-2007 The Codehaus.
@@ -17,6 +17,7 @@
*/
import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.redback.components.cache.hashmap.HashMapCache;
import org.apache.archiva.redback.components.cache.test.AbstractCacheTestCase;
import javax.inject.Inject;
diff --git a/spring-cache-providers/spring-cache-hashmap/src/test/resources/spring-context.xml b/spring-cache-providers/spring-cache-hashmap/src/test/resources/spring-context.xml
index 744cbcf..c1d2276 100644
--- a/spring-cache-providers/spring-cache-hashmap/src/test/resources/spring-context.xml
+++ b/spring-cache-providers/spring-cache-hashmap/src/test/resources/spring-context.xml
@@ -20,32 +20,29 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
- <bean name="cache#hashmap" class="org.codehaus.plexus.cache.hashmap.HashMapCache">
+ <bean name="cache#hashmap" class="org.apache.archiva.redback.components.cache.hashmap.HashMapCache">
<property name="cacheHitRatio" value="1.0"/>
<property name="cacheMaxSize" value="0"/>
<property name="refreshTime" value="0"/>
</bean>
- <bean name="cache#alwaysrefresh" class="org.codehaus.plexus.cache.hashmap.HashMapCache">
+ <bean name="cache#alwaysrefresh" class="org.apache.archiva.redback.components.cache.hashmap.HashMapCache">
<property name="cacheHitRatio" value="1.0"/>
<property name="cacheMaxSize" value="0"/>
<property name="refreshTime" value="-1"/>
</bean>
- <bean name="cache#onesecondrefresh" class="org.codehaus.plexus.cache.hashmap.HashMapCache">
+ <bean name="cache#onesecondrefresh" class="org.apache.archiva.redback.components.cache.hashmap.HashMapCache">
<property name="cacheHitRatio" value="1.0"/>
<property name="cacheMaxSize" value="0"/>
<property name="refreshTime" value="1"/>
</bean>
- <bean name="cache#twosecondrefresh" class="org.codehaus.plexus.cache.hashmap.HashMapCache">
+ <bean name="cache#twosecondrefresh" class="org.apache.archiva.redback.components.cache.hashmap.HashMapCache">
<property name="cacheHitRatio" value="1.0"/>
<property name="cacheMaxSize" value="0"/>
<property name="refreshTime" value="2"/>
