git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1403514 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.4-M4
@@ -33,8 +33,6 @@ import static org.junit.Assert.*; | |||
/** | |||
* AbstractDefaultRepositoryContentTestCase | |||
*/ | |||
@RunWith ( ArchivaSpringJUnit4ClassRunner.class ) | |||
@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } ) | |||
public abstract class AbstractDefaultRepositoryContentTestCase | |||
extends AbstractRepositoryLayerTestCase | |||
{ |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository; | |||
package org.apache.archiva.metadata.repository.storage.maven2.conf; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -40,6 +40,7 @@ import java.util.Set; | |||
public class MockConfiguration | |||
implements ArchivaConfiguration | |||
{ | |||
private Configuration configuration = new Configuration(); | |||
private Set<RegistryListener> registryListeners = new HashSet<RegistryListener>(); |
@@ -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.xml" } ) | |||
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-no-mock-conf.xml" } ) | |||
public abstract class AbstractRepositoryLayerTestCase | |||
{ | |||
@Rule |
@@ -30,7 +30,7 @@ import org.apache.archiva.policies.ReleasesPolicy; | |||
import org.apache.archiva.policies.SnapshotsPolicy; | |||
import org.apache.archiva.repository.AbstractRepositoryLayerTestCase; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.MockConfiguration; | |||
import org.apache.archiva.metadata.repository.storage.maven2.conf.MockConfiguration; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; | |||
import org.apache.archiva.repository.layout.LayoutException; | |||
import org.apache.commons.io.FileUtils; |
@@ -27,7 +27,7 @@ | |||
http://www.springframework.org/schema/context/spring-context-3.0.xsd" | |||
default-lazy-init="true"> | |||
<bean name="archivaConfiguration#mock" class="org.apache.archiva.repository.MockConfiguration"/> | |||
<bean name="archivaConfiguration#mock" class="org.apache.archiva.metadata.repository.storage.maven2.conf.MockConfiguration"/> | |||
<alias name="archivaConfiguration#mock" alias="archivaConfiguration#default"/> | |||
<bean name="metadataTools#test" class="org.apache.archiva.repository.metadata.MetadataTools"> | |||
<property name="configuration" ref="archivaConfiguration#mock"/> |
@@ -25,6 +25,8 @@ | |||
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd | |||
http://www.springframework.org/schema/context | |||
http://www.springframework.org/schema/context/spring-context-3.0.xsd"> | |||
<alias name="archivaConfiguration#mock" alias="archivaConfiguration#default"/> | |||
<alias name="archivaConfiguration#mock" alias="archivaConfiguration#test"/> | |||
<context:annotation-config/> | |||
<context:component-scan base-package="org.apache.archiva.metadata.repository.storage.maven2.conf"/> | |||
</beans> |