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 2012/09/08 00:36:15 UTC

svn commit: r831334 [12/14] - in /websites/production/camel/content: ./ cache/

Modified: websites/production/camel/content/quartz.html
==============================================================================
--- websites/production/camel/content/quartz.html (original)
+++ websites/production/camel/content/quartz.html Fri Sep  7 22:36:12 2012
@@ -92,21 +92,14 @@ Each endpoint represents a different tim
 </pre>
 </div></div>
 
-
-<div class="panelMacro"><table class="infoMacro"><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/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Using cron expressions</b><br clear="none">Configuring the cron expression in Camel 1.x is based on path separators. We changed this to an URI option in Camel 2.0, allowing a more elegant configuration.<br clear="none">
-Also it is <b>not</b> possible to use the <tt>/</tt> cron special character (for increments) in Camel 1.x, which Camel 2.0 also fixes.
-
-<p>You may need to <a shape="rect" class="external-link" href="http://www.december.com/html/spec/esccodes.html" rel="nofollow">escape certain URI</a> characters such as using ? in the quartz cron expression.</p></td></tr></table></div>
-
 <h3><a shape="rect" name="Quartz-URIformat"></a>URI format</h3>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
 quartz:<span class="code-comment">//timerName?options
 </span>quartz:<span class="code-comment">//groupName/timerName?options
-</span>quartz:<span class="code-comment">//groupName/timerName/cronExpression       (@deprecated)
-</span>quartz:<span class="code-comment">//groupName/timerName/?cron=expression     (Camel 2.0)
-</span>quartz:<span class="code-comment">//timerName?cron=expression                (Camel 2.0)</span>
+</span>quartz:<span class="code-comment">//groupName/timerName?cron=expression
+</span>quartz:<span class="code-comment">//timerName?cron=expression</span>
 </pre>
 </div></div>
 
@@ -189,8 +182,7 @@ an unique id is auto assigned, and there
 <p>The <tt>fireTime</tt> header contains the <tt>java.util.Date</tt> of when the exchange was fired.</p>
 
 <h3><a shape="rect" name="Quartz-UsingCronTriggers"></a>Using Cron Triggers</h3>
-<p><b>Available as of Camel 2.0</b><br clear="none">
-Quartz supports <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/documentation/quartz-2.1.x/tutorials/crontrigger" rel="nofollow">Cron-like expressions</a> for specifying timers in a handy format. You can use these expressions in the <tt>cron</tt> URI parameter; though to preserve valid URI encoding we allow + to be used instead of spaces. Quartz provides a <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/docs/tutorials/crontrigger.html" rel="nofollow">little tutorial</a> on how to use cron expressions.</p>
+<p>Quartz supports <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/documentation/quartz-2.1.x/tutorials/crontrigger" rel="nofollow">Cron-like expressions</a> for specifying timers in a handy format. You can use these expressions in the <tt>cron</tt> URI parameter; though to preserve valid URI encoding we allow + to be used instead of spaces. Quartz provides a <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/docs/tutorials/crontrigger.html" rel="nofollow">little tutorial</a> on how to use cron expressions.</p>
 
 <p>For example, the following will fire a message every five minutes starting at 12pm (noon) to 6pm on weekdays:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -212,32 +204,6 @@ from(<span class="code-quote">"quartz:<s
 </div>
 </div>
 
-<h3><a shape="rect" name="Quartz-UsingCronTriggersinCamel1.x"></a>Using Cron Triggers in Camel 1.x</h3>
-<p><b>@deprecated</b><br clear="none">
-Quartz supports <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/docs/api/2.0.0/org/quartz/CronTrigger.html" rel="nofollow">Cron-like expressions</a> for specifying timers in a handy format. You can use these expressions in the URI; though to preserve valid URI encoding we allow <tt>/</tt> to be used instead of spaces and <tt>$</tt> to be used instead of <tt>?</tt>.</p>
-
-<p>For example, the following endpoint URI will fire a message at 12pm (noon) every day</p>
-
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"quartz:<span class="code-comment">//myGroup/myTimerName/0/0/12/*/*/$"</span>).to(<span class="code-quote">"activemq:Totally.Rocks"</span>);</span>
-</pre>
-</div></div>
-
-<p>which is equivalent to using the cron expression</p>
-
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-0 0 12 * * ?
-</pre>
-</div></div>
-
-<p>The following table shows the URI character encodings we use to preserve valid URI syntax:</p>
-<div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">URI Character</th><th colspan="1" rowspan="1" class="confluenceTh">Cron character</th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>/</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>Space</em> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>$</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>?</tt> </td></tr></tbody></table>
-</div>
-</div>
-
 <h3><a shape="rect" name="Quartz-Specifyingtimezone"></a>Specifying time zone</h3>
 <p><b>Available as of Camel 2.8.1</b><br clear="none">
 The Quartz Scheduler allows you to configure time zone per trigger. For example to use a timezone of your country, then you can do as follows:</p>

Modified: websites/production/camel/content/quickfix.html
==============================================================================
--- websites/production/camel/content/quickfix.html (original)
+++ websites/production/camel/content/quickfix.html Fri Sep  7 22:36:12 2012
@@ -77,7 +77,6 @@
         <td valign="top" width="100%">
 <div class="wiki-content maincontent"><h2><a shape="rect" name="Quickfix-QuickFIX%2FJComponent"></a>QuickFIX/J Component</h2>
 
-<p><b>Available as of Camel 2.0</b></p>
 
 <p>The <b>quickfix</b> component adapts the <a shape="rect" class="external-link" href="http://www.quickfixj.org/" rel="nofollow">QuickFIX/J</a> FIX engine for using in Camel . This component uses the standard <a shape="rect" class="external-link" href="http://www.fixprotocol.org/" rel="nofollow">Financial Interchange (FIX) protocol</a> for message transport.</p>
 
@@ -428,8 +427,6 @@ from(<span class="code-quote">"quickfix:
 
 <h2><a shape="rect" name="Quickfix-QuickFIX%2FJComponentPriortoCamel2.5"></a>QuickFIX/J Component Prior to Camel 2.5</h2>
 
-<p><b>Available since Camel 2.0</b></p>
-
 <p>The <b>quickfix</b> component is an implementation of the <a shape="rect" class="external-link" href="http://www.quickfixj.org/" rel="nofollow">QuickFIX/J</a> engine for Java . This engine allows to connect to a FIX server which is used to exchange financial messages according to <a shape="rect" class="external-link" href="http://www.fixprotocol.org/" rel="nofollow">FIX protocol</a> standard.</p>
 
 <p><b>Note:</b> The component can be used to send/receives messages to a FIX server.</p>

Modified: websites/production/camel/content/recipient-list.html
==============================================================================
--- websites/production/camel/content/recipient-list.html (original)
+++ websites/production/camel/content/recipient-list.html Fri Sep  7 22:36:12 2012
@@ -86,7 +86,7 @@
 <h3><a shape="rect" name="RecipientList-Options"></a>Options</h3>
 
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>delimiter</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>,</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Delimiter used if the <a shape="rect" href="expression.html" title="Expression">Expression</a> returned multiple endpoints. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>strategyRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> An <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/AggregationStrategy.html">AggregationStrategy</a> that will assemble the replies from r
 ecipients into a single outgoing message from the <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a>. By default Camel will use the last reply as the outgoing message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>parallelProcessing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.2:</b> If enabled, messages are sent to the recipients concurrently. Note that the calling thread will still wait until all messages have been fully processed before it continues; it's the sending and processing of replies from recipients which happens in parallel. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>executorServiceRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.2:</b> A custom <a shape="rect" href="threading-model.html" title="Threadin
 g Model">Thread Pool</a> to use for parallel processing. Note that enabling this option implies parallel processing, so you need not enable that option as well. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>stopOnException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.2:</b> Whether to immediately stop processing when an exception occurs. If disabled, Camel will send the message to all recipients regardless of any individual failures. You can process exceptions in an <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/AggregationStrategy.html">AggregationStrategy</a> implementation, which supports full control of error handling. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>ignoreInvalidEndpoints</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"
 > <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Whether to ignore an endpoint URI that could not be resolved. If disabled, Camel will throw an exception identifying the invalid endpoint URI. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>streaming</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> If enabled, Camel will process replies out-of-order - that is, in the order received in reply from each recipient. If disabled, Camel will process replies in the same order as specified by the <a shape="rect" href="expression.html" title="Expression">Expression</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeout</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> Specifies a processing timeout milliseconds. If t
 he <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a> hasn't been able to send and process all replies within this timeframe, then the timeout triggers and the <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a> breaks out, with message flow continuing to the next element. Note that if you provide a <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/TimeoutAwareAggregationStrategy.html">TimeoutAwareAggregationStrategy</a>, its <tt>timeout</tt> method is invoked before breaking out. <b>Beware:</b> When a timeout is hit, and there is already running tasks, then these tasks may run for a while, as its hard to cancel/interrupt these tasks in a graceful manner. So use this option with a bit of care. In a future Camel release we may have improved this. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onPrepareR
 ef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> A custom <a shape="rect" href="processor.html" title="Processor">Processor</a> to prepare the copy of the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> each recipient will receive. This allows you to perform arbitrary transformations, such as deep-cloning the message payload (or any other custom logic). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>shareUnitOfWork</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 the unit of work should be shared. See <a shape="rect" href="splitter.html#Splitter-Sharingunitofwork">the same option on Splitter</a> for more details. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>delimiter</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>,</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Delimiter used if the <a shape="rect" href="expression.html" title="Expression">Expression</a> returned multiple endpoints. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>strategyRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> An <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/AggregationStrategy.html">AggregationStrategy</a> that will assemble the replies from r
 ecipients into a single outgoing message from the <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a>. By default Camel will use the last reply as the outgoing message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>parallelProcessing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.2:</b> If enabled, messages are sent to the recipients concurrently. Note that the calling thread will still wait until all messages have been fully processed before it continues; it's the sending and processing of replies from recipients which happens in parallel. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>executorServiceRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.2:</b> A custom <a shape="rect" href="threading-model.html" title="Threadin
 g Model">Thread Pool</a> to use for parallel processing. Note that enabling this option implies parallel processing, so you need not enable that option as well. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>stopOnException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.2:</b> Whether to immediately stop processing when an exception occurs. If disabled, Camel will send the message to all recipients regardless of any individual failures. You can process exceptions in an <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/AggregationStrategy.html">AggregationStrategy</a> implementation, which supports full control of error handling. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>ignoreInvalidEndpoints</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"
 > <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Whether to ignore an endpoint URI that could not be resolved. If disabled, Camel will throw an exception identifying the invalid endpoint URI. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>streaming</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> If enabled, Camel will process replies out-of-order - that is, in the order received in reply from each recipient. If disabled, Camel will process replies in the same order as specified by the <a shape="rect" href="expression.html" title="Expression">Expression</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeout</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> Specifies a processing timeout milliseconds. If t
 he <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a> hasn't been able to send and process all replies within this timeframe, then the timeout triggers and the <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a> breaks out, with message flow continuing to the next element. Note that if you provide a <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/TimeoutAwareAggregationStrategy.html">TimeoutAwareAggregationStrategy</a>, its <tt>timeout</tt> method is invoked before breaking out. <b>Beware:</b> If the timeout is reached with running tasks still remaining, certain tasks for which it is difficult for Camel to shut down in a graceful manner may continue to run.  So use this option with a bit of care.  We may be able to improve this functionality in future Camel releases. </td></tr><tr><td colspan="1" rowspan="1" class="confl
 uenceTd"> <tt>onPrepareRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> A custom <a shape="rect" href="processor.html" title="Processor">Processor</a> to prepare the copy of the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> each recipient will receive. This allows you to perform arbitrary transformations, such as deep-cloning the message payload (or any other custom logic). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>shareUnitOfWork</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 the unit of work should be shared. See <a shape="rect" href="splitter.html#Splitter-Sharingunitofwork">the same option on Splitter</a> for more details. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -151,7 +151,7 @@ You can use the <a shape="rect" href="re
 
 <h5><a shape="rect" name="RecipientList-Iteratablevalue"></a>Iteratable value</h5>
 <p>The dynamic list of recipients that are defined in the header must be iteratable such as:</p>
-<ul class="alternate" type="square"><li><tt>java.util.Collection</tt></li><li><tt>java.util.Iterator</tt></li><li>arrays</li><li><tt>org.w3c.dom.NodeList</tt></li><li><b>Camel 1.6.0:</b> a single String with values separated with comma</li><li>any other type will be regarded as a single value</li></ul>
+<ul class="alternate" type="square"><li><tt>java.util.Collection</tt></li><li><tt>java.util.Iterator</tt></li><li>arrays</li><li><tt>org.w3c.dom.NodeList</tt></li><li>a single String with values separated with comma</li><li>any other type will be regarded as a single value</li></ul>
 
 
 <p><b>Using the <a shape="rect" href="spring-xml-extensions.html" title="Spring XML Extensions">Spring XML Extensions</a></b></p>
@@ -363,7 +363,7 @@ from(<span class="code-quote">"activemq:
 
 <p>If you use <tt>parallelProcessing</tt> then you can configure a total <tt>timeout</tt> value in millis. Camel will then process the messages in parallel until the timeout is hit. This allows you to continue processing if one message is slow. For example you can set a timeout value of 20 sec.</p>
 
-<div class="panelMacro"><table class="warningMacro"><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/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Tasks may keep running</b><br clear="none">When a timeout is hit, and there is already running tasks, then these tasks may run for a while, as its hard to cancel/interrupt these tasks in a graceful manner. So use this option with a bit of care. In a future Camel release we may have improved this.</td></tr></table></div>
+<div class="panelMacro"><table class="warningMacro"><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/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Tasks may keep running</b><br clear="none">If the timeout is reached with running tasks still remaining, certain tasks for which it is difficult for Camel to shut down in a graceful manner may continue to run.  So use this option with a bit of care.  We may be able to improve this functionality in future Camel releases.</td></tr></table></div>
 
 <p>For example in the unit test below you can see we multicast the message to 3 destinations. We have a timeout of 2 seconds, which means only the last two messages can be completed within the timeframe. This means we will only aggregate the last two which yields a result aggregation which outputs <tt>"BC"</tt>.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">

Modified: websites/production/camel/content/restlet.html
==============================================================================
--- websites/production/camel/content/restlet.html (original)
+++ websites/production/camel/content/restlet.html Fri Sep  7 22:36:12 2012
@@ -110,7 +110,7 @@ protocol:<span class="code-comment">//ho
 
 <h3><a shape="rect" name="Restlet-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>headerFilterStrategy=#</tt><em>refName</em> (<b>2.x or later</b>) </td><td colspan="1" rowspan="1" class="confluenceTd"> An instance of <tt>RestletHeaderFilterStrategy</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Use the <tt>#</tt> notation (<tt>headerFilterStrategy=#</tt><em>refName</em>) to reference a header filter strategy in the Camel Registry.  The strategy will be plugged into the restlet binding if it is <tt>HeaderFilterStrategyAware</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>restletBindingRef</tt> (<b>1.x</b>), <br clear="none" class="atl-forced-newline">  <tt>restletBinding=#</tt><em>refName</em> (<b>2.x or later</b>) </td><
 td colspan="1" rowspan="1" class="confluenceTd"> An instance of <tt>DefaultRestletBinding</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The bean ID of a <tt>RestletBinding</tt> object in the Camel Registry. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>restletMethod</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>GET</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> On a producer endpoint, specifies the request method to use.  On a consumer endpoint, specifies that the endpoint consumes only <tt>restletMethod</tt> requests.  The string value is converted to <a shape="rect" class="external-link" href="http://www.restlet.org/documentation/1.1/api/org/restlet/data/Method.html" rel="nofollow">org.restlet.data.Method</a> by the <tt>Method.valueOf(String)</tt> method. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>restletMethods</tt> (<b>2.x or later</b>) </td><td colspan="1" rowspan="1" class="conf
 luenceTd"> <em>None</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Consumer only</b> Specify one or more methods separated by commas (e.g. <tt>restletMethods=post,put</tt>) to be serviced by a restlet consumer endpoint.  If both <tt>restletMethod</tt> and <tt>restletMethods</tt> options are specified, the <tt>restletMethod</tt> setting is ignored. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>restletRealmRef</tt> (<b>1.x</b>), <br clear="none" class="atl-forced-newline">  <tt>restletRealm=#</tt><em>refName</em> <b>(2.x or later)</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The bean ID of the Realm Map in the Camel Registry. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>restletUriPatterns=#</tt><em>refName</em> (<b>2.x or later</b>) </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>None</em> </td><td colspan="1" rowspan="1" cl
 ass="confluenceTd"> <b>Consumer only</b> Specify one ore more URI templates to be serviced by a restlet consumer endpoint, using the <tt>#</tt> notation to reference a <tt>List&lt;String&gt;</tt> in the Camel Registry.  If a URI pattern has been defined in the endpoint URI, both the URI pattern defined in the endpoint and the <tt>restletUriPatterns</tt> option will be honored. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>throwExceptionOnFailure</tt> (<b>2.6 or later</b>)</td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> *Producer only * Throws exception on a producer failure. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>headerFilterStrategy=#</tt><em>refName</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> An instance of <tt>RestletHeaderFilterStrategy</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Use the <tt>#</tt> notation (<tt>headerFilterStrategy=#</tt><em>refName</em>) to reference a header filter strategy in the Camel Registry.  The strategy will be plugged into the restlet binding if it is <tt>HeaderFilterStrategyAware</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>restletBinding=#</tt><em>refName</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> An instance of <tt>DefaultRestletBinding</tt> </td><td colspan="1" rowspan="1" cla
 ss="confluenceTd"> The bean ID of a <tt>RestletBinding</tt> object in the Camel Registry. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>restletMethod</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>GET</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> On a producer endpoint, specifies the request method to use.  On a consumer endpoint, specifies that the endpoint consumes only <tt>restletMethod</tt> requests.  The string value is converted to <a shape="rect" class="external-link" href="http://www.restlet.org/documentation/1.1/api/org/restlet/data/Method.html" rel="nofollow">org.restlet.data.Method</a> by the <tt>Method.valueOf(String)</tt> method. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>restletMethods</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>None</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Consumer only</b> Specify one or more methods separated by commas (e.g
 . <tt>restletMethods=post,put</tt>) to be serviced by a restlet consumer endpoint.  If both <tt>restletMethod</tt> and <tt>restletMethods</tt> options are specified, the <tt>restletMethod</tt> setting is ignored. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>restletRealm=#</tt><em>refName</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The bean ID of the Realm Map in the Camel Registry. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>restletUriPatterns=#</tt><em>refName</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>None</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Consumer only</b> Specify one ore more URI templates to be serviced by a restlet consumer endpoint, using the <tt>#</tt> notation to reference a <tt>List&lt;String&gt;</tt> in the Camel Registry.  If a URI pattern has been defined in the endpoint URI, both th
 e URI pattern defined in the endpoint and the <tt>restletUriPatterns</tt> option will be honored. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>throwExceptionOnFailure</tt> (<b>2.6 or later</b>)</td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> *Producer only * Throws exception on a producer failure. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -123,19 +123,9 @@ protocol:<span class="code-comment">//ho
 
 <h3><a shape="rect" name="Restlet-MessageHeaders"></a>Message Headers</h3>
 
-<h4><a shape="rect" name="Restlet-Camel1.x"></a>Camel 1.x</h4>
-<div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </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>org.apache.camel.restlet.auth.login</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Login name for basic authentication.  It is set on the IN message by the application and gets filtered before the restlet request header by Camel. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.restlet.auth.password</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Password name for basic authentication.  It is set on the IN message by the application and gets filtered before the restlet request header by Ca
 mel. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.restlet.mediaType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies the content type, which can be set on the OUT message by the application/processor.  The value is the <tt>content-type</tt> of the response message.  If this header is not set, the <tt>content-type</tt> is set based on the object type of the OUT message body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.restlet.queryString</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The query string of the request URI.  It is set on the IN message by <tt>DefaultRestletBinding</tt> when the restlet component receives a request. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.restlet.resp
 onseCode</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> or <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The response code can be set on the OUT message by the application/processor.  The value is the response code of the response message.  If this header is not set, the response code is set by the restlet runtime engine. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.restlet.*</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Attributes of a restlet message that get propagated to Camel IN headers. </td></tr></tbody></table>
-</div>
-</div>
-
-<h4><a shape="rect" name="Restlet-Camel2.x"></a>Camel 2.x</h4>
 <div class="confluenceTableSmall"><div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </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>Content-Type</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies the content type, which can be set on the OUT message by the application/processor.  The value is the <tt>content-type</tt> of the response message.  If this header is not set, the content type is based on the object type of the OUT message body. In Camel 2.3 onward, if the Content-Type header is specified in the Camel IN message, the value of the header determine the content type for the Restlet request message.&#160;&#160; Otherwise, it is defaulted to "application/x-www-form-urlencoded'.  Prior to release 2.3, it is not possible to ch
 ange the request content type default. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelAcceptContentType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.9.3, 2.10.0:</b> The HTTP Accept request header.  </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelHttpMethod</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The HTTP request method.  This is set in the IN message header. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelHttpQuery</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The query string of the request URI.  It is set on the IN message by <tt>DefaultRestletBinding</tt> when the restlet component receives a request. </td></tr><tr><td col
 span="1" rowspan="1" class="confluenceTd"> <tt>CamelHttpResponseCode</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> or <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The response code can be set on the OUT message by the application/processor.  The value is the response code of the response message.  If this header is not set, the response code is set by the restlet runtime engine. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelHttpUri</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The HTTP request URI.  This is set in the IN message header. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelRestletLogin</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Login name for basic authentication.  It is set on the IN me
 ssage by the application and gets filtered before the restlet request header by Camel. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelRestletPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Password name for basic authentication.  It is set on the IN message by the application and gets filtered before the restlet request header by Camel. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelRestletRequest</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Request</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> The <tt>org.restlet.Request</tt> object which holds all request details. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelRestletResponse</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Response</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">
  <b>Camel 2.8:</b> The <tt>org.restlet.Response</tt> object. You can use this to create responses using the API from Restlet. See examples below. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.restlet.*</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Attributes of a Restlet message that get propagated to Camel IN headers. </td></tr></tbody></table>
 </div>
-
-
-
 </div>
 
 <h3><a shape="rect" name="Restlet-MessageBody"></a>Message Body</h3>
@@ -158,7 +148,7 @@ protocol:<span class="code-comment">//ho
 });
 </pre>
 </div></div>
-<p>The <tt>restletRealm</tt> setting (in <b>2.x</b>, use the <tt>#</tt> notation,  that is, <tt>restletRealm=#<em>refName</em></tt>)in the URI query is used to look up a Realm Map in the registry.  If this option is specified, the restlet consumer uses the information to authenticate user logins.  Only <em>authenticated</em> requests can access the resources.  In this sample, we create a Spring application context that serves as a registry.  The bean ID of the Realm Map should match the <em>restletRealmRef</em>.</p>
+<p>The <tt>restletRealm</tt> setting in the URI query is used to look up a Realm Map in the registry.  If this option is specified, the restlet consumer uses the information to authenticate user logins.  Only <em>authenticated</em> requests can access the resources.  In this sample, we create a Spring application context that serves as a registry.  The bean ID of the Realm Map should match the <em>restletRealmRef</em>.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-xml"><span class="code-tag">&lt;util:map id=<span class="code-quote">"realm"</span>&gt;</span>
 	<span class="code-tag">&lt;entry key=<span class="code-quote">"admin"</span> value=<span class="code-quote">"foo"</span> /&gt;</span>
@@ -202,7 +192,7 @@ received [&lt;order foo='1'/&gt;] as an 
 </pre>
 </div></div>
 
-<h4><a shape="rect" name="Restlet-SinglerestletendpointtoservicemultiplemethodsandURItemplates%282.0orlater%29"></a>Single restlet endpoint to service multiple methods and URI templates (2.0 or later)</h4>
+<h4><a shape="rect" name="Restlet-SinglerestletendpointtoservicemultiplemethodsandURItemplates"></a>Single restlet endpoint to service multiple methods and URI templates</h4>
 
 <p>It is possible to create a single route to service multiple HTTP methods using the <tt>restletMethods</tt> option.  This snippet also shows how to retrieve the request method from the header:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">

Modified: websites/production/camel/content/rmi.html
==============================================================================
--- websites/production/camel/content/rmi.html (original)
+++ websites/production/camel/content/rmi.html Fri Sep  7 22:36:12 2012
@@ -113,7 +113,7 @@ rmi:<span class="code-comment">//localho
 
 <h3><a shape="rect" name="RMI-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>method</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of <b>Camel 1.3</b>, you can set the name of the method to invoke. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>remoteInterfaces</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Its now possible to use this option from <b>Camel 2.7:</b> in the XML DSL. It can be a list of interface names separated by comma. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>method</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> You can set the name of the method to invoke. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>remoteInterfaces</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Its now possible to use this option from <b>Camel 2.7:</b> in the XML DSL. It can be a list of interface names separated by comma. </td></tr></tbody></table>
 </div>
 </div>
 

Modified: websites/production/camel/content/routing-slip.html
==============================================================================
--- websites/production/camel/content/routing-slip.html (original)
+++ websites/production/camel/content/routing-slip.html Fri Sep  7 22:36:12 2012
@@ -101,8 +101,6 @@ from(<span class="code-quote">"activemq:
 
 <p>Messages will be checked for the existance of the "headerName" header. The value of this header should be a comma-delimited list of endpoint <a shape="rect" href="uris.html" title="URIs">URIs</a> you wish the message to be routed to. The <a shape="rect" href="message.html" title="Message">Message</a> will be routed in a <a shape="rect" href="pipes-and-filters.html" title="Pipes and Filters">pipeline</a> fashion (i.e. one after the other).</p>
 
-<p><b>Note:</b> In Camel 1.x the default header name <tt>routingSlipHeader</tt> has been @deprecated and is removed in Camel 2.0. We feel that the DSL needed to express, the header it uses to locate the destinations, directly in the DSL to not confuse readers. So the header name must be provided. </p>
-
 <p>From Camel 2.5 the <a shape="rect" href="routing-slip.html" title="Routing Slip">Routing Slip</a> will set a property (<tt>Exchange.SLIP_ENDPOINT</tt>) on the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> which contains the current endpoint as it advanced though the slip. This allows you to <em>know</em> how far we have processed in the slip.</p>
 
 <p>The <a shape="rect" href="routing-slip.html" title="Routing Slip">Routing Slip</a> will compute the slip <b>beforehand</b> which means, the slip is only computed once. If you need to compute the slip <em>on-the-fly</em> then use the <a shape="rect" href="dynamic-router.html" title="Dynamic Router">Dynamic Router</a> pattern instead.</p>

Modified: websites/production/camel/content/rss.html
==============================================================================
--- websites/production/camel/content/rss.html (original)
+++ websites/production/camel/content/rss.html Fri Sep  7 22:36:12 2012
@@ -123,7 +123,7 @@ rss:rssUri
 
 <h3><a shape="rect" name="RSS-MessageHeaders"></a>Message Headers</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.component.rss.feed</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 1.x: The entire <tt>SyncFeed</tt> object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelRssFeed</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 2.0: The entire <tt>SyncFeed</tt> object. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelRssFeed</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The entire <tt>SyncFeed</tt> object. </td></tr></tbody></table>
 </div>
 </div>
 

Modified: websites/production/camel/content/scatter-gather.html
==============================================================================
--- websites/production/camel/content/scatter-gather.html (original)
+++ websites/production/camel/content/scatter-gather.html Fri Sep  7 22:36:12 2012
@@ -81,8 +81,6 @@
 
 <p><span class="image-wrap" style=""><img src="http://www.enterpriseintegrationpatterns.com/img/BroadcastAggregate.gif" style="border: 0px solid black"></span></p>
 
-<p>Available in Camel 1.5.</p>
-
 <h4><a shape="rect" name="Scatter-Gather-DynamicScatterGatherExample"></a>Dynamic Scatter-Gather Example</h4>
 
 <p>In this example we want to get the best quote for beer from several different vendors. We use a dynamic <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a> to get the request for a quote to all vendors and an <a shape="rect" href="aggregator.html" title="Aggregator">Aggregator</a> to pick the best quote out of all the responses. The routes for this are defined as:</p>

Modified: websites/production/camel/content/seda.html
==============================================================================
--- websites/production/camel/content/seda.html (original)
+++ websites/production/camel/content/seda.html Fri Sep  7 22:36:12 2012
@@ -114,7 +114,7 @@ from(<span class="code-quote">"seda:inpu
 </div></div>
 <p>In the route above, we have a TCP listener on port 9876 that accepts incoming requests. The request is routed to the <tt>seda:input</tt> queue. As it is a <a shape="rect" href="request-reply.html" title="Request Reply">Request Reply</a> message, we wait for the response. When the consumer on the <tt>seda:input</tt> queue is complete, it copies the response to the original message response.</p>
 
-<div class="panelMacro"><table class="noteMacro"><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/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Camel 2.0 - 2.2: Works only with 2 endpoints</b><br clear="none">Using <a shape="rect" href="request-reply.html" title="Request Reply">Request Reply</a> over <a shape="rect" href="seda.html" title="SEDA">SEDA</a> or <a shape="rect" href="vm.html" title="VM">VM</a> only works with 2 endpoints. You <b>cannot</b> chain endpoints by sending to A -&gt; B -&gt; C etc. Only between A -&gt; B. The reason is the implementation logic is fairly simple. To support 3+ endpoints makes the logic much more complex to handle ordering and notification between the waiting threads properly. 
+<div class="panelMacro"><table class="noteMacro"><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/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>until 2.2: Works only with 2 endpoints</b><br clear="none">Using <a shape="rect" href="request-reply.html" title="Request Reply">Request Reply</a> over <a shape="rect" href="seda.html" title="SEDA">SEDA</a> or <a shape="rect" href="vm.html" title="VM">VM</a> only works with 2 endpoints. You <b>cannot</b> chain endpoints by sending to A -&gt; B -&gt; C etc. Only between A -&gt; B. The reason is the implementation logic is fairly simple. To support 3+ endpoints makes the logic much more complex to handle ordering and notification between the waiting threads properly. 
 
 <p>This has been improved in <b>Camel 2.3</b> onwards, which allows you to chain as many endpoints as you like.</p></td></tr></table></div>
 

Modified: websites/production/camel/content/simple.html
==============================================================================
--- websites/production/camel/content/simple.html (original)
+++ websites/production/camel/content/simple.html Fri Sep  7 22:36:12 2012
@@ -106,7 +106,7 @@ From <b>Camel 2.9</b> onwards you can ne
 <h3><a shape="rect" name="Simple-Variables"></a>Variables</h3>
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Variable </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"> camelId </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> the CamelContext name </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exchangeId </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> the exchange id </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> id </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> the input message id </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> body </td><td colspan="1" rowspan="
 1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> the input body </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.body </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> the input body </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> body.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> the input body invoked using a Camel OGNL expression. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.body.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> the input body invoked using a Camel OGNL expression. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> bodyAs(<em>type</em>) </td><td colspan="1" rowspan="1" class="confluenceTd">
  Type </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Converts the body to the given type determined by its classname. The converted body can be null. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> mandatoryBodyAs(<em>type</em>) </td><td colspan="1" rowspan="1" class="confluenceTd"> Type </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> Converts the body to the given type determined by its classname, and expects the body to be not null. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.body </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> the output body </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="conflu
 enceTd"> header[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> headers.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> headers[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.header.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.header[foo] </td><td colspan="1" rowspan="
 1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.headers.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.headers[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.foo[bar] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> regard input foo header as a map and perform lookup on the map with bar as key </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.header.foo[bar] </
 td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> regard input foo header as a map and perform lookup on the map with bar as key </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.headers.foo[bar] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> regard input foo header as a map and perform lookup on the map with bar as key </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.foo.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> refer to the input foo header and invoke its value using a Camel OGNL expression. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.header.foo.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" ro
 wspan="1" class="confluenceTd"> <b>Camel 2.3:</b> refer to the input foo header and invoke its value using a Camel OGNL expression. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.headers.foo.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> refer to the input foo header and invoke its value using a Camel OGNL expression. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.header.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the out header foo </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.header[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the out header foo </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.headers.foo 
 </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the out header foo </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.headers[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the out header foo </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> headerAs(<em>key</em>,<em>type</em>) </td><td colspan="1" rowspan="1" class="confluenceTd"> Type </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> Converts the header to the given type determined by its classname </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> headers </td><td colspan="1" rowspan="1" class="confluenceTd"> Map </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> refer to the input headers </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.
 headers </td><td colspan="1" rowspan="1" class="confluenceTd"> Map </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> refer to the input headers </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> property.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the foo property on the exchange </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> property[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the foo property on the exchange </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> property.foo.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> refer to the foo property on the exchange and invoke its value using a Camel OGNL expression. </td></tr><
 tr><td colspan="1" rowspan="1" class="confluenceTd"> sys.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the system property </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> sysenv.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> refer to the system environment </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exception </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.4:</b> Refer to the exception object on the exchange, is <b>null</b> if no exception set on exchange. Will fallback and grab caught exceptions (<tt>Exchange.EXCEPTION_CAUGHT</tt>) if the Exchange has any. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exception.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="conflue
 nceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.4:</b> Refer to the exchange exception invoked using a Camel OGNL expression object </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exception.message </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0.</b> Refer to the exception.message on the exchange, is <b>null</b> if no exception set on exchange. Will fallback and grab caught exceptions (<tt>Exchange.EXCEPTION_CAUGHT</tt>) if the Exchange has any. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exception.stacktrace </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6.</b> Refer to the exception.stracktrace on the exchange, is <b>null</b> if no exception set on exchange. Will fallback and grab caught exceptions (<tt>Exchange.EXCEPTION_CAUGHT</tt>) if the Exc
 hange has any. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> date:<em>command:pattern</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 1.5.</b> Date formatting using the <tt>java.text.SimpleDataFormat</tt> patterns. Supported commands are: <b>now</b> for current timestamp, <b>in.header.xxx</b> or <b>header.xxx</b> to use the Date object in the IN header with the key xxx. <b>out.header.xxx</b> to use the Date object in the OUT header with the key xxx.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> bean:<em>bean expression</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 1.5.</b> Invoking a bean expression using the <a shape="rect" href="bean.html" title="Bean">Bean</a> language. Specifying a method name you must use dot as separator. In Camel 2.0 we also support the ?method=methodn
 ame syntax that is used by the <a shape="rect" href="bean.html" title="Bean">Bean</a> component. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties:<em>locations:key</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Lookup a property with the given key. The <tt>locations</tt> option is optional. See more at <a shape="rect" href="using-propertyplaceholder.html" title="Using PropertyPlaceholder">Using PropertyPlaceholder</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> threadName </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Returns the name of the current thread. Can be used for logging purpose. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> ref:xxx </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="
 1" class="confluenceTd"> <b>Camel 2.6:</b> To lookup a bean from the <a shape="rect" href="registry.html" title="Registry">Registry</a> with the given id. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Variable </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"> camelId </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> the CamelContext name </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exchangeId </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> the exchange id </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> id </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> the input message id </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> body </td><td colspan="1" rowspan="
 1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> the input body </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.body </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> the input body </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> body.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> the input body invoked using a Camel OGNL expression. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.body.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> the input body invoked using a Camel OGNL expression. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> bodyAs(<em>type</em>) </td><td colspan="1" rowspan="1" class="confluenceTd">
  Type </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Converts the body to the given type determined by its classname. The converted body can be null. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> mandatoryBodyAs(<em>type</em>) </td><td colspan="1" rowspan="1" class="confluenceTd"> Type </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> Converts the body to the given type determined by its classname, and expects the body to be not null. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.body </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> the output body </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="conflu
 enceTd"> header[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> headers.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> headers[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.header.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.header[foo] </td><td colspan="1" rowspan="
 1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.headers.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.headers[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the input foo header </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.foo[bar] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> regard input foo header as a map and perform lookup on the map with bar as key </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.header.foo[bar] </
 td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> regard input foo header as a map and perform lookup on the map with bar as key </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.headers.foo[bar] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> regard input foo header as a map and perform lookup on the map with bar as key </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.foo.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> refer to the input foo header and invoke its value using a Camel OGNL expression. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.header.foo.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" ro
 wspan="1" class="confluenceTd"> <b>Camel 2.3:</b> refer to the input foo header and invoke its value using a Camel OGNL expression. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.headers.foo.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> refer to the input foo header and invoke its value using a Camel OGNL expression. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.header.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the out header foo </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.header[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the out header foo </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.headers.foo 
 </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the out header foo </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.headers[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the out header foo </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> headerAs(<em>key</em>,<em>type</em>) </td><td colspan="1" rowspan="1" class="confluenceTd"> Type </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> Converts the header to the given type determined by its classname </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> headers </td><td colspan="1" rowspan="1" class="confluenceTd"> Map </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> refer to the input headers </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.
 headers </td><td colspan="1" rowspan="1" class="confluenceTd"> Map </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> refer to the input headers </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> property.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the foo property on the exchange </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> property[foo] </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> refer to the foo property on the exchange </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> property.foo.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> refer to the foo property on the exchange and invoke its value using a Camel OGNL expression. </td></tr><
 tr><td colspan="1" rowspan="1" class="confluenceTd"> sys.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> refer to the system property </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> sysenv.foo </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> refer to the system environment </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exception </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.4:</b> Refer to the exception object on the exchange, is <b>null</b> if no exception set on exchange. Will fallback and grab caught exceptions (<tt>Exchange.EXCEPTION_CAUGHT</tt>) if the Exchange has any. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exception.<b>OGNL</b> </td><td colspan="1" rowspan="1" class="conflue
 nceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.4:</b> Refer to the exchange exception invoked using a Camel OGNL expression object </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exception.message </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> Refer to the exception.message on the exchange, is <b>null</b> if no exception set on exchange. Will fallback and grab caught exceptions (<tt>Exchange.EXCEPTION_CAUGHT</tt>) if the Exchange has any. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exception.stacktrace </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6.</b> Refer to the exception.stracktrace on the exchange, is <b>null</b> if no exception set on exchange. Will fallback and grab caught exceptions (<tt>Exchange.EXCEPTION_CAUGHT</tt>) if the Exchange has any. </t
 d></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> date:<em>command:pattern</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> Date formatting using the <tt>java.text.SimpleDataFormat</tt> patterns. Supported commands are: <b>now</b> for current timestamp, <b>in.header.xxx</b> or <b>header.xxx</b> to use the Date object in the IN header with the key xxx. <b>out.header.xxx</b> to use the Date object in the OUT header with the key xxx.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> bean:<em>bean expression</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> Invoking a bean expression using the <a shape="rect" href="bean.html" title="Bean">Bean</a> language. Specifying a method name you must use dot as separator. We also support the ?method=methodname syntax that is used by the <a shape="rect" href="bean.html" tit
 le="Bean">Bean</a> component. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties:<em>locations:key</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Lookup a property with the given key. The <tt>locations</tt> option is optional. See more at <a shape="rect" href="using-propertyplaceholder.html" title="Using PropertyPlaceholder">Using PropertyPlaceholder</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> threadName </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Returns the name of the current thread. Can be used for logging purpose. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> ref:xxx </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6:</b> To lookup a bean from th
 e <a shape="rect" href="registry.html" title="Registry">Registry</a> with the given id. </td></tr></tbody></table>
 </div>
 
 
@@ -203,8 +203,7 @@ simple(<span class="code-quote">"${body.
 </div></div>
 
 <h3><a shape="rect" name="Simple-Operatorsupport"></a>Operator support</h3>
-<p><b>Available as of Camel 2.0</b><br clear="none">
-We added a basic set of operators supported in the simple language in Camel 2.0. The parser is limited to only support a single operator. </p>
+<p>The parser is limited to only support a single operator. </p>
 
 <p>To enable it the left value must be enclosed in ${ }. The syntax is:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -448,7 +447,7 @@ simple(<span class="code-quote">"${in.he
 </pre>
 </div></div>
 
-<p>And in Camel 2.0 we can use the <tt>?method=methodname</tt> option that we are familiar with the <a shape="rect" href="bean.html" title="Bean">Bean</a> component itself:</p>
+<p>We can use the <tt>?method=methodname</tt> option that we are familiar with the <a shape="rect" href="bean.html" title="Bean">Bean</a> component itself:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
    from(<span class="code-quote">"direct:order"</span>).transform().simple(<span class="code-quote">"OrderId: ${bean:orderIdGenerator?method=generateId}"</span>).to(<span class="code-quote">"mock:reply"</span>);

Modified: websites/production/camel/content/sort.html
==============================================================================
--- websites/production/camel/content/sort.html (original)
+++ websites/production/camel/content/sort.html Fri Sep  7 22:36:12 2012
@@ -76,7 +76,6 @@
         <tr>
         <td valign="top" width="100%">
 <div class="wiki-content maincontent"><h2><a shape="rect" name="Sort-Sort"></a>Sort</h2>
-<p><b>Available as of Camel 2.0</b></p>
 
 <p>Sort can be used to sort a message. Imagine you consume text files and before processing each file you want to be sure the content is sorted.</p>