Author: ningjiang
Date: Wed Dec 15 08:18:46 2010
New Revision: 1049452
URL: http://svn.apache.org/viewvc?rev=1049452&view=rev
Log:
SMX4-707 Fix the camel-nmr failed unit tests
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/log4j.properties
servicemix/smx4/features/trunk/pom.xml
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java?rev=1049452&r1=1049451&r2=1049452&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
Wed Dec 15 08:18:46 2010
@@ -163,6 +163,9 @@ public class ExceptionHandleTest extends
ClientProxy.getClient(greeter).getInInterceptors().add(new
LoggingInInterceptor());
ClientProxy.getClient(greeter).getOutInterceptors().add(new
LoggingOutInterceptor());
greeter.greetMeOneWay("test oneway");
+ // Need to sleep a while as Camel is using Async Engine,
+ // we need to make sure the camel context is not shutdown rightly.
+ Thread.sleep(1000);
}
public void testGetTransportFactoryFromBus() throws Exception {
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/log4j.properties?rev=1049452&r1=1049451&r2=1049452&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/log4j.properties
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/log4j.properties
Wed Dec 15 08:18:46 2010
@@ -18,11 +18,11 @@
#
# The logging properties used during tests..
#
-log4j.rootLogger=DEBUG, out, stdout
+log4j.rootLogger=INFO, out, stdout
# Separate loggers for Camel and ServiceMix to reduce lock contention
-log4j.org.apache.camel=DEBUG, out
-log4j.org.apache.servicemix=DEBUG,out
+log4j.org.apache.camel=INFO, out
+#log4j.org.apache.servicemix=DEBUG,out
# CONSOLE appender not used by default
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1049452&r1=1049451&r2=1049452&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Dec 15 08:18:46 2010
@@ -128,7 +128,7 @@
<activemq.version>5.4.1</activemq.version>
<!-- Camel -->
- <camel.version>2.5.0</camel.version>
+ <camel.version>2.6-SNAPSHOT</camel.version>
<!-- CXF -->
<cxf.version>2.2.11</cxf.version>
