move spring-utils to apache namespace

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1325919 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
index 9c4ae956a20162cfb346c4b2bfbc9a3b605c9a93..8389b154a40e27928926d4a1ec39c5d68128869f 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
@@ -43,7 +43,7 @@ import org.codehaus.plexus.evaluator.DefaultExpressionEvaluator;
 import org.codehaus.plexus.evaluator.EvaluatorException;
 import org.codehaus.plexus.evaluator.ExpressionEvaluator;
 import org.codehaus.plexus.evaluator.sources.SystemPropertyExpressionSource;
-import org.codehaus.redback.components.springutils.ComponentContainer;
+import org.apache.archiva.redback.components.springutils.ComponentContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
index 9369f396f13ffc87c57ba2812dab29d858cbfc5e..a8bf17a54b211ea538a8bfb7972be2dcd39129c1 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
@@ -24,7 +24,7 @@ import org.apache.archiva.common.utils.FileUtil;
 import org.apache.archiva.redback.components.registry.RegistryException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
-import org.codehaus.redback.components.springutils.ComponentContainer;
+import org.apache.archiva.redback.components.springutils.ComponentContainer;
 import org.custommonkey.xmlunit.XMLAssert;
 import org.easymock.MockControl;
 import org.junit.Test;

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml
index ad7386b1542a831f40693c09953e67ac8d83b80f..94cbba3c755f5aba5bbe8459bd84ad5b463c4c45 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml
@@ -30,7 +30,7 @@
 
   <context-param>
     <param-name>contextClass</param-name>
-    <param-value>org.codehaus.redback.components.springutils.CachingWebApplicationContext</param-value>
+    <param-value>org.apache.archiva.redback.components.springutils.CachingWebApplicationContext</param-value>
   </context-param>
 
   <servlet>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
index e9982ea1deca2bcfab29bc8ecbcc8a1ba56a5c39..8a0c2c93970d031833f8dd492bf7ff565e6b8c93 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
@@ -30,7 +30,7 @@
 
   <context-param>
     <param-name>contextClass</param-name>
-    <param-value>org.codehaus.redback.components.springutils.CachingWebApplicationContext</param-value>
+    <param-value>org.apache.archiva.redback.components.springutils.CachingWebApplicationContext</param-value>
   </context-param>
 
   <context-param>

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml
index b18dfd55a084326afc04fe4621f67dd2ff9e6ec5..21eaa92b2ac507eab5142ac7fb2b0427654acc3c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml
@@ -32,7 +32,7 @@
   </listener>
   <context-param>
     <param-name>contextClass</param-name>
-    <param-value>org.codehaus.redback.components.springutils.CachingWebApplicationContext</param-value>
+    <param-value>org.apache.archiva.redback.components.springutils.CachingWebApplicationContext</param-value>
   </context-param>
 
    <context-param>

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
index 464d352ec539e1139c8811b343d8ba4aa57bb067..11ceaa7dd3634ea2f6ffd34bc1aa9f69e78810ed 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
@@ -32,7 +32,7 @@
   </listener>
   <context-param>
     <param-name>contextClass</param-name>
-    <param-value>org.codehaus.redback.components.springutils.CachingWebApplicationContext</param-value>
+    <param-value>org.apache.archiva.redback.components.springutils.CachingWebApplicationContext</param-value>
   </context-param>
   <context-param>
     <param-name>contextConfigLocation</param-name>

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml
index 708ca597e27e276d226c40b9f99b799ab99b81ca..0ff4d1e5c69b170d1ce1f1c75d156eb21da4f384 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml
@@ -54,7 +54,7 @@
 
   <alias name="registry#default" alias="commons-configuration"/>
 
-  <bean name="componentContainer" class="org.codehaus.redback.components.springutils.ComponentContainer"/>
+  <bean name="componentContainer" class="org.apache.archiva.redback.components.springutils.ComponentContainer"/>
 
 
 </beans>
\ No newline at end of file