You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bu...@apache.org on 2013/07/18 11:19:58 UTC

svn commit: r869945 - in /websites/production/camel/content: ./ cache/

Author: buildbot
Date: Thu Jul 18 09:19:57 2013
New Revision: 869945

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/book-component-appendix.html
    websites/production/camel/content/book-in-one-page.html
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/how-do-i-enable-debug-logging.html
    websites/production/camel/content/how-do-i-use-java-14-logging.html
    websites/production/camel/content/how-do-i-use-log4j.html
    websites/production/camel/content/log.html
    websites/production/camel/content/uses-commons-logging.html

Modified: websites/production/camel/content/book-component-appendix.html
==============================================================================
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Thu Jul 18 09:19:57 2013
@@ -10576,17 +10576,10 @@ context.stop();
 
 <p>The <b>log:</b> component logs message exchanges to the underlying logging mechanism.</p>
 
-<b>Camel 2.7 or better</b> uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:
+Camel uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:
 <ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://logback.qos.ch/" rel="nofollow">Logback</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li></ul>
 
 
-<p><b>Camel 2.6 or lower</b> uses <a shape="rect" class="external-link" href="http://commons.apache.org/logging/">commons-logging</a> which allows you to configure logging via, among others:</p>
-<ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li><li>SimpleLog - a simple provider in commons-logging</li></ul>
-
-
-<p>Refer to the <a shape="rect" class="external-link" href="http://commons.apache.org/logging/commons-logging-1.1.1/guide.html">commons-logging user guide</a> for a more complete overview of how to use and configure commons-logging.</p>
-
-
 <h3><a shape="rect" name="BookComponentAppendix-URIformat"></a>URI format</h3>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -10607,11 +10600,11 @@ log:org.apache.camel.example?level=DEBUG
 
 <p>The default logger logs every exchange (<em>regular logging</em>). But Camel also ships with the <tt>Throughput</tt> logger, which is used whenever the <tt>groupSize</tt> option is specified.</p>
 
-<div class="panelMacro"><table class="tipMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Also a log in the DSL</b><br clear="none">In <b>Camel 2.2</b> onwards there is a <tt>log</tt> directly in the DSL, but it has a different purpose. Its meant for lightweight and human logs. See more details at <a shape="rect" href="logeip.html" title="LogEIP">LogEIP</a>.</td></tr></table></div>
+<div class="panelMacro"><table class="tipMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Also a log in the DSL</b><br clear="none">There is also a <tt>log</tt> directly in the DSL, but it has a different purpose. Its meant for lightweight and human logs. See more details at <a shape="rect" href="logeip.html" title="LogEIP">LogEIP</a>.</td></tr></table></div>
 
 <h3><a shape="rect" name="BookComponentAppendix-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>level</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>INFO</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Logging level to use. Possible values: <tt>ERROR</tt>, <tt>WARN</tt>, <tt>INFO</tt>, <tt>DEBUG</tt>, <tt>TRACE</tt>, <tt>OFF</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>marker</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> An optional
  <a shape="rect" class="external-link" href="http://www.slf4j.org/api/org/slf4j/Marker.html" rel="nofollow">Marker</a> name to use. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> An integer that specifies a group size for throughput logging.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupInterval</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: If specified will group message stats by this time interval (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> <
 /td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: Set the initial delay for stats (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupActiveOnly</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: If true, will hide stats when no new messages have been received for a time interval, if false, show stats regardless of message traffic </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>level</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>INFO</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Logging level to use. Possible values: <tt>ERROR</tt>, <tt>WARN</tt>, <tt>INFO</tt>, <tt>DEBUG</tt>, <tt>TRACE</tt>, <tt>OFF</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>marker</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> An optional
  <a shape="rect" class="external-link" href="http://www.slf4j.org/api/org/slf4j/Marker.html" rel="nofollow">Marker</a> name to use. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> An integer that specifies a group size for throughput logging.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupInterval</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If specified will group message stats by this time interval (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td colspan="1
 " rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Set the initial delay for stats (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupActiveOnly</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If true, will hide stats when no new messages have been received for a time interval, if false, show stats regardless of message traffic </td></tr></tbody></table>
 </div>
 </div>
 <p><b>note</b>: groupDelay and groupActiveOnly are only applicable when using groupInterval</p>
@@ -10622,7 +10615,7 @@ log:org.apache.camel.example?level=DEBUG
 <p>The log formats the execution of exchanges to log lines. <br clear="none">
 By default, the log uses <tt>LogFormatter</tt> to format the log output, where <tt>LogFormatter</tt> has the following options:</p>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showAll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangeId</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the unique exchange ID. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangePattern</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>
 Camel 2.3:</b> Shows the Message Exchange Pattern (or MEP for short). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showProperties</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the exchange properties. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showHeaders</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In message headers. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBodyType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In body Java type. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> S
 how the In body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showOut</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an Out message, show the Out message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an exception, show the exception message (no stack trace). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showCaughtException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has a caught exception, show the exception message (no stack trace). A caught exception is stored as a property on the exchange (using the key <tt>Exchange.EXCEPTION_CAUGHT</tt>) and for inst
 ance a <tt>doCatch</tt> can catch exceptions. See <a shape="rect" href="try-catch-finally.html" title="Try Catch Finally">Try Catch Finally</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStackTrace</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the stack trace, if an exchange has an exception. Only effective if one of <tt>showAll</tt>, <tt>showException</tt> or <tt>showCaughtException</tt> are enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFiles</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Whether Camel should show file bodies or not (eg such as java.io.File). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFuture</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" 
 rowspan="1" class="confluenceTd"> <b>Camel 2.1:</b> Whether Camel should show <tt>java.util.concurrent.Future</tt> bodies or not. If enabled Camel could potentially wait until the <tt>Future</tt> task is done. Will by default not wait. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStreams</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use <a shape="rect" href="stream-caching.html" title="Stream caching">Stream caching</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>multiline</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" 
 class="confluenceTd"> If <tt>true</tt>, each piece of information is logged on a new line. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxChars</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Limits the number of characters logged per line. The default value is <tt>10000</tt> from <b>Camel 2.9</b> onwards. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showAll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangeId</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the unique exchange ID. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangePattern</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sho
 ws the Message Exchange Pattern (or MEP for short). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showProperties</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the exchange properties. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showHeaders</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In message headers. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBodyType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In body Java type. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In body. <
 /td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showOut</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an Out message, show the Out message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an exception, show the exception message (no stack trace). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showCaughtException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has a caught exception, show the exception message (no stack trace). A caught exception is stored as a property on the exchange (using the key <tt>Exchange.EXCEPTION_CAUGHT</tt>) and for instance a <tt>doCatch
 </tt> can catch exceptions. See <a shape="rect" href="try-catch-finally.html" title="Try Catch Finally">Try Catch Finally</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStackTrace</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the stack trace, if an exchange has an exception. Only effective if one of <tt>showAll</tt>, <tt>showException</tt> or <tt>showCaughtException</tt> are enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFiles</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Whether Camel should show file bodies or not (eg such as java.io.File). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFuture</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class=
 "confluenceTd"> Whether Camel should show <tt>java.util.concurrent.Future</tt> bodies or not. If enabled Camel could potentially wait until the <tt>Future</tt> task is done. Will by default not wait. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStreams</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use <a shape="rect" href="stream-caching.html" title="Stream caching">Stream caching</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>multiline</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If <tt>true</t
 t>, each piece of information is logged on a new line. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxChars</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Limits the number of characters logged per line. The default value is <tt>10000</tt> from <b>Camel 2.9</b> onwards. </td></tr></tbody></table>
 </div>
 </div>
 

Modified: websites/production/camel/content/book-in-one-page.html
==============================================================================
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Thu Jul 18 09:19:57 2013
@@ -31958,17 +31958,10 @@ context.stop();
 
 <p>The <b>log:</b> component logs message exchanges to the underlying logging mechanism.</p>
 
-<b>Camel 2.7 or better</b> uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:
+Camel uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:
 <ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://logback.qos.ch/" rel="nofollow">Logback</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li></ul>
 
 
-<p><b>Camel 2.6 or lower</b> uses <a shape="rect" class="external-link" href="http://commons.apache.org/logging/">commons-logging</a> which allows you to configure logging via, among others:</p>
-<ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li><li>SimpleLog - a simple provider in commons-logging</li></ul>
-
-
-<p>Refer to the <a shape="rect" class="external-link" href="http://commons.apache.org/logging/commons-logging-1.1.1/guide.html">commons-logging user guide</a> for a more complete overview of how to use and configure commons-logging.</p>
-
-
 <h3><a shape="rect" name="BookInOnePage-URIformat"></a>URI format</h3>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -31989,11 +31982,11 @@ log:org.apache.camel.example?level=DEBUG
 
 <p>The default logger logs every exchange (<em>regular logging</em>). But Camel also ships with the <tt>Throughput</tt> logger, which is used whenever the <tt>groupSize</tt> option is specified.</p>
 
-<div class="panelMacro"><table class="tipMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Also a log in the DSL</b><br clear="none">In <b>Camel 2.2</b> onwards there is a <tt>log</tt> directly in the DSL, but it has a different purpose. Its meant for lightweight and human logs. See more details at <a shape="rect" href="logeip.html" title="LogEIP">LogEIP</a>.</td></tr></table></div>
+<div class="panelMacro"><table class="tipMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Also a log in the DSL</b><br clear="none">There is also a <tt>log</tt> directly in the DSL, but it has a different purpose. Its meant for lightweight and human logs. See more details at <a shape="rect" href="logeip.html" title="LogEIP">LogEIP</a>.</td></tr></table></div>
 
 <h3><a shape="rect" name="BookInOnePage-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>level</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>INFO</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Logging level to use. Possible values: <tt>ERROR</tt>, <tt>WARN</tt>, <tt>INFO</tt>, <tt>DEBUG</tt>, <tt>TRACE</tt>, <tt>OFF</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>marker</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> An optional
  <a shape="rect" class="external-link" href="http://www.slf4j.org/api/org/slf4j/Marker.html" rel="nofollow">Marker</a> name to use. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> An integer that specifies a group size for throughput logging.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupInterval</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: If specified will group message stats by this time interval (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> <
 /td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: Set the initial delay for stats (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupActiveOnly</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: If true, will hide stats when no new messages have been received for a time interval, if false, show stats regardless of message traffic </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>level</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>INFO</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Logging level to use. Possible values: <tt>ERROR</tt>, <tt>WARN</tt>, <tt>INFO</tt>, <tt>DEBUG</tt>, <tt>TRACE</tt>, <tt>OFF</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>marker</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> An optional
  <a shape="rect" class="external-link" href="http://www.slf4j.org/api/org/slf4j/Marker.html" rel="nofollow">Marker</a> name to use. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> An integer that specifies a group size for throughput logging.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupInterval</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If specified will group message stats by this time interval (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td colspan="1
 " rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Set the initial delay for stats (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupActiveOnly</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If true, will hide stats when no new messages have been received for a time interval, if false, show stats regardless of message traffic </td></tr></tbody></table>
 </div>
 </div>
 <p><b>note</b>: groupDelay and groupActiveOnly are only applicable when using groupInterval</p>
@@ -32004,7 +31997,7 @@ log:org.apache.camel.example?level=DEBUG
 <p>The log formats the execution of exchanges to log lines. <br clear="none">
 By default, the log uses <tt>LogFormatter</tt> to format the log output, where <tt>LogFormatter</tt> has the following options:</p>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showAll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangeId</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the unique exchange ID. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangePattern</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>
 Camel 2.3:</b> Shows the Message Exchange Pattern (or MEP for short). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showProperties</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the exchange properties. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showHeaders</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In message headers. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBodyType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In body Java type. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> S
 how the In body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showOut</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an Out message, show the Out message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an exception, show the exception message (no stack trace). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showCaughtException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has a caught exception, show the exception message (no stack trace). A caught exception is stored as a property on the exchange (using the key <tt>Exchange.EXCEPTION_CAUGHT</tt>) and for inst
 ance a <tt>doCatch</tt> can catch exceptions. See <a shape="rect" href="try-catch-finally.html" title="Try Catch Finally">Try Catch Finally</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStackTrace</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the stack trace, if an exchange has an exception. Only effective if one of <tt>showAll</tt>, <tt>showException</tt> or <tt>showCaughtException</tt> are enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFiles</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Whether Camel should show file bodies or not (eg such as java.io.File). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFuture</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" 
 rowspan="1" class="confluenceTd"> <b>Camel 2.1:</b> Whether Camel should show <tt>java.util.concurrent.Future</tt> bodies or not. If enabled Camel could potentially wait until the <tt>Future</tt> task is done. Will by default not wait. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStreams</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use <a shape="rect" href="stream-caching.html" title="Stream caching">Stream caching</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>multiline</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" 
 class="confluenceTd"> If <tt>true</tt>, each piece of information is logged on a new line. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxChars</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Limits the number of characters logged per line. The default value is <tt>10000</tt> from <b>Camel 2.9</b> onwards. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showAll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangeId</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the unique exchange ID. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangePattern</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sho
 ws the Message Exchange Pattern (or MEP for short). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showProperties</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the exchange properties. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showHeaders</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In message headers. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBodyType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In body Java type. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In body. <
 /td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showOut</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an Out message, show the Out message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an exception, show the exception message (no stack trace). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showCaughtException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has a caught exception, show the exception message (no stack trace). A caught exception is stored as a property on the exchange (using the key <tt>Exchange.EXCEPTION_CAUGHT</tt>) and for instance a <tt>doCatch
 </tt> can catch exceptions. See <a shape="rect" href="try-catch-finally.html" title="Try Catch Finally">Try Catch Finally</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStackTrace</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the stack trace, if an exchange has an exception. Only effective if one of <tt>showAll</tt>, <tt>showException</tt> or <tt>showCaughtException</tt> are enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFiles</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Whether Camel should show file bodies or not (eg such as java.io.File). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFuture</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class=
 "confluenceTd"> Whether Camel should show <tt>java.util.concurrent.Future</tt> bodies or not. If enabled Camel could potentially wait until the <tt>Future</tt> task is done. Will by default not wait. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStreams</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use <a shape="rect" href="stream-caching.html" title="Stream caching">Stream caching</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>multiline</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If <tt>true</t
 t>, each piece of information is logged on a new line. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxChars</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Limits the number of characters logged per line. The default value is <tt>10000</tt> from <b>Camel 2.9</b> onwards. </td></tr></tbody></table>
 </div>
 </div>
 

Modified: websites/production/camel/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/camel/content/how-do-i-enable-debug-logging.html
==============================================================================
--- websites/production/camel/content/how-do-i-enable-debug-logging.html (original)
+++ websites/production/camel/content/how-do-i-enable-debug-logging.html Thu Jul 18 09:19:57 2013
@@ -88,17 +88,10 @@
 
 <p>Camel uses convention over configuration so sometimes its useful to turn on debug logging to see how Camel is operating and to try and diagnose issues.</p>
 
-<p><b>Camel 2.7 or better</b> uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:</p>
+<p>Camel uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:</p>
 <ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://logback.qos.ch/" rel="nofollow">Logback</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li></ul>
 
 
-<p><b>Camel 2.6 or lower</b> uses <a shape="rect" class="external-link" href="http://commons.apache.org/logging/">commons-logging</a> which allows you to configure logging via, among others:</p>
-<ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li><li>SimpleLog - a simple provider in commons-logging</li></ul>
-
-
-<p>Refer to the <a shape="rect" class="external-link" href="http://commons.apache.org/logging/commons-logging-1.1.1/guide.html">commons-logging user guide</a> for a more complete overview of how to use and configure commons-logging.</p>
-
-
 <p>To enable debug logging we recommend you <a shape="rect" href="how-do-i-use-log4j.html" title="How do I use log4j">use log4j for logging</a> then make sure your log4j.properties file enables DEBUG level logging for the <b>org.apache.camel.</b> package. </p>
 
 <p>For example here is a log4j.properties file with debug Camel logging enabled</p>

Modified: websites/production/camel/content/how-do-i-use-java-14-logging.html
==============================================================================
--- websites/production/camel/content/how-do-i-use-java-14-logging.html (original)
+++ websites/production/camel/content/how-do-i-use-java-14-logging.html Thu Jul 18 09:19:57 2013
@@ -86,17 +86,10 @@
         <td valign="top" width="100%">
 <div class="wiki-content maincontent"><h2><a shape="rect" name="HowdoIuseJava1.4logging-HowdoIuseJava1.4logging%3F"></a>How do I use Java 1.4 logging?</h2>
 
-<p><b>Camel 2.7 or better</b> uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:</p>
+<p>Camel uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:</p>
 <ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://logback.qos.ch/" rel="nofollow">Logback</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li></ul>
 
 
-<p><b>Camel 2.6 or lower</b> uses <a shape="rect" class="external-link" href="http://commons.apache.org/logging/">commons-logging</a> which allows you to configure logging via, among others:</p>
-<ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li><li>SimpleLog - a simple provider in commons-logging</li></ul>
-
-
-<p>Refer to the <a shape="rect" class="external-link" href="http://commons.apache.org/logging/commons-logging-1.1.1/guide.html">commons-logging user guide</a> for a more complete overview of how to use and configure commons-logging.</p>
-
-
 <p>The quick way to enable Java 1.4 logging is to create a <b>commons-logging.properties</b> file on the classpath with this entry...</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">

Modified: websites/production/camel/content/how-do-i-use-log4j.html
==============================================================================
--- websites/production/camel/content/how-do-i-use-log4j.html (original)
+++ websites/production/camel/content/how-do-i-use-log4j.html Thu Jul 18 09:19:57 2013
@@ -86,17 +86,10 @@
         <td valign="top" width="100%">
 <div class="wiki-content maincontent"><h2><a shape="rect" name="HowdoIuselog4j-HowdoIuseLog4j%3F"></a>How do I use Log4j?</h2>
 
-<p><b>Camel 2.7 or better</b> uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:</p>
+<p>Camel uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:</p>
 <ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://logback.qos.ch/" rel="nofollow">Logback</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li></ul>
 
 
-<p><b>Camel 2.6 or lower</b> uses <a shape="rect" class="external-link" href="http://commons.apache.org/logging/">commons-logging</a> which allows you to configure logging via, among others:</p>
-<ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li><li>SimpleLog - a simple provider in commons-logging</li></ul>
-
-
-<p>Refer to the <a shape="rect" class="external-link" href="http://commons.apache.org/logging/commons-logging-1.1.1/guide.html">commons-logging user guide</a> for a more complete overview of how to use and configure commons-logging.</p>
-
-
 <p>The quick way to enable Log4j is to add log4j to your classpath or maven pom.xml. For example the following in your pom.xml should do the trick</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">

Modified: websites/production/camel/content/log.html
==============================================================================
--- websites/production/camel/content/log.html (original)
+++ websites/production/camel/content/log.html Thu Jul 18 09:19:57 2013
@@ -89,17 +89,10 @@
 
 <p>The <b>log:</b> component logs message exchanges to the underlying logging mechanism.</p>
 
-<p><b>Camel 2.7 or better</b> uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:</p>
+<p>Camel uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:</p>
 <ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://logback.qos.ch/" rel="nofollow">Logback</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li></ul>
 
 
-<p><b>Camel 2.6 or lower</b> uses <a shape="rect" class="external-link" href="http://commons.apache.org/logging/">commons-logging</a> which allows you to configure logging via, among others:</p>
-<ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li><li>SimpleLog - a simple provider in commons-logging</li></ul>
-
-
-<p>Refer to the <a shape="rect" class="external-link" href="http://commons.apache.org/logging/commons-logging-1.1.1/guide.html">commons-logging user guide</a> for a more complete overview of how to use and configure commons-logging.</p>
-
-
 <h3><a shape="rect" name="Log-URIformat"></a>URI format</h3>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -120,11 +113,11 @@ log:org.apache.camel.example?level=DEBUG
 
 <p>The default logger logs every exchange (<em>regular logging</em>). But Camel also ships with the <tt>Throughput</tt> logger, which is used whenever the <tt>groupSize</tt> option is specified.</p>
 
-<div class="panelMacro"><table class="tipMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Also a log in the DSL</b><br clear="none">In <b>Camel 2.2</b> onwards there is a <tt>log</tt> directly in the DSL, but it has a different purpose. Its meant for lightweight and human logs. See more details at <a shape="rect" href="logeip.html" title="LogEIP">LogEIP</a>.</td></tr></table></div>
+<div class="panelMacro"><table class="tipMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Also a log in the DSL</b><br clear="none">There is also a <tt>log</tt> directly in the DSL, but it has a different purpose. Its meant for lightweight and human logs. See more details at <a shape="rect" href="logeip.html" title="LogEIP">LogEIP</a>.</td></tr></table></div>
 
 <h3><a shape="rect" name="Log-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>level</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>INFO</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Logging level to use. Possible values: <tt>ERROR</tt>, <tt>WARN</tt>, <tt>INFO</tt>, <tt>DEBUG</tt>, <tt>TRACE</tt>, <tt>OFF</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>marker</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> An optional
  <a shape="rect" class="external-link" href="http://www.slf4j.org/api/org/slf4j/Marker.html" rel="nofollow">Marker</a> name to use. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> An integer that specifies a group size for throughput logging.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupInterval</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: If specified will group message stats by this time interval (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> <
 /td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: Set the initial delay for stats (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupActiveOnly</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: If true, will hide stats when no new messages have been received for a time interval, if false, show stats regardless of message traffic </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>level</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>INFO</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Logging level to use. Possible values: <tt>ERROR</tt>, <tt>WARN</tt>, <tt>INFO</tt>, <tt>DEBUG</tt>, <tt>TRACE</tt>, <tt>OFF</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>marker</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> An optional
  <a shape="rect" class="external-link" href="http://www.slf4j.org/api/org/slf4j/Marker.html" rel="nofollow">Marker</a> name to use. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> An integer that specifies a group size for throughput logging.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupInterval</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If specified will group message stats by this time interval (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td colspan="1
 " rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Set the initial delay for stats (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupActiveOnly</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If true, will hide stats when no new messages have been received for a time interval, if false, show stats regardless of message traffic </td></tr></tbody></table>
 </div>
 </div>
 <p><b>note</b>: groupDelay and groupActiveOnly are only applicable when using groupInterval</p>
@@ -135,7 +128,7 @@ log:org.apache.camel.example?level=DEBUG
 <p>The log formats the execution of exchanges to log lines. <br clear="none">
 By default, the log uses <tt>LogFormatter</tt> to format the log output, where <tt>LogFormatter</tt> has the following options:</p>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showAll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangeId</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the unique exchange ID. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangePattern</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>
 Camel 2.3:</b> Shows the Message Exchange Pattern (or MEP for short). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showProperties</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the exchange properties. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showHeaders</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In message headers. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBodyType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In body Java type. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> S
 how the In body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showOut</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an Out message, show the Out message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an exception, show the exception message (no stack trace). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showCaughtException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has a caught exception, show the exception message (no stack trace). A caught exception is stored as a property on the exchange (using the key <tt>Exchange.EXCEPTION_CAUGHT</tt>) and for inst
 ance a <tt>doCatch</tt> can catch exceptions. See <a shape="rect" href="try-catch-finally.html" title="Try Catch Finally">Try Catch Finally</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStackTrace</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the stack trace, if an exchange has an exception. Only effective if one of <tt>showAll</tt>, <tt>showException</tt> or <tt>showCaughtException</tt> are enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFiles</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Whether Camel should show file bodies or not (eg such as java.io.File). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFuture</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" 
 rowspan="1" class="confluenceTd"> <b>Camel 2.1:</b> Whether Camel should show <tt>java.util.concurrent.Future</tt> bodies or not. If enabled Camel could potentially wait until the <tt>Future</tt> task is done. Will by default not wait. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStreams</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use <a shape="rect" href="stream-caching.html" title="Stream caching">Stream caching</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>multiline</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" 
 class="confluenceTd"> If <tt>true</tt>, each piece of information is logged on a new line. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxChars</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Limits the number of characters logged per line. The default value is <tt>10000</tt> from <b>Camel 2.9</b> onwards. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showAll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangeId</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the unique exchange ID. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangePattern</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sho
 ws the Message Exchange Pattern (or MEP for short). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showProperties</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the exchange properties. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showHeaders</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In message headers. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBodyType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In body Java type. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In body. <
 /td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showOut</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an Out message, show the Out message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an exception, show the exception message (no stack trace). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showCaughtException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has a caught exception, show the exception message (no stack trace). A caught exception is stored as a property on the exchange (using the key <tt>Exchange.EXCEPTION_CAUGHT</tt>) and for instance a <tt>doCatch
 </tt> can catch exceptions. See <a shape="rect" href="try-catch-finally.html" title="Try Catch Finally">Try Catch Finally</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStackTrace</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the stack trace, if an exchange has an exception. Only effective if one of <tt>showAll</tt>, <tt>showException</tt> or <tt>showCaughtException</tt> are enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFiles</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Whether Camel should show file bodies or not (eg such as java.io.File). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFuture</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class=
 "confluenceTd"> Whether Camel should show <tt>java.util.concurrent.Future</tt> bodies or not. If enabled Camel could potentially wait until the <tt>Future</tt> task is done. Will by default not wait. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStreams</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use <a shape="rect" href="stream-caching.html" title="Stream caching">Stream caching</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>multiline</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If <tt>true</t
 t>, each piece of information is logged on a new line. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxChars</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Limits the number of characters logged per line. The default value is <tt>10000</tt> from <b>Camel 2.9</b> onwards. </td></tr></tbody></table>
 </div>
 </div>
 

Modified: websites/production/camel/content/uses-commons-logging.html
==============================================================================
--- websites/production/camel/content/uses-commons-logging.html (original)
+++ websites/production/camel/content/uses-commons-logging.html Thu Jul 18 09:19:57 2013
@@ -75,15 +75,8 @@
 	<tbody>
         <tr>
         <td valign="top" width="100%">
-<div class="wiki-content maincontent"><p><b>Camel 2.7 or better</b> uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:</p>
+<div class="wiki-content maincontent"><p>Camel uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">sfl4j</a> which allows you to configure logging via, among others:</p>
 <ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://logback.qos.ch/" rel="nofollow">Logback</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li></ul>
-
-
-<p><b>Camel 2.6 or lower</b> uses <a shape="rect" class="external-link" href="http://commons.apache.org/logging/">commons-logging</a> which allows you to configure logging via, among others:</p>
-<ul><li><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/">Log4j</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/package-summary.html" rel="nofollow">JDK Util Logging logging</a></li><li>SimpleLog - a simple provider in commons-logging</li></ul>
-
-
-<p>Refer to the <a shape="rect" class="external-link" href="http://commons.apache.org/logging/commons-logging-1.1.1/guide.html">commons-logging user guide</a> for a more complete overview of how to use and configure commons-logging.</p>
 </div>
         </td>
         <td valign="top">