Author: davsclaus
Date: Mon May 28 11:13:16 2012
New Revision: 1343206
URL: http://svn.apache.org/viewvc?rev=1343206&view=rev
Log:
Force using SSL protocol in camel-ahc testing, to resolve issue with java7 on
ubuntu
Modified:
camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
camel/trunk/components/camel-ahc/src/test/resources/log4j.properties
Modified:
camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java?rev=1343206&r1=1343205&r2=1343206&view=diff
==============================================================================
---
camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
(original)
+++
camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
Mon May 28 11:13:16 2012
@@ -80,11 +80,14 @@ public abstract class BaseAhcTest extend
// is provided. We turn on WANT client-auth to prefer using
authentication
SSLContextServerParameters scsp = new SSLContextServerParameters();
scsp.setClientAuthentication(ClientAuthentication.WANT.name());
-
+
SSLContextParameters sslContextParameters = new SSLContextParameters();
sslContextParameters.setKeyManagers(kmp);
sslContextParameters.setTrustManagers(tmp);
sslContextParameters.setServerParameters(scsp);
+ // use SSLv3 to avoid issue with (eg disable TLS)
+ // Caused by: javax.net.ssl.SSLException: bad record MAC
+ sslContextParameters.setSecureSocketProtocol("SSLv3");
registry.bind("sslContextParameters", sslContextParameters);
}
Modified: camel/trunk/components/camel-ahc/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ahc/src/test/resources/log4j.properties?rev=1343206&r1=1343205&r2=1343206&view=diff
==============================================================================
--- camel/trunk/components/camel-ahc/src/test/resources/log4j.properties
(original)
+++ camel/trunk/components/camel-ahc/src/test/resources/log4j.properties Mon
May 28 11:13:16 2012
@@ -18,20 +18,27 @@
#
# The logging properties used for testing.
#
-log4j.rootLogger=DEBUG, out
+log4j.rootLogger=INFO, out
# uncomment the following to enable camel debugging
-#log4j.logger.org.apache.camel.component.ahc=TRACE
-#log4j.logger.com.ning=TRACE
+log4j.logger.org.apache.camel.component.ahc=TRACE
+log4j.logger.org.apache.camel.util.jsse=DEBUG
+log4j.logger.com.ning=TRACE
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
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
+# MDC
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%-10.10X{camel.breadcrumbId} - %-10.10X{camelexchangeId} -
%-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n
# File appender
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
-log4j.appender.file.file=target/camel-ahc-test.log
\ No newline at end of file
+log4j.appender.file.file=target/camel-ahc-test.log
+log4j.appender.file.append=true
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+# MDC
+#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} -
%-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n
+
+log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file
