Repository: archiva Updated Branches: refs/heads/master dfbe05b8a -> 97b2c9c90
http://git-wip-us.apache.org/repos/asf/archiva/blob/97b2c9c9/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 1a6cf7c..98091f3 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 @@ -73,9 +73,9 @@ public abstract class AbstractRepositoryLayerTestCase repo.setLocation( location.toAbsolutePath().toUri() ); repo.setLayout( layout ); + RepositoryContentProvider provider = applicationContext.getBean( "repositoryContentProvider#maven", RepositoryContentProvider.class ); ManagedRepositoryContent repoContent = - applicationContext.getBean( "managedRepositoryContent#" + layout, ManagedRepositoryContent.class ); - repoContent.setRepository( repo ); + provider.createManagedContent( repo ); return repoContent; } @@ -87,9 +87,9 @@ public abstract class AbstractRepositoryLayerTestCase repo.setLocation( new URI( url ) ); repo.setLayout( layout ); + RepositoryContentProvider provider = applicationContext.getBean( "repositoryContentProvider#maven", RepositoryContentProvider.class ); RemoteRepositoryContent repoContent = - applicationContext.getBean( "remoteRepositoryContent#" + layout, RemoteRepositoryContent.class ); - repoContent.setRepository( repo ); + provider.createRemoteContent( repo ); return repoContent; } http://git-wip-us.apache.org/repos/asf/archiva/blob/97b2c9c9/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 17068d6..928482b 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 @@ -23,6 +23,7 @@ import org.apache.archiva.common.utils.FileUtils; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.repository.ManagedRepositoryContent; +import org.apache.archiva.repository.RepositoryContentProvider; import org.apache.archiva.repository.layout.LayoutException; import org.apache.archiva.repository.maven2.MavenManagedRepository; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; @@ -518,9 +519,10 @@ public class RepositoryRequestTest repo.setLocation( location.toAbsolutePath().toUri() ); repo.setLayout( layout ); + RepositoryContentProvider provider = applicationContext.getBean( "repositoryContentProvider#maven", RepositoryContentProvider.class ); + ManagedRepositoryContent repoContent = - applicationContext.getBean( "managedRepositoryContent#" + layout, ManagedRepositoryContent.class ); - repoContent.setRepository( repo ); + provider.createManagedContent( repo ); return repoContent; } http://git-wip-us.apache.org/repos/asf/archiva/blob/97b2c9c9/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 4516486..650f49f 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 @@ -32,6 +32,7 @@ import org.apache.archiva.policies.SnapshotsPolicy; import org.apache.archiva.repository.AbstractRepositoryLayerTestCase; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RemoteRepositoryContent; +import org.apache.archiva.repository.RepositoryContentProvider; import org.apache.archiva.repository.layout.LayoutException; import org.apache.archiva.repository.maven2.MavenManagedRepository; import org.apache.commons.io.FileUtils; @@ -365,9 +366,11 @@ public class MetadataToolsTest MavenManagedRepository repo = createRepository( "test-repo", "Test Repository: " + name.getMethodName(), repoRootDir ); + + RepositoryContentProvider provider = applicationContext.getBean( "repositoryContentProvider#maven", RepositoryContentProvider.class ); + ManagedRepositoryContent repoContent = - applicationContext.getBean( "managedRepositoryContent#default", ManagedRepositoryContent.class ); - repoContent.setRepository( repo ); + provider.createManagedContent( repo ); Set<String> testedVersionSet = tools.gatherSnapshotVersions( repoContent, reference ); @@ -618,9 +621,10 @@ public class MetadataToolsTest MavenManagedRepository repoConfig = createRepository( "test-repo", "Test Repository: " + name.getMethodName(), repoRoot ); + RepositoryContentProvider provider = applicationContext.getBean( "repositoryContentProvider#maven", RepositoryContentProvider.class ); + ManagedRepositoryContent repoContent = - applicationContext.getBean( "managedRepositoryContent#default", ManagedRepositoryContent.class ); - repoContent.setRepository( repoConfig ); + provider.createManagedContent( repoConfig ); return repoContent; } http://git-wip-us.apache.org/repos/asf/archiva/blob/97b2c9c9/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml b/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml index 8b00cdc..b5de647 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml +++ b/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml @@ -29,8 +29,6 @@ <context:annotation-config/> <context:component-scan base-package="org.apache.archiva.metadata.repository.storage.maven2.conf,org.apache.archiva.repository.content.maven2"/> - <alias name="managedRepositoryContent#maven" alias="managedRepositoryContent#default" /> - <alias name="remoteRepositoryContent#maven" alias="remoteRepositoryContent#default" /> </beans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/archiva/blob/97b2c9c9/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-repo-request-test.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-repo-request-test.xml b/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-repo-request-test.xml index 1601f2a..3f28158 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-repo-request-test.xml +++ b/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-repo-request-test.xml @@ -35,10 +35,6 @@ <alias name="archivaConfiguration#repo-request-test" alias="archivaConfiguration#default"/> <alias name="archivaConfiguration#repo-request-test" alias="archivaConfiguration"/> - <alias name="managedRepositoryContent#maven" alias="managedRepositoryContent#default" /> - <alias name="remoteRepositoryContent#maven" alias="remoteRepositoryContent#default" /> - - <bean name="registry#configured" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"> <property name="properties"> <value> http://git-wip-us.apache.org/repos/asf/archiva/blob/97b2c9c9/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context.xml b/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context.xml index 5f445d7..197d7e4 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context.xml +++ b/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context.xml @@ -33,7 +33,6 @@ <alias name="archivaConfiguration#test" alias="archivaConfiguration#default"/> <alias name="archivaConfiguration#test" alias="archivaConfiguration"/> - <alias name="managedRepositoryContent#maven" alias="managedRepositoryContent#default" /> <alias name="metadataResolver#test" alias="metadataResolver#default"/> </beans> \ No newline at end of file
