From: Olivier Lamy <olamy@apache.org>
Date: Wed, 5 Dec 2012 17:22:16 +0000 (+0000)
Subject: fix junit
X-Git-Tag: redback-2.1~225
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dde5f4a956a035accd3da11053a79d789c1f54e4;p=archiva.git

fix junit

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

diff --git a/redback-configuration/src/test/resources/META-INF/spring-context.xml b/redback-configuration/src/test/resources/META-INF/spring-context.xml
index 5db29e960..8faad7c72 100644
--- a/redback-configuration/src/test/resources/META-INF/spring-context.xml
+++ b/redback-configuration/src/test/resources/META-INF/spring-context.xml
@@ -19,11 +19,8 @@
   -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/context 
-           http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
        default-lazy-init="true">
 
 
diff --git a/redback-configuration/src/test/resources/props/test-another.properties b/redback-configuration/src/test/resources/props/test-another.properties
index f61a0fa25..dfada9316 100644
--- a/redback-configuration/src/test/resources/props/test-another.properties
+++ b/redback-configuration/src/test/resources/props/test-another.properties
@@ -17,4 +17,4 @@
 email.smtp.host=127.0.2.2
 test.value=foo
 test.expression=${org.codehaus.plexus.security.test.value}/bar
-ldap.bind.dn=uid=brett,dc=codehaus,dc=org
+ldap.config.bind.dn=uid=brett,dc=codehaus,dc=org
diff --git a/redback-configuration/src/test/resources/props/test-overlaid.properties b/redback-configuration/src/test/resources/props/test-overlaid.properties
index a6a0cecce..1ebda1b34 100644
--- a/redback-configuration/src/test/resources/props/test-overlaid.properties
+++ b/redback-configuration/src/test/resources/props/test-overlaid.properties
@@ -18,5 +18,5 @@ email.smtp.host=127.0.1.1
 email.smtp.description=Testable Description
 #can't do this, it's appended
 #ldap.bind.dn=uid=user,dc=codehaus,dc=org
-ldap.base.dn=dc=codehaus,dc=org
+ldap.config.base.dn=dc=codehaus,dc=org
 short.list=foo
\ No newline at end of file