This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 0e01b1f6b274dc57fcc42208a37efe5468a6a9e9 Author: Martin Stockhammer <[email protected]> AuthorDate: Thu Nov 21 22:09:39 2019 +0100 Changing eferences to moved spring-taskqueue component --- .../src/test/resources/log4j2-test.xml | 2 +- .../archiva-consumers/archiva-lucene-consumers/pom.xml | 10 ++-------- .../archiva/consumers/lucene/NexusIndexerConsumer.java | 2 +- .../archiva/consumers/lucene/NexusIndexerConsumerTest.java | 2 +- .../apache/archiva/proxy/DefaultRepositoryProxyHandler.java | 2 +- .../archiva-repository-admin-default/pom.xml | 10 ++-------- .../repository/managed/DefaultManagedRepositoryAdmin.java | 2 +- .../admin/mock/MockRepositoryArchivaTaskScheduler.java | 2 +- .../repository/MockRepositoryArchivaTaskScheduler.java | 2 +- .../repository/MockRepositoryArchivaTaskScheduler.java | 2 +- .../indexing/maven/ArchivaIndexingTaskExecutor.java | 6 +++--- .../src/main/resources/META-INF/spring-context.xml | 2 +- .../archiva-scheduler/archiva-scheduler-api/pom.xml | 10 ++-------- .../org/apache/archiva/scheduler/ArchivaTaskScheduler.java | 4 ++-- .../archiva/scheduler/indexing/ArtifactIndexingTask.java | 2 +- .../scheduler/indexing/IndexingArchivaTaskScheduler.java | 4 ++-- .../src/main/resources/META-INF/spring-context.xml | 2 +- .../repository/model/RepositoryArchivaTaskScheduler.java | 2 +- .../archiva/scheduler/repository/model/RepositoryTask.java | 2 +- .../repository/ArchivaRepositoryScanningTaskExecutor.java | 6 +++--- .../repository/DefaultRepositoryArchivaTaskScheduler.java | 4 ++-- .../archiva/scheduler/repository/RepositoryTaskJob.java | 4 ++-- .../src/main/resources/META-INF/spring-context.xml | 4 ++-- .../AbstractArchivaRepositoryScanningTaskExecutorTest.java | 2 +- .../apache/archiva/rest/services/AbstractRestService.java | 2 +- .../archiva/rest/services/DefaultRepositoriesService.java | 2 +- .../archiva/rest/services/DefaultSystemStatusService.java | 4 ++-- .../src/test/resources/META-INF/spring-context-test.xml | 2 +- .../org/apache/archiva/security/mock/MockBeanServices.java | 2 +- archiva-modules/archiva-web/archiva-web-common/pom.xml | 10 ++-------- .../org/apache/archiva/web/api/DefaultFileUploadService.java | 2 +- .../java/org/apache/archiva/web/startup/ArchivaStartup.java | 4 ++-- .../src/test/resources/spring-context-test-common.xml | 2 +- .../src/test/resources/spring-context-test-upload.xml | 2 +- .../archiva-web/archiva-webapp/src/test/log4j2-test.xml | 2 +- pom.xml | 12 +++--------- 36 files changed, 53 insertions(+), 83 deletions(-) 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 95aff68..2625d6f 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 @@ -86,7 +86,7 @@ <logger name="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry" level="debug"/> - <logger name="org.apache.archiva.redback.components.taskqueue.DefaultTaskQueue" level="info" /> + <logger name="org.apache.archiva.components.taskqueue.DefaultTaskQueue" level="info" /> <logger name="org.apache.archiva" level="debug" /> <!-- 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 4265964..8930334 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 @@ -64,14 +64,8 @@ <artifactId>archiva-components-spring-registry-api</artifactId> </dependency> <dependency> - <groupId>org.apache.archiva.redback.components</groupId> - <artifactId>spring-taskqueue</artifactId> - <exclusions> - <exclusion> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.archiva.components</groupId> + <artifactId>archiva-components-spring-taskqueue</artifactId> </dependency> <dependency> <groupId>commons-io</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 ea7ade2..89c3a97 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 @@ -29,7 +29,7 @@ import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.indexer.UnsupportedBaseContextException; 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.components.taskqueue.TaskQueueException; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.RepositoryType; import org.apache.archiva.scheduler.ArchivaTaskScheduler; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java index 763f184..85ee942 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java @@ -23,7 +23,7 @@ import junit.framework.TestCase; import org.apache.archiva.common.utils.PathUtil; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.FileTypes; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.repository.base.ArchivaRepositoryRegistry; import org.apache.archiva.repository.base.BasicManagedRepository; import org.apache.archiva.repository.ReleaseScheme; diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java index d23d65c..7cce032 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java @@ -41,7 +41,7 @@ import org.apache.archiva.proxy.model.NetworkProxy; import org.apache.archiva.proxy.model.ProxyConnector; import org.apache.archiva.proxy.model.ProxyFetchResult; import org.apache.archiva.proxy.model.RepositoryProxyHandler; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.RemoteRepository; import org.apache.archiva.repository.RemoteRepositoryContent; 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 a02803d..a7b8af0 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 @@ -87,14 +87,8 @@ <artifactId>javax.inject</artifactId> </dependency> <dependency> - <groupId>org.apache.archiva.redback.components</groupId> - <artifactId>spring-taskqueue</artifactId> - <exclusions> - <exclusion> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.archiva.components</groupId> + <artifactId>archiva-components-spring-taskqueue</artifactId> </dependency> <dependency> <groupId>org.apache.archiva.components.registry</groupId> 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 e2e2aa3..4917cb7 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 @@ -36,7 +36,7 @@ import org.apache.archiva.metadata.repository.*; import org.apache.archiva.metadata.repository.stats.model.RepositoryStatisticsManager; import org.apache.archiva.components.cache.Cache; import org.apache.archiva.components.registry.RegistryException; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.repository.ReleaseScheme; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositoryArchivaTaskScheduler.java index 6e32329..8c3cfe2 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositoryArchivaTaskScheduler.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositoryArchivaTaskScheduler.java @@ -18,7 +18,7 @@ package org.apache.archiva.admin.mock; * under the License. */ -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.model.RepositoryTask; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java index 08bcd96..6892014 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java @@ -18,7 +18,7 @@ package org.apache.archiva.metadata.repository; * under the License. */ -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.model.RepositoryTask; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java index 08bcd96..6892014 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java @@ -18,7 +18,7 @@ package org.apache.archiva.metadata.repository; * under the License. */ -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.model.RepositoryTask; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java index ea88d8f..e88fac6 100644 --- a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java +++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java @@ -22,9 +22,9 @@ package org.apache.archiva.scheduler.indexing.maven; import org.apache.archiva.indexer.ArchivaIndexingContext; import org.apache.archiva.indexer.UnsupportedBaseContextException; -import org.apache.archiva.redback.components.taskqueue.Task; -import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutionException; -import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutor; +import org.apache.archiva.components.taskqueue.Task; +import org.apache.archiva.components.taskqueue.execution.TaskExecutionException; +import org.apache.archiva.components.taskqueue.execution.TaskExecutor; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask; diff --git a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/resources/META-INF/spring-context.xml index ddb6a15..30f3c35 100644 --- a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/resources/META-INF/spring-context.xml @@ -32,7 +32,7 @@ - <bean name="taskQueueExecutor#indexing" class="org.apache.archiva.redback.components.taskqueue.execution.ThreadedTaskQueueExecutor"> + <bean name="taskQueueExecutor#indexing" class="org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor"> <property name="executor" ref="taskExecutor#indexing"/> <property name="queue" ref="taskQueue#indexing"/> <property name="name" value="indexing"/> diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml index 7da9c8b..0d54566 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml @@ -37,14 +37,8 @@ <artifactId>archiva-repository-admin-api</artifactId> </dependency> <dependency> - <groupId>org.apache.archiva.redback.components</groupId> - <artifactId>spring-taskqueue</artifactId> - <exclusions> - <exclusion> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.archiva.components</groupId> + <artifactId>archiva-components-spring-taskqueue</artifactId> </dependency> </dependencies> </project> diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java index b372654..820ee59 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java @@ -19,8 +19,8 @@ package org.apache.archiva.scheduler; * under the License. */ -import org.apache.archiva.redback.components.taskqueue.Task; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.Task; +import org.apache.archiva.components.taskqueue.TaskQueueException; /** * The component that takes care of scheduling in the application. diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java index dcf7428..751347f 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java @@ -20,7 +20,7 @@ package org.apache.archiva.scheduler.indexing; */ import org.apache.archiva.indexer.ArchivaIndexingContext; -import org.apache.archiva.redback.components.taskqueue.Task; +import org.apache.archiva.components.taskqueue.Task; import org.apache.archiva.repository.ManagedRepository; import java.nio.file.Path; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java index 14cbfe3..838601e 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java @@ -19,8 +19,8 @@ package org.apache.archiva.scheduler.indexing; * under the License. */ -import org.apache.archiva.redback.components.taskqueue.TaskQueue; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueue; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.scheduler.ArchivaTaskScheduler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/spring-context.xml index 991654e..f85c82d 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/spring-context.xml @@ -29,6 +29,6 @@ <context:annotation-config/> <context:component-scan base-package="org.apache.archiva.scheduler.indexing"/> - <bean name="taskQueue#indexing" class="org.apache.archiva.redback.components.taskqueue.DefaultTaskQueue"/> + <bean name="taskQueue#indexing" class="org.apache.archiva.components.taskqueue.DefaultTaskQueue"/> </beans> \ No newline at end of file diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryArchivaTaskScheduler.java index d192187..0ef9b7a 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryArchivaTaskScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryArchivaTaskScheduler.java @@ -19,7 +19,7 @@ package org.apache.archiva.scheduler.repository.model; * under the License. */ -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.scheduler.ArchivaTaskScheduler; /** diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryTask.java index 511ce61..ed079fd 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryTask.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryTask.java @@ -1,6 +1,6 @@ package org.apache.archiva.scheduler.repository.model; -import org.apache.archiva.redback.components.taskqueue.Task; +import org.apache.archiva.components.taskqueue.Task; import org.apache.archiva.repository.storage.StorageAsset; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java index 49fa4c9..ed0dd1a 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java @@ -27,9 +27,9 @@ import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.metadata.repository.RepositorySessionFactory; import org.apache.archiva.metadata.repository.stats.model.RepositoryStatistics; import org.apache.archiva.metadata.repository.stats.model.RepositoryStatisticsManager; -import org.apache.archiva.redback.components.taskqueue.Task; -import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutionException; -import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutor; +import org.apache.archiva.components.taskqueue.Task; +import org.apache.archiva.components.taskqueue.execution.TaskExecutionException; +import org.apache.archiva.components.taskqueue.execution.TaskExecutor; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.scanner.RepositoryContentConsumers; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java index b9557e6..7152f0a 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java @@ -31,8 +31,8 @@ import org.apache.archiva.metadata.repository.RepositorySessionFactory; import org.apache.archiva.metadata.repository.stats.model.RepositoryStatisticsManager; import org.apache.archiva.redback.components.scheduler.CronExpressionValidator; import org.apache.archiva.redback.components.scheduler.Scheduler; -import org.apache.archiva.redback.components.taskqueue.TaskQueue; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueue; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.model.RepositoryTask; import org.apache.commons.lang3.time.StopWatch; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java index 6f97495..99d719d 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java @@ -20,8 +20,8 @@ package org.apache.archiva.scheduler.repository; */ import org.apache.archiva.redback.components.scheduler.AbstractJob; -import org.apache.archiva.redback.components.taskqueue.TaskQueue; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueue; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.scheduler.repository.model.RepositoryTask; import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/spring-context.xml index d23af07..e209e07 100755 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/spring-context.xml @@ -30,9 +30,9 @@ <context:annotation-config/> <context:component-scan base-package="org.apache.archiva.scheduler.repository"/> - <bean name="taskQueue#repository-scanning" class="org.apache.archiva.redback.components.taskqueue.DefaultTaskQueue"/> + <bean name="taskQueue#repository-scanning" class="org.apache.archiva.components.taskqueue.DefaultTaskQueue"/> - <bean name="taskQueueExecutor#repository-scanning" class="org.apache.archiva.redback.components.taskqueue.execution.ThreadedTaskQueueExecutor"> + <bean name="taskQueueExecutor#repository-scanning" class="org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor"> <property name="name" value="repository-scanning"/> <property name="executor" ref="taskExecutor#repository-scanning"/> <property name="queue" ref="taskQueue#repository-scanning"/> diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/AbstractArchivaRepositoryScanningTaskExecutorTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/AbstractArchivaRepositoryScanningTaskExecutorTest.java index 78d3e0a..1ff3219 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/AbstractArchivaRepositoryScanningTaskExecutorTest.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/AbstractArchivaRepositoryScanningTaskExecutorTest.java @@ -25,7 +25,7 @@ import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.stats.model.RepositoryStatisticsManager; import org.apache.archiva.mock.MockRepositorySessionFactory; -import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutor; +import org.apache.archiva.components.taskqueue.execution.TaskExecutor; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.scheduler.repository.model.RepositoryTask; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java index f555f9f..5e69784 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java @@ -30,7 +30,7 @@ import org.apache.archiva.maven2.model.Artifact; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.metadata.repository.RepositorySessionFactory; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfigurationKeys; import org.apache.archiva.redback.rest.services.RedbackAuthenticationThreadLocal; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java index 4c9ccd4..55c9995 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java @@ -37,7 +37,7 @@ import org.apache.archiva.model.VersionedReference; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.components.cache.Cache; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.redback.system.DefaultSecuritySession; import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySystem; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java index 705bdb6..e62cdc9 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java @@ -22,8 +22,8 @@ import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.components.cache.Cache; import org.apache.archiva.components.cache.CacheStatistics; -import org.apache.archiva.redback.components.taskqueue.TaskQueue; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueue; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.repository.scanner.RepositoryScanner; import org.apache.archiva.repository.scanner.RepositoryScannerInstance; import org.apache.archiva.rest.api.model.CacheEntry; 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 4ed2e8a..5a79159 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 @@ -69,7 +69,7 @@ </bean> <bean name="taskQueueExecutor#repository-scanning" - class="org.apache.archiva.redback.components.taskqueue.execution.ThreadedTaskQueueExecutor" lazy-init="false"> + class="org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor" lazy-init="false"> <property name="name" value="repository-scanning"/> <property name="executor" ref="taskExecutor#repository-scanning"/> <property name="queue" ref="taskQueue#repository-scanning"/> diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java index ad7a580..8f332ef 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java @@ -27,7 +27,7 @@ import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.repository.storage.*; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.policies.ProxyDownloadException; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.metadata.audit.RepositoryListener; diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index fe694d2..1371b37 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -190,14 +190,8 @@ <artifactId>javax.ws.rs-api</artifactId> </dependency> <dependency> - <groupId>org.apache.archiva.redback.components</groupId> - <artifactId>spring-taskqueue</artifactId> - <exclusions> - <exclusion> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.archiva.components</groupId> + <artifactId>archiva-components-spring-taskqueue</artifactId> </dependency> <dependency> <groupId>org.apache.archiva.redback.components</groupId> diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java index 674427c..a3f8c09 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java @@ -35,7 +35,7 @@ import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.SnapshotVersion; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; +import org.apache.archiva.components.taskqueue.TaskQueueException; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryNotFoundException; import org.apache.archiva.repository.content.base.ArtifactUtil; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java index 44a5e48..287429a 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java @@ -21,8 +21,8 @@ package org.apache.archiva.web.startup; import org.apache.archiva.common.ArchivaException; import org.apache.archiva.redback.components.scheduler.DefaultScheduler; -import org.apache.archiva.redback.components.taskqueue.Task; -import org.apache.archiva.redback.components.taskqueue.execution.ThreadedTaskQueueExecutor; +import org.apache.archiva.components.taskqueue.Task; +import org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor; import org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler; import org.quartz.SchedulerException; import org.springframework.web.context.WebApplicationContext; 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 7f9bf2c..e24d4c4 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 @@ -66,7 +66,7 @@ </bean> <bean name="taskQueueExecutor#repository-scanning" - class="org.apache.archiva.redback.components.taskqueue.execution.ThreadedTaskQueueExecutor" lazy-init="false"> + class="org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor" lazy-init="false"> <property name="name" value="repository-scanning"/> <property name="executor" ref="taskExecutor#repository-scanning"/> <property name="queue" ref="taskQueue#repository-scanning"/> 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 95b570a..9eccc48 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 @@ -75,7 +75,7 @@ </bean> <bean name="taskQueueExecutor#repository-scanning" - class="org.apache.archiva.redback.components.taskqueue.execution.ThreadedTaskQueueExecutor" lazy-init="false"> + class="org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor" lazy-init="false"> <property name="name" value="repository-scanning"/> <property name="executor" ref="taskExecutor#repository-scanning"/> <property name="queue" ref="taskQueue#repository-scanning"/> 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 b7fa9f8..6aec440 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 @@ -84,7 +84,7 @@ <logger name="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry" level="debug"/> - <logger name="org.apache.archiva.redback.components.taskqueue.DefaultTaskQueue" level="info" /> + <logger name="org.apache.archiva.components.taskqueue.DefaultTaskQueue" level="info" /> <logger name="org.apache.archiva" level="debug" /> <!-- diff --git a/pom.xml b/pom.xml index 54f5fab..da3eeea 100644 --- a/pom.xml +++ b/pom.xml @@ -951,15 +951,9 @@ </dependency> <dependency> - <groupId>org.apache.archiva.redback.components</groupId> - <artifactId>spring-taskqueue</artifactId> - <version>${redback.taskqueue.version}</version> - <exclusions> - <exclusion> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.archiva.components</groupId> + <artifactId>archiva-components-spring-taskqueue</artifactId> + <version>${archiva.comp.version}</version> </dependency> <dependency> <groupId>org.apache.archiva.redback.components</groupId>
