Author: davsclaus
Date: Sat Sep 13 03:25:59 2008
New Revision: 694916
URL: http://svn.apache.org/viewvc?rev=694916&view=rev
Log:
Upgraded ApacheDS to 1.5.4
Modified:
activemq/camel/trunk/components/camel-ldap/ (props changed)
activemq/camel/trunk/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapTestSupport.java
activemq/camel/trunk/components/camel-ldap/src/test/resources/log4j.properties
activemq/camel/trunk/pom.xml
Propchange: activemq/camel/trunk/components/camel-ldap/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Sep 13 03:25:59 2008
@@ -6,3 +6,4 @@
eclipse-classes
.settings
*.i??
+server-work
Modified:
activemq/camel/trunk/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapTestSupport.java?rev=694916&r1=694915&r2=694916&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapTestSupport.java
(original)
+++
activemq/camel/trunk/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapTestSupport.java
Sat Sep 13 03:25:59 2008
@@ -18,7 +18,6 @@
import java.util.Collection;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
import javax.naming.Context;
@@ -39,12 +38,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.directory.server.constants.ServerDNConstants;
-import org.apache.directory.server.ldap.handlers.DefaultUnbindHandler;
import org.apache.directory.server.unit.AbstractServerTest;
/**
- * @version $
+ *
*/
public abstract class LdapTestSupport extends AbstractServerTest {
protected transient Log log = LogFactory.getLog(getClass());
Modified:
activemq/camel/trunk/components/camel-ldap/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ldap/src/test/resources/log4j.properties?rev=694916&r1=694915&r2=694916&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ldap/src/test/resources/log4j.properties
(original)
+++
activemq/camel/trunk/components/camel-ldap/src/test/resources/log4j.properties
Sat Sep 13 03:25:59 2008
@@ -30,7 +30,14 @@
# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1}
- %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
-#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+log4j.appender.out.file=target/camel-ldap-test.log
+log4j.appender.out.append=true
Modified: activemq/camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=694916&r1=694915&r2=694916&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Sat Sep 13 03:25:59 2008
@@ -74,7 +74,7 @@
<testng-version>5.7</testng-version>
<hamcrest-version>1.1</hamcrest-version>
<saxon-version>9.1.0.1</saxon-version>
- <apacheds-version>1.5.3</apacheds-version>
+ <apacheds-version>1.5.4</apacheds-version>
<!-- Repositories -->
<m1-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-repo-url>
