aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-08-27 21:03:38 +0000
committerOlivier Lamy <olamy@apache.org>2012-08-27 21:03:38 +0000
commit6f6609413d7f8ea240dc4dfa38d9f1e365a3a3ae (patch)
tree43acd3aceb12930928ed7c19279807a7a25c9e30 /archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
parenta257d19489eb4e9c14dc858e4c991f28ea68e066 (diff)
downloadarchiva-6f6609413d7f8ea240dc4dfa38d9f1e365a3a3ae.tar.gz
archiva-6f6609413d7f8ea240dc4dfa38d9f1e365a3a3ae.zip
fix unit test.
avoid using same registry singleton which is modified by one test. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1377860 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml')
-rwxr-xr-xarchiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
index c2c251191..5d9afa13d 100755
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
@@ -32,16 +32,19 @@
<bean name="archivaConfiguration#test-defaults-default-repo-location-exists" class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
<property name="registry" ref="registry#empty"/>
</bean>
+ <bean name="registry#empty" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"/>
<bean name="archivaConfiguration#test-defaults" class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
- <property name="registry" ref="registry#empty"/>
+ <property name="registry" ref="registry#emptydef"/>
</bean>
- <bean name="registry#empty" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"/>
+ <bean name="registry#emptydef" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"/>
<bean name="archivaConfiguration#test-upgrade-09" class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
<property name="registry" ref="registry#test-upgrade-09"/>
</bean>
+
+
<bean name="registry#test-upgrade-09" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
<property name="properties">
<value>