Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Martin Stockhammer 2019-11-17 13:29:31 +01:00
parent 48d3bc2cf9
commit 622006c9fd
67 changed files with 187 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
archiva-modules/archiva-base/archiva-configuration/pom.xml
View File

@ -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>

6
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java
View File

@ -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

16
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
View File

@ -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;

8
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
View File

@ -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;

2
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java
View File

@ -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;

2
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java
View File

@ -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;

2
archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
View File

@ -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;

34
archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
View File

@ -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[

6
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
View File

@ -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 ) )
{

13
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
View File

@ -32,4 +32,6 @@ springockitoVersion=${springockito.version}
mockitoVersion=${mockito.version}
httpclientVersion=${httpclient.version}
httpcoreVersion=${httpclient.core.version}
asmVersion=${asm.version}
asmVersion=${asm.version}
archivaCompVersion=${archiva.comp.version}
beanUtilsVersion=${commons.beanutils.version}

5
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
View File

@ -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;

4
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
View File

@ -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;

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
View File

@ -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[

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/log4j2-test.xml
View File

@ -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" />

4
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
View File

@ -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[

6
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
View File

@ -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[

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
View File

@ -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[

4
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
View File

@ -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;

2
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
View File

@ -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[

4
archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
View File

@ -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;

4
archiva-modules/archiva-base/archiva-proxy/pom.xml
View File

@ -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>

5
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
View File

@ -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>

6
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
View File

@ -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;
}

6
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java
View File

@ -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;
}

2
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
View File

@ -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;

2
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
View File

@ -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;

2
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
View File

@ -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;

2
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
View File

@ -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[

4
archiva-modules/archiva-base/archiva-repository-api/pom.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java
View File

@ -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;

5
archiva-modules/archiva-base/archiva-repository-layer/pom.xml
View File

@ -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>

2
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java
View File

@ -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;

4
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java
View File

@ -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;

2
archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context.xml
View File

@ -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[

5
archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
View File

@ -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>

2
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
View File

@ -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;

2
archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml
View File

@ -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[

4
archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
View File

@ -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>

10
archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java
View File

@ -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
{

5
archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
View File

@ -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>

4
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/StubConfiguration.java
View File

@ -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;

4
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
View File

@ -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;

6
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
View File

@ -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;

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml
View File

@ -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[

2
archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml
View File

@ -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[

5
archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
View File

@ -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>

2
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml
View File

@ -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[

4
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
View File

@ -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>

2
archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
View File

@ -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[

6
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
View File

@ -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 */

2
archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-artifacts-download.xml
View File

@ -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[

2
archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml
View File

@ -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[

2
archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml
View File

@ -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[

2
archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
View File

@ -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[

2
archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
View File

@ -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[

16
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -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>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
View File

@ -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>

2
archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
View File

@ -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" />

2
archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml
View File

@ -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[

2
archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
View File

@ -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[

2
archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
View File

@ -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[

4
archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
View File

@ -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;

42
pom.xml
View File

@ -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>