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 5db29e96040c7c806fdf8b02fc479d42dda696ab..8faad7c72223e4ff00a6daa884ff9383a32b89ae 100644 (file)
--- 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 f61a0fa25e2eb74f4f4cabe2d9e48aef1aa4bae1..dfada93165fabdef11e95b4c4bdb2ef228f1e4aa 100644 (file)
--- 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 a6a0cecce249107078de53f12ff41896faef96df..1ebda1b34d587b48cea8ad276aa87577490a8ef0 100644 (file)
--- 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