diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2019-11-17 13:29:31 +0100 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2019-11-17 13:29:31 +0100 |
| commit | 622006c9fde29f5e1b5d94043ef1fd6bd78d2a98 (patch) | |
| tree | badee58fbfd84ed3475f02b1bc22f0a7f692fa5a | |
| parent | 48d3bc2cf9bbb619dcac5119a5b0996becc58451 (diff) | |
| download | archiva-622006c9fde29f5e1b5d94043ef1fd6bd78d2a98.tar.gz archiva-622006c9fde29f5e1b5d94043ef1fd6bd78d2a98.zip | |
Applying references after package change of components spring-registry and expression-evaluator
67 files changed, 187 insertions, 171 deletions
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index dfb6a9b05..d5207dacf 100644 --- 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> @@ -143,6 +147,11 @@ <!-- 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> <version>${project.version}</version> 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 0f6ff82e2..9d8ead089 100644 --- 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 af7e2ef6d..b45fb5a59 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 @@ -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 c7a9d4935..428255371 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 @@ -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 8c0ff5d56..f3f0f2ea7 100644 --- 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 786b027a9..2cbd387b6 100644 --- 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 ffd513f78..90802a64b 100644 --- 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 f0bd4e10d..4f40fc978 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 @@ -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 c8bd82371..381e6a2aa 100644 --- 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 94881bcb5..ba1805cc3 100644 --- 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> @@ -172,6 +174,11 @@ </dependency> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${commons.beanutils.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.12</version> 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 59ca7c984..6b48f58d5 100644 --- 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 0c1a81f5f..b0d007a87 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -83,6 +83,11 @@ <!-- 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> <scope>test</scope> 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 15013c64a..89b014a7b 100644 --- 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 309d90838..248e96d4b 100644 --- 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 810411f3d..c38d4e543 100644 --- 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 295370038..95aff6804 100644 --- 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 ddc8bfff8..9a4fa2c83 100644 --- 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 379335bdd..babb15ebb 100644 --- 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 e63eb7af3..0e4ffd8ba 100644 --- 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 55dd403ff..0e541d0e0 100644 --- 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 0c16c5804..ea7ade252 100644 --- 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 ebf31812a..cecafef8a 100644 --- 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 845f0943a..3662968df 100644 --- 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 6ec311ef3..f694d5af4 100644 --- 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 5d90c62ce..af604519d 100644 --- 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 eaaeb1ddc..a02803d80 100644 --- 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 @@ -97,6 +97,11 @@ </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> </dependency> 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 85c16121f..f1c947572 100644 --- 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 ff2766e3f..692bf11ed 100644 --- 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 3c04c955b..ce1c305a8 100644 --- 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 718bfc169..2b6980cf9 100644 --- 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 0433e65a1..92e4c3969 100644 --- 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 dd261ebad..661aec58e 100644 --- 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 0f27fc3e5..1c7675b95 100644 --- 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 3936dc321..537a043a6 100644 --- 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 4768691df..209911ea3 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -112,6 +112,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> <scope>test</scope> 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 4db1b592f..0f0d4bfea 100644 --- 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 83b8922d3..8b321c764 100644 --- 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 1d41a6ed4..5c100d2c0 100644 --- 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 11eff993c..c97fd34f2 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml @@ -52,6 +52,11 @@ <!-- Test scope --> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> 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 0cbc0aa6a..828fd5c0b 100644 --- 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 d0b44b201..be7ef6558 100644 --- 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 b4221debd..28d6be8ba 100644 --- 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 1579ce7bb..7e3d945fa 100644 --- 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 045da6a0a..d83328f05 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml @@ -152,6 +152,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> <scope>test</scope> 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 2c41b4845..f1f3d5ca0 100644 --- 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 4c14045b7..6b899b7e4 100644 --- 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 bf035ad06..2cd0db66d 100644 --- 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 3f28158ae..8b7e4fa29 100644 --- 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 3c9ef40d1..160a3acb5 100644 --- 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 966112194..e9d16d32c 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml @@ -98,6 +98,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> <scope>test</scope> 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 47127b63d..8030e079e 100755 --- 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 ebf958bfc..4ed2e8a61 100644 --- 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 696514868..59e3c2fd0 100644 --- 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 da0963365..7b487803b 100644 --- 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 570eeb588..bc162f9dd 100644 --- 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 7a06a884d..8768f43bd 100644 --- 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 5f9f77153..7ea76e797 100644 --- 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 d62446b45..7f9bf2cca 100644 --- 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 d1adbce1b..95b570aee 100644 --- 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 45ee0cac2..0f177868e 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -400,22 +400,14 @@ </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> </exclusion> 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 9071317e9..1e63b2700 100644 --- 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 b4965e64c..b7fa9f8a3 100644 --- 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 435ca0d00..abcab4b5c 100644 --- 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 ee6bcb7b8..b782fbff8 100644 --- 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 b816f0ccb..9b3a139f9 100644 --- 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 965e42139..d3d66aa7b 100644 --- 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; @@ -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,30 +1262,16 @@ <!-- 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> </exclusion> @@ -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> |