You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/17 09:29:14 UTC

svn commit: r1232332 - in /camel/trunk/components/camel-test-blueprint: pom.xml src/test/resources/log4j.properties

Author: davsclaus
Date: Tue Jan 17 08:29:13 2012
New Revision: 1232332

URL: http://svn.apache.org/viewvc?rev=1232332&view=rev
Log:
camel-test-blueprint must use pertest fork mode for testing as otherwise it fails when having multiple test classes

Modified:
    camel/trunk/components/camel-test-blueprint/pom.xml
    camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties

Modified: camel/trunk/components/camel-test-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/pom.xml?rev=1232332&r1=1232331&r2=1232332&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-test-blueprint/pom.xml Tue Jan 17 08:29:13 2012
@@ -124,4 +124,16 @@
 
     </dependencies>
 
+  <build>
+    <plugins>
+      <!-- TODO: use per test fork mode as otherwise this component fails -->
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>pertest</forkMode>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

Modified: camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties?rev=1232332&r1=1232331&r2=1232332&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties Tue Jan 17 08:29:13 2012
@@ -22,16 +22,21 @@ log4j.rootLogger=INFO, file
 
 log4j.logger.org.springframework=WARN
 #log4j.logger.org.apache.camel=DEBUG
+log4j.logger.org.apache.camel.management=DEBUG
 #log4j.logger.org.apache.camel.test.junit4=DEBUG
 
 # 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{breadcrumbId} - %-10.10X{exchangeId} - %-10.10X{correlationId} - %-10.10X{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-test.log
+log4j.appender.file.file=target/camel-test-blueprint.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{breadcrumbId} - %-10.10X{exchangeId} - %-10.10X{correlationId} - %-10.10X{routeId} - %m%n