Applying references after package change of components spring-registry and expression...

diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index dfb6a9b05d404f19af1eeda06cb6c5e5caf69108..d5207dacf367d4b5eb8a2e8ee74bee34a99d011f 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -42,8 +42,8 @@
       <artifactId>archiva-policies</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
-      <artifactId>spring-registry-api</artifactId>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-api</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.springframework</groupId>
@@ -62,8 +62,12 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
-      <artifactId>spring-registry-commons</artifactId>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-commons</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.springframework</groupId>
@@ -72,8 +76,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components</groupId>
-      <artifactId>expression-evaluator</artifactId>
+      <groupId>org.apache.archiva.components</groupId>
+      <artifactId>archiva-components-expression-evaluator</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-configuration</groupId>
@@ -142,6 +146,11 @@
     </dependency>
 
     <!-- Test scope -->
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-test-utils</artifactId>

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java
index 0f6ff82e2b05c89748698cd704dca17c09128129..9d8ead089a13ec4e2ceaba5c8104ec888cb87cc8 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java
@@ -19,8 +19,8 @@ package org.apache.archiva.configuration;
  * under the License.
  */
 
-import org.apache.archiva.redback.components.registry.RegistryException;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryListener;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -47,7 +47,7 @@ public interface ArchivaConfiguration
      * Save any updated configuration.
      *
      * @param configuration the configuration to save
-     * @throws org.apache.archiva.redback.components.registry.RegistryException
+     * @throws org.apache.archiva.components.registry.RegistryException
      *          if there is a problem saving the registry data
      * @throws IndeterminateConfigurationException
      *          if the configuration cannot be saved because it was read from two sources

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 af7e2ef6d91e46c2b1f838d31a5427ac0d437c03..b45fb5a5937538c4afba1c0317b3e03e22d29da9 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
@@ -25,14 +25,14 @@ import org.apache.archiva.configuration.io.registry.ConfigurationRegistryWriter;
 import org.apache.archiva.policies.AbstractUpdatePolicy;
 import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
-import org.apache.archiva.redback.components.evaluator.DefaultExpressionEvaluator;
-import org.apache.archiva.redback.components.evaluator.EvaluatorException;
-import org.apache.archiva.redback.components.evaluator.ExpressionEvaluator;
-import org.apache.archiva.redback.components.evaluator.sources.SystemPropertyExpressionSource;
-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.archiva.components.evaluator.DefaultExpressionEvaluator;
+import org.apache.archiva.components.evaluator.EvaluatorException;
+import org.apache.archiva.components.evaluator.ExpressionEvaluator;
+import org.apache.archiva.components.evaluator.sources.SystemPropertyExpressionSource;
+import org.apache.archiva.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.configuration.BaseConfiguration;

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 c7a9d4935f1a5a919e410dde022e9d569369d629..428255371b862bfc5575250a1a04f31d4a5d05fd 100644 (file)
--- 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
@@ -23,10 +23,10 @@ import org.apache.archiva.common.FileTypeUtils;
 import org.apache.archiva.configuration.functors.FiletypeSelectionPredicate;
 import org.apache.archiva.configuration.io.registry.ConfigurationRegistryReader;
 import org.apache.archiva.configuration.util.PathMatcher;
-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.archiva.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.IterableUtils;
 import org.apache.commons.collections4.Predicate;

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java
index 8c0ff5d563654ef4b4f935bf7e160ae686a348cd..f3f0f2ea7e797211f5a02ee55be59d7e7deded8c 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java
@@ -21,7 +21,7 @@ package org.apache.archiva.configuration.io.registry;
  */
 
 import org.apache.archiva.configuration.*;
-import org.apache.archiva.redback.components.registry.Registry;
+import org.apache.archiva.components.registry.Registry;
 
 import java.util.Iterator;
 import java.util.List;

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java
index 786b027a9b4e043ccab3f3a70da703112e627b47..2cbd387b6bd711f2a762c9645a9ffac24741300c 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java
@@ -21,7 +21,7 @@ package org.apache.archiva.configuration.io.registry;
  */
 
 import org.apache.archiva.configuration.*;
-import org.apache.archiva.redback.components.registry.Registry;
+import org.apache.archiva.components.registry.Registry;
 
 import java.util.Iterator;
 import java.util.List;

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 ffd513f783c1b570de310162d6857822aa37c758..90802a64bbc9e66bad47e769b7de3d77bd73e096 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
@@ -19,7 +19,7 @@ package org.apache.archiva.configuration;
  * under the License.
  */
 
-import org.apache.archiva.redback.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryException;
 import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;

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 f0bd4e10dc7b4c1571455983c6a2867fc253dd33..4f40fc978dfb5989a7c585729d541e3cb7e782fb 100755 (executable)
--- 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
@@ -32,12 +32,12 @@
   <bean name="archivaConfiguration#test-defaults-default-repo-location-exists" class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
     <property name="registry" ref="registry#empty"/>
   </bean>
-  <bean name="registry#empty" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"/>
+  <bean name="registry#empty" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"/>
 
   <bean name="archivaConfiguration#test-defaults" class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
     <property name="registry" ref="registry#emptydef"/>
   </bean>
-  <bean name="registry#emptydef" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"/>
+  <bean name="registry#emptydef" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"/>
 
   <bean name="archivaConfiguration#test-upgrade-09"  class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
     <property name="registry" ref="registry#test-upgrade-09"/>
@@ -45,7 +45,7 @@
 
 
 
-  <bean name="registry#test-upgrade-09" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-upgrade-09" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -62,7 +62,7 @@
     <property name="registry" ref="registry#test-upgrade-1.3"/>
   </bean>
 
-  <bean name="registry#test-upgrade-1.3" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-upgrade-1.3" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -79,7 +79,7 @@
     <property name="registry" ref="registry#configured"/>
   </bean>
 
-  <bean name="registry#configured" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#configured" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -98,7 +98,7 @@
     <property name="registry" ref="registry#test-autodetect-v1"/>
   </bean>
 
-  <bean name="registry#test-autodetect-v1" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-autodetect-v1" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -117,7 +117,7 @@
     <property name="registry" ref="registry#test-archiva-v1"/>
   </bean>
 
-  <bean name="registry#test-archiva-v1" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-archiva-v1" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -135,7 +135,7 @@
     <property name="registry" ref="registry#test-save"/>
   </bean>
 
-  <bean name="registry#test-save" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-save" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -152,7 +152,7 @@
     <property name="registry" ref="registry#test-save-user-defaults"/>
   </bean>
 
-  <bean name="registry#test-save-user-defaults" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-save-user-defaults" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -171,7 +171,7 @@
     <property name="registry" ref="registry#test-save-user-fallback"/>
   </bean>
 
-  <bean name="registry#test-save-user-fallback" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-save-user-fallback" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -190,7 +190,7 @@
     <property name="registry" ref="registry#test-save-user"/>
   </bean>
 
-  <bean name="registry#test-save-user" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-save-user" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -210,7 +210,7 @@
     <property name="registry" ref="registry#test-configuration-both"/>
   </bean>
 
-  <bean name="registry#test-configuration-both" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-configuration-both" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -230,7 +230,7 @@
     <property name="registry" ref="registry#test-read-saved"/>
   </bean>
 
-  <bean name="registry#test-read-saved" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-read-saved" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -249,7 +249,7 @@
     <property name="userConfigFilename" value="${basedir}/target/test/test-file.xml"/>
   </bean>
 
-  <bean name="registry#test-cron-expressions" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-cron-expressions" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -267,7 +267,7 @@
     <property name="registry" ref="registry#test-remove-central"/>
   </bean>
 
-  <bean name="registry#test-remove-central" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-remove-central" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -287,7 +287,7 @@
     <property name="altConfigFilename" value="/../../..//target/*intentionally:invalid*/conf/archiva.xml"/>
   </bean>
 
-  <bean name="registry#test-not-allowed-to-write-to-both" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-not-allowed-to-write-to-both" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -308,7 +308,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.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-not-allowed-to-write-to-user" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
index c8bd82371055d7fcde5c1d39b34637ed2e089cf4..381e6a2aaca254778f3b9b5ff7768c0ab56a82ca 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
@@ -29,8 +29,8 @@ import org.apache.archiva.metadata.repository.MetadataRepositoryException;
 import org.apache.archiva.metadata.repository.RepositorySession;
 import org.apache.archiva.metadata.repository.RepositorySessionFactory;
 import org.apache.archiva.model.ArtifactReference;
-import org.apache.archiva.redback.components.registry.Registry;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.archiva.repository.LayoutException;
 import org.apache.archiva.repository.ManagedRepository;
 import org.apache.archiva.repository.ManagedRepositoryContent;
@@ -160,7 +160,7 @@ public class SimpleArtifactConsumer
         return super.isProcessUnmodified();
     }
 
-    public void afterConfigurationChange( org.apache.archiva.redback.components.registry.Registry registry, String propertyName, Object propertyValue )
+    public void afterConfigurationChange( org.apache.archiva.components.registry.Registry registry, String propertyName, Object propertyValue )
     {
         if ( propertyNameTriggers.contains( propertyName ) )
         {

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
index 94881bcb5ff4e48239c0134676a48647e2ca2558..ba1805cc3075a933ac8a902b1df3909107cc1913 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
@@ -42,6 +42,8 @@
     <httpclient.version>${httpclientVersion}</httpclient.version>
     <httpclient.core.version>${httpcoreVersion}</httpclient.core.version>
     <asm.version>${asmVersion}</asm.version>
+    <archiva.comp.version>${archivaCompVersion}</archiva.comp.version>
+    <commons.beanutils.version>${beanUtilsVersion}</commons.beanutils.version>
   </properties>
   <dependencies>
     <dependency>
@@ -95,9 +97,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
-      <artifactId>spring-registry-api</artifactId>
-      <version>${redback.registry.version}</version>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-api</artifactId>
+      <version>${archiva.comp.version}</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -171,6 +173,11 @@
         <scope>test</scope>
       </dependency>
 
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>${commons.beanutils.version}</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
index 59ca7c98480fc69cc9d43223739e341aba128630..6b48f58d5fe70275af19d2ff9bcf3b275a5d8a70 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
@@ -32,4 +32,6 @@ springockitoVersion=${springockito.version}
 mockitoVersion=${mockito.version}
 httpclientVersion=${httpclient.version}
 httpcoreVersion=${httpclient.core.version}
-asmVersion=${asm.version}
\ No newline at end of file
+asmVersion=${asm.version}
+archivaCompVersion=${archiva.comp.version}
+beanUtilsVersion=${commons.beanutils.version}
\ No newline at end of file

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index 0c1a81f5f53d4a2347a8717589ac157f036a804a..b0d007a87f123dd071944ae5db160bcc16aa56a4 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -82,6 +82,11 @@
     </dependency>
 
     <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-commons</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.archiva.maven</groupId>
       <artifactId>archiva-maven-repository</artifactId>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
index 15013c64aac618517f86d715e40665ab96ff8605..89b014a7b7b639f7f47d87b89f740e4d4604f938 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
@@ -25,8 +25,8 @@ import org.apache.archiva.configuration.FileTypes;
 import org.apache.archiva.consumers.AbstractMonitoredConsumer;
 import org.apache.archiva.consumers.ConsumerException;
 import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.archiva.redback.components.registry.Registry;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.archiva.repository.ManagedRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
index 309d908382d20c0ed645141ae6421458d699ec69..248e96d4b1e5930383b362c7f227dd5848c6c661 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
@@ -27,8 +27,8 @@ import org.apache.archiva.consumers.ConsumerException;
 import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
 import org.apache.archiva.metadata.repository.RepositorySession;
 import org.apache.archiva.metadata.repository.RepositorySessionFactory;
-import org.apache.archiva.redback.components.registry.Registry;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.archiva.repository.ManagedRepository;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryContentFactory;

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
index 810411f3dcfbbc6db61a4e9b428d181db2e36e56..c38d4e543331d6a7c58c02517b94e38d72680c0b 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
@@ -35,7 +35,7 @@
     </property>
   </bean>
 
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/log4j2-test.xml
index 29537003882d313e57df089239813e602e13fc7f..95aff68042191b8a00b9ab6e2b491b3659e7ced7 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/log4j2-test.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/log4j2-test.xml
@@ -84,7 +84,7 @@
 
     <logger name="org.apache.archiva.redback.rest.services.DefaultRoleManagementService" level="debug"/>
 
-    <logger name="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry" level="debug"/>
+    <logger name="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry" level="debug"/>
 
     <logger name="org.apache.archiva.redback.components.taskqueue.DefaultTaskQueue" level="info" />
 

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
index ddc8bfff8053f44baa200975678f7c95e4cf294b..9a4fa2c83ad80a786d2d6e5767649e68f28ec561 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
@@ -37,7 +37,7 @@
   <alias name="repositoryContentFactory#cleanup-released-snapshots" alias="repositoryContentFactory#default" />
 
 
-  <bean name="registry#cleanup-released-snapshots" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#cleanup-released-snapshots" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -54,7 +54,7 @@
     <property name="archivaConfiguration" ref="archivaConfiguration#cleanup-released-snapshots"/>
   </bean>
 
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
index 379335bddd7ccae37483175644697f4877f2f091..babb15ebb2627d1d26c50fba2a4bc117634f97bb 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
@@ -49,7 +49,7 @@
     <property name="archivaConfiguration" ref="archivaConfiguration#retention-count"/>
   </bean>
 
-  <bean name="registry#retention-count" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#retention-count" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -83,7 +83,7 @@
     <property name="archivaConfiguration" ref="archivaConfiguration#days-old"/>
   </bean>
 
-  <bean name="registry#days-old" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#days-old" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -100,7 +100,7 @@
     <property name="archivaConfiguration" ref="archivaConfiguration#days-old"/>
   </bean>
 
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
index e63eb7af3775d5ecf30b88bdd833e16f91ecf714..0e4ffd8baeddca0f193cae987be7b6f06a09bcaf 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
@@ -29,7 +29,7 @@
   <context:annotation-config/>
   <context:component-scan base-package="org.apache.archiva.metadata.repository"/>
 
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index 55dd403ffc483f04331b0d0755b77abcacd61566..0e541d0e0c5f720a0a8eb8ebe05653dfb9242dea 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -60,8 +60,8 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
-      <artifactId>spring-registry-api</artifactId>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva.redback.components</groupId>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
index 0c16c5804f385c66e1233dbe08ee302dc072d1a3..ea7ade252678b053055cec034082d4ed75d105bb 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
@@ -27,8 +27,8 @@ import org.apache.archiva.consumers.AbstractMonitoredConsumer;
 import org.apache.archiva.consumers.ConsumerException;
 import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
 import org.apache.archiva.indexer.UnsupportedBaseContextException;
-import org.apache.archiva.redback.components.registry.Registry;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
 import org.apache.archiva.repository.ManagedRepository;
 import org.apache.archiva.repository.RepositoryType;

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
index ebf31812a193575c09114f6e3c58c98de4aac2fe..cecafef8a71a201b2b6affe678850ce0298b297d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
@@ -30,7 +30,7 @@
   <context:annotation-config/>
   <context:component-scan base-package="org.apache.archiva.consumers.lucene.test,org.apache.maven.index"/>
 
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
index 845f0943acb23d2ad9054545b02208c633ce7dca..3662968dfe263c19f1d70deebb8bd7955b5d4e76 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
@@ -58,8 +58,8 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
-      <artifactId>spring-registry-api</artifactId>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-api</artifactId>
     </dependency>
   </dependencies>
 </project>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
index 6ec311ef30cbdc8b66487ba07aa4bdc906b12632..f694d5af4a09c432d322e220b24e52c6e8600eab 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
@@ -35,8 +35,8 @@ import org.apache.archiva.metadata.repository.storage.RepositoryStorage;
 import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException;
 import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataNotFoundException;
 import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException;
-import org.apache.archiva.redback.components.registry.Registry;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.archiva.repository.ManagedRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index 5d90c62cef3b23269160fa2347b485b554bfe431..af604519d1c84aefa5ea7bcb9d17d57b61bd6f4d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -102,8 +102,8 @@
       <artifactId>archiva-plexus-bridge</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
-      <artifactId>spring-registry-commons</artifactId>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-commons</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index eaaeb1ddc01040bf5c4f4ac6ed7089572d394387..a02803d80b6d9d14eafc954a20219de6ec81b5bc 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -96,6 +96,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-commons</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.modelmapper</groupId>
       <artifactId>modelmapper</artifactId>

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
index 85c16121fc04e8bd9e3c5216e7b9ec0fa6048b9b..f1c9475727ecf71b16e13a8c3b2c0be9245e8f08 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
@@ -27,7 +27,7 @@ import org.apache.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.configuration.Configuration;
 import org.apache.archiva.configuration.IndeterminateConfigurationException;
 import org.apache.archiva.metadata.model.facets.AuditEvent;
-import org.apache.archiva.redback.components.registry.Registry;
+import org.apache.archiva.components.registry.Registry;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.repository.Repository;
 import org.apache.archiva.metadata.audit.AuditListener;
@@ -89,7 +89,7 @@ public abstract class AbstractRepositoryAdmin
         {
             getArchivaConfiguration().save( config );
         }
-        catch ( org.apache.archiva.redback.components.registry.RegistryException e )
+        catch ( org.apache.archiva.components.registry.RegistryException e )
         {
             throw new RepositoryAdminException( "Error occurred in the registry: " + e.getLocalizedMessage(), e );
         }
@@ -190,7 +190,7 @@ public abstract class AbstractRepositoryAdmin
         return registry;
     }
 
-    public void setRegistry( org.apache.archiva.redback.components.registry.Registry registry )
+    public void setRegistry( org.apache.archiva.components.registry.Registry registry )
     {
         this.registry = registry;
     }

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java
index ff2766e3fe7ab76e2e6cd2969941349aaf265ab4..692bf11ed3f132d8d18983cc913182fd9adc376e 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java
@@ -25,7 +25,7 @@ import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
 import org.apache.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.configuration.Configuration;
-import org.apache.archiva.redback.components.registry.Registry;
+import org.apache.archiva.components.registry.Registry;
 import org.apache.archiva.redback.components.scheduler.CronExpressionValidator;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.validator.GenericValidator;
@@ -51,7 +51,7 @@ public class DefaultRepositoryCommonValidator
 
     @Inject
     @Named( value = "commons-configuration" )
-    private org.apache.archiva.redback.components.registry.Registry registry;
+    private org.apache.archiva.components.registry.Registry registry;
 
     /**
      * @param abstractRepository
@@ -182,7 +182,7 @@ public class DefaultRepositoryCommonValidator
         return registry;
     }
 
-    public void setRegistry( org.apache.archiva.redback.components.registry.Registry registry )
+    public void setRegistry( org.apache.archiva.components.registry.Registry registry )
     {
         this.registry = registry;
     }

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
index 3c04c955be0644c5a2fe390cb8ab9048cb4ea6d5..ce1c305a80e3f4deed5f7e53c379817cb063bfdd 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
@@ -35,7 +35,7 @@ import org.apache.archiva.metadata.model.facets.AuditEvent;
 import org.apache.archiva.metadata.repository.*;
 import org.apache.archiva.metadata.repository.stats.model.RepositoryStatisticsManager;
 import org.apache.archiva.redback.components.cache.Cache;
-import org.apache.archiva.redback.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryException;
 import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
 import org.apache.archiva.redback.role.RoleManager;
 import org.apache.archiva.redback.role.RoleManagerException;

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
index 718bfc16966161c2d674b132c09a60b8209a37a5..2b6980cf969abdcadd25b878f4e18362a3ef3cd9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
@@ -28,7 +28,7 @@ import org.apache.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.configuration.Configuration;
 import org.apache.archiva.configuration.IndeterminateConfigurationException;
 import org.apache.archiva.redback.components.cache.Cache;
-import org.apache.archiva.redback.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
index 0433e65a17761f1b237901437c7f668ff0c58c46..92e4c3969f81d4cc5e98dd3bb69949c388fdcec9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
@@ -29,7 +29,7 @@ import org.apache.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.configuration.Configuration;
 import org.apache.archiva.configuration.IndeterminateConfigurationException;
 import org.apache.archiva.redback.components.cache.Cache;
-import org.apache.archiva.redback.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryException;
 import org.apache.archiva.redback.configuration.UserConfiguration;
 import org.apache.archiva.redback.configuration.UserConfigurationException;
 import org.apache.archiva.redback.configuration.UserConfigurationKeys;

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
index dd261ebad51ee91349203af2d095acba0089d4ce..661aec58ef391d3ca3f4613e10af218d88d412d5 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
@@ -45,7 +45,7 @@
     </property>
   </bean>
 
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-base/archiva-repository-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-api/pom.xml
index 0f27fc3e53ccf975d24916167a9dbbe66e5273d3..1c7675b95de5ed4b119dad3b178bc522ab56e28e 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-api/pom.xml
@@ -64,8 +64,8 @@
       <artifactId>javax.inject</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
-      <artifactId>spring-registry-api</artifactId>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-api</artifactId>
     </dependency>
   </dependencies>
   <build>

diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java
index 3936dc32156e78e0a95a2a3f31d101445a9bc880..537a043a604ff2ecc3e3226f027946a9654ca021 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java
+++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java
@@ -21,8 +21,8 @@ package org.apache.archiva.repository;
 
 import org.apache.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.configuration.ConfigurationNames;
-import org.apache.archiva.redback.components.registry.Registry;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index 4768691dfaa7309223109b3b7597c07198fd8734..209911ea36d3a273739ef4c7a24297a3bf1b1c37 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -111,6 +111,11 @@
 
 
     <!-- Test scope -->
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java
index 4db1b592f55943224a5d61c4eb2376b83420fc83..0f0d4bfea9c963135fdaa08efc932b6f3f7822e0 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java
@@ -24,7 +24,7 @@ import org.apache.archiva.event.Event;
 import org.apache.archiva.event.EventManager;
 import org.apache.archiva.event.EventType;
 import org.apache.archiva.indexer.*;
-import org.apache.archiva.redback.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryException;
 import org.apache.archiva.repository.EditableManagedRepository;
 import org.apache.archiva.repository.EditableRemoteRepository;
 import org.apache.archiva.repository.EditableRepository;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java
index 83b8922d304896802164022bc87dc914c1fce59e..8b321c764b3805fcad43f797c674bad97d328382 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java
@@ -35,8 +35,8 @@ import org.apache.archiva.model.Plugin;
 import org.apache.archiva.model.ProjectReference;
 import org.apache.archiva.model.SnapshotVersion;
 import org.apache.archiva.model.VersionedReference;
-import org.apache.archiva.redback.components.registry.Registry;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.archiva.repository.ContentNotFoundException;
 import org.apache.archiva.repository.LayoutException;
 import org.apache.archiva.repository.ManagedRepositoryContent;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context.xml
index 1d41a6ed447c8aa8fb477de2e1a1a51255707348..5c100d2c0d4371532502b510c5ea84fb25d764a1 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context.xml
@@ -31,7 +31,7 @@
   <context:component-scan base-package="org.apache.archiva.repository.mock"/>
 
 
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
index 11eff993cbb1c179d62051c0ca58030a526510d9..c97fd34f2de6bc1e0c6686fc99093cee696c0365 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
@@ -51,6 +51,11 @@
     </dependency>
 
     <!-- Test scope -->
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>

diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
index 0cbc0aa6a7a49529695a15ffdbdde1d334edd904..828fd5c0bef08df0d98eaea1def97ad82cb32f1a 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
@@ -28,7 +28,7 @@ import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
 import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
 import org.apache.archiva.consumers.RepositoryContentConsumer;
 import org.apache.archiva.consumers.functors.ConsumerWantsFilePredicate;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.archiva.repository.ManagedRepository;
 import org.apache.archiva.repository.scanner.functors.ConsumerProcessFileClosure;
 import org.apache.archiva.repository.scanner.functors.TriggerBeginScanClosure;

diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml
index d0b44b201084ffec8b0d2c48f0fa22a3ec7d217a..be7ef6558b54d9151384008befc3b1bc376651d0 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml
@@ -32,7 +32,7 @@
     <constructor-arg ref="archivaConfiguration#test-conf"/>
   </bean>
 
-  <bean name="registry#configured" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#configured" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
index b4221debd94af395235c660bedd98c4a8b48fb45..28d6be8badcb2523970e93e5c70bd95f82b1d1ed 100644 (file)
--- a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
@@ -87,8 +87,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
-      <artifactId>spring-registry-commons</artifactId>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-commons</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java
index 1579ce7bb70bfebe5c6d1b19135f7a4076378492..7e3d945fa9493124a51b3615a297c9dc2de91368 100644 (file)
--- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java
+++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java
@@ -20,9 +20,9 @@ package org.apache.archiva.proxy;
  */
 
 import org.apache.archiva.configuration.*;
-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.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.commons.lang3.StringUtils;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
@@ -86,7 +86,7 @@ public class MockConfiguration
     }
 
     @Override
-    public void addChangeListener( org.apache.archiva.redback.components.registry.RegistryListener listener )
+    public void addChangeListener( org.apache.archiva.components.registry.RegistryListener listener )
     {
         registryListeners.add( listener );
     }
@@ -113,7 +113,7 @@ public class MockConfiguration
 
     public void triggerChange( String name, String value )
     {
-        for ( org.apache.archiva.redback.components.registry.RegistryListener listener : registryListeners )
+        for ( org.apache.archiva.components.registry.RegistryListener listener : registryListeners )
         {
             try
             {

diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
index 045da6a0abcd5cc4302afe22cb9c7d472291353b..d83328f05052774338f8fba35dba42fb3b50feb2 100644 (file)
--- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
@@ -151,6 +151,11 @@
 
 
     <!-- Test scope -->
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>

diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/StubConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/StubConfiguration.java
index 2c41b48451e5cfe0583c4bdf2f4a9d0f1c250c78..f1f3d5ca0bf9e3da9519113fdd85fce44c93144e 100644 (file)
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/StubConfiguration.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/StubConfiguration.java
@@ -19,8 +19,8 @@ package org.apache.archiva.configuration;
  * under the License.
  */
 
-import org.apache.archiva.redback.components.registry.RegistryException;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 

diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
index 4c14045b7b5da3c15b5bae3cd9ed88a797e3d63e..6b899b7e4bc206b0dcd51f54b1438d5bfc9d8f19 100644 (file)
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
@@ -1,7 +1,7 @@
 package org.apache.archiva.configuration;
 
-import org.apache.archiva.redback.components.registry.RegistryException;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 

diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
index bf035ad06eafaf7e4532e005b6f3e169d84262a6..2cd0db66dd2cf20c3adce186a16ea586afef45e8 100644 (file)
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
@@ -23,9 +23,9 @@ import org.apache.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.configuration.ArchivaRuntimeConfiguration;
 import org.apache.archiva.configuration.Configuration;
 import org.apache.archiva.configuration.ConfigurationListener;
-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.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.commons.lang3.StringUtils;
 import org.easymock.IMocksControl;
 import org.springframework.stereotype.Service;

diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml
index 3f28158ae1b6dcafebfdac0e1e1b4a2e0838b33d..8b7e4fa297f60128483767808112e13e54f0d4ce 100644 (file)
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml
@@ -35,7 +35,7 @@
   <alias name="archivaConfiguration#repo-request-test" alias="archivaConfiguration#default"/>
   <alias name="archivaConfiguration#repo-request-test" alias="archivaConfiguration"/>
 
-  <bean name="registry#configured" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#configured" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
       <![CDATA[

diff --git a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml
index 3c9ef40d1ce4a881696a74f5907de2d11c580fe1..160a3acb56de5c0fee371293c2b6ea556d7d7600 100644 (file)
--- a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml
@@ -47,7 +47,7 @@
 
   <alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
 
-  <bean name="registry#default" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#default" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index 966112194f5bad8a1095731c1abc0476160740c7..e9d16d32cb011326bae653dfbf0cbd15a9f25cb2 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -97,6 +97,11 @@
 
 
     <!-- Test scope -->
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.archiva.maven</groupId>
       <artifactId>archiva-maven-repository</artifactId>

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml
index 47127b63dbc4ad3054db73e9592535bf802018f3..8030e079ef4ae8d196819b8fefd497432ff591a7 100755 (executable)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml
@@ -55,7 +55,7 @@
     <property name="registry" ref="registry#test-configured"/>
   </bean>
 
-  <bean name="registry#test-configured" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#test-configured" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
           <![CDATA[

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
index ebf958bfc4f02717d60c1242a35607bcf58537a4..4ed2e8a6104058eccb7a257d63d16ed5902c6860 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
@@ -53,7 +53,7 @@
 
   <alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
 
-  <bean name="registry#default" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#default" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[
@@ -86,7 +86,7 @@
   </bean>
   -->
 
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
         init-method="initialize">
     <property name="properties">
       <value>

diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
index 696514868fb6ce9db6e6104b7df6e868aa5ad916..59e3c2fd03117d8a9a080919dc7f1934fd43952e 100644 (file)
--- a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
@@ -86,7 +86,7 @@
 
   <alias name="commons-configuration" alias="registry#test"/>
 
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
index da09633651c903dc846898aa8123ff97ba442db2..7b487803b7fe176f63f00755e0be562e2fe4a20f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
@@ -23,7 +23,7 @@ import org.apache.archiva.common.ArchivaException;
 import org.apache.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.configuration.ConfigurationNames;
 import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.archiva.redback.rbac.RBACManager;
 import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.apache.archiva.redback.rbac.UserAssignment;
@@ -97,7 +97,7 @@ public class SecuritySynchronization
     }
 
     @Override
-    public void afterConfigurationChange( org.apache.archiva.redback.components.registry.Registry registry,
+    public void afterConfigurationChange( org.apache.archiva.components.registry.Registry registry,
                                           String propertyName, Object propertyValue )
     {
         if ( ConfigurationNames.isManagedRepositories( propertyName ) && propertyName.endsWith( ".id" ) )
@@ -110,7 +110,7 @@ public class SecuritySynchronization
     }
 
     @Override
-    public void beforeConfigurationChange( org.apache.archiva.redback.components.registry.Registry registry,
+    public void beforeConfigurationChange( org.apache.archiva.components.registry.Registry registry,
                                            String propertyName, Object propertyValue )
     {
         /* do nothing */

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-artifacts-download.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-artifacts-download.xml
index 570eeb588035f3157b39563acdf98d1af3b5ae9c..bc162f9dddb8587fdb172884c09654429195d7cf 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-artifacts-download.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-artifacts-download.xml
@@ -30,7 +30,7 @@
 
   <context:property-placeholder system-properties-mode="OVERRIDE"/>
 
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml
index 7a06a884d1a8c5e3c871a3ba1cf6676a44408d77..8768f43bdc1e8cac941ae1362de085d20bae29ef 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml
@@ -31,7 +31,7 @@
   <context:property-placeholder system-properties-mode="OVERRIDE"/>
 
 
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml
index 5f9f77153e7990b096db4ecbfffca611bf56eae8..7ea76e797f995c89d59e38bcee1a3245c1903f9d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml
@@ -55,7 +55,7 @@
     </constructor-arg>
   </bean>
 
-  <bean name="registry#default" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#default" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
index d62446b45286b0daa887fb98b1209dce779f60a5..7f9bf2ccafc98890994c06a9b09a6f7900c8a7f0 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
@@ -50,7 +50,7 @@
 
   <alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
 
-  <bean name="registry#default" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#default" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
index d1adbce1bf852b58ade67b4ba599bd4eaf09571e..95b570aee22a7da85c050e8ab070793d652cd3bb 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
@@ -52,7 +52,7 @@
 
   <alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
 
-  <bean name="registry#default" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#default" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 45ee0cac28a448af864f1eeff5b281c2a63a603a..0f177868e3055d75ac6869a1e876c3b14341b1a6 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -400,21 +400,13 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
-      <artifactId>spring-registry-api</artifactId>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
-      <artifactId>spring-registry-commons</artifactId>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-commons</artifactId>
       <exclusions>
-        <exclusion>
-          <groupId>ant</groupId>
-          <artifactId>ant-optional</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jdom</groupId>
-          <artifactId>jdom</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging-api</artifactId>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 9071317e90cc4664d26b45b13557c33800a49c8f..1e63b2700c36d3963b88ed2f2a6cffe2992ab51c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -69,7 +69,7 @@
   </bean>
 
   <!-- START SNIPPET: configuration-files-list -->
-  <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
+  <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
     init-method="initialize">
     <property name="properties">
       <value>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
index b4965e64c73f3bae1f21e61013999221d90f0e27..b7fa9f8a35efe6429f875809ca83636048119e57 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
@@ -82,7 +82,7 @@
 
     <logger name="org.apache.archiva.redback.rest.services.DefaultRoleManagementService" level="debug"/>
 
-    <logger name="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry" level="debug"/>
+    <logger name="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry" level="debug"/>
 
     <logger name="org.apache.archiva.redback.components.taskqueue.DefaultTaskQueue" level="info" />
 

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 435ca0d007c7694ac03a083086aa4f932ce2fc8c..abcab4b5c99b88b64880b8b91027ee9f2aadca06 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
@@ -37,7 +37,7 @@
 
   <alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
 
-  <bean name="registry#default" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#default" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
index ee6bcb7b847d5f97478278070a2a0b7ceebf4954..b782fbff80d95f998e4eb82b1c1437f3b5ac1009 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
@@ -53,7 +53,7 @@
 
   <alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
 
-  <bean name="registry#default" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#default" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
index b816f0ccb5ad1138446b4962c809a63c2a1e0827..9b3a139f9dde7187e3d43a18099de68908260b5f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
@@ -52,7 +52,7 @@
 
   <alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
 
-  <bean name="registry#default" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+  <bean name="registry#default" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
         <![CDATA[

diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
index 965e42139e4db9bc63c67d1b17af66efd10fc72f..d3d66aa7b442efb8908ada15e328395e9a8d9ede 100644 (file)
--- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
+++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
@@ -34,8 +34,8 @@ import org.apache.archiva.metadata.repository.MetadataRepositoryException;
 import org.apache.archiva.metadata.repository.RepositorySession;
 import org.apache.archiva.metadata.repository.RepositorySessionFactory;
 import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
-import org.apache.archiva.redback.components.registry.Registry;
-import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.components.registry.Registry;
+import org.apache.archiva.components.registry.RegistryListener;
 import org.apache.archiva.repository.ManagedRepository;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;

diff --git a/pom.xml b/pom.xml
index e920c805260520782e1a9dfcdb3f6cc4b829be30..89dd965b82ae2ff724add3b68ad43883f7484d65 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -931,15 +931,9 @@
       </dependency>
 
       <dependency>
-        <groupId>org.apache.archiva.redback.components</groupId>
-        <artifactId>expression-evaluator</artifactId>
-        <version>${plexus-expression-evaluator.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
-          </exclusion>
-        </exclusions>
+        <groupId>org.apache.archiva.components</groupId>
+        <artifactId>archiva-components-expression-evaluator</artifactId>
+        <version>${archiva.comp.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -1268,29 +1262,15 @@
       <!-- redback components -->
 
       <dependency>
-        <groupId>org.apache.archiva.redback.components.registry</groupId>
-        <artifactId>spring-registry-api</artifactId>
-        <version>${redback.registry.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
-          </exclusion>
-        </exclusions>
+        <groupId>org.apache.archiva.components.registry</groupId>
+        <artifactId>archiva-components-spring-registry-api</artifactId>
+        <version>${archiva.comp.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.archiva.redback.components.registry</groupId>
-        <artifactId>spring-registry-commons</artifactId>
-        <version>${redback.registry.version}</version>
+        <groupId>org.apache.archiva.components.registry</groupId>
+        <artifactId>archiva-components-spring-registry-commons</artifactId>
+        <version>${archiva.comp.version}</version>
         <exclusions>
-          <exclusion>
-            <groupId>ant</groupId>
-            <artifactId>ant-optional</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>jdom</groupId>
-            <artifactId>jdom</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging-api</artifactId>
@@ -1299,10 +1279,6 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
       <dependency>