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/01/21 13:23:51 UTC

svn commit: r847450 - in /websites/production/camel/content: book-in-one-page.html book-pattern-appendix.html cache/main.pageCache message-filter.html throttler.html

Author: buildbot
Date: Mon Jan 21 12:23:50 2013
New Revision: 847450

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/book-in-one-page.html
    websites/production/camel/content/book-pattern-appendix.html
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/message-filter.html
    websites/production/camel/content/throttler.html

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 Mon Jan 21 12:23:50 2013
@@ -15339,7 +15339,7 @@ from(<span class="code-quote">"activemq:
 
 <p><span class="image-wrap" style=""><img src="http://www.enterpriseintegrationpatterns.com/img/MessageFilter.gif" style="border: 0px solid black"></span></p>
 
-<p>The following example shows how to create a Message Filter route consuming messages from an endpoint called <b>queue:a</b> which if the <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> is true will be dispatched to <b>queue:b</b></p>
+<p>The following example shows how to create a Message Filter route consuming messages from an endpoint called <b>queue:a</b>, which if the <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> is true will be dispatched to <b>queue:b</b></p>
 
 <p><b>Using the <a shape="rect" href="fluent-builders.html" title="Fluent Builders">Fluent Builders</a></b></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -15355,7 +15355,7 @@ from(<span class="code-quote">"activemq:
 </pre>
 </div></div>
 
-<p>You can of course use many different <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> languages such as <a shape="rect" href="xpath.html" title="XPath">XPath</a>, <a shape="rect" href="xquery.html" title="XQuery">XQuery</a>, <a shape="rect" href="sql.html" title="SQL">SQL</a> or various <a shape="rect" href="scripting-languages.html" title="Scripting Languages">Scripting Languages</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java">XPath  example</a> </p>
+<p>You can, of course, use many different <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> languages such as <a shape="rect" href="xpath.html" title="XPath">XPath</a>, <a shape="rect" href="xquery.html" title="XQuery">XQuery</a>, <a shape="rect" href="sql.html" title="SQL">SQL</a> or various <a shape="rect" href="scripting-languages.html" title="Scripting Languages">Scripting Languages</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java">XPath  example</a> </p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">from(<span class="code-quote">"direct:start"</span>).
@@ -15419,9 +15419,9 @@ from(<span class="code-quote">"direct:st
 <h4><a shape="rect" name="BookInOnePage-KnowingifExchangewasfilteredornot"></a>Knowing if <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> was filtered or not</h4>
 <p><b>Available as of Camel 2.5</b></p>
 
-<p>The <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> EIP will add a property on the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> which states if it was filtered or not.</p>
+<p>The <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> EIP will add a property on the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> that states if it was filtered or not.</p>
 
-<p>The property has the key <tt>Exchannge.FILTER_MATCHED</tt> which has the String value of <tt>CamelFilterMatched</tt>. Its value is a boolean indicating <tt>true</tt> or <tt>false</tt>. If the value is <tt>true</tt> then the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> was routed in the filter block.</p>
+<p>The property has the key <tt>Exchange.FILTER_MATCHED</tt>, which has the String value of <tt>CamelFilterMatched</tt>. Its value is a boolean indicating <tt>true</tt> or <tt>false</tt>. If the value is <tt>true</tt> then the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> was routed in the filter block. This property will be visible within the <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> block who's <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> matches (value set to <tt>true</tt>), and to the steps immediately following the <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> with the value set based on the results of the last <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> evaluated.</p>
 
 <h4><a shape="rect" name="BookInOnePage-UsingThisPattern"></a>Using This Pattern</h4>
 
@@ -17549,7 +17549,7 @@ from(<span class="code-quote">"activemq:
 <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"> 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>maximumRequestsPerPeriod</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Maximum number of requests per period to throttle. This option must be provided and a positive number. Notice, in the XML DSL, from <b>Camel 2.8</b> onwards this option is configured using an <a shape="rect" href="expression.html" title="Expression">Expression</a> instead of an attribute. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timePeriodMillis</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The time period in millis, in which the
  throttler will allow at most <tt>maximumRequestsPerPeriod</tt> number of messages. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>asyncDelayed</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.4:</b> If enabled then any messages which is delayed happens asynchronously using a scheduled thread pool. </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.4:</b> Refers to a custom <a shape="rect" href="threading-model.html" title="Threading Model">Thread Pool</a> to be used if <tt>asyncDelay</tt> has been enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>callerRunsWhenRejected</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="
 1" class="confluenceTd"> <b>Camel 2.4:</b> Is used if <tt>asyncDelayed</tt> was enabled. This controls if the caller thread should execute the task if the thread pool rejected the task. </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>maximumRequestsPerPeriod</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Maximum number of requests per period to throttle. This option must be provided as a positive number. Notice, in the XML DSL, from <b>Camel 2.8</b> onwards this option is configured using an <a shape="rect" href="expression.html" title="Expression">Expression</a> instead of an attribute. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timePeriodMillis</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The time period in milliseconds, in whic
 h the throttler will allow at most <tt>maximumRequestsPerPeriod</tt> number of messages. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>asyncDelayed</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.4:</b> If enabled then any messages which is delayed happens asynchronously using a scheduled thread pool. </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.4:</b> Refers to a custom <a shape="rect" href="threading-model.html" title="Threading Model">Thread Pool</a> to be used if <tt>asyncDelay</tt> has been enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>callerRunsWhenRejected</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rows
 pan="1" class="confluenceTd"> <b>Camel 2.4:</b> Is used if <tt>asyncDelayed</tt> was enabled. This controls if the caller thread should execute the task if the thread pool rejected the task. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -17562,7 +17562,9 @@ from(<span class="code-quote">"activemq:
 </pre>
 </div></div>
 
-<p>So the above example will throttle messages all messages received on <b>seda:a</b> before being sent to <b>mock:result</b> ensuring that a maximum of 3 messages are sent in any 10 second window. Note that typically you would often use the default time period of a second. So to throttle requests at 100 requests per second between two endpoints it would look more like this...</p>
+<p>So the above example will throttle messages all messages received on <b>seda:a</b> before being sent to <b>mock:result</b> ensuring that a maximum of 3 messages are sent in any 10 second window.</p>
+
+<p>Note that since <tt>timePeriodMillis</tt> defaults to 1000 milliseconds, just setting the <tt>maximumRequestsPerPeriod</tt> has the effect of setting the maximum number of requests per second. So to throttle requests at 100 requests per second between two endpoints, it would look more like this...</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
@@ -17599,7 +17601,7 @@ from(<span class="code-quote">"seda:a"</
 </div></div>
 
 <h3><a shape="rect" name="BookInOnePage-Dynamicallychangingmaximumrequestsperperiod"></a>Dynamically changing maximum requests per period</h3>
-<p><b>Available os of Camel 2.8</b> <br clear="none">
+<p><b>Available as of Camel 2.8</b> <br clear="none">
 Since we use an <a shape="rect" href="expression.html" title="Expression">Expression</a> you can adjust this value at runtime, for example you can provide a header with the value. At runtime Camel evaluates the expression and converts the result to a <tt>java.lang.Long</tt> type. In the example below we use a header from the message to determine the maximum requests per period. If the header is absent, then the <a shape="rect" href="throttler.html" title="Throttler">Throttler</a> uses the old value. So that allows you to only provide a header if the value is to be changed:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-xml"><span class="code-tag">&lt;route&gt;</span>
@@ -17616,7 +17618,7 @@ Since we use an <a shape="rect" href="ex
 <h3><a shape="rect" name="BookInOnePage-Asynchronousdelaying"></a>Asynchronous delaying</h3>
 <p><b>Available as of Camel 2.4</b></p>
 
-<p>You can let the <a shape="rect" href="throttler.html" title="Throttler">Throttler</a> use non blocking asynchronous delaying, which means Camel will use a scheduler to schedule a task to be executed in the future. The task will then continue routing. This allows the caller thread to not block and be able to service other messages etc.</p>
+<p>You can let the <a shape="rect" href="throttler.html" title="Throttler">Throttler</a> use non blocking asynchronous delaying, which means Camel will use a scheduler to schedule a task to be executed in the future. The task will then continue routing. This allows the caller thread to not block and be able to service other messages, etc.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">

Modified: websites/production/camel/content/book-pattern-appendix.html
==============================================================================
--- websites/production/camel/content/book-pattern-appendix.html (original)
+++ websites/production/camel/content/book-pattern-appendix.html Mon Jan 21 12:23:50 2013
@@ -1094,7 +1094,7 @@ from(<span class="code-quote">"activemq:
 
 <p><span class="image-wrap" style=""><img src="http://www.enterpriseintegrationpatterns.com/img/MessageFilter.gif" style="border: 0px solid black"></span></p>
 
-<p>The following example shows how to create a Message Filter route consuming messages from an endpoint called <b>queue:a</b> which if the <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> is true will be dispatched to <b>queue:b</b></p>
+<p>The following example shows how to create a Message Filter route consuming messages from an endpoint called <b>queue:a</b>, which if the <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> is true will be dispatched to <b>queue:b</b></p>
 
 <p><b>Using the <a shape="rect" href="fluent-builders.html" title="Fluent Builders">Fluent Builders</a></b></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -1110,7 +1110,7 @@ from(<span class="code-quote">"activemq:
 </pre>
 </div></div>
 
-<p>You can of course use many different <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> languages such as <a shape="rect" href="xpath.html" title="XPath">XPath</a>, <a shape="rect" href="xquery.html" title="XQuery">XQuery</a>, <a shape="rect" href="sql.html" title="SQL">SQL</a> or various <a shape="rect" href="scripting-languages.html" title="Scripting Languages">Scripting Languages</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java">XPath  example</a> </p>
+<p>You can, of course, use many different <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> languages such as <a shape="rect" href="xpath.html" title="XPath">XPath</a>, <a shape="rect" href="xquery.html" title="XQuery">XQuery</a>, <a shape="rect" href="sql.html" title="SQL">SQL</a> or various <a shape="rect" href="scripting-languages.html" title="Scripting Languages">Scripting Languages</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java">XPath  example</a> </p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">from(<span class="code-quote">"direct:start"</span>).
@@ -1174,9 +1174,9 @@ from(<span class="code-quote">"direct:st
 <h4><a shape="rect" name="BookPatternAppendix-KnowingifExchangewasfilteredornot"></a>Knowing if <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> was filtered or not</h4>
 <p><b>Available as of Camel 2.5</b></p>
 
-<p>The <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> EIP will add a property on the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> which states if it was filtered or not.</p>
+<p>The <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> EIP will add a property on the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> that states if it was filtered or not.</p>
 
-<p>The property has the key <tt>Exchannge.FILTER_MATCHED</tt> which has the String value of <tt>CamelFilterMatched</tt>. Its value is a boolean indicating <tt>true</tt> or <tt>false</tt>. If the value is <tt>true</tt> then the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> was routed in the filter block.</p>
+<p>The property has the key <tt>Exchange.FILTER_MATCHED</tt>, which has the String value of <tt>CamelFilterMatched</tt>. Its value is a boolean indicating <tt>true</tt> or <tt>false</tt>. If the value is <tt>true</tt> then the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> was routed in the filter block. This property will be visible within the <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> block who's <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> matches (value set to <tt>true</tt>), and to the steps immediately following the <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> with the value set based on the results of the last <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> evaluated.</p>
 
 <h4><a shape="rect" name="BookPatternAppendix-UsingThisPattern"></a>Using This Pattern</h4>
 
@@ -3304,7 +3304,7 @@ from(<span class="code-quote">"activemq:
 <h3><a shape="rect" name="BookPatternAppendix-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>maximumRequestsPerPeriod</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Maximum number of requests per period to throttle. This option must be provided and a positive number. Notice, in the XML DSL, from <b>Camel 2.8</b> onwards this option is configured using an <a shape="rect" href="expression.html" title="Expression">Expression</a> instead of an attribute. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timePeriodMillis</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The time period in millis, in which the
  throttler will allow at most <tt>maximumRequestsPerPeriod</tt> number of messages. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>asyncDelayed</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.4:</b> If enabled then any messages which is delayed happens asynchronously using a scheduled thread pool. </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.4:</b> Refers to a custom <a shape="rect" href="threading-model.html" title="Threading Model">Thread Pool</a> to be used if <tt>asyncDelay</tt> has been enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>callerRunsWhenRejected</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="
 1" class="confluenceTd"> <b>Camel 2.4:</b> Is used if <tt>asyncDelayed</tt> was enabled. This controls if the caller thread should execute the task if the thread pool rejected the task. </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>maximumRequestsPerPeriod</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Maximum number of requests per period to throttle. This option must be provided as a positive number. Notice, in the XML DSL, from <b>Camel 2.8</b> onwards this option is configured using an <a shape="rect" href="expression.html" title="Expression">Expression</a> instead of an attribute. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timePeriodMillis</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The time period in milliseconds, in whic
 h the throttler will allow at most <tt>maximumRequestsPerPeriod</tt> number of messages. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>asyncDelayed</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.4:</b> If enabled then any messages which is delayed happens asynchronously using a scheduled thread pool. </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.4:</b> Refers to a custom <a shape="rect" href="threading-model.html" title="Threading Model">Thread Pool</a> to be used if <tt>asyncDelay</tt> has been enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>callerRunsWhenRejected</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rows
 pan="1" class="confluenceTd"> <b>Camel 2.4:</b> Is used if <tt>asyncDelayed</tt> was enabled. This controls if the caller thread should execute the task if the thread pool rejected the task. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -3317,7 +3317,9 @@ from(<span class="code-quote">"activemq:
 </pre>
 </div></div>
 
-<p>So the above example will throttle messages all messages received on <b>seda:a</b> before being sent to <b>mock:result</b> ensuring that a maximum of 3 messages are sent in any 10 second window. Note that typically you would often use the default time period of a second. So to throttle requests at 100 requests per second between two endpoints it would look more like this...</p>
+<p>So the above example will throttle messages all messages received on <b>seda:a</b> before being sent to <b>mock:result</b> ensuring that a maximum of 3 messages are sent in any 10 second window.</p>
+
+<p>Note that since <tt>timePeriodMillis</tt> defaults to 1000 milliseconds, just setting the <tt>maximumRequestsPerPeriod</tt> has the effect of setting the maximum number of requests per second. So to throttle requests at 100 requests per second between two endpoints, it would look more like this...</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
@@ -3354,7 +3356,7 @@ from(<span class="code-quote">"seda:a"</
 </div></div>
 
 <h3><a shape="rect" name="BookPatternAppendix-Dynamicallychangingmaximumrequestsperperiod"></a>Dynamically changing maximum requests per period</h3>
-<p><b>Available os of Camel 2.8</b> <br clear="none">
+<p><b>Available as of Camel 2.8</b> <br clear="none">
 Since we use an <a shape="rect" href="expression.html" title="Expression">Expression</a> you can adjust this value at runtime, for example you can provide a header with the value. At runtime Camel evaluates the expression and converts the result to a <tt>java.lang.Long</tt> type. In the example below we use a header from the message to determine the maximum requests per period. If the header is absent, then the <a shape="rect" href="throttler.html" title="Throttler">Throttler</a> uses the old value. So that allows you to only provide a header if the value is to be changed:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-xml"><span class="code-tag">&lt;route&gt;</span>
@@ -3371,7 +3373,7 @@ Since we use an <a shape="rect" href="ex
 <h3><a shape="rect" name="BookPatternAppendix-Asynchronousdelaying"></a>Asynchronous delaying</h3>
 <p><b>Available as of Camel 2.4</b></p>
 
-<p>You can let the <a shape="rect" href="throttler.html" title="Throttler">Throttler</a> use non blocking asynchronous delaying, which means Camel will use a scheduler to schedule a task to be executed in the future. The task will then continue routing. This allows the caller thread to not block and be able to service other messages etc.</p>
+<p>You can let the <a shape="rect" href="throttler.html" title="Throttler">Throttler</a> use non blocking asynchronous delaying, which means Camel will use a scheduler to schedule a task to be executed in the future. The task will then continue routing. This allows the caller thread to not block and be able to service other messages, etc.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">

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

Modified: websites/production/camel/content/message-filter.html
==============================================================================
--- websites/production/camel/content/message-filter.html (original)
+++ websites/production/camel/content/message-filter.html Mon Jan 21 12:23:50 2013
@@ -81,7 +81,7 @@
 
 <p><span class="image-wrap" style=""><img src="http://www.enterpriseintegrationpatterns.com/img/MessageFilter.gif" style="border: 0px solid black"></span></p>
 
-<p>The following example shows how to create a Message Filter route consuming messages from an endpoint called <b>queue:a</b> which if the <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> is true will be dispatched to <b>queue:b</b></p>
+<p>The following example shows how to create a Message Filter route consuming messages from an endpoint called <b>queue:a</b>, which if the <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> is true will be dispatched to <b>queue:b</b></p>
 
 <p><b>Using the <a shape="rect" href="fluent-builders.html" title="Fluent Builders">Fluent Builders</a></b></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -97,7 +97,7 @@
 </pre>
 </div></div>
 
-<p>You can of course use many different <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> languages such as <a shape="rect" href="xpath.html" title="XPath">XPath</a>, <a shape="rect" href="xquery.html" title="XQuery">XQuery</a>, <a shape="rect" href="sql.html" title="SQL">SQL</a> or various <a shape="rect" href="scripting-languages.html" title="Scripting Languages">Scripting Languages</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java">XPath  example</a> </p>
+<p>You can, of course, use many different <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> languages such as <a shape="rect" href="xpath.html" title="XPath">XPath</a>, <a shape="rect" href="xquery.html" title="XQuery">XQuery</a>, <a shape="rect" href="sql.html" title="SQL">SQL</a> or various <a shape="rect" href="scripting-languages.html" title="Scripting Languages">Scripting Languages</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java">XPath  example</a> </p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">from(<span class="code-quote">"direct:start"</span>).
@@ -161,9 +161,9 @@ from(<span class="code-quote">"direct:st
 <h4><a shape="rect" name="MessageFilter-KnowingifExchangewasfilteredornot"></a>Knowing if <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> was filtered or not</h4>
 <p><b>Available as of Camel 2.5</b></p>
 
-<p>The <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> EIP will add a property on the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> which states if it was filtered or not.</p>
+<p>The <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> EIP will add a property on the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> that states if it was filtered or not.</p>
 
-<p>The property has the key <tt>Exchannge.FILTER_MATCHED</tt> which has the String value of <tt>CamelFilterMatched</tt>. Its value is a boolean indicating <tt>true</tt> or <tt>false</tt>. If the value is <tt>true</tt> then the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> was routed in the filter block.</p>
+<p>The property has the key <tt>Exchange.FILTER_MATCHED</tt>, which has the String value of <tt>CamelFilterMatched</tt>. Its value is a boolean indicating <tt>true</tt> or <tt>false</tt>. If the value is <tt>true</tt> then the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> was routed in the filter block. This property will be visible within the <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> block who's <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> matches (value set to <tt>true</tt>), and to the steps immediately following the <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> with the value set based on the results of the last <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> evaluated.</p>
 
 <h4><a shape="rect" name="MessageFilter-UsingThisPattern"></a>Using This Pattern</h4>
 

Modified: websites/production/camel/content/throttler.html
==============================================================================
--- websites/production/camel/content/throttler.html (original)
+++ websites/production/camel/content/throttler.html Mon Jan 21 12:23:50 2013
@@ -82,7 +82,7 @@
 <h3><a shape="rect" name="Throttler-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>maximumRequestsPerPeriod</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Maximum number of requests per period to throttle. This option must be provided and a positive number. Notice, in the XML DSL, from <b>Camel 2.8</b> onwards this option is configured using an <a shape="rect" href="expression.html" title="Expression">Expression</a> instead of an attribute. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timePeriodMillis</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The time period in millis, in which the
  throttler will allow at most <tt>maximumRequestsPerPeriod</tt> number of messages. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>asyncDelayed</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.4:</b> If enabled then any messages which is delayed happens asynchronously using a scheduled thread pool. </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.4:</b> Refers to a custom <a shape="rect" href="threading-model.html" title="Threading Model">Thread Pool</a> to be used if <tt>asyncDelay</tt> has been enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>callerRunsWhenRejected</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="
 1" class="confluenceTd"> <b>Camel 2.4:</b> Is used if <tt>asyncDelayed</tt> was enabled. This controls if the caller thread should execute the task if the thread pool rejected the task. </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>maximumRequestsPerPeriod</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Maximum number of requests per period to throttle. This option must be provided as a positive number. Notice, in the XML DSL, from <b>Camel 2.8</b> onwards this option is configured using an <a shape="rect" href="expression.html" title="Expression">Expression</a> instead of an attribute. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timePeriodMillis</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The time period in milliseconds, in whic
 h the throttler will allow at most <tt>maximumRequestsPerPeriod</tt> number of messages. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>asyncDelayed</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.4:</b> If enabled then any messages which is delayed happens asynchronously using a scheduled thread pool. </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.4:</b> Refers to a custom <a shape="rect" href="threading-model.html" title="Threading Model">Thread Pool</a> to be used if <tt>asyncDelay</tt> has been enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>callerRunsWhenRejected</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rows
 pan="1" class="confluenceTd"> <b>Camel 2.4:</b> Is used if <tt>asyncDelayed</tt> was enabled. This controls if the caller thread should execute the task if the thread pool rejected the task. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -95,7 +95,9 @@
 </pre>
 </div></div>
 
-<p>So the above example will throttle messages all messages received on <b>seda:a</b> before being sent to <b>mock:result</b> ensuring that a maximum of 3 messages are sent in any 10 second window. Note that typically you would often use the default time period of a second. So to throttle requests at 100 requests per second between two endpoints it would look more like this...</p>
+<p>So the above example will throttle messages all messages received on <b>seda:a</b> before being sent to <b>mock:result</b> ensuring that a maximum of 3 messages are sent in any 10 second window.</p>
+
+<p>Note that since <tt>timePeriodMillis</tt> defaults to 1000 milliseconds, just setting the <tt>maximumRequestsPerPeriod</tt> has the effect of setting the maximum number of requests per second. So to throttle requests at 100 requests per second between two endpoints, it would look more like this...</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
@@ -132,7 +134,7 @@ from(<span class="code-quote">"seda:a"</
 </div></div>
 
 <h3><a shape="rect" name="Throttler-Dynamicallychangingmaximumrequestsperperiod"></a>Dynamically changing maximum requests per period</h3>
-<p><b>Available os of Camel 2.8</b> <br clear="none">
+<p><b>Available as of Camel 2.8</b> <br clear="none">
 Since we use an <a shape="rect" href="expression.html" title="Expression">Expression</a> you can adjust this value at runtime, for example you can provide a header with the value. At runtime Camel evaluates the expression and converts the result to a <tt>java.lang.Long</tt> type. In the example below we use a header from the message to determine the maximum requests per period. If the header is absent, then the <a shape="rect" href="throttler.html" title="Throttler">Throttler</a> uses the old value. So that allows you to only provide a header if the value is to be changed:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-xml"><span class="code-tag">&lt;route&gt;</span>
@@ -149,7 +151,7 @@ Since we use an <a shape="rect" href="ex
 <h3><a shape="rect" name="Throttler-Asynchronousdelaying"></a>Asynchronous delaying</h3>
 <p><b>Available as of Camel 2.4</b></p>
 
-<p>You can let the <a shape="rect" href="throttler.html" title="Throttler">Throttler</a> use non blocking asynchronous delaying, which means Camel will use a scheduler to schedule a task to be executed in the future. The task will then continue routing. This allows the caller thread to not block and be able to service other messages etc.</p>
+<p>You can let the <a shape="rect" href="throttler.html" title="Throttler">Throttler</a> use non blocking asynchronous delaying, which means Camel will use a scheduler to schedule a task to be executed in the future. The task will then continue routing. This allows the caller thread to not block and be able to service other messages, etc.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">