use o.a.a package namespace for spring-cache-oscache component
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1324647 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java b/spring-cache-providers/spring-cache-oscache/src/main/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCache.java
similarity index 99%
rename from spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java
rename to spring-cache-providers/spring-cache-oscache/src/main/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCache.java
index cbe8483..f8eec25 100644
--- a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java
+++ b/spring-cache-providers/spring-cache-oscache/src/main/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCache.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.oscache;
+package org.apache.archiva.redback.components.cache.oscache;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java b/spring-cache-providers/spring-cache-oscache/src/main/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCreator.java
similarity index 97%
rename from spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java
rename to spring-cache-providers/spring-cache-oscache/src/main/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCreator.java
index 3013779..b6a5041 100644
--- a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java
+++ b/spring-cache-providers/spring-cache-oscache/src/main/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCreator.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.oscache;
+package org.apache.archiva.redback.components.cache.oscache;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java b/spring-cache-providers/spring-cache-oscache/src/main/java/org/apache/archiva/redback/components/cache/oscache/OsCacheStatistics.java
similarity index 95%
rename from spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java
rename to spring-cache-providers/spring-cache-oscache/src/main/java/org/apache/archiva/redback/components/cache/oscache/OsCacheStatistics.java
index 1d27499..fcf5c02 100644
--- a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java
+++ b/spring-cache-providers/spring-cache-oscache/src/main/java/org/apache/archiva/redback/components/cache/oscache/OsCacheStatistics.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.oscache;
+package org.apache.archiva.redback.components.cache.oscache;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/spring-cache-providers/spring-cache-oscache/src/main/resources/META-INF/plexus-cache.properties b/spring-cache-providers/spring-cache-oscache/src/main/resources/META-INF/plexus-cache.properties
index eba4083..aec3c36 100644
--- a/spring-cache-providers/spring-cache-oscache/src/main/resources/META-INF/plexus-cache.properties
+++ b/spring-cache-providers/spring-cache-oscache/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.oscache.OsCacheCreator
\ No newline at end of file
+cache.creator=org.apache.archiva.redback.components.cache.oscache.OsCacheCreator
\ No newline at end of file
diff --git a/spring-cache-providers/spring-cache-oscache/src/main/resources/META-INF/spring-context.xml b/spring-cache-providers/spring-cache-oscache/src/main/resources/META-INF/spring-context.xml
index 83d9eba..ce72aff 100644
--- a/spring-cache-providers/spring-cache-oscache/src/main/resources/META-INF/spring-context.xml
+++ b/spring-cache-providers/spring-cache-oscache/src/main/resources/META-INF/spring-context.xml
@@ -28,6 +28,6 @@
<context:annotation-config />
<context:component-scan
- base-package="org.codehaus.plexus.cache.oscache"/>
+ base-package="org.apache.archiva.redback.components.cache.oscache"/>
</beans>
\ No newline at end of file
diff --git a/spring-cache-providers/spring-cache-oscache/src/test/java/org/codehaus/plexus/cache/oscache/OsCacheCacheTest.java b/spring-cache-providers/spring-cache-oscache/src/test/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCacheTest.java
similarity index 93%
rename from spring-cache-providers/spring-cache-oscache/src/test/java/org/codehaus/plexus/cache/oscache/OsCacheCacheTest.java
rename to spring-cache-providers/spring-cache-oscache/src/test/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCacheTest.java
index 3b2a35a..4889493 100644
--- a/spring-cache-providers/spring-cache-oscache/src/test/java/org/codehaus/plexus/cache/oscache/OsCacheCacheTest.java
+++ b/spring-cache-providers/spring-cache-oscache/src/test/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCacheTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.cache.oscache;
+package org.apache.archiva.redback.components.cache.oscache;
/*
* Copyright 2001-2007 The Codehaus.
@@ -17,6 +17,7 @@
*/
import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.redback.components.cache.oscache.OsCacheCache;
import org.apache.archiva.redback.components.cache.test.AbstractCacheTestCase;
import javax.inject.Inject;
diff --git a/spring-cache-providers/spring-cache-oscache/src/test/resources/spring-context.xml b/spring-cache-providers/spring-cache-oscache/src/test/resources/spring-context.xml
index be6409d..8c61c14 100644
--- a/spring-cache-providers/spring-cache-oscache/src/test/resources/spring-context.xml
+++ b/spring-cache-providers/spring-cache-oscache/src/test/resources/spring-context.xml
@@ -27,35 +27,35 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
- <bean name="cache#default" class="org.codehaus.plexus.cache.oscache.OsCacheCache">
+ <bean name="cache#default" class="org.apache.archiva.redback.components.cache.oscache.OsCacheCache">
<property name="cacheKey" value="default"/>
</bean>
- <bean name="cache#oscache" class="org.codehaus.plexus.cache.oscache.OsCacheCache">
+ <bean name="cache#oscache" class="org.apache.archiva.redback.components.cache.oscache.OsCacheCache">
<property name="cacheKey" value="oscache"/>
</bean>
- <bean name="cache#neverrefresh" class="org.codehaus.plexus.cache.oscache.OsCacheCache">
+ <bean name="cache#neverrefresh" class="org.apache.archiva.redback.components.cache.oscache.OsCacheCache">
<property name="cacheKey" value="neverrefresh"/>
<property name="refreshPeriod" value="-2"/>
</bean>
- <bean name="cache#alwaysrefresh" class="org.codehaus.plexus.cache.oscache.OsCacheCache">
+ <bean name="cache#alwaysrefresh" class="org.apache.archiva.redback.components.cache.oscache.OsCacheCache">
<property name="cacheKey" value="alwaysrefresh"/>
<property name="refreshPeriod" value="0"/>
</bean>
- <bean name="cache#onesecondrefresh" class="org.codehaus.plexus.cache.oscache.OsCacheCache">
+ <bean name="cache#onesecondrefresh" class="org.apache.archiva.redback.components.cache.oscache.OsCacheCache">
<property name="cacheKey" value="onesecondrefresh"/>
<property name="refreshPeriod" value="1"/>
</bean>
- <bean name="cache#twosecondrefresh" class="org.codehaus.plexus.cache.oscache.OsCacheCache">
+ <bean name="cache#twosecondrefresh" class="org.apache.archiva.redback.components.cache.oscache.OsCacheCache">
<property name="cacheKey" value="onesecondrefresh"/>
<property name="refreshPeriod" value="15"/>
</bean>
- <bean name="cache#wine" class="org.codehaus.plexus.cache.oscache.OsCacheCache">
+ <bean name="cache#wine" class="org.apache.archiva.redback.components.cache.oscache.OsCacheCache">
</bean>
</beans>
\ No newline at end of file
