diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java index 42e92464b..545f62f86 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java @@ -76,8 +76,7 @@ public abstract class AbstractRepositoryPurge /** * Purge the repo. Update db and index of removed artifacts. * - * @param artifactFiles - * @throws RepositoryIndexException + * @param references */ protected void purge( Set references ) { diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/MockConfiguration.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/MockConfiguration.java deleted file mode 100644 index 9ad167150..000000000 --- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/MockConfiguration.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.apache.maven.archiva.indexer; - -/* - * 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.maven.archiva.configuration.ArchivaConfiguration; -import org.apache.maven.archiva.configuration.Configuration; -import org.apache.maven.archiva.configuration.ConfigurationListener; -import org.codehaus.plexus.registry.Registry; -import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.plexus.registry.RegistryListener; -import org.easymock.MockControl; - -import java.util.HashSet; -import java.util.Set; - -/** - * MockConfiguration - * - * @version $Id$ - * - * @plexus.component role="org.apache.maven.archiva.configuration.ArchivaConfiguration" - * role-hint="mock" - */ -public class MockConfiguration implements ArchivaConfiguration -{ - private Configuration configuration = new Configuration(); - - private Set registryListeners = new HashSet(); - private Set configListeners = new HashSet(); - - private MockControl registryControl; - - private Registry registryMock; - - public MockConfiguration() - { - registryControl = MockControl.createNiceControl( Registry.class ); - registryMock = (Registry) registryControl.getMock(); - } - - public void addChangeListener( RegistryListener listener ) - { - registryListeners.add( listener ); - } - - public Configuration getConfiguration() - { - return configuration; - } - - public void save( Configuration configuration ) - throws RegistryException - { - /* do nothing */ - } - - public void triggerChange( String name, String value ) - { - for(RegistryListener listener: registryListeners) - { - try - { - listener.afterConfigurationChange( registryMock, name, value ); - } - catch ( Exception e ) - { - e.printStackTrace(); - } - } - } - - public void addListener( ConfigurationListener listener ) - { - configListeners.add(listener); - } - - public void removeListener( ConfigurationListener listener ) - { - configListeners.remove( listener ); - } - - public boolean isDefaulted() - { - return false; - } -} diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/resources/META-INF/plexus/components.xml b/archiva-modules/archiva-base/archiva-indexer/src/test/resources/META-INF/plexus/components.xml deleted file mode 100644 index af15697a1..000000000 --- a/archiva-modules/archiva-base/archiva-indexer/src/test/resources/META-INF/plexus/components.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - org.apache.maven.archiva.configuration.ArchivaConfiguration - mock - org.apache.maven.archiva.indexer.MockConfiguration - - - org.apache.maven.archiva.indexer.RepositoryContentIndexFactory - lucene - org.apache.maven.archiva.indexer.lucene.LuceneRepositoryContentIndexFactory - Factory for Lucene repository content index instances. - - - org.apache.maven.archiva.configuration.ArchivaConfiguration - mock - configuration - - - - -