Author: buildbot
Date: Tue Jan 8 19:26:23 2013
New Revision: 845562
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/error-handling-in-camel.html
websites/production/camel/content/mail.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 Tue Jan 8
19:26:23 2013
@@ -10673,6 +10673,8 @@ template.sendBodyAndHeaders(<span class=
</pre>
</div></div>
+<p><b>Since Camel 2.11</b> When using the MailProducer the send the mail to
server, you should be able to get the message id of the <a shape="rect"
class="external-link"
href="http://java.sun.com/javaee/5/docs/api/javax/mail/internet/MimeMessage.html"
rel="nofollow">MimeMessage</a> with the key <tt>CamelMailMessageId</tt> from
the Camel message header.</p>
+
<h3><a shape="rect"
name="BookComponentAppendix-Headerstakeprecedenceoverpreconfiguredrecipients"></a>Headers
take precedence over pre-configured recipients</h3>
<p>The recipients specified in the message headers always take precedence over
recipients pre-configured in the endpoint URI. The idea is that if you provide
any recipients in the message headers, that is what you get. The recipients
pre-configured in the endpoint URI are treated as a fallback.</p>
@@ -10701,10 +10703,6 @@ template.sendBodyAndHeaders(<span class=
<p>The preceding example uses a semicolon, <tt>;</tt>, as the separator
character.</p>
-<h3><a shape="rect"
name="BookComponentAppendix-GettheMessageIDofMimeMessage"></a>Get the Message
ID of MimeMessage</h3>
-
-<p><b>Since Camel 2.11</b> When using the MailProducer the send the mail to
sever, you should be able to get the message id of the <a shape="rect"
class="external-link"
href="http://java.sun.com/javaee/5/docs/api/javax/mail/internet/MimeMessage.html"
rel="nofollow">MimeMessage</a> with the key <tt>CamelMailMessageId</tt> form
the Camel message header.</p>
-
<h3><a shape="rect"
name="BookComponentAppendix-Settingsendernameandemail"></a>Setting sender name
and email</h3>
<p>You can specify recipients in the format, <tt>name <email></tt>, to
include both the name and the email address of the recipient.</p>
Modified: websites/production/camel/content/error-handling-in-camel.html
==============================================================================
--- websites/production/camel/content/error-handling-in-camel.html (original)
+++ websites/production/camel/content/error-handling-in-camel.html Tue Jan 8
19:26:23 2013
@@ -149,7 +149,7 @@ from(<span class="code-quote">"seda:newO
<p>It will continue to do redeliveries based on the policy configured. By
default <a shape="rect" href="dead-letter-channel.html" title="Dead Letter
Channel">Dead Letter Channel</a> will attempt at most 6 redeliveries with 1
second delay. So if the storeOrder bean did succeed at the 3rd attempt the
routing will continue to the next node the confirmOrder bean. In case all
redeliveries failed the Exchange is regarded as failed and is moved to the dead
letter queue and the processing of this exchange stops. By default the dead
letter queue is just a ERROR logger.</p>
-<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">This
applies to all kind of <a shape="rect" href="components.html"
title="Components">Components</a> in Camel. The sample above only uses <a
shape="rect" href="bean.html" title="Bean">Bean</a> but it's the same for <span
class="error">[File]</span>, <a shape="rect" href="mail.html"
title="Mail">Mail</a>, <a shape="rect" href="velocity.html"
title="Velocity">Velocity</a> or whatever component you
use.</td></tr></table></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">This
applies to all kind of <a shape="rect" href="components.html"
title="Components">Components</a> in Camel. The sample above only uses <a
shape="rect" href="bean.html" title="Bean">Bean</a> but it's the same for <a
shape="rect" href="file2.html" title="File2">File</a>, <a shape="rect"
href="mail.html" title="Mail">Mail</a>, <a shape="rect" href="velocity.html"
title="Velocity">Velocity</a> or whatever component you
use.</td></tr></table></div>
<h3><a shape="rect"
name="ErrorhandlinginCamel-Transactional"></a>Transactional</h3>
<p>Camel leverages Spring transactions. Usually you can only use this with a
limited number of transport types such as JMS or JDBC based, that yet again
requires a transaction manager such as a Spring transaction, a J2EE server or a
Message Broker.</p>
@@ -164,7 +164,7 @@ In Camel 2.0 we have empowered the <a sh
<p>See <a shape="rect" href="transactional-client.html" title="Transactional
Client">Transactional Client</a> for more.</p>
<h2><a shape="rect" name="ErrorhandlinginCamel-Seealso"></a>See also</h2>
-<ul class="alternate" type="square"><li><a shape="rect"
href="error-handler.html" title="Error Handler">Error Handler</a></li><li><a
shape="rect" href="dead-letter-channel.html" title="Dead Letter Channel">Dead
Letter Channel</a></li><li><a shape="rect" href="exception-clause.html"
title="Exception Clause">Exception Clause</a> <b>onException</b></li><li><a
shape="rect" href="transactional-client.html" title="Transactional
Client">Transactional Client</a></li><li><a shape="rect"
href="transactionerrorhandler.html"
title="TransactionErrorHandler">TransactionErrorHandler</a></li><li><a
shape="rect" href="defaulterrorhandler.html"
title="DefaultErrorHandler">DefaultErrorHandler</a></li><li><a shape="rect"
href="try-catch-finally.html" title="Try Catch Finally">Try Catch
Finally</a></li></ul>
+<ul class="alternate" type="square"><li><a shape="rect"
href="error-handler.html" title="Error Handler">Error Handler</a></li><li><a
shape="rect" href="dead-letter-channel.html" title="Dead Letter Channel">Dead
Letter Channel</a></li><li><a shape="rect" href="exception-clause.html"
title="Exception Clause">Exception Clause</a></li><li><a shape="rect"
href="transactional-client.html" title="Transactional Client">Transactional
Client</a></li><li><a shape="rect" href="transactionerrorhandler.html"
title="TransactionErrorHandler">TransactionErrorHandler</a></li><li><a
shape="rect" href="defaulterrorhandler.html"
title="DefaultErrorHandler">DefaultErrorHandler</a></li><li><a shape="rect"
href="try-catch-finally.html" title="Try Catch Finally">Try Catch
Finally</a></li></ul>
</div>
</td>
<td valign="top">
Modified: websites/production/camel/content/mail.html
==============================================================================
--- websites/production/camel/content/mail.html (original)
+++ websites/production/camel/content/mail.html Tue Jan 8 19:26:23 2013
@@ -230,6 +230,8 @@ template.sendBodyAndHeaders(<span class=
</pre>
</div></div>
+<p><b>Since Camel 2.11</b> When using the MailProducer the send the mail to
server, you should be able to get the message id of the <a shape="rect"
class="external-link"
href="http://java.sun.com/javaee/5/docs/api/javax/mail/internet/MimeMessage.html"
rel="nofollow">MimeMessage</a> with the key <tt>CamelMailMessageId</tt> from
the Camel message header.</p>
+
<h3><a shape="rect"
name="Mail-Headerstakeprecedenceoverpreconfiguredrecipients"></a>Headers take
precedence over pre-configured recipients</h3>
<p>The recipients specified in the message headers always take precedence over
recipients pre-configured in the endpoint URI. The idea is that if you provide
any recipients in the message headers, that is what you get. The recipients
pre-configured in the endpoint URI are treated as a fallback.</p>
@@ -258,10 +260,6 @@ template.sendBodyAndHeaders(<span class=
<p>The preceding example uses a semicolon, <tt>;</tt>, as the separator
character.</p>
-<h3><a shape="rect" name="Mail-GettheMessageIDofMimeMessage"></a>Get the
Message ID of MimeMessage</h3>
-
-<p><b>Since Camel 2.11</b> When using the MailProducer the send the mail to
sever, you should be able to get the message id of the <a shape="rect"
class="external-link"
href="http://java.sun.com/javaee/5/docs/api/javax/mail/internet/MimeMessage.html"
rel="nofollow">MimeMessage</a> with the key <tt>CamelMailMessageId</tt> form
the Camel message header.</p>
-
<h3><a shape="rect" name="Mail-Settingsendernameandemail"></a>Setting sender
name and email</h3>
<p>You can specify recipients in the format, <tt>name <email></tt>, to
include both the name and the email address of the recipient.</p>