diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml index 2de571f08..851d78914 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml @@ -69,6 +69,11 @@ + + org.apache.archiva + repository-statistics + ${archiva.version} + org.apache.archiva.components.cache archiva-components-spring-cache-ehcache diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml index 012e3f293..2a9678abe 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml @@ -93,6 +93,11 @@ + + org.apache.archiva + repository-statistics + test + org.springframework spring-test diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java index 8d33daf95..3b49e3a9b 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java @@ -19,8 +19,8 @@ package org.apache.archiva.repository.scanner; * under the License. */ -import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.consumers.RepositoryContentConsumer; @@ -70,10 +70,11 @@ public class DefaultRepositoryScanner return scan( repository, knownContentConsumers, invalidContentConsumers, ignoredPatterns, changesSince ); } - catch ( RepositoryAdminException e ) + catch ( ConsumerException e ) { - throw new RepositoryScannerException( e.getMessage(), e ); - } finally + throw new RepositoryScannerException( e.getMessage( ), e ); + } + finally { repositoryContentConsumers.releaseSelectedKnownConsumers( knownContentConsumers ); } diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java index 828fd5c0b..0795fa557 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java @@ -24,6 +24,7 @@ import org.apache.archiva.admin.model.admin.ArchivaAdministration; import org.apache.archiva.common.utils.BaseFile; import org.apache.archiva.common.utils.PathUtil; import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.consumers.RepositoryContentConsumer; @@ -34,7 +35,6 @@ import org.apache.archiva.repository.scanner.functors.ConsumerProcessFileClosure import org.apache.archiva.repository.scanner.functors.TriggerBeginScanClosure; import org.apache.archiva.repository.scanner.functors.TriggerScanCompletedClosure; import org.apache.commons.collections4.Closure; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.IterableUtils; import org.apache.commons.collections4.functors.IfClosure; import org.springframework.beans.BeansException; @@ -96,9 +96,16 @@ public class RepositoryContentConsumers * @return the list of consumer ids that have been selected by the configuration. */ public List getSelectedKnownConsumerIds() - throws RepositoryAdminException + throws ConsumerException { - return archivaAdministration.getKnownContentConsumers(); + try + { + return archivaAdministration.getKnownContentConsumers(); + } + catch ( RepositoryAdminException e ) + { + throw new ConsumerException( e.getMessage( ), e ); + } } /** @@ -114,9 +121,16 @@ public class RepositoryContentConsumers * @return the list of consumer ids that have been selected by the configuration. */ public List getSelectedInvalidConsumerIds() - throws RepositoryAdminException + throws ConsumerException { - return archivaAdministration.getInvalidContentConsumers(); + try + { + return archivaAdministration.getInvalidContentConsumers(); + } + catch ( RepositoryAdminException e ) + { + throw new ConsumerException( e.getMessage( ), e ); + } } /** @@ -126,7 +140,7 @@ public class RepositoryContentConsumers * @return the map of String ids to {@link KnownRepositoryContentConsumer} objects. */ public Map getSelectedKnownConsumersMap() - throws RepositoryAdminException + throws ConsumerException { Map consumerMap = new HashMap<>(); @@ -145,7 +159,7 @@ public class RepositoryContentConsumers * @return the map of String ids to {@link InvalidRepositoryContentConsumer} objects. */ public Map getSelectedInvalidConsumersMap() - throws RepositoryAdminException + throws ConsumerException { Map consumerMap = new HashMap<>(); @@ -165,7 +179,7 @@ public class RepositoryContentConsumers * by the active configuration. */ public List getSelectedKnownConsumers() - throws RepositoryAdminException + throws ConsumerException { // FIXME only for testing if ( selectedKnownConsumers != null ) @@ -210,7 +224,7 @@ public class RepositoryContentConsumers * by the active configuration. */ public synchronized List getSelectedInvalidConsumers() - throws RepositoryAdminException + throws ConsumerException { // FIXME only for testing @@ -221,7 +235,15 @@ public class RepositoryContentConsumers List ret = new ArrayList<>(); - List invalidSelected = getSelectedInvalidConsumerIds(); + List invalidSelected = null; + try + { + invalidSelected = getSelectedInvalidConsumerIds(); + } + catch ( ConsumerException e ) + { + e.printStackTrace( ); + } for ( InvalidRepositoryContentConsumer consumer : getAvailableInvalidConsumers() ) { @@ -264,13 +286,12 @@ public class RepositoryContentConsumers * NOTE: Make sure that there is no repository scanning task executing before invoking this so as to prevent * the index writer/reader of the current index-content consumer executing from getting closed. For an example, * see ArchivaDavResource#executeConsumers( File ). - * - * @param repository the repository configuration to use. + * @param repository the repository configuration to use. * @param localFile the local file to execute the consumers against. * @param updateRelatedArtifacts TODO */ public void executeConsumers( ManagedRepository repository, Path localFile, boolean updateRelatedArtifacts ) - throws RepositoryAdminException + throws ConsumerException { List selectedKnownConsumers = null; // Run the repository consumers diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml b/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml index 11b0471b5..8fcc724e0 100644 --- a/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml @@ -150,6 +150,11 @@ + + org.apache.archiva + repository-statistics + test + org.easymock easymock diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml index 0d54566d1..10ebcc55f 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml @@ -32,10 +32,6 @@ - - org.apache.archiva - archiva-repository-admin-api - org.apache.archiva.components archiva-components-spring-taskqueue diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml index a312519e4..5047b1800 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml @@ -32,30 +32,37 @@ + + org.apache.archiva + archiva-scheduler-repository-api + org.apache.archiva archiva-scheduler-api org.apache.archiva - archiva-scheduler-repository-api - ${project.version} - - - commons-io - commons-io - - - org.apache.archiva.components - archiva-components-spring-quartz - - - org.quartz-scheduler - quartz + archiva-storage-api org.apache.archiva - repository-statistics + archiva-storage-fs + + + org.apache.archiva + archiva-consumer-api + + + org.apache.archiva + archiva-filelock + + + org.apache.archiva + archiva-proxy-api + + + org.apache.archiva + archiva-model org.apache.archiva @@ -65,36 +72,76 @@ org.apache.archiva archiva-repository-scanner - org.apache.archiva archiva-repository-layer - - - commons-logging - commons-logging-api - - - log4j - log4j - - - org.slf4j - slf4j-api + org.apache.archiva + archiva-common + + + org.apache.archiva + archiva-repository-api + + + org.apache.archiva + metadata-repository-api + + + org.apache.archiva + metadata-statistics-api + + + org.apache.archiva.components + archiva-components-spring-taskqueue + + + org.apache.archiva.components + archiva-components-spring-quartz + + javax.annotation + javax.annotation-api + + + javax.inject + javax.inject + + + + org.springframework + spring-context + + + + org.apache.commons + commons-lang3 + + + commons-io + commons-io + + + org.quartz-scheduler + quartz + - org.apache.maven.indexer - indexer-core - shaded-lucene + org.apache.archiva + archiva-repository-admin-api + test - commons-beanutils - commons-beanutils + org.apache.logging.log4j + log4j-jcl + test + + + org.apache.archiva.maven + archiva-maven-common test @@ -102,10 +149,30 @@ archiva-maven-repository test + + org.apache.maven.wagon + wagon-provider-api + test + + + org.apache.maven.wagon + wagon-http-shared + test + + + org.springframework + spring-test + test + + + org.apache.maven.indexer + indexer-core + shaded-lucene + test + org.apache.archiva archiva-test-utils - ${project.version} test @@ -119,18 +186,6 @@ test - - org.ow2.asm - asm - test - - - - org.apache.archiva.components.cache - archiva-components-spring-cache-ehcache - test - - 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 ed0dd1a22..c4080417f 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 @@ -19,8 +19,6 @@ package org.apache.archiva.scheduler.repository; * under the License. */ -import org.apache.archiva.admin.model.RepositoryAdminException; -import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.MetadataRepositoryException; import org.apache.archiva.metadata.repository.RepositorySession; @@ -60,9 +58,6 @@ public class ArchivaRepositoryScanningTaskExecutor @Inject RepositoryRegistry repositoryRegistry; - @Inject - private ManagedRepositoryAdmin managedRepositoryAdmin; - @Inject private RepositoryScanner repoScanner; @@ -195,15 +190,14 @@ public class ArchivaRepositoryScanningTaskExecutor this.task = null; } } - catch ( RepositoryAdminException e ) - { - log.error( e.getMessage(), e ); - throw new TaskExecutionException( e.getMessage(), e ); - } catch ( MetadataRepositoryException e ) { e.printStackTrace( ); } + catch ( org.apache.archiva.consumers.ConsumerException e ) + { + e.printStackTrace( ); + } } public Task getCurrentTaskInExecution() @@ -251,13 +245,4 @@ public class ArchivaRepositoryScanningTaskExecutor this.repositoryStatisticsManager = repositoryStatisticsManager; } - public ManagedRepositoryAdmin getManagedRepositoryAdmin() - { - return managedRepositoryAdmin; - } - - public void setManagedRepositoryAdmin( ManagedRepositoryAdmin managedRepositoryAdmin ) - { - this.managedRepositoryAdmin = managedRepositoryAdmin; - } } diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java deleted file mode 100644 index c4b01b6c9..000000000 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java +++ /dev/null @@ -1,124 +0,0 @@ -package org.apache.archiva.mock; -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.archiva.admin.model.AuditInformation; -import org.apache.archiva.admin.model.RepositoryAdminException; -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.ManagedRepositoryConfiguration; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -/** - * @author Olivier Lamy - */ -public class MockManagedRepositoryAdmin - implements ManagedRepositoryAdmin -{ - private ArchivaConfiguration archivaConfiguration; - - @Override - public List getManagedRepositories() - throws RepositoryAdminException - { - List managedRepoConfigs = - getArchivaConfiguration().getConfiguration().getManagedRepositories(); - - List managedRepos = new ArrayList<>( managedRepoConfigs.size() ); - - for ( ManagedRepositoryConfiguration repoConfig : managedRepoConfigs ) - { - // TODO add staging repo information back too - ManagedRepository repo = - new ManagedRepository( Locale.getDefault( ), repoConfig.getId(), repoConfig.getName(), repoConfig.getLocation(), - repoConfig.getLayout(), repoConfig.isSnapshots(), repoConfig.isReleases(), - repoConfig.isBlockRedeployments(), repoConfig.getRefreshCronExpression(), - repoConfig.getIndexDir(), repoConfig.isScanned(), repoConfig.getRetentionPeriod(), - repoConfig.getRetentionCount(), repoConfig.isDeleteReleasedSnapshots(), true ); - - managedRepos.add( repo ); - } - - return managedRepos; - } - - @Override - public Map getManagedRepositoriesAsMap() - throws RepositoryAdminException - { - return null; - } - - @Override - public ManagedRepository getManagedRepository( String repositoryId ) - throws RepositoryAdminException - { - List repos = getManagedRepositories(); - for ( ManagedRepository repo : repos ) - { - if ( StringUtils.equals( repo.getId(), repositoryId ) ) - { - return repo; - } - } - return null; - } - - @Override - public Boolean deleteManagedRepository( String repositoryId, AuditInformation auditInformation, - boolean deleteContent ) - throws RepositoryAdminException - { - return null; - } - - @Override - public Boolean addManagedRepository( ManagedRepository managedRepository, boolean needStageRepo, - AuditInformation auditInformation ) - throws RepositoryAdminException - { - return null; - } - - @Override - public Boolean updateManagedRepository( ManagedRepository managedRepository, boolean needStageRepo, - AuditInformation auditInformation, boolean resetStats ) - throws RepositoryAdminException - { - return null; - } - - public ArchivaConfiguration getArchivaConfiguration() - { - return archivaConfiguration; - } - - public void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration ) - { - this.archivaConfiguration = archivaConfiguration; - } - - -} 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 1ff32198b..1a6d39070 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 @@ -20,6 +20,7 @@ package org.apache.archiva.scheduler.repository; */ import junit.framework.TestCase; +import org.apache.archiva.common.utils.FileUtils; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.metadata.repository.MetadataRepository; @@ -30,7 +31,6 @@ import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.scheduler.repository.model.RepositoryTask; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; -import org.codehaus.plexus.util.FileUtils; import org.junit.After; import org.junit.Before; import org.junit.runner.RunWith; @@ -101,12 +101,12 @@ public abstract class AbstractArchivaRepositoryScanningTaskExecutorTest Path sourceRepoDir = Paths.get( "src/test/repositories/default-repository" ); repoDir = Paths.get( "target/default-repository" ); - org.apache.archiva.common.utils.FileUtils.deleteDirectory( repoDir ); + FileUtils.deleteDirectory( repoDir ); assertFalse( "Default Test Repository should not exist.", Files.exists(repoDir) ); Files.createDirectories(repoDir); - FileUtils.copyDirectoryStructure( sourceRepoDir.toFile(), repoDir.toFile() ); + org.apache.commons.io.FileUtils.copyDirectory( sourceRepoDir.toFile(), repoDir.toFile() ); // set the timestamps to a time well in the past Calendar cal = Calendar.getInstance(); cal.add( Calendar.YEAR, -1 ); diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java index 291d6678e..1adefe033 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java @@ -24,7 +24,7 @@ import org.apache.archiva.metadata.repository.stats.model.DefaultRepositoryStati import org.apache.archiva.metadata.repository.stats.model.RepositoryStatistics; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.scheduler.repository.model.RepositoryTask; -import org.codehaus.plexus.util.FileUtils; +import org.apache.commons.io.FileUtils; import org.junit.Test; import org.springframework.test.context.ContextConfiguration; @@ -78,7 +78,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test Path newArtifactGroup = repoDir.resolve( "org/apache/archiva" ); assertFalse( "newArtifactGroup should not exist.", Files.exists(newArtifactGroup) ); - FileUtils.copyDirectoryStructure( Paths.get( "target/test-classes/test-repo/org/apache/archiva" ).toFile(), + FileUtils.copyDirectory( Paths.get( "target/test-classes/test-repo/org/apache/archiva" ).toFile(), newArtifactGroup.toFile() ); // update last modified date @@ -123,7 +123,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test Path newArtifactGroup = repoDir.resolve( "org/apache/archiva" ); assertFalse( "newArtifactGroup should not exist.", Files.exists(newArtifactGroup) ); - FileUtils.copyDirectoryStructure( Paths.get( "target/test-classes/test-repo/org/apache/archiva" ).toFile(), + FileUtils.copyDirectory( Paths.get( "target/test-classes/test-repo/org/apache/archiva" ).toFile(), newArtifactGroup.toFile() ); // update last modified date, placing shortly after last scan @@ -170,7 +170,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test Path newArtifactGroup = repoDir.resolve( "org/apache/archiva" ); assertFalse( "newArtifactGroup should not exist.", Files.exists(newArtifactGroup) ); - FileUtils.copyDirectoryStructure( Paths.get( "target/test-classes/test-repo/org/apache/archiva" ).toFile(), + FileUtils.copyDirectory( Paths.get( "target/test-classes/test-repo/org/apache/archiva" ).toFile(), newArtifactGroup.toFile() ); // update last modified date, placing in middle of last scan diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml index 79dff8fdd..3d832345a 100755 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml @@ -29,9 +29,6 @@ - - - @@ -42,7 +39,6 @@ - diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/StubRepositoryContentConsumers.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/StubRepositoryContentConsumers.java index e78875375..c820ee2d4 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/StubRepositoryContentConsumers.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/StubRepositoryContentConsumers.java @@ -20,6 +20,7 @@ package org.apache.archiva.webdav; */ import org.apache.archiva.admin.model.admin.ArchivaAdministration; +import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.repository.scanner.RepositoryContentConsumers; @@ -35,13 +36,13 @@ public class StubRepositoryContentConsumers } @Override - public List getSelectedKnownConsumers() + public List getSelectedKnownConsumers() throws ConsumerException { return getAvailableKnownConsumers(); } @Override - public synchronized List getSelectedInvalidConsumers() + public synchronized List getSelectedInvalidConsumers() throws ConsumerException { return getAvailableInvalidConsumers(); } diff --git a/status-dep.txt b/status-dep.txt index 1e16dd29f..84980d53c 100644 --- a/status-dep.txt +++ b/status-dep.txt @@ -29,6 +29,9 @@ archiva-modules archiva-repository-admin archiva-repository-admin-api archiva-repository-admin-default + archiva-scheduler + archiva-scheduler-api + archiva-scheduler-repository