Author: olamy
Date: Wed Dec 5 17:22:16 2012
New Revision: 1417538
URL: http://svn.apache.org/viewvc?rev=1417538&view=rev
Log:
fix junit
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/META-INF/spring-context.xml
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/props/test-another.properties
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/props/test-overlaid.properties
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/META-INF/spring-context.xml?rev=1417538&r1=1417537&r2=1417538&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/META-INF/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/META-INF/spring-context.xml
Wed Dec 5 17:22:16 2012
@@ -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">
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/props/test-another.properties
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/props/test-another.properties?rev=1417538&r1=1417537&r2=1417538&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/props/test-another.properties
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/props/test-another.properties
Wed Dec 5 17:22:16 2012
@@ -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
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/props/test-overlaid.properties
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/props/test-overlaid.properties?rev=1417538&r1=1417537&r2=1417538&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/props/test-overlaid.properties
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/props/test-overlaid.properties
Wed Dec 5 17:22:16 2012
@@ -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
