Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125648 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-05-21 08:45:49 +00:00
parent 5a3e23ead6
commit facd5173ce
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml
View File

@ -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>

6
archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.xml
View File

@ -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>