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
The following commit(s) were added to refs/heads/master by this push: new 4b6ee0e Extracting maven specific scheduler part to single module 4b6ee0e is described below commit 4b6ee0e554e5f7515182dabc054ee366e48cbbf1 Author: Martin Stockhammer <marti...@apache.org> AuthorDate: Mon Apr 16 23:39:39 2018 +0200 Extracting maven specific scheduler part to single module --- .../pom.xml | 148 ++++++--------------- .../maven}/ArchivaIndexingTaskExecutor.java | 3 +- .../DefaultDownloadRemoteIndexScheduler.java | 6 +- .../maven}/DefaultIndexUpdateSideEffect.java | 2 +- .../indexing/maven}/DownloadRemoteIndexTask.java | 2 +- .../maven}/DownloadRemoteIndexTaskRequest.java | 2 +- .../src/main/resources/META-INF/spring-context.xml | 2 +- .../index-updates/nexus-maven-repository-index.gz | Bin .../nexus-maven-repository-index.properties | 0 .../index-updates/nexus-maven-repository-index.zip | Bin .../maven}/ArchivaIndexingTaskExecutorTest.java | 3 +- .../maven}/DownloadRemoteIndexTaskTest.java | 5 +- .../src/test/resources/log4j2-test.xml} | 41 +++--- .../src/test/resources/spring-context.xml | 0 .../archiva-scheduler-indexing/pom.xml | 145 -------------------- .../src/main/resources/META-INF/spring-context.xml | 16 +-- .../archiva-scheduler-repository/pom.xml | 10 -- archiva-modules/archiva-scheduler/pom.xml | 1 + .../archiva-rest/archiva-rest-services/pom.xml | 4 + .../rest/services/DefaultRepositoriesService.java | 2 +- pom.xml | 5 + 21 files changed, 94 insertions(+), 303 deletions(-) diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml similarity index 72% copy from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml copy to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml index 170140d..b7aabb5 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml @@ -17,70 +17,78 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>archiva-scheduler</artifactId> <groupId>org.apache.archiva</groupId> <version>3.0.0-SNAPSHOT</version> </parent> - <artifactId>archiva-scheduler-indexing</artifactId> + + <artifactId>archiva-scheduler-indexing-maven2</artifactId> + <name>Archiva Scheduler :: Maven Indexing</name> <packaging>bundle</packaging> - <name>Archiva Scheduler :: Indexing</name> + <description>Scheduler for downloading remote Maven indexes.</description> <dependencies> <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-scheduler-api</artifactId> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin-api</artifactId> + <artifactId>archiva-configuration</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-configuration</artifactId> + <artifactId>archiva-scheduler-indexing</artifactId> </dependency> <dependency> - <groupId>org.apache.maven.indexer</groupId> - <artifactId>indexer-core</artifactId> - <classifier>shaded-lucene</classifier> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-layer</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-proxy-common</artifactId> </dependency> + <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-http</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-http-lightweight</artifactId> + <scope>provided</scope> </dependency> + + <!-- Test dependencies --> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-plexus-bridge</artifactId> + <artifactId>archiva-repository-admin-default</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-proxy-common</artifactId> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - </exclusion> - </exclusions> + <artifactId>archiva-maven2-indexer</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>maven2-repository</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-test-utils</artifactId> + <version>${project.version}</version> + <scope>test</scope> </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> @@ -93,31 +101,11 @@ <version>${jettyVersion}</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - <scope>test</scope> - </dependency> <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-test-utils</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin-default</artifactId> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-mock</artifactId> @@ -125,28 +113,17 @@ </dependency> <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-scheduler-repository</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rbac-cached</artifactId> <scope>test</scope> <version>${redback.version}</version> </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <scope>test</scope> - </dependency> <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http</artifactId> - <scope>provided</scope> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-scheduler-repository</artifactId> + <scope>test</scope> </dependency> <dependency> @@ -155,40 +132,11 @@ </dependency> <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-common-test-resources</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-maven2-indexer</artifactId> - <scope>test</scope> - </dependency> </dependencies> @@ -229,15 +177,6 @@ org.apache.commons.lang*;version="[2.4,3)", org.springframework*;version="[3,4)", org.apache.archiva.redback.components.taskqueue*, - org.apache.maven.index*, - org.apache.maven.wagon, - org.apache.maven.wagon.authentication, - org.apache.maven.wagon.authorization, - org.apache.maven.wagon.events, - org.apache.maven.wagon.providers.http, - org.apache.maven.wagon.proxy, - org.apache.maven.wagon.repository, - org.apache.maven.wagon.resource, org.slf4j;resolution:=optional </Import-Package> </instructions> @@ -261,4 +200,5 @@ </plugin> </plugins> </build> -</project> + +</project> \ No newline at end of file diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java similarity index 99% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java rename to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java index 9a2babf..8192cce 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java @@ -1,4 +1,4 @@ -package org.apache.archiva.scheduler.indexing; +package org.apache.archiva.scheduler.indexing.maven; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,6 +27,7 @@ import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutionEx import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutor; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.features.IndexCreationFeature; +import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask; import org.apache.maven.index.ArtifactContext; import org.apache.maven.index.ArtifactContextProducer; import org.apache.maven.index.DefaultScannerListener; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultDownloadRemoteIndexScheduler.java similarity index 96% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java rename to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultDownloadRemoteIndexScheduler.java index 4bf0891..6854788 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultDownloadRemoteIndexScheduler.java @@ -1,4 +1,4 @@ -package org.apache.archiva.scheduler.indexing; +package org.apache.archiva.scheduler.indexing.maven; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,6 +18,8 @@ package org.apache.archiva.scheduler.indexing; * under the License. */ +import org.apache.archiva.scheduler.indexing.DownloadRemoteIndexException; +import org.apache.archiva.scheduler.indexing.DownloadRemoteIndexScheduler; import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.beans.NetworkProxy; import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin; @@ -84,7 +86,7 @@ public class DefaultDownloadRemoteIndexScheduler @PostConstruct public void startup() throws - DownloadRemoteIndexException, UnsupportedBaseContextException { + DownloadRemoteIndexException, UnsupportedBaseContextException { archivaConfiguration.addListener( this ); // TODO add indexContexts even if null diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultIndexUpdateSideEffect.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultIndexUpdateSideEffect.java similarity index 96% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultIndexUpdateSideEffect.java rename to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultIndexUpdateSideEffect.java index e1e2851..581dbb2 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultIndexUpdateSideEffect.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultIndexUpdateSideEffect.java @@ -1,4 +1,4 @@ -package org.apache.archiva.scheduler.indexing; +package org.apache.archiva.scheduler.indexing.maven; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTask.java similarity index 99% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java rename to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTask.java index 1563e12..f141f43 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTask.java @@ -1,4 +1,4 @@ -package org.apache.archiva.scheduler.indexing; +package org.apache.archiva.scheduler.indexing.maven; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskRequest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskRequest.java similarity index 98% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskRequest.java rename to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskRequest.java index dce7215..732bc7e 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskRequest.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskRequest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.scheduler.indexing; +package org.apache.archiva.scheduler.indexing.maven; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file 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-maven2/src/main/resources/META-INF/spring-context.xml similarity index 94% copy from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/spring-context.xml copy to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/resources/META-INF/spring-context.xml index 674d097..ddb6a15 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-maven2/src/main/resources/META-INF/spring-context.xml @@ -29,7 +29,7 @@ <context:annotation-config/> <context:component-scan base-package="org.apache.archiva.scheduler.indexing,org.apache.maven.index"/> - <bean name="taskQueue#indexing" class="org.apache.archiva.redback.components.taskqueue.DefaultTaskQueue"/> + <bean name="taskQueueExecutor#indexing" class="org.apache.archiva.redback.components.taskqueue.execution.ThreadedTaskQueueExecutor"> diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/index-updates/nexus-maven-repository-index.gz b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.gz similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/index-updates/nexus-maven-repository-index.gz rename to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.gz diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/index-updates/nexus-maven-repository-index.properties b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.properties similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/index-updates/nexus-maven-repository-index.properties rename to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.properties diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/index-updates/nexus-maven-repository-index.zip b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.zip similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/index-updates/nexus-maven-repository-index.zip rename to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.zip diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java similarity index 99% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java rename to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java index 5c3f3bc..b67ee24 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.scheduler.indexing; +package org.apache.archiva.scheduler.indexing.maven; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,6 +27,7 @@ import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.features.IndexCreationFeature; +import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.maven.index.ArtifactInfo; import org.apache.maven.index.FlatSearchRequest; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskTest.java similarity index 97% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java rename to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskTest.java index c4d7d93..01921e4 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.scheduler.indexing; +package org.apache.archiva.scheduler.indexing.maven; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -31,6 +31,7 @@ import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.expr.StringSearchExpression; import org.apache.maven.index_shaded.lucene.search.BooleanClause; import org.apache.maven.index_shaded.lucene.search.BooleanQuery; +import org.assertj.core.api.Assertions; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; @@ -161,7 +162,7 @@ public class DownloadRemoteIndexTaskTest FlatSearchResponse response = indexer.searchFlat(rq); log.info( "returned hit count:{}", response.getReturnedHitsCount() ); - assertThat( response.getReturnedHitsCount() ).isEqualTo( 8 ); + Assertions.assertThat( response.getReturnedHitsCount() ).isEqualTo( 8 ); } diff --git a/archiva-modules/archiva-scheduler/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/resources/log4j2-test.xml similarity index 51% copy from archiva-modules/archiva-scheduler/pom.xml copy to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/resources/log4j2-test.xml index 91eaa58..c7f86dd 100644 --- a/archiva-modules/archiva-scheduler/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/resources/log4j2-test.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" ?> <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -18,20 +18,25 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-modules</artifactId> - <version>3.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>archiva-scheduler</artifactId> - <packaging>pom</packaging> - <name>Archiva :: Scheduler</name> - <modules> - <module>archiva-scheduler-api</module> - <module>archiva-scheduler-indexing</module> - <module>archiva-scheduler-repository-api</module> - <module>archiva-scheduler-repository</module> - </modules> -</project> + +<configuration> + <appenders> + <Console name="console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/> + </Console> + </appenders> + <loggers> + + <logger name="org.springframework" level="error"/> + + <logger name="org.apache.archiva.scheduler.indexing" level="info"/> + <!-- + <logger name="org.apache.http" level="debug"/> + --> + <root level="info"> + <appender-ref ref="console"/> + </root> + </loggers> +</configuration> + + diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/resources/spring-context.xml similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml rename to archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/resources/spring-context.xml diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml index 170140d..26825f4 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml @@ -42,37 +42,10 @@ <artifactId>archiva-configuration</artifactId> </dependency> <dependency> - <groupId>org.apache.maven.indexer</groupId> - <artifactId>indexer-core</artifactId> - <classifier>shaded-lucene</classifier> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-plexus-bridge</artifactId> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-proxy-common</artifactId> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> </dependency> @@ -81,115 +54,6 @@ <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jettyVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-plus</artifactId> - <version>${jettyVersion}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-test-utils</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin-default</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-mock</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-scheduler-repository</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-rbac-cached</artifactId> - <scope>test</scope> - <version>${redback.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-common-test-resources</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-maven2-indexer</artifactId> - <scope>test</scope> - </dependency> - </dependencies> <build> @@ -229,15 +93,6 @@ org.apache.commons.lang*;version="[2.4,3)", org.springframework*;version="[3,4)", org.apache.archiva.redback.components.taskqueue*, - org.apache.maven.index*, - org.apache.maven.wagon, - org.apache.maven.wagon.authentication, - org.apache.maven.wagon.authorization, - org.apache.maven.wagon.events, - org.apache.maven.wagon.providers.http, - org.apache.maven.wagon.proxy, - org.apache.maven.wagon.repository, - org.apache.maven.wagon.resource, org.slf4j;resolution:=optional </Import-Package> </instructions> 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 674d097..991654e 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 @@ -27,22 +27,8 @@ default-lazy-init="false"> <context:annotation-config/> - <context:component-scan base-package="org.apache.archiva.scheduler.indexing,org.apache.maven.index"/> + <context:component-scan base-package="org.apache.archiva.scheduler.indexing"/> <bean name="taskQueue#indexing" class="org.apache.archiva.redback.components.taskqueue.DefaultTaskQueue"/> - - <bean name="taskQueueExecutor#indexing" class="org.apache.archiva.redback.components.taskqueue.execution.ThreadedTaskQueueExecutor"> - <property name="executor" ref="taskExecutor#indexing"/> - <property name="queue" ref="taskQueue#indexing"/> - <property name="name" value="indexing"/> - </bean> - - <bean name="taskScheduler#indexDownloadRemote" - class="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler"> - <property name="poolSize" value="4"/> - <property name="threadGroupName" value="indexDownloadRemote"/> - </bean> - - </beans> \ No newline at end of file diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml index 51b3a2c..bd4e3c1 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml @@ -77,16 +77,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-layer</artifactId> <exclusions> diff --git a/archiva-modules/archiva-scheduler/pom.xml b/archiva-modules/archiva-scheduler/pom.xml index 91eaa58..94f7177 100644 --- a/archiva-modules/archiva-scheduler/pom.xml +++ b/archiva-modules/archiva-scheduler/pom.xml @@ -31,6 +31,7 @@ <modules> <module>archiva-scheduler-api</module> <module>archiva-scheduler-indexing</module> + <module>archiva-scheduler-indexing-maven2</module> <module>archiva-scheduler-repository-api</module> <module>archiva-scheduler-repository</module> </modules> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 58b1a03..3605930 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -68,6 +68,10 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-scheduler-indexing-maven2</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>audit</artifactId> </dependency> <dependency> 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 8367c78..3c3cc71 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 @@ -67,7 +67,7 @@ import org.apache.archiva.rest.api.model.StringList; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.api.services.RepositoriesService; import org.apache.archiva.scheduler.ArchivaTaskScheduler; -import org.apache.archiva.scheduler.indexing.ArchivaIndexingTaskExecutor; +import org.apache.archiva.scheduler.indexing.maven.ArchivaIndexingTaskExecutor; import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask; import org.apache.archiva.scheduler.indexing.DownloadRemoteIndexException; import org.apache.archiva.scheduler.indexing.DownloadRemoteIndexScheduler; diff --git a/pom.xml b/pom.xml index 9ae556a..396c72c 100644 --- a/pom.xml +++ b/pom.xml @@ -462,6 +462,11 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-scheduler-indexing-maven2</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>archiva-security</artifactId> <version>${project.version}</version> </dependency> -- To stop receiving notification emails like this one, please contact marti...@apache.org.