repackage spring-registry-commons to o.a.a namespace

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

3 files changed, 18 insertions, 18 deletions

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 a619332d7..9c4ae956a 100644
--- 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
@@ -32,6 +32,7 @@ import org.apache.archiva.policies.PreDownloadPolicy;
 import org.apache.archiva.redback.components.registry.Registry;
 import org.apache.archiva.redback.components.registry.RegistryException;
 import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.collections.MapUtils;
@@ -42,7 +43,6 @@ 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.registry.commons.CommonsConfigurationRegistry;
 import org.codehaus.redback.components.springutils.ComponentContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
index 9611a5aa2..886156cf1 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Predicate;
 import org.apache.commons.configuration.CombinedConfiguration;
 import org.apache.tools.ant.types.selectors.SelectorUtils;
 import org.apache.archiva.redback.components.registry.RegistryException;
-import org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry;
+import org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
index 85e92e76d..c2c251191 100755
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
@@ -36,13 +36,13 @@
   <bean name="archivaConfiguration#test-defaults" class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
     <property name="registry" ref="registry#empty"/>
   </bean>
-  <bean name="registry#empty" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry"/>
+  <bean name="registry#empty" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"/>
 
   <bean name="archivaConfiguration#test-upgrade-09"  class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
     <property name="registry" ref="registry#test-upgrade-09"/>
   </bean>
 
-  <bean name="registry#test-upgrade-09" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-upgrade-09" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -59,7 +59,7 @@
     <property name="registry" ref="registry#test-upgrade-1.3"/>
   </bean>
 
-  <bean name="registry#test-upgrade-1.3" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-upgrade-1.3" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -76,7 +76,7 @@
     <property name="registry" ref="registry#configured"/>
   </bean>
 
-  <bean name="registry#configured" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#configured" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -95,7 +95,7 @@
     <property name="registry" ref="registry#test-autodetect-v1"/>
   </bean>
 
-  <bean name="registry#test-autodetect-v1" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-autodetect-v1" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -114,7 +114,7 @@
     <property name="registry" ref="registry#test-archiva-v1"/>
   </bean>
 
-  <bean name="registry#test-archiva-v1" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-archiva-v1" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -132,7 +132,7 @@
     <property name="registry" ref="registry#test-save"/>
   </bean>
 
-  <bean name="registry#test-save" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-save" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -149,7 +149,7 @@
     <property name="registry" ref="registry#test-save-user-defaults"/>
   </bean>
 
-  <bean name="registry#test-save-user-defaults" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-save-user-defaults" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -168,7 +168,7 @@
     <property name="registry" ref="registry#test-save-user-fallback"/>
   </bean>
 
-  <bean name="registry#test-save-user-fallback" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-save-user-fallback" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -187,7 +187,7 @@
     <property name="registry" ref="registry#test-save-user"/>
   </bean>
 
-  <bean name="registry#test-save-user" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-save-user" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -207,7 +207,7 @@
     <property name="registry" ref="registry#test-configuration-both"/>
   </bean>
 
-  <bean name="registry#test-configuration-both" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-configuration-both" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -227,7 +227,7 @@
     <property name="registry" ref="registry#test-read-saved"/>
   </bean>
 
-  <bean name="registry#test-read-saved" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-read-saved" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -246,7 +246,7 @@
     <property name="userConfigFilename" value="${basedir}/target/test/test-file.xml"/>
   </bean>
 
-  <bean name="registry#test-cron-expressions" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-cron-expressions" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -264,7 +264,7 @@
     <property name="registry" ref="registry#test-remove-central"/>
   </bean>
 
-  <bean name="registry#test-remove-central" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-remove-central" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -284,7 +284,7 @@
     <property name="altConfigFilename" value="${basedir}/target/*intentionally:invalid*/conf/archiva.xml"/>
   </bean>
 
-  <bean name="registry#test-not-allowed-to-write-to-both" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-not-allowed-to-write-to-both" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -305,7 +305,7 @@
     <property name="altConfigFilename" value="${basedir}/target/test-appserver-base/conf/archiva.xml"/>
   </bean>
 
-  <bean name="registry#test-not-allowed-to-write-to-user" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-not-allowed-to-write-to-user" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[