diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2018-04-07 20:30:27 +0200 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2018-04-07 20:30:27 +0200 |
| commit | 2ef9315447eee184b0b473d3364246a435dacb96 (patch) | |
| tree | 910f8cec676eaae8a474f257d47aed619ac2360b /archiva-modules | |
| parent | face2ff751a7d10c3f487862fca97ed2e8496e84 (diff) | |
| download | archiva-2ef9315447eee184b0b473d3364246a435dacb96.tar.gz archiva-2ef9315447eee184b0b473d3364246a435dacb96.zip | |
Removing repositoryAdmin dependency
Diffstat (limited to 'archiva-modules')
| -rw-r--r-- | archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java index de69ac56b..cbf5eee87 100644 --- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java +++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java @@ -20,9 +20,7 @@ package org.apache.archiva.indexer.maven.search; */ import junit.framework.TestCase; -import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; import org.apache.archiva.admin.repository.proxyconnector.DefaultProxyConnectorAdmin; -import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; import org.apache.archiva.common.utils.FileUtils; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; @@ -45,7 +43,6 @@ import org.apache.maven.index.QueryCreator; import org.apache.maven.index.Scanner; import org.apache.maven.index.ScanningRequest; import org.apache.maven.index.ScanningResult; -import org.apache.maven.index.context.IndexCreator; import org.apache.maven.index.context.IndexingContext; import org.easymock.EasyMock; import org.easymock.IMocksControl; @@ -100,12 +97,6 @@ public abstract class AbstractMavenRepositorySearch Configuration config; @Inject - PlexusSisuBridge plexusSisuBridge; - - @Inject - List<IndexCreator> indexCreators; - - @Inject Indexer indexer; @Inject @@ -131,9 +122,6 @@ public abstract class AbstractMavenRepositorySearch archivaConfig = archivaConfigControl.createMock( ArchivaConfiguration.class ); - DefaultManagedRepositoryAdmin defaultManagedRepositoryAdmin = new DefaultManagedRepositoryAdmin(); - defaultManagedRepositoryAdmin.setArchivaConfiguration( archivaConfig ); - DefaultProxyConnectorAdmin defaultProxyConnectorAdmin = new DefaultProxyConnectorAdmin(); defaultProxyConnectorAdmin.setArchivaConfiguration( archivaConfig ); repositoryRegistry.setArchivaConfiguration( archivaConfig ); @@ -142,14 +130,12 @@ public abstract class AbstractMavenRepositorySearch queryCreator ); assertNotNull( repositoryRegistry ); - defaultManagedRepositoryAdmin.setRepositoryRegistry( repositoryRegistry ); config = new Configuration(); config.addManagedRepository( createRepositoryConfig( TEST_REPO_1 ) ); config.addManagedRepository( createRepositoryConfig( TEST_REPO_2 ) ); config.addManagedRepository( createRepositoryConfig( REPO_RELEASE ) ); - archivaConfig.addListener( EasyMock.anyObject( ConfigurationListener.class ) ); EasyMock.expect( archivaConfig.getDefaultLocale() ).andReturn( Locale.getDefault( ) ).anyTimes(); EasyMock.expect( archivaConfig.getConfiguration() ).andReturn(config).anyTimes(); |