[MRM-1003] get RID of org.apache.maven package : artifact-converter module : fix...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1170633 13f79535-47bb-0310-9956-ffa450edef68

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 12df06f0fdcc52373f4a4a786973ce5e347debf3..1d16223573a3861d177adb487e1bd667024c1092 100644 (file)
--- 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 3113639cfbe979eb71a63fa0304d21b918e3d00b..50fdb0c3147523fd431a7e3896f98a24151cf2f5 100644 (file)
--- 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 0f39f64a01b7923991eeea2ba495ce813bcb651b..b679284d8dc6360675e88d71474c73bbee2ef023 100644 (file)
--- 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