camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r943340 [3/3] - in /websites/production/camel/content: ./ cache/
Date Wed, 11 Mar 2015 11:30:44 GMT
Modified: websites/production/camel/content/error-handler.html
==============================================================================
--- websites/production/camel/content/error-handler.html (original)
+++ websites/production/camel/content/error-handler.html Wed Mar 11 11:30:43 2015
@@ -86,56 +86,21 @@
 	<tbody>
         <tr>
         <td valign="top" width="100%">
-<div class="wiki-content maincontent"><h2 id="ErrorHandler-ErrorHandler">Error Handler</h2>
-
-<p>Camel supports pluggable <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/ErrorHandler.html">ErrorHandler</a> strategies to deal with errors processing an <a shape="rect" href="event-driven-consumer.html">Event Driven Consumer</a>. An alternative is to specify the error handling directly in the <a shape="rect" href="dsl.html">DSL</a> using the <a shape="rect" href="exception-clause.html">Exception Clause</a>.</p>
-
-<p>For introduction and background material see <a shape="rect" href="error-handling-in-camel.html">Error handling in Camel</a>.</p>
-
-    <div class="aui-message success shadowed information-macro">
+<div class="wiki-content maincontent"><h2 id="ErrorHandler-ErrorHandler">Error Handler</h2><p>Camel supports pluggable <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/ErrorHandler.html">ErrorHandler</a> strategies to deal with errors processing an <a shape="rect" href="event-driven-consumer.html">Event Driven Consumer</a>. An alternative is to specify the error handling directly in the <a shape="rect" href="dsl.html">DSL</a> using the <a shape="rect" href="exception-clause.html">Exception Clause</a>.</p><p>For introduction and background material see <a shape="rect" href="error-handling-in-camel.html">Error handling in Camel</a>.</p>    <div class="aui-message success shadowed information-macro">
                     <p class="title">Exception Clause</p>
                             <span class="aui-icon icon-success">Icon</span>
                 <div class="message-content">
-                            
-<p>Using <a shape="rect" href="error-handler.html">Error Handler</a> combined with <a shape="rect" href="exception-clause.html">Exception Clause</a> is a very powerful combination. We encourage end-users to use this combination in your error handling strategies. See samples and <a shape="rect" href="exception-clause.html">Exception Clause</a>.</p>
+                            <p>Using <a shape="rect" href="error-handler.html">Error Handler</a> combined with <a shape="rect" href="exception-clause.html">Exception Clause</a> is a very powerful combination. We encourage end-users to use this combination in your error handling strategies. See samples and <a shape="rect" href="exception-clause.html">Exception Clause</a>.</p>
                     </div>
     </div>
- 
-
     <div class="aui-message success shadowed information-macro">
                     <p class="title">Using try ... catch ... finally</p>
                             <span class="aui-icon icon-success">Icon</span>
                 <div class="message-content">
-                            
-<p>Related to error handling is the <a shape="rect" href="try-catch-finally.html">Try Catch Finally</a> as DSL you can use directly in your route. Its basically a mimic of the regular try catch finally in the Java language but with more power.</p>
+                            <p>Related to error handling is the <a shape="rect" href="try-catch-finally.html">Try Catch Finally</a> as DSL you can use directly in your route. Its basically a mimic of the regular try catch finally in the Java language but with more power.</p>
                     </div>
     </div>
-
-
-<p>The current implementations Camel provides out of the box are:</p>
-
-<h4 id="ErrorHandler-Nontransacted">Non transacted</h4>
-<ul><li><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a> is the default error handler in Camel. This error handler does not support a dead letter queue, it will propagate exceptions back to the caller, as if there where no error handler at all. It has a limited set of features.</li><li><a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> which supports attempting to redeliver the message exchange a number of times before sending it to a dead letter endpoint</li><li>LoggingErrorHandler for just catching and logging exceptions</li><li>NoErrorHandler for no error handling</li></ul>
-
-
-<h4 id="ErrorHandler-Transacted">Transacted</h4>
-<ul><li><a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a> is the default error handler in Camel for transacted routes. See the <a shape="rect" href="transactional-client.html">Transactional Client</a> EIP pattern.</li></ul>
-
-
-<p>These error handlers can be applied in the <a shape="rect" href="dsl.html">DSL</a> to an entire set of rules or a specific routing rule as we show in the next examples. Error handling rules are inherited on each routing rule within a single <a shape="rect" href="routebuilder.html">RouteBuilder</a></p>
-
-<h3 id="ErrorHandler-ShortSummaryoftheprovidedErrorHandlers">Short Summary of the provided Error Handlers</h3>
-
-<h4 id="ErrorHandler-DefaultErrorHandler"><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a></h4>
-
-<p>The <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a> is the default error handler in Camel. Unlike <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> it does not have any dead letter queue, and do <strong>not</strong> handle exceptions by default.</p>
-
-<h4 id="ErrorHandler-DeadLetterChannel"><a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></h4>
-
-<p>The <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> will redeliver at most 6 times using 1 second delay, and if the exchange failed it will be logged at ERROR level.</p>
-
-<p>You can configure the default dead letter endpoint to use:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<p>The current implementations Camel provides out of the box are:</p><h4 id="ErrorHandler-Nontransacted">Non transacted</h4><ul><li><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a> is the default error handler in Camel. This error handler does not support a dead letter queue, it will propagate exceptions back to the caller, as if there where no error handler at all. It has a limited set of features.</li><li><a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> which supports attempting to redeliver the message exchange a number of times before sending it to a dead letter endpoint</li><li>LoggingErrorHandler for just catching and logging exceptions</li><li>NoErrorHandler for no error handling</li></ul><h4 id="ErrorHandler-Transacted">Transacted</h4><ul><li><a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a> is the default error handler in Camel for transacted routes. See the <a shape="rect" href="transactional-clien
 t.html">Transactional Client</a> EIP pattern.</li></ul><p>These error handlers can be applied in the <a shape="rect" href="dsl.html">DSL</a> to an entire set of rules or a specific routing rule as we show in the next examples. Error handling rules are inherited on each routing rule within a single <a shape="rect" href="routebuilder.html">RouteBuilder</a></p><h3 id="ErrorHandler-ShortSummaryoftheprovidedErrorHandlers">Short Summary of the provided Error Handlers</h3><h4 id="ErrorHandler-DefaultErrorHandler"><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a></h4><p>The <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a> is the default error handler in Camel. Unlike <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> it does not have any dead letter queue, and do <strong>not</strong> handle exceptions by default.</p><h4 id="ErrorHandler-DeadLetterChannel"><a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a>
 </h4><p>The <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> will redeliver at most 6 times using 1 second delay, and if the exchange failed it will be logged at ERROR level.</p><p>You can configure the default dead letter endpoint to use:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 RouteBuilder builder = new RouteBuilder() {
     public void configure() {
@@ -147,12 +112,8 @@ RouteBuilder builder = new RouteBuilder(
     }
 };
 ]]></script>
-</div></div>
-
-<p>or in Spring DSL</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;bean id=&quot;deadLetterErrorHandler&quot; class=&quot;org.apache.camel.builder.DeadLetterChannelBuilder&quot;&gt;
+</div></div><p>or in Spring DSL</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;bean id=&quot;deadLetterErrorHandler&quot; class=&quot;org.apache.camel.builder.DeadLetterChannelBuilder&quot;&gt;
   &lt;property name=&quot;deadLetterUri&quot; value=&quot;log:dead&quot;/&gt;
 &lt;/bean&gt;
 
@@ -160,31 +121,18 @@ RouteBuilder builder = new RouteBuilder(
   ...
 &lt;/camelContext&gt;
 ]]></script>
-</div></div>
-<p>or also from <strong>Camel 2.3.0 onwards</strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;camel:errorHandler id=&quot;deadLetterErrorHandler&quot; type=&quot;DeadLetterChannel&quot; deadLetterUri=&quot;log:dead&quot;&gt;
+</div></div><p>or also from <strong>Camel 2.3.0 onwards</strong></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;camel:errorHandler id=&quot;deadLetterErrorHandler&quot; type=&quot;DeadLetterChannel&quot; deadLetterUri=&quot;log:dead&quot;&gt;
 
 &lt;camel:camelContext errorHandlerRef=&quot;deadLetterErrorHandler&quot;&gt;
   ...
 &lt;/camel:camelContext&gt;
 ]]></script>
-</div></div>
-
-<h4 id="ErrorHandler-LoggingErrorHandler">Logging Error Handler</h4>
-
-<p>The logging error handler will log (by default at ERROR level) whenever an uncaught exception is thrown. The logging category, logger and level may all be defined in the builder.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-errorHandler(loggingErrorHandler(&quot;mylogger.name&quot;).level(LoggingLevel.INFO));
+</div></div><h4 id="ErrorHandler-LoggingErrorHandler">Logging Error Handler</h4><p>The logging error handler will log (by default at ERROR level) whenever an uncaught exception is thrown. The logging category, logger and level may all be defined in the builder.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[errorHandler(loggingErrorHandler(&quot;mylogger.name&quot;).level(LoggingLevel.INFO));
 ]]></script>
-</div></div>
-<p>or in Spring DSL</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;bean id=&quot;loggingErrorHandler&quot; class=&quot;org.apache.camel.builder.LoggingErrorHandler&quot;&gt;
+</div></div><p>or in Spring DSL</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;bean id=&quot;loggingErrorHandler&quot; class=&quot;org.apache.camel.builder.LoggingErrorHandler&quot;&gt;
   &lt;property name=&quot;logName&quot; value=&quot;mylogger.name&quot;/&gt;
   &lt;property name=&quot;level&quot; value=&quot;DEBUG&quot;/&gt;
 &lt;/bean&gt;
@@ -193,84 +141,40 @@ errorHandler(loggingErrorHandler(&quot;m
   ...
 &lt;/camelContext&gt;
 ]]></script>
-</div></div>
-<p>or also from <strong>Camel 2.3.0 onwards</strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;camel:errorHandler id=&quot;loggingErrorHandler&quot; type=&quot;LoggingErrorHandler&quot; logName=&quot;mylogger.name&quot; level=&quot;DEBUG&quot;/&gt;
+</div></div><p>or also from <strong>Camel 2.3.0 onwards</strong></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;camel:errorHandler id=&quot;loggingErrorHandler&quot; type=&quot;LoggingErrorHandler&quot; logName=&quot;mylogger.name&quot; level=&quot;DEBUG&quot;/&gt;
 
 &lt;camel:camelContext errorHandlerRef=&quot;loggingErrorHandler&quot;&gt;
   ...
 &lt;/camel:camelContext&gt;
 ]]></script>
-</div></div>
-
-<p>This would create an error handler which logs exceptions using the category mylogger.name and uses the level INFO for all log messages created.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-from(&quot;seda:a&quot;).errorHandler(loggingErrorHandler(&quot;mylogger.name&quot;).level(LoggingLevel.DEBUG)).to(&quot;seda:b&quot;);
+</div></div><p>This would create an error handler which logs exceptions using the category mylogger.name and uses the level INFO for all log messages created.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[from(&quot;seda:a&quot;).errorHandler(loggingErrorHandler(&quot;mylogger.name&quot;).level(LoggingLevel.DEBUG)).to(&quot;seda:b&quot;);
 ]]></script>
-</div></div>
-
-<p>Loggers may also be defined for specific routes.</p>
-
-<h4 id="ErrorHandler-NoErrorHandler">No Error Handler</h4>
-
-<p>The no error handler is to be used for disabling error handling. </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-errorHandler(noErrorHandler());
+</div></div><p>Loggers may also be defined for specific routes.</p><h4 id="ErrorHandler-NoErrorHandler">No Error Handler</h4><p>The no error handler is to be used for disabling error handling.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[errorHandler(noErrorHandler());
 ]]></script>
-</div></div>
-<p>or in Spring DSL</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;bean id=&quot;noErrorHandler&quot; class=&quot;org.apache.camel.builder.NoErrorHandlerBuilder&quot;/&gt;
+</div></div><p>or in Spring DSL</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;bean id=&quot;noErrorHandler&quot; class=&quot;org.apache.camel.builder.NoErrorHandlerBuilder&quot;/&gt;
 
 &lt;camelContext errorHandlerRef=&quot;noErrorHandler&quot; xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
   ...
 &lt;/camelContext&gt;
 ]]></script>
-</div></div>
-<p>or also from <strong>Camel 2.3.0 onwards</strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;camel:errorHandler id=&quot;noErrorHandler&quot; type=&quot;NoErrorHandler&quot;/&gt;
+</div></div><p>or also from <strong>Camel 2.3.0 onwards</strong></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;camel:errorHandler id=&quot;noErrorHandler&quot; type=&quot;NoErrorHandler&quot;/&gt;
 
 &lt;camel:camelContext errorHandlerRef=&quot;noErrorHandler&quot;&gt;
   ...
 &lt;/camel:camelContext&gt;
 ]]></script>
-</div></div>
-
-<h4 id="ErrorHandler-TransactionErrorHandler"><a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a></h4>
-
-<p>The <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a> is the default error handler in Camel for transacted routes. </p>
-
-    <div class="aui-message success shadowed information-macro">
+</div></div><h4 id="ErrorHandler-TransactionErrorHandler"><a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a></h4><p>The <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a> is the default error handler in Camel for transacted routes.</p>    <div class="aui-message success shadowed information-macro">
                             <span class="aui-icon icon-success">Icon</span>
                 <div class="message-content">
-                            
-<p>If you have marked a route as transacted using the <strong>transacted</strong> DSL then Camel will automatic use a <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>. It will try to lookup the global/per route configured error handler and use it if its a <code>TransactionErrorHandlerBuilder</code> instance. If not Camel will automatic create a temporary <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a> that overrules the default error handler. This is convention over configuration.</p>
+                            <p>If you have marked a route as transacted using the <strong>transacted</strong> DSL then Camel will automatic use a <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>. It will try to lookup the global/per route configured error handler and use it if its a <code>TransactionErrorHandlerBuilder</code> instance. If not Camel will automatic create a temporary <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a> that overrules the default error handler. This is convention over configuration.</p>
                     </div>
     </div>
-
-
-<h3 id="ErrorHandler-Featuressupportbyvariouss">Features support by various <a shape="rect" href="error-handler.html">Error Handler</a>s</h3>
-
-<p>Here is a breakdown of which features is supported by the <a shape="rect" href="error-handler.html">Error Handler</a>(s):</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Feature </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Supported by the following <a shape="rect" href="error-handler.html">Error Handler</a> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> all scopes </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> onException </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead
  Letter Channel</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> onWhen </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> continued </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> handled </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transa
 ctionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Custom ExceptionPolicy </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> useOriginalBody </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> retryWhile </p></td><td colspan="1" rowspan=
 "1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> onRedelivery </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> RedeliveryPolicy </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channe
 l</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> asyncDelayedRedelivery </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> redeliverWhileStopping </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> dead letter queue </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> </p>
 </td></tr></tbody></table></div>
-
-
-<p>See <a shape="rect" href="exception-clause.html">Exception Clause</a> documentation for documentation of some of the features above.</p>
-
-<h3 id="ErrorHandler-Scopes">Scopes</h3>
-<p>The error handler is scoped as either</p>
-<ul class="alternate"><li>global</li><li>per route</li></ul>
-
-
-<p>The following example shows how you can register a global error handler (in this case using the logging handler)</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<h3 id="ErrorHandler-Featuressupportbyvariouss">Features support by various <a shape="rect" href="error-handler.html">Error Handler</a>s</h3><p>Here is a breakdown of which features is supported by the <a shape="rect" href="error-handler.html">Error Handler</a>(s):</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Feature</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Supported by the following <a shape="rect" href="error-handler.html">Error Handler</a></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>all scopes</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>onException</p></td>
 <td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>onWhen</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>continued</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Chan
 nel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>handled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Custom ExceptionPolicy</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useOriginalBody</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transact
 ionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>retryWhile</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>onRedelivery</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>RedeliveryPolicy</p></td><td colspan="1" rowspan="1" class="confluenceT
 d"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>asyncDelayedRedelivery</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>redeliverWhileStopping</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a>, <a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td><
 /tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>dead letter queue</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">onPrepareFailure</td><td colspan="1" rowspan="1" class="confluenceTd"><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a><span>, <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a></span></td></tr></tbody></table></div><p>See <a shape="rect" href="exception-clause.html">Exception Clause</a> documentation for documentation of some of the features above.</p><h3 id="ErrorHandler-Scopes">Scopes</h3><p>The error handler is scoped as either</p><ul class="alternate"><li>global</li><li>per route</li></ul><p>The following example shows how you can register a global error handler (in this case using the logging handler)</p><div class="code panel pdl" style="border-width: 1px;"><div 
 class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 RouteBuilder builder = new RouteBuilder() {
     public void configure() {
@@ -282,10 +186,7 @@ RouteBuilder builder = new RouteBuilder(
     }
 };
 ]]></script>
-</div></div>
-
-<p>The following example shows how you can register a route specific error handler; the customized logging handler is only registered for the route from <a shape="rect" href="endpoint.html">Endpoint</a> <strong>seda:a</strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>The following example shows how you can register a route specific error handler; the customized logging handler is only registered for the route from <a shape="rect" href="endpoint.html">Endpoint</a> <strong>seda:a</strong></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 RouteBuilder builder = new RouteBuilder() {
     public void configure() {
@@ -301,41 +202,21 @@ RouteBuilder builder = new RouteBuilder(
     }
 };
 ]]></script>
-</div></div>
-
-
-<h3 id="ErrorHandler-Springbasedconfiguration">Spring based configuration</h3>
-
-    <div class="aui-message hint shadowed information-macro">
+</div></div><h3 id="ErrorHandler-Springbasedconfiguration">Spring based configuration</h3>    <div class="aui-message hint shadowed information-macro">
                     <p class="title">Java DSL vs. Spring DSL</p>
                             <span class="aui-icon icon-hint">Icon</span>
                 <div class="message-content">
-                            
-<p>The error handler is configured a bit differently in Java DSL and Spring DSL. Spring DSL relies more on standard Spring bean configuration whereas Java DSL uses fluent builders.</p>
+                            <p>The error handler is configured a bit differently in Java DSL and Spring DSL. Spring DSL relies more on standard Spring bean configuration whereas Java DSL uses fluent builders.</p>
                     </div>
     </div>
-
-
-<p>The error handler can be configured as a spring bean and scoped in:</p>
-<ul class="alternate"><li>global (the camelContext tag)</li><li>per route (the route tag)</li><li>or per policy (the policy/transacted tag)</li></ul>
-
-
-<p>The error handler is configured with the <code>errorHandlerRef</code> attribute.</p>
-
-    <div class="aui-message success shadowed information-macro">
+<p>The error handler can be configured as a spring bean and scoped in:</p><ul class="alternate"><li>global (the camelContext tag)</li><li>per route (the route tag)</li><li>or per policy (the policy/transacted tag)</li></ul><p>The error handler is configured with the <code>errorHandlerRef</code> attribute.</p>    <div class="aui-message success shadowed information-macro">
                     <p class="title">Error Handler Hierarchy</p>
                             <span class="aui-icon icon-success">Icon</span>
                 <div class="message-content">
-                            
-<p>The error handlers is inherited, so if you only have set a global error handler then its use everywhere. But you can override this in a route and use another error handler.</p>
+                            <p>The error handlers is inherited, so if you only have set a global error handler then its use everywhere. But you can override this in a route and use another error handler.</p>
                     </div>
     </div>
-
-
-<h4 id="ErrorHandler-Springbasedconfigurationsample">Spring based configuration sample</h4>
-<p>In this sample we configure a <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> on the route that should redeliver at most 3 times and use a little delay before retrying.<br clear="none">
-First we configure the reference to <strong>myDeadLetterErrorHandler</strong> using the <code>errorHandlerRef</code> attribute on the <code>route</code> tag.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<h4 id="ErrorHandler-Springbasedconfigurationsample">Spring based configuration sample</h4><p>In this sample we configure a <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> on the route that should redeliver at most 3 times and use a little delay before retrying.<br clear="none"> First we configure the reference to <strong>myDeadLetterErrorHandler</strong> using the <code>errorHandlerRef</code> attribute on the <code>route</code> tag.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
   &lt;camelContext xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
       &lt;template id=&quot;myTemplate&quot;/&gt;
@@ -347,11 +228,7 @@ First we configure the reference to <str
       &lt;/route&gt;
   &lt;/camelContext&gt;
 ]]></script>
-</div></div>
-
-<p>Then we configure <strong>myDeadLetterErrorHandler</strong> that is our <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a>. This configuration is standard Spring using the bean element.<br clear="none">
-And finally we have another spring bean for the redelivery policy where we can configure the options for how many times to redeliver, delays etc.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>Then we configure <strong>myDeadLetterErrorHandler</strong> that is our <a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a>. This configuration is standard Spring using the bean element.<br clear="none"> And finally we have another spring bean for the redelivery policy where we can configure the options for how many times to redeliver, delays etc.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
    &lt;!-- here we configure our DeadLetterChannel --&gt;
 &lt;bean id=&quot;myDeadLetterErrorHandler&quot; class=&quot;org.apache.camel.builder.DeadLetterChannelBuilder&quot;&gt;
@@ -369,10 +246,7 @@ And finally we have another spring bean
        &lt;property name=&quot;redeliveryDelay&quot; value=&quot;250&quot;/&gt;
    &lt;/bean&gt;
 ]]></script>
-</div></div>
-
-<p>From Camel 2.3.0, camel provides a customer bean configuration for the Error Handler, you can find the examples here.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>From Camel 2.3.0, camel provides a customer bean configuration for the Error Handler, you can find the examples here.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;errorHandler id=&quot;loggingErrorHandler&quot; type=&quot;LoggingErrorHandler&quot; logName=&quot;foo&quot; level=&quot;INFO&quot; xmlns=&quot;http://camel.apache.org/schema/spring&quot;/&gt;
 
@@ -402,15 +276,7 @@ And finally we have another spring bean
     &lt;errorHandler id=&quot;noErrorHandler&quot; type=&quot;NoErrorHandler&quot;/&gt;
 &lt;/camelContext&gt;
 ]]></script>
-</div></div>
-
-
-<h3 id="ErrorHandler-Usingthetransactionalerrorhandler">Using the transactional error handler</h3>
-<p>The transactional error handler is based on spring transaction. This requires the usage of the camel-spring component.<br clear="none">
-See <a shape="rect" href="transactional-client.html">Transactional Client</a> that has many samples for how to use and transactional behavior and configuration with this error handler.</p>
-
-<h3 id="ErrorHandler-Seealso">See also</h3>
-<ul class="alternate"><li><a shape="rect" href="error-handling-in-camel.html">Error handling in Camel</a> for introduction and background material on error handling in Camel</li><li><a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> for the dead letter error handler</li><li><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a> for the default error handler in Camel</li><li><a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a> for the default error handler for transacted routes</li><li><a shape="rect" href="transactional-client.html">Transactional Client</a> for transactional behavior</li><li><a shape="rect" href="exception-clause.html">Exception Clause</a> as it supports <strong>handling</strong> thrown exceptions</li><li><a shape="rect" href="try-catch-finally.html">Try Catch Finally</a> for try ... catch ... finally as DSL you can use in the routing</li></ul></div>
+</div></div><h3 id="ErrorHandler-Usingthetransactionalerrorhandler">Using the transactional error handler</h3><p>The transactional error handler is based on spring transaction. This requires the usage of the camel-spring component.<br clear="none"> See <a shape="rect" href="transactional-client.html">Transactional Client</a> that has many samples for how to use and transactional behavior and configuration with this error handler.</p><h3 id="ErrorHandler-Seealso">See also</h3><ul class="alternate"><li><a shape="rect" href="error-handling-in-camel.html">Error handling in Camel</a> for introduction and background material on error handling in Camel</li><li><a shape="rect" href="dead-letter-channel.html">Dead Letter Channel</a> for the dead letter error handler</li><li><a shape="rect" href="defaulterrorhandler.html">DefaultErrorHandler</a> for the default error handler in Camel</li><li><a shape="rect" href="transactionerrorhandler.html">TransactionErrorHandler</a> for the default error 
 handler for transacted routes</li><li><a shape="rect" href="transactional-client.html">Transactional Client</a> for transactional behavior</li><li><a shape="rect" href="exception-clause.html">Exception Clause</a> as it supports <strong>handling</strong> thrown exceptions</li><li><a shape="rect" href="try-catch-finally.html">Try Catch Finally</a> for try ... catch ... finally as DSL you can use in the routing</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/release-guide.html
==============================================================================
--- websites/production/camel/content/release-guide.html (original)
+++ websites/production/camel/content/release-guide.html Wed Mar 11 11:30:43 2015
@@ -181,7 +181,7 @@ gpg: Good signature from &quot;Christian
 </li><li><p>Perform the release to the staging repo</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: text; gutter: false" type="syntaxhighlighter"><![CDATA[mvn release:perform -Prelease
 ]]></script>
-</div></div></li><li>Close the staging repository<br clear="none"> Quote from the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">Maven release guide for Apache projects</a><blockquote><p>Login to <a shape="rect" class="external-link" href="https://repository.apache.org">https://repository.apache.org</a> using your Apache LDAP credentials. Click on "Staging Repositories". Then select "org.apache.camel-xxx" in the list of repositories, where xxx represents your username and ip. Click "Close" on the tool bar above. This will close the repository from future deployments and make it available for others to view. If you are staging multiple releases together, skip this step until you have staged everything. Enter the name and version of the artifact being released in the "Description" field and then click "Close". This will make it easier to identify it later.</p></blockquote>See the image in the original guide for more info.</l
 i><li>Verify staged artifacts<br clear="none"> Quote from the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">original guide</a><blockquote><p>If you click on your repository, a tree view will appear below. You can then browse the contents to ensure the artifacts are as you expect them. Pay particular attention to the existence of *.asc (signature) files. If the you don't like the content of the repository, right click your repository and choose "Drop". You can then rollback your release and repeat the process.<br clear="none"> Note the repository URL, you will need this in your vote email.</p></blockquote></li></ol><h2 id="ReleaseGuide-TestingtheCamelReleaseCandidate">Testing the Camel Release Candidate</h2><p>When folks need to test out a release candidate, the jars will not have been uploaded to the central Maven repo. This means that the example programs which use Maven will not automatically work and you need to follow
  the <a shape="rect" href="testing-a-release-candidate.html">Testing a release candidate</a> guidelines.<br clear="none"> Afterwards send out the VOTE for this release candidate to the dev@ mailing list.</p><h2 id="ReleaseGuide-Manuallyupdatingfiles">Manually updating files</h2><p>From camel 2.14.x, you don't need to update the &#160;pom version of the below modules if you already specify the -Prelease in the mvn release:xxx command.</p><p>The <code>pom.xml</code> files in <code>etc</code>, <code>tests/camel-itest-karaf</code>, <code>tests/camel-itest-osgi</code>, <code>tests/camel-itest-performance</code> and <code>tests/camel-performance</code> need to be manually updated with the Camel version number in the <code>&lt;parent&gt;</code> tag.</p><h2 id="ReleaseGuide-AnnouncingtheCamelRelease">Announcing the Camel Release</h2><p>If the VOTE pass,</p><ol><li>Close it by sending the RESULT to the mailing list.</li><li>Promote the artifacts to the central repo. For this login to <a shap
 e="rect" class="external-link" href="https://repository.apache.org">https://repository.apache.org</a> using your Apache LDAP credentials. Click on "Staging Repositories". Select "org.apache.camel-xxx" in the list of repositories, where xxx represents your username and ip. Click "Release" on the tool bar above. This will promote all artifacts to the central maven repo. Enter the name and version of the artifact being released in the "Description" field and then click "Release". This will make it easier to identify it later.</li><li>Perform a <a shape="rect" class="external-link" href="https://issues.apache.org/jira/plugins/servlet/project-config/CAMEL/versions">release in JIRA</a> and create a new release version in JIRA</li><li>There should be already a release notes page in the <a shape="rect" href="in-progress.html">In Progress</a> folder (if not create one based on the <a shape="rect" href="camel-xyz-release-template.html">Camel x.y.z Release (template)</a>). Edit it and change t
 he number of fixed issues and update its parent to be the <a shape="rect" href="download.html">Download</a> page. Now would be a good time to create a new release notes page for the next release based on the template mentioned before. It is useful and simpler to keep it up to date during the development cycle.</li><li><p>Copy the newly deployed distribution to Apache website:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div></li><li>Close the staging repository<br clear="none"> Quote from the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">Maven release guide for Apache projects</a><blockquote><p>Login to <a shape="rect" class="external-link" href="https://repository.apache.org">https://repository.apache.org</a> using your Apache LDAP credentials. Click on "Staging Repositories". Then select "org.apache.camel-xxx" in the list of repositories, where xxx represents your username and ip. Click "Close" on the tool bar above. This will close the repository from future deployments and make it available for others to view. If you are staging multiple releases together, skip this step until you have staged everything. Enter the name and version of the artifact being released in the "Description" field and then click "Close". This will make it easier to identify it later.</p></blockquote>See the image in the original guide for more info.</l
 i><li>Verify staged artifacts<br clear="none"> Quote from the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">original guide</a><blockquote><p>If you click on your repository, a tree view will appear below. You can then browse the contents to ensure the artifacts are as you expect them. Pay particular attention to the existence of *.asc (signature) files. If the you don't like the content of the repository, right click your repository and choose "Drop". You can then rollback your release and repeat the process.<br clear="none"> Note the repository URL, you will need this in your vote email.</p></blockquote></li></ol><h2 id="ReleaseGuide-TestingtheCamelReleaseCandidate">Testing the Camel Release Candidate</h2><p>When folks need to test out a release candidate, the jars will not have been uploaded to the central Maven repo. This means that the example programs which use Maven will not automatically work and you need to follow
  the <a shape="rect" href="testing-a-release-candidate.html">Testing a release candidate</a> guidelines.<br clear="none"> Afterwards send out the VOTE for this release candidate to the dev@ mailing list.</p><h2 id="ReleaseGuide-Manuallyupdatingfiles">Manually updating files</h2><p>From camel 2.14.x, you don't need to update the &#160;pom version of the below modules if you already specify the -Prelease in the mvn release:xxx command.</p><p>The <code>pom.xml</code> files in <code>etc</code>, <code>tests/camel-itest-karaf</code>, <code>tests/camel-itest-osgi</code>, <code>tests/camel-itest-performance</code> and <code>tests/camel-performance</code> need to be manually updated with the Camel version number in the <code>&lt;parent&gt;</code> tag.</p><h2 id="ReleaseGuide-AnnouncingtheCamelRelease">Announcing the Camel Release</h2><p>If the VOTE pass,</p><ol><li>Close it by sending the RESULT to the mailing list.</li><li>Promote the artifacts to the central repo. For this login to <a shap
 e="rect" class="external-link" href="https://repository.apache.org">https://repository.apache.org</a> using your Apache LDAP credentials. Click on "Staging Repositories". Select "org.apache.camel-xxx" in the list of repositories, where xxx represents your username and ip. Click "Release" on the tool bar above. This will promote all artifacts to the central maven repo. Enter the name and version of the artifact being released in the "Description" field and then click "Release". This will make it easier to identify it later.</li><li>Perform a <a shape="rect" class="external-link" href="https://issues.apache.org/jira/plugins/servlet/project-config/CAMEL/versions">release in JIRA</a> and create a new release version in JIRA</li><li>There should be already a release notes page in the <a shape="rect" href="in-progress.html">In Progress</a> folder (if not create one based on the <a shape="rect" href="camel-xyz-release-template.html">Camel x.y.z Release (template)</a>). Edit it and change t
 he number of fixed issues, and update its parent to be the <a shape="rect" href="download.html">Download</a> page, and <strong>make sure</strong>&#160;to remove the (release in progress) in the title. Now would be a good time to create a new release notes page for the next release based on the template mentioned before. It is useful and simpler to keep it up to date during the development cycle.</li><li><p>Copy the newly deployed distribution to Apache website:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: text; gutter: false" type="syntaxhighlighter"><![CDATA[cd ${CAMEL_ROOT_DIR}/etc/scripts
 release-distro.sh &lt;Camel version&gt;
 ]]></script>

Modified: websites/production/camel/content/servlet.html
==============================================================================
--- websites/production/camel/content/servlet.html (original)
+++ websites/production/camel/content/servlet.html Wed Mar 11 11:30:43 2015
@@ -86,66 +86,26 @@
 	<tbody>
         <tr>
         <td valign="top" width="100%">
-<div class="wiki-content maincontent"><h2 id="SERVLET-ServletComponent">Servlet Component</h2>
-
-<p>The <strong>servlet:</strong> component provides HTTP based <a shape="rect" href="endpoint.html">endpoints</a> for consuming HTTP requests that arrive at a HTTP endpoint that is bound to a published Servlet.</p>
-
-<p>Maven users will need to add the following dependency to their <code>pom.xml</code> for this component:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;dependency&gt;
+<div class="wiki-content maincontent"><h2 id="SERVLET-ServletComponent">Servlet Component</h2><p>The <strong>servlet:</strong> component provides HTTP based <a shape="rect" href="endpoint.html">endpoints</a> for consuming HTTP requests that arrive at a HTTP endpoint that is bound to a published Servlet.</p><p>Maven users will need to add the following dependency to their <code>pom.xml</code> for this component:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
     &lt;groupId&gt;org.apache.camel&lt;/groupId&gt;
     &lt;artifactId&gt;camel-servlet&lt;/artifactId&gt;
     &lt;version&gt;x.x.x&lt;/version&gt;
     &lt;\!-\- use the same version as your Camel core version \--&gt;
 &lt;/dependency&gt;
 ]]></script>
-</div></div>
-
-    <div class="aui-message hint shadowed information-macro">
+</div></div>    <div class="aui-message hint shadowed information-macro">
                     <p class="title">Stream</p>
                             <span class="aui-icon icon-hint">Icon</span>
                 <div class="message-content">
-                            
-<p>Servlet is stream based, which means the input it receives is submitted to Camel as a stream. That means you will only be able to read the content of the stream <strong>once</strong>.  If you find a situation where the message body appears to be empty or you need to access the data multiple times (eg: doing multicasting, or redelivery error handling) you should use <a shape="rect" href="stream-caching.html">Stream Caching</a> or convert the message body to a <code>String</code> which is safe to be read multiple times.</p>
+                            <p>Servlet is stream based, which means the input it receives is submitted to Camel as a stream. That means you will only be able to read the content of the stream <strong>once</strong>. If you find a situation where the message body appears to be empty or you need to access the data multiple times (eg: doing multicasting, or redelivery error handling) you should use <a shape="rect" href="stream-caching.html">Stream caching</a> or convert the message body to a <code>String</code> which is safe to be read multiple times.</p>
                     </div>
     </div>
-
-
-<h3 id="SERVLET-URIformat">URI format</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-servlet://relative_path[?options]
+<h3 id="SERVLET-URIformat">URI format</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[servlet://relative_path[?options]
 ]]></script>
-</div></div>
-
-<p>You can append query options to the URI in the following format, <code>?option=value&amp;option=value&amp;...</code></p>
-
-<h3 id="SERVLET-Options">Options</h3>
-<div class="confluenceTableSmall">
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default Value </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>httpBindingRef</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>null</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Reference to an <code>org.apache.camel.component.http.HttpBinding</code> in the <a shape="rect" href="registry.html">Registry</a>. A <code>HttpBinding</code> implementation can be used to customize how to write a response. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>matchOnUriPrefix</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>false</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Whether or not 
 the <code>CamelServlet</code> should try to find a target consumer by matching the URI prefix, if no exact match is found. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>servletName</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>CamelServlet</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Specifies the servlet name that the servlet endpoint will bind to. This name should match the name you define in <code>web.xml</code> file. </p></td></tr></tbody></table></div>
-</div>
-
-<h3 id="SERVLET-MessageHeaders">Message Headers</h3>
-<p>Camel will apply the same Message Headers as the <a shape="rect" href="http.html">HTTP</a> component.</p>
-
-<p>Camel will also populate <strong>all</strong> <code>request.parameter</code> and <code>request.headers</code>. For example, if a client request has the URL, <code><a shape="rect" class="external-link" href="http://myserver/myserver?orderid=123" rel="nofollow">http://myserver/myserver?orderid=123</a></code>, the exchange will contain a header named <code>orderid</code> with the value 123. </p>
-
-<h3 id="SERVLET-Usage">Usage</h3>
-
-<p>You can consume only from endpoints generated by the Servlet component. Therefore, it should be used only as input into your Camel routes. To issue HTTP requests against other HTTP endpoints, use the <a shape="rect" href="http.html">HTTP Component</a></p>
-
-
-<h3 id="SERVLET-PuttingCamelJARsintheappserverbootclasspath">Putting Camel JARs in the app server boot classpath</h3>
-<p>If you put the Camel JARs such as <code>camel-core</code>, <code>camel-servlet</code>, etc. in the boot classpath of your application server (eg usually in its lib directory), then mind that the servlet mapping list is now shared between multiple deployed Camel application in the app server.</p>
-
-<p>Mind that putting Camel JARs in the boot classpath of the application server is generally not best practice!</p>
-
-<p>So in those situations you <strong>must</strong> define a custom and unique servlet name in each of your Camel application, eg in the <code>web.xml</code> define:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;servlet&gt;
+</div></div><p>You can append query options to the URI in the following format, <code>?option=value&amp;option=value&amp;...</code></p><h3 id="SERVLET-Options">Options</h3><div class="confluenceTableSmall"><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>httpBindingRef</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Reference to an <code>org.apache.camel.component.http.HttpBinding</code> in the <a shape="rect" href="registry.html">Registry</a>. A <code>HttpBinding</code> implementation can be used to customize how to write a response.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd
 "><p><code>matchOnUriPrefix</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Whether or not the <code>CamelServlet</code> should try to find a target consumer by matching the URI prefix, if no exact match is found.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>servletName</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>CamelServlet</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specifies the servlet name that the servlet endpoint will bind to. This name should match the name you define in <code>web.xml</code> file.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><span style="color: rgb(0,0,0);">httpMethodRestrict</span></td><td colspan="1" rowspan="1" class="confluenceTd">null</td><td colspan="1" rowspan="1" class="confluenceTd"><strong>Camel 2.11:</strong><span style="color: rgb(0,0,0);">&#160;</
 span><strong>Consumer only</strong><span style="color: rgb(0,0,0);">: Used to only allow consuming if the HttpMethod matches, such as GET/POST/PUT etc.&#160;</span><span style="color: rgb(0,0,0);">From&#160;</span><strong>Camel 2.15 </strong><span style="color: rgb(0,0,0);">onwards multiple methods can be specified separated by comma.</span></td></tr></tbody></table></div></div><h3 id="SERVLET-MessageHeaders">Message Headers</h3><p>Camel will apply the same Message Headers as the <a shape="rect" href="http.html">HTTP</a> component.</p><p>Camel will also populate <strong>all</strong> <code>request.parameter</code> and <code>request.headers</code>. For example, if a client request has the URL, <code><a shape="rect" class="external-link" href="http://myserver/myserver?orderid=123" rel="nofollow">http://myserver/myserver?orderid=123</a></code>, the exchange will contain a header named <code>orderid</code> with the value 123.</p><h3 id="SERVLET-Usage">Usage</h3><p>You can consume only fr
 om endpoints generated by the Servlet component. Therefore, it should be used only as input into your Camel routes. To issue HTTP requests against other HTTP endpoints, use the <a shape="rect" href="http.html">HTTP Component</a></p><h3 id="SERVLET-PuttingCamelJARsintheappserverbootclasspath">Putting Camel JARs in the app server boot classpath</h3><p>If you put the Camel JARs such as <code>camel-core</code>, <code>camel-servlet</code>, etc. in the boot classpath of your application server (eg usually in its lib directory), then mind that the servlet mapping list is now shared between multiple deployed Camel application in the app server.</p><p>Mind that putting Camel JARs in the boot classpath of the application server is generally not best practice!</p><p>So in those situations you <strong>must</strong> define a custom and unique servlet name in each of your Camel application, eg in the <code>web.xml</code> define:</p><div class="code panel pdl" style="border-width: 1px;"><div class
 ="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;servlet&gt;
   &lt;servlet-name&gt;MyServlet&lt;/servlet-name&gt;
   &lt;servlet-class&gt;org.apache.camel.component.servlet.CamelHttpTransportServlet&lt;/servlet-class&gt;
   &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
@@ -156,24 +116,14 @@ servlet://relative_path[?options]
   &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
 &lt;/servlet-mapping&gt;
 ]]></script>
-</div></div>
-
-<p>And in your Camel endpoints then include the servlet name as well</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;route&gt;
+</div></div><p>And in your Camel endpoints then include the servlet name as well</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;route&gt;
   &lt;from uri=&quot;servlet://foo?servletName=MyServlet&quot;/&gt;
   ...
 &lt;/route&gt;
 ]]></script>
-</div></div>
-
-
-<p>From <strong>Camel 2.11</strong> onwards Camel will detect this duplicate and fail to start the application. You can control to ignore this duplicate by setting the servlet init-parameter ignoreDuplicateServletName to true as follows:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-  &lt;servlet&gt;
+</div></div><p>From <strong>Camel 2.11</strong> onwards Camel will detect this duplicate and fail to start the application. You can control to ignore this duplicate by setting the servlet init-parameter ignoreDuplicateServletName to true as follows:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[  &lt;servlet&gt;
     &lt;servlet-name&gt;CamelServlet&lt;/servlet-name&gt;
     &lt;display-name&gt;Camel Http Transport Servlet&lt;/display-name&gt;
     &lt;servlet-class&gt;org.apache.camel.component.servlet.CamelHttpTransportServlet&lt;/servlet-class&gt;
@@ -183,26 +133,13 @@ servlet://relative_path[?options]
     &lt;/init-param&gt;
   &lt;/servlet&gt;
 ]]></script>
-</div></div>
-
-<p>But its <strong>strongly advised</strong> to use unique servlet-name for each Camel application to avoid this duplication clash, as well any unforeseen side-effects.</p>
-
-
-<h3 id="SERVLET-Sample">Sample</h3>
-
-    <div class="aui-message hint shadowed information-macro">
+</div></div><p>But its <strong>strongly advised</strong> to use unique servlet-name for each Camel application to avoid this duplication clash, as well any unforeseen side-effects.</p><h3 id="SERVLET-Sample">Sample</h3>    <div class="aui-message hint shadowed information-macro">
                             <span class="aui-icon icon-hint">Icon</span>
                 <div class="message-content">
-                            
-<p>From Camel 2.7 onwards it's easier to use <a shape="rect" href="servlet.html">Servlet</a> in Spring web applications. See <a shape="rect" href="servlet-tomcat-example.html">Servlet Tomcat Example</a> for details.</p>
+                            <p>From Camel 2.7 onwards it's easier to use <a shape="rect" href="servlet.html">Servlet</a> in Spring web applications. See <a shape="rect" href="servlet-tomcat-example.html">Servlet Tomcat Example</a> for details.</p>
                     </div>
     </div>
-
-
-<p>In this sample, we define a route that exposes a HTTP service at <code><a shape="rect" class="external-link" href="http://localhost:8080/camel/services/hello" rel="nofollow">http://localhost:8080/camel/services/hello</a></code>.<br clear="none">
-First, you need to publish the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java">CamelHttpTransportServlet</a> through the normal Web Container, or OSGi Service.<br clear="none">
-Use the <code>Web.xml</code> file to publish the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java">CamelHttpTransportServlet</a> as follows:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<p>In this sample, we define a route that exposes a HTTP service at <code><a shape="rect" class="external-link" href="http://localhost:8080/camel/services/hello" rel="nofollow">http://localhost:8080/camel/services/hello</a></code>.<br clear="none"> First, you need to publish the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java">CamelHttpTransportServlet</a> through the normal Web Container, or OSGi Service.<br clear="none"> Use the <code>Web.xml</code> file to publish the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java">CamelHttpTransportServlet</a> as follows:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;web-app&gt;
 
@@ -219,10 +156,7 @@ Use the <code>Web.xml</code> file to pub
 
 &lt;/web-app&gt;
 ]]></script>
-</div></div>
-
-<p>Then you can define your route as follows:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>Then you can define your route as follows:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 from(&quot;servlet:///hello?matchOnUriPrefix=true&quot;).process(new Processor() {
     public void process(Exchange exchange) throws Exception {
@@ -242,27 +176,14 @@ from(&quot;servlet:///hello?matchOnUriPr
     }
 });
 ]]></script>
-</div></div>
-
-    <div class="aui-message warning shadowed information-macro">
+</div></div>    <div class="aui-message warning shadowed information-macro">
                     <p class="title">Specify the relative path for camel-servlet endpoint</p>
                             <span class="aui-icon icon-warning">Icon</span>
                 <div class="message-content">
-                            
-<p>Since we are binding the Http transport with a published servlet, and we don't know the servlet's application context path, the <code>camel-servlet</code> endpoint uses the relative path to specify the endpoint's URL. A client can access the <code>camel-servlet</code> endpoint through the servlet publish address: <code>("http://localhost:8080/camel/services") + RELATIVE_PATH("/hello")</code>.</p>
+                            <p>Since we are binding the Http transport with a published servlet, and we don't know the servlet's application context path, the <code>camel-servlet</code> endpoint uses the relative path to specify the endpoint's URL. A client can access the <code>camel-servlet</code> endpoint through the servlet publish address: <code>("http://localhost:8080/camel/services") + RELATIVE_PATH("/hello")</code>.</p>
                     </div>
     </div>
-
-
-<h4 id="SERVLET-SamplewhenusingSpring3.x">Sample when using Spring 3.x</h4>
-
-<p>See <a shape="rect" href="servlet-tomcat-example.html">Servlet Tomcat Example</a></p>
-
-<h4 id="SERVLET-SamplewhenusingSpring2.x">Sample when using Spring 2.x</h4>
-
-<p>When using the Servlet component in a Camel/Spring application it's often required to load the Spring ApplicationContext <em>after</em> the Servlet component has started. This can be accomplished by using Spring's <code>ContextLoaderServlet</code> instead of <code>ContextLoaderListener</code>. In that case you'll need to start <code>ContextLoaderServlet</code> after <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java">CamelHttpTransportServlet</a> like this:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<h4 id="SERVLET-SamplewhenusingSpring3.x">Sample when using Spring 3.x</h4><p>See <a shape="rect" href="servlet-tomcat-example.html">Servlet Tomcat Example</a></p><h4 id="SERVLET-SamplewhenusingSpring2.x">Sample when using Spring 2.x</h4><p>When using the Servlet component in a Camel/Spring application it's often required to load the Spring ApplicationContext <em>after</em> the Servlet component has started. This can be accomplished by using Spring's <code>ContextLoaderServlet</code> instead of <code>ContextLoaderListener</code>. In that case you'll need to start <code>ContextLoaderServlet</code> after <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java">CamelHttpTransportServlet</a> like this:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ 
 &lt;web-app&gt;
   &lt;servlet&gt; 
@@ -281,12 +202,7 @@ from(&quot;servlet:///hello?matchOnUriPr
   &lt;/servlet&gt; 
 &lt;web-app&gt;
 ]]></script>
-</div></div>
-
-<h4 id="SERVLET-SamplewhenusingOSGi">Sample when using OSGi</h4>
-
-<p>From <strong>Camel 2.6.0</strong>, you can publish the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java">CamelHttpTransportServlet</a> as an OSGi service with help of SpringDM like this.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><h4 id="SERVLET-SamplewhenusingOSGi">Sample when using OSGi</h4><p>From <strong>Camel 2.6.0</strong>, you can publish the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java">CamelHttpTransportServlet</a> as an OSGi service with help of SpringDM like this.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;beans xmlns=&quot;http://www.springframework.org/schema/beans&quot;
        xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
@@ -320,10 +236,7 @@ from(&quot;servlet:///hello?matchOnUriPr
 
 &lt;/beans&gt;
 ]]></script>
-</div></div>
-
-<p>Then use this service in your camel route like this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>Then use this service in your camel route like this:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;beans xmlns=&quot;http://www.springframework.org/schema/beans&quot;
        xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
@@ -358,10 +271,7 @@ from(&quot;servlet:///hello?matchOnUriPr
 
 &lt;/beans&gt;
 ]]></script>
-</div></div>
-
-<p>For versions prior to Camel 2.6 you can use an <code>Activator</code> to publish the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java">CamelHttpTransportServlet</a> on the OSGi platform </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>For versions prior to Camel 2.6 you can use an <code>Activator</code> to publish the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java">CamelHttpTransportServlet</a> on the OSGi platform</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -435,11 +345,8 @@ public final class ServletActivator impl
 
 }
 ]]></script>
-</div></div>
-
-<h3 id="SERVLET-SeeAlso">See Also</h3>
-<ul><li><a shape="rect" href="configuring-camel.html">Configuring Camel</a></li><li><a shape="rect" href="component.html">Component</a></li><li><a shape="rect" href="endpoint.html">Endpoint</a></li><li><a shape="rect" href="getting-started.html">Getting Started</a></li></ul>
-<ul class="alternate"><li><a shape="rect" href="servlet-tomcat-example.html">Servlet Tomcat Example</a></li><li><a shape="rect" href="servlet-tomcat-no-spring-example.html">Servlet Tomcat No Spring Example</a></li><li><a shape="rect" href="http.html">Http</a></li><li><a shape="rect" href="jetty.html">Jetty</a></li></ul></div>
+</div></div><p></p><h3 id="SERVLET-SeeAlso">See Also</h3>
+<ul><li><a shape="rect" href="configuring-camel.html">Configuring Camel</a></li><li><a shape="rect" href="component.html">Component</a></li><li><a shape="rect" href="endpoint.html">Endpoint</a></li><li><a shape="rect" href="getting-started.html">Getting Started</a></li></ul><ul class="alternate"><li><a shape="rect" href="servlet-tomcat-example.html">Servlet Tomcat Example</a></li><li><a shape="rect" href="servlet-tomcat-no-spring-example.html">Servlet Tomcat No Spring Example</a></li><li><a shape="rect" href="http.html">HTTP</a></li><li><a shape="rect" href="jetty.html">Jetty</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">



Mime
View raw message