You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/10/05 18:41:58 UTC
[1/2] git commit: update infinispan from 6.0.0.Alpha1 to 6.0.0.Beta2
Updated Branches:
refs/heads/master ab7b9d0d4 -> 16524a395
update infinispan from 6.0.0.Alpha1 to 6.0.0.Beta2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f1611f0f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f1611f0f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f1611f0f
Branch: refs/heads/master
Commit: f1611f0f0e7fad02a7ad38c54bdf353883b6487c
Parents: ab7b9d0
Author: cmueller <cm...@apache.org>
Authored: Sat Oct 5 18:39:36 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Sat Oct 5 18:39:36 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f1611f0f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0027895..7b03c2d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -182,7 +182,7 @@
<httpclient-version>3.1</httpclient-version>
<ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
<ibatis-version>2.3.4.726</ibatis-version>
- <infinispan-version>6.0.0.Alpha1</infinispan-version>
+ <infinispan-version>6.0.0.Beta2</infinispan-version>
<irclib-bundle-version>1.10_5</irclib-bundle-version>
<irclib-version>1.10</irclib-version>
<isorelax-bundle-version>20050913_4</isorelax-bundle-version>
[2/2] git commit: adjust the default log configuration for the unit
test to not log on the console
Posted by cm...@apache.org.
adjust the default log configuration for the unit test to not log on the console
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16524a39
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16524a39
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16524a39
Branch: refs/heads/master
Commit: 16524a3950a9b4ba5d88503d2f94619487473450
Parents: f1611f0
Author: cmueller <cm...@apache.org>
Authored: Sat Oct 5 18:41:47 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Sat Oct 5 18:41:47 2013 +0200
----------------------------------------------------------------------
.../src/test/resources/log4j.properties | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/16524a39/components/camel-infinispan/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/resources/log4j.properties b/components/camel-infinispan/src/test/resources/log4j.properties
index c71f6a3..077ffeb 100644
--- a/components/camel-infinispan/src/test/resources/log4j.properties
+++ b/components/camel-infinispan/src/test/resources/log4j.properties
@@ -16,12 +16,9 @@
## ------------------------------------------------------------------------
#
-# The logging properties used
+# The logging properties used for eclipse testing, We want to see debug output on the console.
#
-log4j.rootLogger=INFO, out
-
-# uncomment the following line to turn on Camel debugging
-#log4j.logger.org.apache.camel=DEBUG
+log4j.rootLogger=INFO, file
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
@@ -29,4 +26,9 @@ 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.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.file.file=target/camel-ical-test.log
+log4j.appender.file.append=true