remove unused package, reduce annotations (value= or locations=) Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/fe7e671f Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/fe7e671f Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/fe7e671f
Branch: refs/heads/master Commit: fe7e671f3bb075e22572da95cf2eddc100e0eb73 Parents: 4e90506 Author: Eric Barboni <[email protected]> Authored: Fri Apr 18 01:45:16 2014 +0200 Committer: Eric Barboni <[email protected]> Committed: Fri Apr 18 01:45:16 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/archiva/configuration/MockRepoAdmin.java | 2 +- .../tree/maven2/DependencyTreeBuilderTestMaven3.java | 6 +++--- .../maven2/AbstractDefaultRepositoryContentTestCase.java | 3 --- .../maven2/AbstractLegacyRepositoryContentTestCase.java | 2 +- .../storage/maven2/ManagedDefaultRepositoryContentTest.java | 7 ++----- .../storage/maven2/ManagedLegacyRepositoryContentTest.java | 5 +---- .../Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java | 6 +++--- .../maven2/Maven2RepositoryMetadataResolverMRM1411Test.java | 6 +++--- .../Maven2RepositoryMetadataResolverManagedReleaseTest.java | 2 +- .../Maven2RepositoryMetadataResolverManagedSnapshotTest.java | 5 +---- .../storage/maven2/Maven2RepositoryMetadataResolverTest.java | 6 +++--- .../archiva/metadata/repository/storage/maven2/MockWagon.java | 2 +- .../storage/maven2/RemoteDefaultRepositoryContentTest.java | 5 +---- .../storage/maven2/RemoteLegacyRepositoryContentTest.java | 2 +- .../archiva/repository/AbstractRepositoryLayerTestCase.java | 2 +- .../repository/content/legacy/LegacyPathParserTest.java | 4 ++-- .../content/maven2/ArtifactExtensionMappingTest.java | 2 +- .../repository/content/maven2/DefaultPathParserTest.java | 2 +- .../repository/content/maven2/RepositoryRequestTest.java | 4 ++-- .../repository/metadata/Maven2RepositoryStorageTest.java | 4 ++-- .../apache/archiva/repository/metadata/MetadataToolsTest.java | 6 +++--- 21 files changed, 34 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java index f3c3c55..b9ba411 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java @@ -52,7 +52,7 @@ public class MockRepoAdmin implements RemoteRepositoryAdmin, ManagedRepositoryAdmin, ProxyConnectorAdmin, NetworkProxyAdmin { @Inject - @Named (value = "archivaConfiguration#test") + @Named ( "archivaConfiguration#test" ) private ArchivaConfiguration archivaConfiguration; @Override http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java index d05cad4..c277434 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java @@ -40,12 +40,12 @@ import java.util.Collections; import java.util.List; @RunWith( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) +@ContextConfiguration( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) public class DependencyTreeBuilderTestMaven3 extends TestCase { @Inject - @Named( value = "dependencyTreeBuilder#maven3" ) + @Named( "dependencyTreeBuilder#maven3" ) private Maven3DependencyTreeBuilder builder; @Inject @@ -61,7 +61,7 @@ public class DependencyTreeBuilderTestMaven3 @Inject - @Named( value = "archivaConfiguration#test" ) + @Named( "archivaConfiguration#test" ) ArchivaConfiguration config; @Before http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java index fb425ba..0967e22 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java @@ -22,11 +22,8 @@ package org.apache.archiva.metadata.repository.storage.maven2; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.repository.AbstractRepositoryLayerTestCase; import org.apache.archiva.repository.layout.LayoutException; -import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.lang.StringUtils; import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractLegacyRepositoryContentTestCase.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractLegacyRepositoryContentTestCase.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractLegacyRepositoryContentTestCase.java index f00aef4..379c28d 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractLegacyRepositoryContentTestCase.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractLegacyRepositoryContentTestCase.java @@ -33,7 +33,7 @@ import static org.junit.Assert.*; * AbstractLegacyRepositoryContentTestCase */ @RunWith ( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } ) +@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } ) public abstract class AbstractLegacyRepositoryContentTestCase extends AbstractRepositoryLayerTestCase { http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java index 0b921b0..6c0033e 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java @@ -29,11 +29,8 @@ import org.apache.archiva.model.ProjectReference; import org.apache.archiva.model.VersionedReference; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.layout.LayoutException; -import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; import javax.inject.Inject; import javax.inject.Named; @@ -54,14 +51,14 @@ public class ManagedDefaultRepositoryContentTest extends AbstractDefaultRepositoryContentTestCase { @Inject - @Named ( value = "managedRepositoryContent#default" ) + @Named ( "managedRepositoryContent#default" ) private ManagedRepositoryContent repoContent; @Inject FileTypes fileTypes; @Inject - @Named ( value = "archivaConfiguration#default" ) + @Named ( "archivaConfiguration#default" ) ArchivaConfiguration archivaConfiguration; @Before http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedLegacyRepositoryContentTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedLegacyRepositoryContentTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedLegacyRepositoryContentTest.java index 3bdbea0..ad52ab3 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedLegacyRepositoryContentTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedLegacyRepositoryContentTest.java @@ -26,11 +26,8 @@ import org.apache.archiva.model.ProjectReference; import org.apache.archiva.model.VersionedReference; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.layout.LayoutException; -import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; import javax.inject.Inject; import javax.inject.Named; @@ -51,7 +48,7 @@ public class ManagedLegacyRepositoryContentTest extends AbstractLegacyRepositoryContentTestCase { @Inject - @Named( value = "managedRepositoryContent#legacy" ) + @Named( "managedRepositoryContent#legacy" ) private ManagedRepositoryContent repoContent; @Before http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java index e7538de..dcc05ea 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java @@ -58,14 +58,14 @@ import static org.mockito.Mockito.when; @RunWith ( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) +@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) public class Maven2RepositoryMetadataResolverMRM1411RepoGroupTest extends TestCase { private static final Filter<String> ALL = new AllFilter<String>(); @Inject - @Named (value = "repositoryStorage#maven2") + @Named ( "repositoryStorage#maven2") private Maven2RepositoryStorage storage; private static final String TEST_REPO_ID = "test"; @@ -93,7 +93,7 @@ public class Maven2RepositoryMetadataResolverMRM1411RepoGroupTest private static final String EMPTY_SHA1 = "da39a3ee5e6b4b0d3255bfef95601890afd80709"; @Inject - @Named (value = "archivaConfiguration#default") + @Named ( "archivaConfiguration#default" ) private ArchivaConfiguration configuration; private WagonFactory wagonFactory; http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java index 43aed4b..0b2f650 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java @@ -58,14 +58,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @RunWith ( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) +@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) public class Maven2RepositoryMetadataResolverMRM1411Test extends TestCase { private static final Filter<String> ALL = new AllFilter<String>(); @Inject - @Named (value = "repositoryStorage#maven2") + @Named ( "repositoryStorage#maven2") private Maven2RepositoryStorage storage; private static final String TEST_REPO_ID = "test"; @@ -89,7 +89,7 @@ public class Maven2RepositoryMetadataResolverMRM1411Test private static final String EMPTY_SHA1 = "da39a3ee5e6b4b0d3255bfef95601890afd80709"; @Inject - @Named (value = "archivaConfiguration#default") + @Named ( "archivaConfiguration#default" ) private ArchivaConfiguration configuration; private WagonFactory wagonFactory; http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java index c0ebe5e..c2549ac 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java @@ -38,7 +38,7 @@ public class Maven2RepositoryMetadataResolverManagedReleaseTest private static final Filter<String> ALL = new AllFilter<String>(); @Inject - @Named (value = "repositoryStorage#maven2") + @Named ( "repositoryStorage#maven2") private Maven2RepositoryStorage storage; private static final String TEST_REPO_ID = "test"; http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java index 0cbb7a7..dbbe8e8 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java @@ -24,11 +24,8 @@ import org.apache.archiva.metadata.repository.filter.AllFilter; import org.apache.archiva.metadata.repository.filter.Filter; import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException; -import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; import javax.inject.Inject; import javax.inject.Named; @@ -39,7 +36,7 @@ public class Maven2RepositoryMetadataResolverManagedSnapshotTest private static final Filter<String> ALL = new AllFilter<String>(); @Inject - @Named (value = "repositoryStorage#maven2") + @Named ( "repositoryStorage#maven2") private Maven2RepositoryStorage storage; private static final String TEST_REPO_ID = "test"; http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java index 9cf7228..f23e2d6 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java @@ -63,14 +63,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @RunWith ( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) +@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) public class Maven2RepositoryMetadataResolverTest extends TestCase { private static final Filter<String> ALL = new AllFilter<String>(); @Inject - @Named (value = "repositoryStorage#maven2") + @Named ( "repositoryStorage#maven2" ) private Maven2RepositoryStorage storage; private static final String TEST_REPO_ID = "test"; @@ -94,7 +94,7 @@ public class Maven2RepositoryMetadataResolverTest private static final String EMPTY_SHA1 = "da39a3ee5e6b4b0d3255bfef95601890afd80709"; @Inject - @Named ( value = "archivaConfiguration#default" ) + @Named ( "archivaConfiguration#default" ) protected ArchivaConfiguration configuration; private WagonFactory wagonFactory; http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java index 4ef36d4..fee3410 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java @@ -86,7 +86,7 @@ public class MockWagon } @Override - public List getFileList( String s ) + public List<String> getFileList( String s ) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException { return null; http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java index be5f77b..2145ebc 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java @@ -23,10 +23,7 @@ import org.apache.archiva.admin.model.beans.RemoteRepository; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.repository.RemoteRepositoryContent; import org.apache.archiva.repository.layout.LayoutException; -import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.junit.Before; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; import javax.inject.Inject; import javax.inject.Named; @@ -38,7 +35,7 @@ public class RemoteDefaultRepositoryContentTest extends AbstractDefaultRepositoryContentTestCase { @Inject - @Named ( value = "remoteRepositoryContent#default" ) + @Named ( "remoteRepositoryContent#default" ) private RemoteRepositoryContent repoContent; @Before http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteLegacyRepositoryContentTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteLegacyRepositoryContentTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteLegacyRepositoryContentTest.java index 8cd826b..2a5e647 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteLegacyRepositoryContentTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteLegacyRepositoryContentTest.java @@ -37,7 +37,7 @@ public class RemoteLegacyRepositoryContentTest extends AbstractLegacyRepositoryContentTestCase { @Inject - @Named( value = "remoteRepositoryContent#legacy" ) + @Named( "remoteRepositoryContent#legacy" ) private RemoteRepositoryContent repoContent; @Before http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java index ec52fb4..94bfe47 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java @@ -37,7 +37,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; * */ @RunWith( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } ) +@ContextConfiguration( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } ) public abstract class AbstractRepositoryLayerTestCase { @Rule http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/legacy/LegacyPathParserTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/legacy/LegacyPathParserTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/legacy/LegacyPathParserTest.java index 1e587c9..4b3eb5d 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/legacy/LegacyPathParserTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/legacy/LegacyPathParserTest.java @@ -41,13 +41,13 @@ import static org.junit.Assert.*; * */ @RunWith ( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } ) +@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } ) public class LegacyPathParserTest { private LegacyPathParser parser; @Inject - @Named( value = "archivaConfiguration#default" ) + @Named( "archivaConfiguration#default" ) ArchivaConfiguration config; /** http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMappingTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMappingTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMappingTest.java index c854da0..ae72a66 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMappingTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMappingTest.java @@ -40,7 +40,7 @@ import static org.junit.Assert.assertFalse; * */ @RunWith ( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) +@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) public class ArtifactExtensionMappingTest { private RepositoryPathTranslator pathTranslator = new Maven2RepositoryPathTranslator( http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java index b376c0b..74b2c0d 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java @@ -38,7 +38,7 @@ import static org.junit.Assert.*; * */ @RunWith ( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) +@ContextConfiguration ( { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) public class DefaultPathParserTest { private PathParser parser = new DefaultPathParser(); http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java index 2206b9f..cb5bd55 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java @@ -45,7 +45,7 @@ import static org.junit.Assert.*; */ @RunWith ( ArchivaSpringJUnit4ClassRunner.class ) @ContextConfiguration ( - locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-repo-request-test.xml" } ) + { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-repo-request-test.xml" } ) public class RepositoryRequestTest { @@ -53,7 +53,7 @@ public class RepositoryRequestTest protected ApplicationContext applicationContext; @Inject - @Named ( value = "archivaConfiguration#repo-request-test" ) + @Named ( "archivaConfiguration#repo-request-test" ) private ArchivaConfiguration archivaConfiguration; private RepositoryRequest repoRequest; http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java index 858bb86..ee52f5f 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java @@ -34,11 +34,11 @@ import javax.inject.Named; * @author Olivier Lamy */ @RunWith( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml" } ) +@ContextConfiguration( { "classpath*:/META-INF/spring-context.xml" } ) public class Maven2RepositoryStorageTest { @Inject - @Named( value = "repositoryStorage#maven2" ) + @Named( "repositoryStorage#maven2" ) RepositoryStorage repositoryStorage; @Test http://git-wip-us.apache.org/repos/asf/archiva/blob/fe7e671f/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java index f7876cd..5bb87ce 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java @@ -58,16 +58,16 @@ import static org.junit.Assert.*; * MetadataToolsTest */ @ContextConfiguration ( - locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-metadata-tools-test.xml" } ) + { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-metadata-tools-test.xml" } ) public class MetadataToolsTest extends AbstractRepositoryLayerTestCase { @Inject - @Named ( value = "metadataTools#test" ) + @Named ( "metadataTools#test" ) private MetadataTools tools; @Inject - @Named ( value = "archivaConfiguration#mock" ) + @Named ( "archivaConfiguration#mock" ) protected MockConfiguration config; @Test
