Author: buildbot
Date: Mon Aug 27 09:20:38 2012
New Revision: 830246

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/book-component-appendix.html
    websites/production/camel/content/book-in-one-page.html
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/camel-2110-release.html
    websites/production/camel/content/camel-30-roadmap.html
    websites/production/camel/content/timer.html

Modified: websites/production/camel/content/book-component-appendix.html
==============================================================================
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Mon Aug 27 
09:20:38 2012
@@ -16543,7 +16543,7 @@ timer:name[?options]
 
 <h3><a shape="rect" name="BookComponentAppendix-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"> 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>time</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> A <tt>java.util.Date</tt> the <b>first</b> event should 
be generated. If using the URI, the pattern expected is: <tt>yyyy-MM-dd 
HH:mm:ss</tt> or <tt>yyyy-MM-dd'T'HH:mm:ss</tt>. </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>pattern</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> Allows you to specify a custom <tt>Date</tt> 
pattern to use for setting the time option using URI syntax. </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <t
 t>period</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If greater 
than 0, generate periodic events every <tt>period</tt> milliseconds. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>delay</tt> 
</td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> The number of milliseconds to 
wait before the first event is generated. Should not be used in conjunction 
with the <tt>time</tt> option. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>fixedRate</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> Events take place at approximately regular intervals, 
separated by the specified period. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>daemon</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <t
 t>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies 
whether or not the thread associated with the timer endpoint runs as a daemon. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>repeatCount</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 
2.8:</b> Specifies a maximum limit of number of fires. So if you set it to 1, 
the timer will only fire once. If you set it to 5, it will only fire five 
times. A value of zero or negative means fire forever. 
</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>time</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> A <tt>java.util.Date</tt> the <b>first</b> event should 
be generated. If using the URI, the pattern expected is: <tt>yyyy-MM-dd 
HH:mm:ss</tt> or <tt>yyyy-MM-dd'T'HH:mm:ss</tt>. </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>pattern</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> Allows you to specify a custom <tt>Date</tt> 
pattern to use for setting the time option using URI syntax. </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <t
 t>period</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If greater 
than 0, generate periodic events every <tt>period</tt> milliseconds. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>delay</tt> 
</td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> / 
<tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number 
of milliseconds to wait before the first event is generated. Should not be used 
in conjunction with the <tt>time</tt> option. The default value has bee n 
changed to <tt>1000</tt> from <b>Camel 2.11</b> onwards. In older releases the 
default value is <tt>0</tt>. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>initialDelay</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <b>Camel 2.10.2:</b> The number of milliseconds to wait 
before the first
  event is generated. Should not be used in conjunction with the <tt>time</tt> 
option. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>fixedRate</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Events 
take place at approximately regular intervals, separated by the specified 
period. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>daemon</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies 
whether or not the thread associated with the timer endpoint runs as a daemon. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>repeatCount</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 
2.8:</b> Specifies a maximum limit of number of fires. So if you set it to 1, 
the timer will only 
 fire once. If you set it to 5, it will only fire five times. A value of zero 
or negative means fire forever. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -16604,7 +16604,6 @@ timer:name[?options]
 
 <ul><li><a shape="rect" href="quartz.html" title="Quartz">Quartz</a></li></ul>
 
-
 <h2><a shape="rect" 
name="BookComponentAppendix-ValidationComponent"></a>Validation Component</h2>
 
 <p>The Validation component performs XML validation of the message body using 
the JAXP Validation API and based on any of the supported XML schema languages, 
which defaults to <a shape="rect" class="external-link" 
href="http://www.w3.org/XML/Schema"; rel="nofollow">XML Schema</a> </p>

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 Aug 27 09:20:38 
2012
@@ -37144,7 +37144,7 @@ timer:name[?options]
 
 <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>time</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> A <tt>java.util.Date</tt> the <b>first</b> event should 
be generated. If using the URI, the pattern expected is: <tt>yyyy-MM-dd 
HH:mm:ss</tt> or <tt>yyyy-MM-dd'T'HH:mm:ss</tt>. </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>pattern</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> Allows you to specify a custom <tt>Date</tt> 
pattern to use for setting the time option using URI syntax. </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <t
 t>period</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If greater 
than 0, generate periodic events every <tt>period</tt> milliseconds. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>delay</tt> 
</td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> The number of milliseconds to 
wait before the first event is generated. Should not be used in conjunction 
with the <tt>time</tt> option. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>fixedRate</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> Events take place at approximately regular intervals, 
separated by the specified period. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>daemon</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <t
 t>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies 
whether or not the thread associated with the timer endpoint runs as a daemon. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>repeatCount</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 
2.8:</b> Specifies a maximum limit of number of fires. So if you set it to 1, 
the timer will only fire once. If you set it to 5, it will only fire five 
times. A value of zero or negative means fire forever. 
</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>time</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> A <tt>java.util.Date</tt> the <b>first</b> event should 
be generated. If using the URI, the pattern expected is: <tt>yyyy-MM-dd 
HH:mm:ss</tt> or <tt>yyyy-MM-dd'T'HH:mm:ss</tt>. </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>pattern</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> Allows you to specify a custom <tt>Date</tt> 
pattern to use for setting the time option using URI syntax. </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <t
 t>period</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If greater 
than 0, generate periodic events every <tt>period</tt> milliseconds. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>delay</tt> 
</td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> / 
<tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number 
of milliseconds to wait before the first event is generated. Should not be used 
in conjunction with the <tt>time</tt> option. The default value has bee n 
changed to <tt>1000</tt> from <b>Camel 2.11</b> onwards. In older releases the 
default value is <tt>0</tt>. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>initialDelay</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <b>Camel 2.10.2:</b> The number of milliseconds to wait 
before the first
  event is generated. Should not be used in conjunction with the <tt>time</tt> 
option. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>fixedRate</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Events 
take place at approximately regular intervals, separated by the specified 
period. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>daemon</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies 
whether or not the thread associated with the timer endpoint runs as a daemon. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>repeatCount</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 
2.8:</b> Specifies a maximum limit of number of fires. So if you set it to 1, 
the timer will only 
 fire once. If you set it to 5, it will only fire five times. A value of zero 
or negative means fire forever. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -37205,7 +37205,6 @@ timer:name[?options]
 
 <ul><li><a shape="rect" href="quartz.html" title="Quartz">Quartz</a></li></ul>
 
-
 <h2><a shape="rect" name="BookInOnePage-ValidationComponent"></a>Validation 
Component</h2>
 
 <p>The Validation component performs XML validation of the message body using 
the JAXP Validation API and based on any of the supported XML schema languages, 
which defaults to <a shape="rect" class="external-link" 
href="http://www.w3.org/XML/Schema"; rel="nofollow">XML Schema</a> </p>

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

Modified: websites/production/camel/content/camel-2110-release.html
==============================================================================
--- websites/production/camel/content/camel-2110-release.html (original)
+++ websites/production/camel/content/camel-2110-release.html Mon Aug 27 
09:20:38 2012
@@ -89,7 +89,7 @@
 
 <h3><a shape="rect" name="Camel2.11.0Release-Fixedissues"></a>Fixed issues</h3>
 
-<ul><li>Fixed <a shape="rect" href="routepolicy.html" 
title="RoutePolicy">RoutePolicy</a> used from Spring XML with 
<tt>routePolicyRef</tt> may not invoke all callbacks on the 
policy.</li><li>Fixed <a shape="rect" href="mina.html" title="MINA">MINA</a> 
consumer to force disconnect upon timeout when doing request/reply, as late 
replies may cause side effects otherwise.</li><li>Fixed <a shape="rect" 
href="simple.html" title="Simple">Simple</a> language with empty quoted 
literals in predicates, so you can compare against empty strings.</li><li>Fixed 
<a shape="rect" href="soap.html" title="SOAP">SOAP</a> data format to set SOAP 
1.1 namespace when marhsalling faults.</li><li>Fixed <a shape="rect" 
href="seda.html" title="SEDA">SEDA</a> producer to send to the right 
BlockingQueue being attached on the <a shape="rect" href="seda.html" 
title="SEDA">SEDA</a> endpoint so that the sent messages don't get 
lost.</li><li>Fixed using <tt>sendEmptyMessageWhenIdle=true</tt> on a batch 
consume
 r such as <a shape="rect" href="file2.html" title="File2">File</a> now working 
with <a shape="rect" href="aggregator2.html" title="Aggregator2">Aggregate</a> 
EIP when using <tt>completionFromBatchConsumer</tt></li><li>Fixed 
<tt>MockEndpoint.expectedBodiesReceivedInAnyOrder</tt> to allow asserting on 
multiple arrival of the same/equal bodies.</li><li>Fixed <a shape="rect" 
href="mybatis.html" title="MyBatis">MyBatis</a> to demarcate the running 
transactions properly while reading/writing from/to database.</li><li>Fixed <a 
shape="rect" href="jetty.html" title="Jetty">Jetty</a>, <a shape="rect" 
href="http.html" title="HTTP">HTTP</a>, <a shape="rect" href="http4.html" 
title="HTTP4">HTTP4</a>, and <a shape="rect" href="ahc.html" 
title="AHC">AHC</a> http components not working in bridge mode if content path 
have spaces</li><li>Fixed the <a shape="rect" href="cxf.html" 
title="CXF">CXF</a> fallback convertor issue which camel will unregister it 
when the converter return null.</li><li
 >Fixed the issue that <a shape="rect" href="file2.html" 
 >title="File2">File2</a> endpoints on windows without volume name in the path 
 >url.</li><li>Fixed the issue of unmarshaling pgp messages encrypted with 
 >ElGamal.</li><li>Fixed random <a shape="rect" href="load-balancer.html" 
 >title="Load Balancer">Load Balancer</a> to be even spread (before was a 
 >little less likely to pick the 1st)</li></ul>
+<ul><li>Fixed <a shape="rect" href="routepolicy.html" 
title="RoutePolicy">RoutePolicy</a> used from Spring XML with 
<tt>routePolicyRef</tt> may not invoke all callbacks on the 
policy.</li><li>Fixed <a shape="rect" href="mina.html" title="MINA">MINA</a> 
consumer to force disconnect upon timeout when doing request/reply, as late 
replies may cause side effects otherwise.</li><li>Fixed <a shape="rect" 
href="simple.html" title="Simple">Simple</a> language with empty quoted 
literals in predicates, so you can compare against empty strings.</li><li>Fixed 
<a shape="rect" href="soap.html" title="SOAP">SOAP</a> data format to set SOAP 
1.1 namespace when marhsalling faults.</li><li>Fixed <a shape="rect" 
href="seda.html" title="SEDA">SEDA</a> producer to send to the right 
BlockingQueue being attached on the <a shape="rect" href="seda.html" 
title="SEDA">SEDA</a> endpoint so that the sent messages don't get 
lost.</li><li>Fixed using <tt>sendEmptyMessageWhenIdle=true</tt> on a batch 
consume
 r such as <a shape="rect" href="file2.html" title="File2">File</a> now working 
with <a shape="rect" href="aggregator2.html" title="Aggregator2">Aggregate</a> 
EIP when using <tt>completionFromBatchConsumer</tt></li><li>Fixed 
<tt>MockEndpoint.expectedBodiesReceivedInAnyOrder</tt> to allow asserting on 
multiple arrival of the same/equal bodies.</li><li>Fixed <a shape="rect" 
href="mybatis.html" title="MyBatis">MyBatis</a> to demarcate the running 
transactions properly while reading/writing from/to database.</li><li>Fixed <a 
shape="rect" href="jetty.html" title="Jetty">Jetty</a>, <a shape="rect" 
href="http.html" title="HTTP">HTTP</a>, <a shape="rect" href="http4.html" 
title="HTTP4">HTTP4</a>, and <a shape="rect" href="ahc.html" 
title="AHC">AHC</a> http components not working in bridge mode if content path 
have spaces</li><li>Fixed the <a shape="rect" href="cxf.html" 
title="CXF">CXF</a> fallback convertor issue which camel will unregister it 
when the converter return null.</li><li
 >Fixed the issue that <a shape="rect" href="file2.html" 
 >title="File2">File2</a> endpoints on windows without volume name in the path 
 >url.</li><li>Fixed the issue of unmarshaling pgp messages encrypted with 
 >ElGamal.</li><li>Fixed random <a shape="rect" href="load-balancer.html" 
 >title="Load Balancer">Load Balancer</a> to be even spread (before was a 
 >little less likely to pick the 1st)</li><li>Fixed <a shape="rect" 
 >href="timer.html" title="Timer">Timer</a> to not fire during starting <a 
 >shape="rect" href="camelcontext.html" 
 >title="CamelContext">CamelContext</a></li></ul>
 
 
 
@@ -136,7 +136,7 @@
 
 <h2><a shape="rect" 
name="Camel2.11.0Release-Importantchangestoconsiderwhenupgrading"></a>Important 
changes to consider when upgrading</h2>
 
-<ul><li><tt>camel-mina2</tt> now uses <tt>OrderedThreadPoolExecutor</tt> by 
default. There is a new option <tt>orderedThreadPoolExecutor</tt> you can 
configure it to <tt>false</tt> to revert back to unordered if needed. Mina that 
using SSL etc. requires ordered.</li></ul>
+<ul><li><tt>camel-mina2</tt> now uses <tt>OrderedThreadPoolExecutor</tt> by 
default. There is a new option <tt>orderedThreadPoolExecutor</tt> you can 
configure it to <tt>false</tt> to revert back to unordered if needed. Mina that 
using SSL etc. requires ordered.</li><li>The default value of <tt>delay</tt> 
option on <a shape="rect" href="timer.html" title="Timer">Timer</a> has been 
changed from <tt>0</tt> to <tt>1000</tt></li></ul>
 
 
 <h2><a shape="rect" name="Camel2.11.0Release-Notice"></a>Notice</h2>

Modified: websites/production/camel/content/camel-30-roadmap.html
==============================================================================
--- websites/production/camel/content/camel-30-roadmap.html (original)
+++ websites/production/camel/content/camel-30-roadmap.html Mon Aug 27 09:20:38 
2012
@@ -269,6 +269,10 @@ However we have not changed this in Came
 
 <p>Likewise there has been ideas to move onRedeliverRef to 
&lt;redeliveryPolicy&gt; as currently its to be configured outside the 
policy.<br clear="none">
 It may make more sense to move onRedeliverRef to the policy to keep it 
together. </p>
+
+<h4><a shape="rect" 
name="Camel3.0-Roadmap-AddcompositeEIPtocomposeanumberofEIPsintoasingleEIP"></a>Add
 composite EIP to compose a number of EIPs into a single EIP</h4>
+
+<p>It would be nice if we have a DSL to compose a number of child EIPs into a 
single EIP itself. eg a bit like &lt;pipeline&gt;. This would allow people to 
make it easier to group together a number of EIPs into a single "unit". This 
allows for example the error handler to redeliver to the composite EIP instead 
of at the point of failure within the group. There are use-cases where people 
want to do that. And today the solution is to split this into a new route, 
which you then disable error handler by setting it to no error handler. And 
then call the route using the direct endpoint. So instead if you could do 
&lt;composite&gt; ... stuff goes here &lt;/composite&gt; then that would be 
neater, as you dont have to split into multiple routes. I think there is an old 
JIRA ticket created about this a long time ago.</p>
 </div>
         </td>
         <td valign="top">

Modified: websites/production/camel/content/timer.html
==============================================================================
--- websites/production/camel/content/timer.html (original)
+++ websites/production/camel/content/timer.html Mon Aug 27 09:20:38 2012
@@ -99,7 +99,7 @@ timer:name[?options]
 
 <h3><a shape="rect" name="Timer-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>time</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> A <tt>java.util.Date</tt> the <b>first</b> event should 
be generated. If using the URI, the pattern expected is: <tt>yyyy-MM-dd 
HH:mm:ss</tt> or <tt>yyyy-MM-dd'T'HH:mm:ss</tt>. </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>pattern</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> Allows you to specify a custom <tt>Date</tt> 
pattern to use for setting the time option using URI syntax. </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <t
 t>period</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If greater 
than 0, generate periodic events every <tt>period</tt> milliseconds. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>delay</tt> 
</td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> The number of milliseconds to 
wait before the first event is generated. Should not be used in conjunction 
with the <tt>time</tt> option. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>fixedRate</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> Events take place at approximately regular intervals, 
separated by the specified period. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>daemon</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <t
 t>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies 
whether or not the thread associated with the timer endpoint runs as a daemon. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>repeatCount</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 
2.8:</b> Specifies a maximum limit of number of fires. So if you set it to 1, 
the timer will only fire once. If you set it to 5, it will only fire five 
times. A value of zero or negative means fire forever. 
</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>time</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> A <tt>java.util.Date</tt> the <b>first</b> event should 
be generated. If using the URI, the pattern expected is: <tt>yyyy-MM-dd 
HH:mm:ss</tt> or <tt>yyyy-MM-dd'T'HH:mm:ss</tt>. </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>pattern</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> Allows you to specify a custom <tt>Date</tt> 
pattern to use for setting the time option using URI syntax. </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <t
 t>period</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If greater 
than 0, generate periodic events every <tt>period</tt> milliseconds. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>delay</tt> 
</td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> / 
<tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number 
of milliseconds to wait before the first event is generated. Should not be used 
in conjunction with the <tt>time</tt> option. The default value has bee n 
changed to <tt>1000</tt> from <b>Camel 2.11</b> onwards. In older releases the 
default value is <tt>0</tt>. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>initialDelay</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <b>Camel 2.10.2:</b> The number of milliseconds to wait 
before the first
  event is generated. Should not be used in conjunction with the <tt>time</tt> 
option. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>fixedRate</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Events 
take place at approximately regular intervals, separated by the specified 
period. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>daemon</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies 
whether or not the thread associated with the timer endpoint runs as a daemon. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>repeatCount</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 
2.8:</b> Specifies a maximum limit of number of fires. So if you set it to 1, 
the timer will only 
 fire once. If you set it to 5, it will only fire five times. A value of zero 
or negative means fire forever. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -159,7 +159,6 @@ timer:name[?options]
 <ul><li><a shape="rect" href="configuring-camel.html" title="Configuring 
Camel">Configuring Camel</a></li><li><a shape="rect" href="component.html" 
title="Component">Component</a></li><li><a shape="rect" href="endpoint.html" 
title="Endpoint">Endpoint</a></li><li><a shape="rect" 
href="getting-started.html" title="Getting Started">Getting 
Started</a></li></ul>
 
 <ul><li><a shape="rect" href="quartz.html" title="Quartz">Quartz</a></li></ul>
-
 </div>
         </td>
         <td valign="top">


Reply via email to