Author: olamy
Date: Wed Sep 14 14:04:12 2011
New Revision: 1170633
URL: http://svn.apache.org/viewvc?rev=1170633&view=rev
Log:
[MRM-1003] get RID of org.apache.maven package : artifact-converter module :
fix test compilation
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml?rev=1170633&r1=1170632&r2=1170633&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml
Wed Sep 14 14:04:12 2011
@@ -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
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java?rev=1170633&r1=1170632&r2=1170633&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
Wed Sep 14 14:04:12 2011
@@ -21,9 +21,10 @@ package org.apache.maven.archiva.convert
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;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml?rev=1170633&r1=1170632&r2=1170633&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml
Wed Sep 14 14:04:12 2011
@@ -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
