فهرست منبع

Fixed problem caused by maven-2.0.8 change in test classpath. ldif file wasn't being loaded for tests. Default path should be "classpath*:" not "classpath:". (See discussing in Spring's PathMatchingResourcePatternResolver).

Luke Taylor 18 سال پیش
والد
کامیت
70286f1197

+ 1 - 1
core/src/main/java/org/springframework/security/config/ApacheDSContainer.java

@@ -151,7 +151,7 @@ class ApacheDSContainer implements InitializingBean, DisposableBean, Lifecycle,
 
     private void importLdifs() throws IOException, NamingException {
         // Import any ldif files
-        Resource[] ldifs = ctxt.getResources("classpath:*.ldif");
+        Resource[] ldifs = ctxt.getResources("classpath*:*.ldif");
 
         // Note that we can't just import using the ServerContext returned
         // from starting Apace DS, apparently because of the long-running issue DIRSERVER-169.

+ 1 - 1
core/src/test/resources/log4j.properties

@@ -2,7 +2,7 @@
 #
 # $Id$
 
-log4j.rootCategory=DEBUG, stdout
+log4j.rootCategory=INFO, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout