You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/05/21 10:45:49 UTC
svn commit: r1125648 - in /archiva/trunk/archiva-modules/archiva-base:
archiva-configuration/src/main/resources/META-INF/
archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/
Author: olamy
Date: Sat May 21 08:45:49 2011
New Revision: 1125648
URL: http://svn.apache.org/viewvc?rev=1125648&view=rev
Log:
[MRM-1473] removing plexus-spring use
fix unit tests in archiva-repository-scanner (not yet moved in full spring)
Conflicts:
archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml?rev=1125648&r1=1125647&r2=1125648&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml Sat May 21 08:45:49 2011
@@ -29,4 +29,9 @@
<context:annotation-config/>
<context:component-scan base-package="org.apache.maven.archiva.configuration"/>
+<<<<<<< HEAD
+=======
+ <!-- olamy could be removed as only here temporary for plexus-spring -->
+ <alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
+>>>>>>> fae223b927f9c5616587cd0aa9b759856e779bed
</beans>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.xml?rev=1125648&r1=1125647&r2=1125648&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.xml Sat May 21 08:45:49 2011
@@ -41,12 +41,16 @@
<component>
<role>org.codehaus.plexus.registry.Registry</role>
<role-hint>configured</role-hint>
- <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
+ <implementation>org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry</implementation>
<configuration>
<properties>
+ <![CDATA[
+ <configuration>
<system/>
<xml fileName="${basedir}/src/test/resources/scanner-archiva.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+ </configuration>
+ ]]>
</properties>
</configuration>
</component>