aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-base/archiva-converter
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-09-14 14:04:12 +0000
committerOlivier Lamy <olamy@apache.org>2011-09-14 14:04:12 +0000
commit1904684d12a7b3c789d6388b92340dc49c26a598 (patch)
treed4036f8a62863aa37444865dbf1aaf0b51c9e946 /archiva-modules/archiva-base/archiva-converter
parent63e9988bb537635051fa1b16083205a2c5d0d13a (diff)
downloadarchiva-1904684d12a7b3c789d6388b92340dc49c26a598.tar.gz
archiva-1904684d12a7b3c789d6388b92340dc49c26a598.zip
[MRM-1003] get RID of org.apache.maven package : artifact-converter module : fix test compilation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1170633 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-converter')
-rw-r--r--archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml2
-rw-r--r--archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java3
-rw-r--r--archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml2
3 files changed, 4 insertions, 3 deletions
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml
index 12df06f0f..1d1622357 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml
@@ -28,6 +28,6 @@
default-lazy-init="true">
<context:annotation-config/>
- <context:component-scan base-package="org.apache.maven.archiva.converter.legacy"/>
+ <context:component-scan base-package="org.apache.archiva.converter.legacy"/>
</beans> \ No newline at end of file
diff --git a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
index 3113639cf..50fdb0c31 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
@@ -21,9 +21,10 @@ package org.apache.maven.archiva.converter;
import junit.framework.TestCase;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.archiva.converter.RepositoryConversionException;
+import org.apache.archiva.converter.legacy.LegacyRepositoryConverter;
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.converter.legacy.LegacyRepositoryConverter;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
diff --git a/archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml
index 0f39f64a0..b679284d8 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml
@@ -27,6 +27,6 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd"
default-lazy-init="true">
- <bean name="mockArchivaAdministration" class="org.apache.maven.archiva.converter.mock.MockArchivaAdministration"/>
+ <bean name="mockArchivaAdministration" class="org.apache.archiva.converter.mock.MockArchivaAdministration"/>
</beans> \ No newline at end of file