You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2013/12/16 21:05:18 UTC

svn commit: r890614 [4/4] - in /websites/production/camel/content: ./ cache/

Modified: websites/production/camel/content/json.html
==============================================================================
--- websites/production/camel/content/json.html (original)
+++ websites/production/camel/content/json.html Mon Dec 16 20:05:17 2013
@@ -40,6 +40,7 @@
   <link href='http://camel.apache.org/styles/highlighter/styles/shThemeCamel.css' rel='stylesheet' type='text/css' />
   <script src='http://camel.apache.org/styles/highlighter/scripts/shCore.js' type='text/javascript'></script>
   <script src='http://camel.apache.org/styles/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script src='http://camel.apache.org/styles/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
   
   <script type="text/javascript">
   SyntaxHighlighter.defaults['toolbar'] = false;
@@ -84,83 +85,46 @@
 	<tbody>
         <tr>
         <td valign="top" width="100%">
-<div class="wiki-content maincontent"><h2 id="JSON-JSON">JSON</h2>
-<p>JSON is a <a shape="rect" href="data-format.html">Data Format</a> to marshal and unmarshal Java objects to and from <a shape="rect" class="external-link" href="http://www.json.org/" rel="nofollow">JSON</a>. </p>
-
-<p>For JSON to object marshalling, Camel provides integration with three popular JSON libraries:</p>
-<ul class="alternate"><li>The <a shape="rect" class="external-link" href="http://xstream.codehaus.org/" rel="nofollow">XStream library</a> and <a shape="rect" class="external-link" href="http://jettison.codehaus.org/" rel="nofollow">Jettsion </a></li><li>The <a shape="rect" class="external-link" href="http://xircles.codehaus.org/projects/jackson" rel="nofollow">Jackson library</a></li><li><strong>Camel 2.10:</strong> The <a shape="rect" class="external-link" href="http://code.google.com/p/google-gson/" rel="nofollow">GSon library</a></li></ul>
-
-
-<p>By default Camel uses the XStream library. </p>
-
-    <div class="aui-message success shadowed information-macro">
+<div class="wiki-content maincontent"><h2 id="JSON-JSON">JSON</h2><p>JSON is a <a shape="rect" href="data-format.html">Data Format</a> to marshal and unmarshal Java objects to and from <a shape="rect" class="external-link" href="http://www.json.org/" rel="nofollow">JSON</a>.</p><p>For JSON to object marshalling, Camel provides integration with three popular JSON libraries:</p><ul class="alternate"><li>The <a shape="rect" class="external-link" href="http://xstream.codehaus.org/" rel="nofollow">XStream library</a> and <a shape="rect" class="external-link" href="http://jettison.codehaus.org/" rel="nofollow">Jettsion </a></li><li>The <a shape="rect" class="external-link" href="http://xircles.codehaus.org/projects/jackson" rel="nofollow">Jackson library</a></li><li><strong>Camel 2.10:</strong> The <a shape="rect" class="external-link" href="http://code.google.com/p/google-gson/" rel="nofollow">GSon library</a></li></ul><p>By default Camel uses the XStream library.</p>    <div class="aui-
 message success shadowed information-macro">
                     <p class="title">Direct, bi-directional JSON &lt;=&gt; XML conversions</p>
                             <span class="aui-icon icon-success">Icon</span>
                 <div class="message-content">
-                            
-<p>As of Camel 2.10, Camel supports direct, bi-directional JSON &lt;=&gt; XML conversions via the <a shape="rect" href="xmljson.html">camel-xmljson</a> data format, which is documented separately.</p>
+                            <p>As of Camel 2.10, Camel supports direct, bi-directional JSON &lt;=&gt; XML conversions via the <a shape="rect" href="xmljson.html">camel-xmljson</a> data format, which is documented separately.</p>
                     </div>
     </div>
-
-
-<h3 id="JSON-UsingJSONdataformatwiththeXStreamlibrary">Using JSON data format with the XStream library</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[
-// lets turn Object messages into json then send to MQSeries
+<h3 id="JSON-UsingJSONdataformatwiththeXStreamlibrary">Using JSON data format with the XStream library</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[// lets turn Object messages into json then send to MQSeries
 from(&quot;activemq:My.Queue&quot;).
   marshal().json().
   to(&quot;mqseries:Another.Queue&quot;);
 ]]></script>
-</div></div>
-
-<h3 id="JSON-UsingJSONdataformatwiththeJacksonlibrary">Using JSON data format with the Jackson library</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[
-// lets turn Object messages into json then send to MQSeries
+</div></div><h3 id="JSON-UsingJSONdataformatwiththeJacksonlibrary">Using JSON data format with the Jackson library</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[// lets turn Object messages into json then send to MQSeries
 from(&quot;activemq:My.Queue&quot;).
   marshal().json(JsonLibrary.Jackson).
   to(&quot;mqseries:Another.Queue&quot;);
 ]]></script>
-</div></div>
-
-<h3 id="JSON-UsingJSONdataformatwiththeGSONlibrary">Using JSON data format with the GSON library</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[
-// lets turn Object messages into json then send to MQSeries
+</div></div><h3 id="JSON-UsingJSONdataformatwiththeGSONlibrary">Using JSON data format with the GSON library</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[// lets turn Object messages into json then send to MQSeries
 from(&quot;activemq:My.Queue&quot;).
   marshal().json(JsonLibrary.Gson).
   to(&quot;mqseries:Another.Queue&quot;);
 ]]></script>
-</div></div>
-
-
-<h4 id="JSON-UsingJSONinSpringDSL">Using JSON in Spring DSL</h4>
-<p>When using <a shape="rect" href="data-format.html">Data Format</a> in Spring DSL you need to declare the data formats first. This is done in the <strong>DataFormats</strong> XML 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;dataFormats&gt;
+</div></div><h4 id="JSON-UsingJSONinSpringDSL">Using JSON in Spring DSL</h4><p>When using <a shape="rect" href="data-format.html">Data Format</a> in Spring DSL you need to declare the data formats first. This is done in the <strong>DataFormats</strong> XML 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;dataFormats&gt;
             &lt;!-- here we define a Json data format with the id jack and that it should use the TestPojo as the class type when
                  doing unmarshal. The unmarshalTypeName is optional, if not provided Camel will use a Map as the type --&gt;
             &lt;json id=&quot;jack&quot; library=&quot;Jackson&quot; unmarshalTypeName=&quot;org.apache.camel.component.jackson.TestPojo&quot;/&gt;
         &lt;/dataFormats&gt;
 ]]></script>
-</div></div>
-
-<p>And then you can refer to this id in the route:</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 then you can refer to this id in the route:</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;direct:back&quot;/&gt;
             &lt;unmarshal ref=&quot;jack&quot;/&gt;
             &lt;to uri=&quot;mock:reverse&quot;/&gt;
         &lt;/route&gt;
 ]]></script>
-</div></div>
-
-<h3 id="JSON-ExcludingPOJOfieldsfrommarshalling">Excluding POJO fields from marshalling</h3>
-<p><strong>As of Camel 2.10</strong><br clear="none">
-When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use <a shape="rect" class="external-link" href="http://wiki.fasterxml.com/JacksonJsonViews" rel="nofollow">JSON views</a> to accomplish this. First create one or more marker classes.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><h3 id="JSON-ExcludingPOJOfieldsfrommarshalling">Excluding POJO fields from marshalling</h3><p><strong>As of Camel 2.10</strong><br clear="none"> When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use <a shape="rect" class="external-link" href="http://wiki.fasterxml.com/JacksonJsonViews" rel="nofollow">JSON views</a> to accomplish this. First create one or more marker classes.</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[
 public class Views {
 
@@ -168,10 +132,7 @@ public class Views {
     static class Age { }
 }
 ]]></script>
-</div></div>
-
-<p>Use the marker classes with the <code>@JsonView</code> annotation to include/exclude certain fields. The annotation also works on getters.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>Use the marker classes with the <code>@JsonView</code> annotation to include/exclude certain fields. The annotation also works on getters.</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[
 @JsonView(Views.Age.class)
 private int age = 30;
@@ -181,25 +142,15 @@ private int height = 190;
 @JsonView(Views.Weight.class)
 private int weight = 70;
 ]]></script>
-</div></div>
-
-<p>Finally use the Camel <code>JacksonDataFormat</code> to marshall the above POJO to JSON.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>Finally use the Camel <code>JacksonDataFormat</code> to marshall the above POJO to JSON.</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[
 JacksonDataFormat ageViewFormat = new JacksonDataFormat(TestPojoView.class, Views.Age.class);
 from(&quot;direct:inPojoAgeView&quot;).marshal(ageViewFormat);
 ]]></script>
-</div></div>
-
-<p>Note that the weight field is missing in the resulting JSON:</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[
-{&quot;age&quot;:30, &quot;height&quot;:190}
+</div></div><p>Note that the weight field is missing in the resulting JSON:</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[{&quot;age&quot;:30, &quot;height&quot;:190}
 ]]></script>
-</div></div>
-
-<p>The GSON library supports a similar feature through the notion of <a shape="rect" class="external-link" href="http://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/ExclusionStrategy.html" rel="nofollow">ExclusionStrategies</a>:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>The GSON library supports a similar feature through the notion of <a shape="rect" class="external-link" href="http://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/ExclusionStrategy.html" rel="nofollow">ExclusionStrategies</a>:</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[
 /**
  * Strategy to exclude {@link ExcludeAge} annotated fields
@@ -217,38 +168,20 @@ protected static class AgeExclusionStrat
     }
 }
 ]]></script>
-</div></div>
-
-<p>The <code>GsonDataFormat</code> accepts an <code>ExclusionStrategy</code> in its constructor:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>The <code>GsonDataFormat</code> accepts an <code>ExclusionStrategy</code> in its constructor:</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[
 GsonDataFormat ageExclusionFormat = new GsonDataFormat(TestPojoExclusion.class, new AgeExclusionStrategy());
 from(&quot;direct:inPojoExcludeAge&quot;).marshal(ageExclusionFormat);
 ]]></script>
-</div></div>
-<p>The line above will exclude fields annotated with <code>@ExcludeAge</code> when marshalling to JSON.</p>
-
-
-<h3 id="JSON-Configuringfieldnamingpolicy">Configuring field naming policy</h3>
-<p><strong>Available as of Camel 2.11</strong></p>
-
-<p>The GSON library supports specifying policies and strategies for mapping from json to POJO fields. A common naming convention is to map json fields using lower case with underscores. </p>
-
-<p>We may have this JSON string</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[
-{
+</div></div><p>The line above will exclude fields annotated with <code>@ExcludeAge</code> when marshalling to JSON.</p><h3 id="JSON-Configuringfieldnamingpolicy">Configuring field naming policy</h3><p><strong>Available as of Camel 2.11</strong></p><p>The GSON library supports specifying policies and strategies for mapping from json to POJO fields. A common naming convention is to map json fields using lower case with underscores.</p><p>We may have this JSON string</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[{
   &quot;id&quot; : 123,
   &quot;first_name&quot; : &quot;Donald&quot;
   &quot;last_name&quot; : &quot;Duck&quot;
 }
 ]]></script>
-</div></div>
-
-<p>Which we want to map to a POJO that has getter/setters as</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[
-public class PersonPojo {
+</div></div><p>Which we want to map to a POJO that has getter/setters as</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>PersonPojo.java</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[public class PersonPojo {
 
     private int id;
     private String firstName;
@@ -279,13 +212,8 @@ public class PersonPojo {
     }
 }
 ]]></script>
-</div></div>
-
-<p>Then we can configure the <code>org.apache.camel.component.gson.GsonDataFormat</code> in a Spring XML files as shown below. Notice we use <code>fieldNamingPolicy</code> property to set the field mapping. This property is an enum from GSon <code>com.google.gson.FieldNamingPolicy</code> which has a number of pre defined mappings. If you need full control you can use the property <code>FieldNamingStrategy</code> and implement a custom <code>com.google.gson.FieldNamingStrategy</code> where you can control the mapping.</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[
-    &lt;!-- define the gson data format, where we configure the data format using the properties --&gt;
+</div></div><p>Then we can configure the <code>org.apache.camel.component.gson.GsonDataFormat</code> in a Spring XML files as shown below. Notice we use <code>fieldNamingPolicy</code> property to set the field mapping. This property is an enum from GSon <code>com.google.gson.FieldNamingPolicy</code> which has a number of pre defined mappings. If you need full control you can use the property <code>FieldNamingStrategy</code> and implement a custom <code>com.google.gson.FieldNamingStrategy</code> where you can control the mapping.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Configuring GsonDataFromat in Spring XML file</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[    &lt;!-- define the gson data format, where we configure the data format using the properties --&gt;
     &lt;bean id=&quot;gson&quot; class=&quot;org.apache.camel.component.gson.GsonDataFormat&quot;&gt;
         &lt;!-- we want to unmarshal to person pojo --&gt;
         &lt;property name=&quot;unmarshalType&quot; value=&quot;org.apache.camel.component.gson.PersonPojo&quot;/&gt;
@@ -293,12 +221,8 @@ public class PersonPojo {
         &lt;property name=&quot;fieldNamingPolicy&quot; value=&quot;LOWER_CASE_WITH_UNDERSCORES&quot;/&gt;
     &lt;/bean&gt;
 ]]></script>
-</div></div>
-
-<p>And use it in Camel routes by referring to its bean id as shown:</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[
-   &lt;camelContext xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
+</div></div><p>And use it in Camel routes by referring to its bean id as shown:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Using gson from Camel Routes</b></div><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;route&gt;
             &lt;from uri=&quot;direct:inPojo&quot;/&gt;
@@ -312,83 +236,37 @@ public class PersonPojo {
 
     &lt;/camelContext&gt;
 ]]></script>
-</div></div>
-
-
-<h3 id="JSON-Include/ExcludefieldsusingthejsonViewattributewithJacksonDataFormat">Include/Exclude fields using the <code>jsonView</code> attribute with <code>JacksonDataFormat</code></h3>
-<p><strong>Available as of Camel 2.12</strong></p>
-
-<p>As an example of using this attribute you can instead of:</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[
-JacksonDataFormat ageViewFormat = new JacksonDataFormat(TestPojoView.class, Views.Age.class);
+</div></div><h3 id="JSON-Include/ExcludefieldsusingthejsonViewattributewithJacksonDataFormat">Include/Exclude fields using the <code>jsonView</code> attribute with <code>JacksonDataFormat</code></h3><p><strong>Available as of Camel 2.12</strong></p><p>As an example of using this attribute you can instead of:</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[JacksonDataFormat ageViewFormat = new JacksonDataFormat(TestPojoView.class, Views.Age.class);
 from(&quot;direct:inPojoAgeView&quot;).
   marshal(ageViewFormat);
 ]]></script>
-</div></div>
-
-<p>Directly specify your <a shape="rect" class="external-link" href="http://wiki.fasterxml.com/JacksonJsonViews" rel="nofollow">JSON view</a> inside the Java DSL as:</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;direct:inPojoAgeView&quot;).
+</div></div><p>Directly specify your <a shape="rect" class="external-link" href="http://wiki.fasterxml.com/JacksonJsonViews" rel="nofollow">JSON view</a> inside the Java DSL as:</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;direct:inPojoAgeView&quot;).
   marshal().json(TestPojoView.class, Views.Age.class);
 ]]></script>
-</div></div>
-
-<p>And the same in XML DSL:</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[
-&lt;from uri=&quot;direct:inPojoAgeView&quot;/&gt;
+</div></div><p>And the same in XML 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;from uri=&quot;direct:inPojoAgeView&quot;/&gt;
   &lt;marshal&gt;
     &lt;json library=&quot;Jackson&quot; unmarshalTypeName=&quot;org.apache.camel.component.jackson.TestPojoView&quot; jsonView=&quot;org.apache.camel.component.jackson.Views$Age&quot;/&gt;
   &lt;/marshal&gt;
 ]]></script>
-</div></div>
-
-<h3 id="JSON-DependenciesforXStream">Dependencies for XStream</h3>
-
-<p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-xstream</strong> which implements this data format. </p>
-
-<p>If you use maven you could just add the following to your pom.xml, substituting the version number for the latest &amp; greatest release (see <a shape="rect" href="download.html">the download page for the latest versions</a>).</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></div><h3 id="JSON-DependenciesforXStream">Dependencies for XStream</h3><p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-xstream</strong> which implements this data format.</p><p>If you use maven you could just add the following to your pom.xml, substituting the version number for the latest &amp; greatest release (see <a shape="rect" href="download.html">the download page for the latest versions</a>).</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-xstream&lt;/artifactId&gt;
   &lt;version&gt;2.9.2&lt;/version&gt;
 &lt;/dependency&gt;
 ]]></script>
-</div></div>
-
-<h3 id="JSON-DependenciesforJackson">Dependencies for Jackson</h3>
-
-<p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-jackson</strong> which implements this data format. </p>
-
-<p>If you use maven you could just add the following to your pom.xml, substituting the version number for the latest &amp; greatest release (see <a shape="rect" href="download.html">the download page for the latest versions</a>).</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></div><h3 id="JSON-DependenciesforJackson">Dependencies for Jackson</h3><p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-jackson</strong> which implements this data format.</p><p>If you use maven you could just add the following to your pom.xml, substituting the version number for the latest &amp; greatest release (see <a shape="rect" href="download.html">the download page for the latest versions</a>).</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-jackson&lt;/artifactId&gt;
   &lt;version&gt;2.9.2&lt;/version&gt;
 &lt;/dependency&gt;
 ]]></script>
-</div></div>
-
-<h3 id="JSON-DependenciesforGSON">Dependencies for GSON</h3>
-
-<p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-gson</strong> which implements this data format. </p>
-
-<p>If you use maven you could just add the following to your pom.xml, substituting the version number for the latest &amp; greatest release (see <a shape="rect" href="download.html">the download page for the latest versions</a>).</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></div><h3 id="JSON-DependenciesforGSON">Dependencies for GSON</h3><p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-gson</strong> which implements this data format.</p><p>If you use maven you could just add the following to your pom.xml, substituting the version number for the latest &amp; greatest release (see <a shape="rect" href="download.html">the download page for the latest versions</a>).</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-gson&lt;/artifactId&gt;
   &lt;version&gt;2.10.0&lt;/version&gt;

Modified: websites/production/camel/content/jt400.html
==============================================================================
--- websites/production/camel/content/jt400.html (original)
+++ websites/production/camel/content/jt400.html Mon Dec 16 20:05:17 2013
@@ -165,7 +165,7 @@ public class Jt400RouteBuilder extends R
 public class Jt400RouteBuilder extends RouteBuilder {
     @Override
     public void configure() throws Exception {
-       from(&quot;direct:work&quot;).to(&quot;jt400://GRUPO:ATWORK@server/QSYS.LIB/assets.LIB/compute.PGM?fieldsLength=10,10,512&amp;ouputFieldsIdx=2,3&quot;).to(“direct:play”);
+       from(&quot;direct:work&quot;).to(&quot;jt400://GRUPO:ATWORK@server/QSYS.LIB/assets.LIB/compute.PGM?fieldsLength=10,10,512&amp;ouputFieldsIdx=2,3&quot;).to(Òdirect:playÓ);
     }
 }
 ]]></script>

Modified: websites/production/camel/content/recipient-list.html
==============================================================================
--- websites/production/camel/content/recipient-list.html (original)
+++ websites/production/camel/content/recipient-list.html Mon Dec 16 20:05:17 2013
@@ -84,29 +84,9 @@
 	<tbody>
         <tr>
         <td valign="top" width="100%">
-<div class="wiki-content maincontent"><h3 id="RecipientList-RecipientList">Recipient List</h3>
-
-<p>The <a shape="rect" class="external-link" href="http://www.enterpriseintegrationpatterns.com/RecipientList.html" rel="nofollow">Recipient List</a> from the <a shape="rect" href="enterprise-integration-patterns.html">EIP patterns</a> allows you to route messages to a number of dynamically specified recipients.</p>
-
-<p><img class="confluence-embedded-image confluence-external-resource" src="http://www.enterpriseintegrationpatterns.com/img/RecipientList.gif" data-image-src="http://www.enterpriseintegrationpatterns.com/img/RecipientList.gif"></p>
-
-<p>The recipients will receive a copy of the <strong>same</strong> <a shape="rect" href="exchange.html">Exchange</a>, and Camel will execute them sequentially.</p>
-
-<h3 id="RecipientList-Options">Options</h3>
-
-<div class="confluenceTableSmall">
+<div class="wiki-content maincontent"><h3 id="RecipientList-RecipientList">Recipient List</h3><p>The <a shape="rect" class="external-link" href="http://www.enterpriseintegrationpatterns.com/RecipientList.html" rel="nofollow">Recipient List</a> from the <a shape="rect" href="enterprise-integration-patterns.html">EIP patterns</a> allows you to route messages to a number of dynamically specified recipients.</p><p><img class="confluence-embedded-image confluence-external-resource" src="http://www.enterpriseintegrationpatterns.com/img/RecipientList.gif" data-image-src="http://www.enterpriseintegrationpatterns.com/img/RecipientList.gif"></p><p>The recipients will receive a copy of the <strong>same</strong> <a shape="rect" href="exchange.html">Exchange</a>, and Camel will execute them sequentially.</p><h3 id="RecipientList-Options">Options</h3><div class="confluenceTableSmall">
 <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>delimiter</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>,</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Delimiter used if the <a shape="rect" href="expression.html" title="Expression">Expression</a> returned multiple endpoints. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>strategyRef</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> An <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/AggregationStrategy.html
 ">AggregationStrategy</a> that will assemble the replies from recipients into a single outgoing message from the <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a>. By default Camel will use the last reply as the outgoing message. From <strong>Camel 2.12</strong> onwards you can also use a POJO as the <code>AggregationStrategy</code>, see the <a shape="rect" href="aggregator2.html" title="Aggregator2">Aggregate</a> page for more details. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>strategyMethodName</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>Camel 2.12:</strong> This option can be used to explicit declare the method name to use, when using POJOs as the <code>AggregationStrategy</code>. See the <a shape="rect" href="aggregator2.html" title="Aggregator2">Aggregate</a> page for more details. </p></td></tr><tr><td colspan
 ="1" rowspan="1" class="confluenceTd"><p> <code>strategyMethodAllowNull</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>false</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>Camel 2.12:</strong> If this option is <code>false</code> then the aggregate method is not used if there was no data to enrich. If this option is <code>true</code> then <code>null</code> values is used as the <code>oldExchange</code> (when no data to enrich), when using POJOs as the <code>AggregationStrategy</code>. See the <a shape="rect" href="aggregator2.html" title="Aggregator2">Aggregate</a> page for more details. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>parallelProcessing</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>false</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>Camel 2.2:</strong> If enabled, messages are sent to the recipients concurrently. Note tha
 t the calling thread will still wait until all messages have been fully processed before it continues; it's the sending and processing of replies from recipients which happens in parallel. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>executorServiceRef</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>Camel 2.2:</strong> A custom <a shape="rect" href="threading-model.html" title="Threading Model">Thread Pool</a> to use for parallel processing. Note that enabling this option implies parallel processing, so you need not enable that option as well. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>stopOnException</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>false</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>Camel 2.2:</strong> Whether to immediately stop processing when an e
 xception occurs. If disabled, Camel will send the message to all recipients regardless of any individual failures. You can process exceptions in an <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/AggregationStrategy.html">AggregationStrategy</a> implementation, which supports full control of error handling. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>ignoreInvalidEndpoints</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>false</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>Camel 2.3:</strong> Whether to ignore an endpoint URI that could not be resolved. If disabled, Camel will throw an exception identifying the invalid endpoint URI. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>streaming</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>false</code> </
 p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>Camel 2.5:</strong> If enabled, Camel will process replies out-of-order - that is, in the order received in reply from each recipient. If disabled, Camel will process replies in the same order as specified by the <a shape="rect" href="expression.html" title="Expression">Expression</a>. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>timeout</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>Camel 2.5:</strong> Specifies a processing timeout milliseconds. If the <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a> hasn't been able to send and process all replies within this timeframe, then the timeout triggers and the <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a> breaks out, with message flow continuing to the next element. Not
 e that if you provide a <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/TimeoutAwareAggregationStrategy.html">TimeoutAwareAggregationStrategy</a>, its <code>timeout</code> method is invoked before breaking out. <strong>Beware:</strong> If the timeout is reached with running tasks still remaining, certain tasks for which it is difficult for Camel to shut down in a graceful manner may continue to run.  So use this option with a bit of care.  We may be able to improve this functionality in future Camel releases. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>onPrepareRef</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>Camel 2.8:</strong> A custom <a shape="rect" href="processor.html" title="Processor">Processor</a> to prepare the copy of the <a shape="rect" href="exchange.h
 tml" title="Exchange">Exchange</a> each recipient will receive. This allows you to perform arbitrary transformations, such as deep-cloning the message payload (or any other custom logic). </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>shareUnitOfWork</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>false</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>Camel 2.8:</strong> Whether the unit of work should be shared. See <a shape="rect" href="splitter.html#Splitter-Sharingunitofwork">the same option on Splitter</a> for more details. </p></td></tr></tbody></table>
-</div>
-
-<h4 id="RecipientList-StaticRecipientList">Static Recipient List</h4>
-
-<p>The following example shows how to route a request from an input <strong>queue:a</strong> endpoint to a static list of destinations</p>
-
-<p><strong>Using Annotations</strong><br clear="none">
-You can use the <a shape="rect" href="recipientlist-annotation.html">RecipientList Annotation</a> on a POJO to create a Dynamic Recipient List. For more details see the <a shape="rect" href="bean-integration.html">Bean Integration</a>.</p>
-
-<p><strong>Using the <a shape="rect" href="fluent-builders.html">Fluent Builders</a></strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div><h4 id="RecipientList-StaticRecipientList">Static Recipient List</h4><p>The following example shows how to route a request from an input <strong>queue:a</strong> endpoint to a static list of destinations</p><p><strong>Using Annotations</strong><br clear="none"> You can use the <a shape="rect" href="recipientlist-annotation.html">RecipientList Annotation</a> on a POJO to create a Dynamic Recipient List. For more details see the <a shape="rect" href="bean-integration.html">Bean Integration</a>.</p><p><strong>Using the <a shape="rect" href="fluent-builders.html">Fluent Builders</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() {
@@ -117,10 +97,7 @@ RouteBuilder builder = new RouteBuilder(
     }
 };
 ]]></script>
-</div></div>
-
-<p><strong>Using the <a shape="rect" href="spring-xml-extensions.html">Spring XML Extensions</a></strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p><strong>Using the <a shape="rect" href="spring-xml-extensions.html">Spring XML Extensions</a></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;camelContext errorHandlerRef=&quot;errorHandler&quot; xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
     &lt;route&gt;
@@ -133,14 +110,7 @@ RouteBuilder builder = new RouteBuilder(
     &lt;/route&gt;
 &lt;/camelContext&gt;
 ]]></script>
-</div></div>
-
-<h4 id="RecipientList-DynamicRecipientList">Dynamic Recipient List</h4>
-
-<p>Usually one of the main reasons for using the <a shape="rect" class="external-link" href="http://www.enterpriseintegrationpatterns.com/RecipientList.html" rel="nofollow">Recipient List</a> pattern is that the list of recipients is dynamic and calculated at runtime. The following example demonstrates how to create a dynamic recipient list using an <a shape="rect" href="expression.html">Expression</a> (which in this case it extracts a named header value dynamically) to calculate the list of endpoints which are either of type <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Endpoint.html">Endpoint</a> or are converted to a String and then resolved using the endpoint <a shape="rect" href="uris.html">URIs</a>.</p>
-
-<p><strong>Using the <a shape="rect" href="fluent-builders.html">Fluent Builders</a></strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><h4 id="RecipientList-DynamicRecipientList">Dynamic Recipient List</h4><p>Usually one of the main reasons for using the <a shape="rect" class="external-link" href="http://www.enterpriseintegrationpatterns.com/RecipientList.html" rel="nofollow">Recipient List</a> pattern is that the list of recipients is dynamic and calculated at runtime. The following example demonstrates how to create a dynamic recipient list using an <a shape="rect" href="expression.html">Expression</a> (which in this case it extracts a named header value dynamically) to calculate the list of endpoints which are either of type <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Endpoint.html">Endpoint</a> or are converted to a String and then resolved using the endpoint <a shape="rect" href="uris.html">URIs</a>.</p><p><strong>Using the <a shape="rect" href="fluent-builders.html">Fluent Builders</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() {
@@ -151,23 +121,12 @@ RouteBuilder builder = new RouteBuilder(
     }
 };
 ]]></script>
-</div></div>
-
-<p>The above assumes that the header contains a list of endpoint URIs. The following takes a single string header and tokenizes it</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>The above assumes that the header contains a list of endpoint URIs. The following takes a single string header and tokenizes it</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;direct:a&quot;).recipientList(
         header(&quot;recipientListHeader&quot;).tokenize(&quot;,&quot;));
 ]]></script>
-</div></div>
-
-<h5 id="RecipientList-Iteratablevalue">Iteratable value</h5>
-<p>The dynamic list of recipients that are defined in the header must be iteratable such as:</p>
-<ul class="alternate"><li><code>java.util.Collection</code></li><li><code>java.util.Iterator</code></li><li>arrays</li><li><code>org.w3c.dom.NodeList</code></li><li>a single String with values separated with comma</li><li>any other type will be regarded as a single value</li></ul>
-
-
-<p><strong>Using the <a shape="rect" href="spring-xml-extensions.html">Spring XML Extensions</a></strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><h5 id="RecipientList-Iteratablevalue">Iteratable value</h5><p>The dynamic list of recipients that are defined in the header must be iteratable such as:</p><ul class="alternate"><li><code>java.util.Collection</code></li><li><code>java.util.Iterator</code></li><li>arrays</li><li><code>org.w3c.dom.NodeList</code></li><li>a single String with values separated with comma</li><li>any other type will be regarded as a single value</li></ul><p><strong>Using the <a shape="rect" href="spring-xml-extensions.html">Spring XML Extensions</a></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;camelContext errorHandlerRef=&quot;errorHandler&quot; xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
     &lt;route&gt;
@@ -178,15 +137,7 @@ from(&quot;direct:a&quot;).recipientList
     &lt;/route&gt;
 &lt;/camelContext&gt;
 ]]></script>
-</div></div>
-
-<p>For further examples of this pattern in use you could look at one of the <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java?view=markup">junit test case</a></p>
-
-<h5 id="RecipientList-UsingdelimiterinSpringXML">Using delimiter in Spring XML</h5>
-
-<p>In Spring DSL you can set the <code>delimiter</code> attribute for setting a delimiter to be used if the header value is a single String with multiple separated endpoints. By default Camel uses comma as delimiter, but this option lets you specify a customer delimiter to use instead.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>For further examples of this pattern in use you could look at one of the <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java?view=markup">junit test case</a></p><h5 id="RecipientList-UsingdelimiterinSpringXML">Using delimiter in Spring XML</h5><p>In Spring DSL you can set the <code>delimiter</code> attribute for setting a delimiter to be used if the header value is a single String with multiple separated endpoints. By default Camel uses comma as delimiter, but this option lets you specify a customer delimiter to use instead.</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;direct:a&quot; /&gt;
@@ -196,120 +147,52 @@ from(&quot;direct:a&quot;).recipientList
   &lt;/recipientList&gt;
 &lt;/route&gt;
 ]]></script>
-</div></div>
-
-<p>So if <strong>myHeader</strong> contains a String with the value <code>"activemq:queue:foo, activemq:topic:hello , log:bar"</code> then Camel will split the String using the delimiter given in the XML that was comma, resulting into 3 endpoints to send to. You can use spaces between the endpoints as Camel will trim the value when it lookup the endpoint to send to. </p>
-
-<p>Note: In Java DSL you use the <code>tokenizer</code> to archive the same. The route above in Java DSL:</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;direct:a&quot;).recipientList(header(&quot;myHeader&quot;).tokenize(&quot;,&quot;));
+</div></div><p>So if <strong>myHeader</strong> contains a String with the value <code>"activemq:queue:foo, activemq:topic:hello , log:bar"</code> then Camel will split the String using the delimiter given in the XML that was comma, resulting into 3 endpoints to send to. You can use spaces between the endpoints as Camel will trim the value when it lookup the endpoint to send to.</p><p>Note: In Java DSL you use the <code>tokenizer</code> to archive the same. The route above in Java DSL:</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;direct:a&quot;).recipientList(header(&quot;myHeader&quot;).tokenize(&quot;,&quot;));
 ]]></script>
-</div></div>
-
-<p>In <strong>Camel 2.1</strong> its a bit easier as you can pass in the delimiter as 2nd parameter:</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;direct:a&quot;).recipientList(header(&quot;myHeader&quot;), &quot;#&quot;);
+</div></div><p>In <strong>Camel 2.1</strong> its a bit easier as you can pass in the delimiter as 2nd parameter:</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;direct:a&quot;).recipientList(header(&quot;myHeader&quot;), &quot;#&quot;);
 ]]></script>
-</div></div>
-
-<h3 id="RecipientList-Sendingtomultiplerecipientsinparallel">Sending to multiple recipients in parallel</h3>
-<p><strong>Available as of Camel 2.2</strong></p>
-
-<p>The <a shape="rect" href="recipient-list.html">Recipient List</a> now supports <code>parallelProcessing</code> that for example <a shape="rect" href="splitter.html">Splitter</a> also supports. You can use it to use a thread pool to have concurrent tasks sending the <a shape="rect" href="exchange.html">Exchange</a> to multiple recipients concurrently.</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;direct:a&quot;).recipientList(header(&quot;myHeader&quot;)).parallelProcessing();
+</div></div><h3 id="RecipientList-Sendingtomultiplerecipientsinparallel">Sending to multiple recipients in parallel</h3><p><strong>Available as of Camel 2.2</strong></p><p>The <a shape="rect" href="recipient-list.html">Recipient List</a> now supports <code>parallelProcessing</code> that for example <a shape="rect" href="splitter.html">Splitter</a> also supports. You can use it to use a thread pool to have concurrent tasks sending the <a shape="rect" href="exchange.html">Exchange</a> to multiple recipients concurrently.</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;direct:a&quot;).recipientList(header(&quot;myHeader&quot;)).parallelProcessing();
 ]]></script>
-</div></div>
-
-<p>And in Spring XML its an attribute on the recipient list tag.</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[
-   &lt;route&gt;
+</div></div><p>And in Spring XML its an attribute on the recipient list tag.</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[   &lt;route&gt;
        &lt;from uri=&quot;direct:a&quot;/&gt;
        &lt;recipientList parallelProcessing=&quot;true&quot;&gt;
            &lt;header&gt;myHeader&lt;/header&gt;
        &lt;/recipientList&gt;
    &lt;/route&gt;
 ]]></script>
-</div></div>
-
-<h3 id="RecipientList-Stopcontinuingincaseonerecipientfailed">Stop continuing in case one recipient failed</h3>
-<p><strong>Available as of Camel 2.2</strong></p>
-
-<p>The <a shape="rect" href="recipient-list.html">Recipient List</a> now supports <code>stopOnException</code> that for example <a shape="rect" href="splitter.html">Splitter</a> also supports. You can use it to stop sending to any further recipients in case any recipient failed. </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;direct:a&quot;).recipientList(header(&quot;myHeader&quot;)).stopOnException();
+</div></div><h3 id="RecipientList-Stopcontinuingincaseonerecipientfailed">Stop continuing in case one recipient failed</h3><p><strong>Available as of Camel 2.2</strong></p><p>The <a shape="rect" href="recipient-list.html">Recipient List</a> now supports <code>stopOnException</code> that for example <a shape="rect" href="splitter.html">Splitter</a> also supports. You can use it to stop sending to any further recipients in case any recipient failed.</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;direct:a&quot;).recipientList(header(&quot;myHeader&quot;)).stopOnException();
 ]]></script>
-</div></div>
-
-<p>And in Spring XML its an attribute on the recipient list tag.</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[
-   &lt;route&gt;
+</div></div><p>And in Spring XML its an attribute on the recipient list tag.</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[   &lt;route&gt;
        &lt;from uri=&quot;direct:a&quot;/&gt;
        &lt;recipientList stopOnException=&quot;true&quot;&gt;
            &lt;header&gt;myHeader&lt;/header&gt;
        &lt;/recipientList&gt;
    &lt;/route&gt;
 ]]></script>
-</div></div>
-
-<p><strong>Note:</strong> You can combine <code>parallelProcessing</code> and <code>stopOnException</code> and have them both <code>true</code>.</p>
-
-<h3 id="RecipientList-Ignoreinvalidendpoints">Ignore invalid endpoints</h3>
-<p><strong>Available as of Camel 2.3</strong></p>
-
-<p>The <a shape="rect" href="recipient-list.html">Recipient List</a> now supports <code>ignoreInvalidEndpoints</code> which the <a shape="rect" href="routing-slip.html">Routing Slip</a> also supports. You can use it to skip endpoints which is invalid.</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;direct:a&quot;).recipientList(header(&quot;myHeader&quot;)).ignoreInvalidEndpoints();
+</div></div><p><strong>Note:</strong> You can combine <code>parallelProcessing</code> and <code>stopOnException</code> and have them both <code>true</code>.</p><h3 id="RecipientList-Ignoreinvalidendpoints">Ignore invalid endpoints</h3><p><strong>Available as of Camel 2.3</strong></p><p>The <a shape="rect" href="recipient-list.html">Recipient List</a> now supports <code>ignoreInvalidEndpoints</code> which the <a shape="rect" href="routing-slip.html">Routing Slip</a> also supports. You can use it to skip endpoints which is invalid.</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;direct:a&quot;).recipientList(header(&quot;myHeader&quot;)).ignoreInvalidEndpoints();
 ]]></script>
-</div></div>
-
-<p>And in Spring XML its an attribute on the recipient list tag.</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[
-   &lt;route&gt;
+</div></div><p>And in Spring XML its an attribute on the recipient list tag.</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[   &lt;route&gt;
        &lt;from uri=&quot;direct:a&quot;/&gt;
        &lt;recipientList ignoreInvalidEndpoints=&quot;true&quot;&gt;
            &lt;header&gt;myHeader&lt;/header&gt;
        &lt;/recipientList&gt;
    &lt;/route&gt;
 ]]></script>
-</div></div>
-
-<p>Then lets say the <code>myHeader</code> contains the following two endpoints <code>direct:foo,xxx:bar</code>. The first endpoint is valid and works. However the 2nd is invalid and will just be ignored. Camel logs at INFO level about, so you can see why the endpoint was invalid.</p>
-
-
-<h3 id="RecipientList-UsingcustomAggregationStrategy">Using custom <code>AggregationStrategy</code></h3>
-<p><strong>Available as of Camel 2.2</strong></p>
-
-<p>You can now use you own <code>AggregationStrategy</code> with the <a shape="rect" href="recipient-list.html">Recipient List</a>. However its not that often you need that. What its good for is that in case you are using <a shape="rect" href="request-reply.html">Request Reply</a> messaging then the replies from the recipient can be aggregated. By default Camel uses <code>UseLatestAggregationStrategy</code> which just keeps that last received reply. What if you must remember all the bodies that all the recipients send back, then you can use your own custom aggregator that keeps those. Its the same principle as with the <a shape="rect" href="aggregator.html">Aggregator</a> EIP so check it out for details.</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;direct:a&quot;)
+</div></div><p>Then lets say the <code>myHeader</code> contains the following two endpoints <code>direct:foo,xxx:bar</code>. The first endpoint is valid and works. However the 2nd is invalid and will just be ignored. Camel logs at INFO level about, so you can see why the endpoint was invalid.</p><h3 id="RecipientList-UsingcustomAggregationStrategy">Using custom <code>AggregationStrategy</code></h3><p><strong>Available as of Camel 2.2</strong></p><p>You can now use you own <code>AggregationStrategy</code> with the <a shape="rect" href="recipient-list.html">Recipient List</a>. However its not that often you need that. What its good for is that in case you are using <a shape="rect" href="request-reply.html">Request Reply</a> messaging then the replies from the recipient can be aggregated. By default Camel uses <code>UseLatestAggregationStrategy</code> which just keeps that last received reply. What if you must remember all the bodies that all the recipients send back, then you can use 
 your own custom aggregator that keeps those. Its the same principle as with the <a shape="rect" href="aggregator.html">Aggregator</a> EIP so check it out for details.</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;direct:a&quot;)
         .recipientList(header(&quot;myHeader&quot;)).aggregationStrategy(new MyOwnAggregationStrategy())
         .to(&quot;direct:b&quot;);
 ]]></script>
-</div></div>
-
-
-<p>And in Spring XML its an attribute on the recipient list tag.</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[
-   &lt;route&gt;
+</div></div><p>And in Spring XML its an attribute on the recipient list tag.</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[   &lt;route&gt;
        &lt;from uri=&quot;direct:a&quot;/&gt;
        &lt;recipientList strategyRef=&quot;myStrategy&quot;&gt;
            &lt;header&gt;myHeader&lt;/header&gt;
@@ -319,42 +202,18 @@ from(&quot;direct:a&quot;).recipientList
 
    &lt;bean id=&quot;myStrategy&quot; class=&quot;com.mycompany.MyOwnAggregationStrategy&quot;/&gt;
 ]]></script>
-</div></div>
-
-<h4 id="RecipientList-KnowingwhichendpointwhenusingcustomAggregationStrategy">Knowing which endpoint when using custom <code>AggregationStrategy</code></h4>
-<p><strong>Available as of Camel 2.12</strong></p>
-
-<p>When using a custom <code>AggregationStrategy</code> then the <code>aggregate</code> method is always invoked in the sequential order (also if parallel processing is enabled) of the endpoints the <a shape="rect" href="recipient-list.html">Recipient List</a> is using. However from Camel 2.12 this is easier to know as the <code>newExchange</code> <a shape="rect" href="exchange.html">Exchange</a> has a property stored (key is <code>Exchange.RECIPIENT_LIST_ENDPOINT</code> with the uri of the <a shape="rect" href="endpoint.html">Endpoint</a>.</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[
-    @Override
+</div></div><h4 id="RecipientList-KnowingwhichendpointwhenusingcustomAggregationStrategy">Knowing which endpoint when using custom <code>AggregationStrategy</code></h4><p><strong>Available as of Camel 2.12</strong></p><p>When using a custom <code>AggregationStrategy</code> then the <code>aggregate</code> method is always invoked in the sequential order (also if parallel processing is enabled) of the endpoints the <a shape="rect" href="recipient-list.html">Recipient List</a> is using. However from Camel 2.12 this is easier to know as the <code>newExchange</code> <a shape="rect" href="exchange.html">Exchange</a> has a property stored (key is <code>Exchange.RECIPIENT_LIST_ENDPOINT</code> with the uri of the <a shape="rect" href="endpoint.html">Endpoint</a>.</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[    @Override
     public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
         String uri = newExchange.getProperty(Exchange.RECIPIENT_LIST_ENDPOINT, String.class);
         ...
     }
 ]]></script>
-</div></div>
-
-
-
-<h3 id="RecipientList-Usingcustomthreadpool">Using custom thread pool</h3>
-<p><strong>Available as of Camel 2.2</strong></p>
-
-<p>A thread pool is only used for <code>parallelProcessing</code>. You supply your own custom thread pool via the <code>ExecutorServiceStrategy</code> (see Camel's <a shape="rect" href="threading-model.html">Threading Model</a>), the same way you would do it for the <code>aggregationStrategy</code>. By default Camel uses a thread pool with 10 threads (subject to change in a future version).</p>
-
-<h3 id="RecipientList-Usingmethodcallasrecipientlist">Using method call as recipient list</h3>
-<p>You can use a <a shape="rect" href="bean.html">Bean</a> to provide the recipients, for example:</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;activemq:queue:test&quot;).recipientList().method(MessageRouter.class, &quot;routeTo&quot;);
+</div></div><h3 id="RecipientList-Usingcustomthreadpool">Using custom thread pool</h3><p><strong>Available as of Camel 2.2</strong></p><p>A thread pool is only used for <code>parallelProcessing</code>. You supply your own custom thread pool via the <code>ExecutorServiceStrategy</code> (see Camel's <a shape="rect" href="threading-model.html">Threading Model</a>), the same way you would do it for the <code>aggregationStrategy</code>. By default Camel uses a thread pool with 10 threads (subject to change in a future version).</p><h3 id="RecipientList-Usingmethodcallasrecipientlist">Using method call as recipient list</h3><p>You can use a <a shape="rect" href="bean.html">Bean</a> to provide the recipients, for example:</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;activemq:queue:test&quot;).recipientList().method(MessageRouter.class, &quot;routeTo&quot;);
 ]]></script>
-</div></div>
-
-<p>And then <code>MessageRouter</code>:</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[
-public class MessageRouter {
+</div></div><p>And then <code>MessageRouter</code>:</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[public class MessageRouter {
 
     public String routeTo() {
         String queueName = &quot;activemq:queue:test2&quot;;
@@ -362,13 +221,8 @@ public class MessageRouter {
     }
 }
 ]]></script>
-</div></div>
-
-<p>When you use a <a shape="rect" href="bean.html">Bean</a> then do <strong>not</strong> also use the <code>@RecipientList</code> annotation as this will in fact add yet another recipient list, so you end up having two. Do <strong>not</strong> do like this.</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[
-public class MessageRouter {
+</div></div><p>When you use a <a shape="rect" href="bean.html">Bean</a> then do <strong>not</strong> also use the <code>@RecipientList</code> annotation as this will in fact add yet another recipient list, so you end up having two. Do <strong>not</strong> do like this.</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[public class MessageRouter {
 
     @RecipientList
     public String routeTo() {
@@ -377,35 +231,17 @@ public class MessageRouter {
     }
 }
 ]]></script>
-</div></div>
-
-<p>Well you should only do like that above (using <code>@RecipientList</code>) if you route just route to a <a shape="rect" href="bean.html">Bean</a> which you then want to act as a recipient list.<br clear="none">
-So the original route can be changed to:</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;activemq:queue:test&quot;).bean(MessageRouter.class, &quot;routeTo&quot;);
+</div></div><p>Well you should only do like that above (using <code>@RecipientList</code>) if you route just route to a <a shape="rect" href="bean.html">Bean</a> which you then want to act as a recipient list.<br clear="none"> So the original route can be changed to:</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;activemq:queue:test&quot;).bean(MessageRouter.class, &quot;routeTo&quot;);
 ]]></script>
-</div></div>
-<p>Which then would invoke the routeTo method and detect its annotated with <code>@RecipientList</code> and then act accordingly as if it was a recipient list EIP.</p>
-
-
-<h3 id="RecipientList-Usingtimeout">Using timeout</h3>
-<p><strong>Available as of Camel 2.5</strong></p>
-
-<p>If you use <code>parallelProcessing</code> then you can configure a total <code>timeout</code> value in millis. Camel will then process the messages in parallel until the timeout is hit. This allows you to continue processing if one message is slow. For example you can set a timeout value of 20 sec.</p>
-
-    <div class="aui-message problem shadowed information-macro">
+</div></div><p>Which then would invoke the routeTo method and detect its annotated with <code>@RecipientList</code> and then act accordingly as if it was a recipient list EIP.</p><h3 id="RecipientList-Usingtimeout">Using timeout</h3><p><strong>Available as of Camel 2.5</strong></p><p>If you use <code>parallelProcessing</code> then you can configure a total <code>timeout</code> value in millis. Camel will then process the messages in parallel until the timeout is hit. This allows you to continue processing if one message is slow. For example you can set a timeout value of 20 sec.</p>    <div class="aui-message problem shadowed information-macro">
                     <p class="title">Tasks may keep running</p>
                             <span class="aui-icon icon-problem">Icon</span>
                 <div class="message-content">
-                            
-<p>If the timeout is reached with running tasks still remaining, certain tasks for which it is difficult for Camel to shut down in a graceful manner may continue to run.  So use this option with a bit of care.  We may be able to improve this functionality in future Camel releases.</p>
+                            <p>If the timeout is reached with running tasks still remaining, certain tasks for which it is difficult for Camel to shut down in a graceful manner may continue to run. So use this option with a bit of care. We may be able to improve this functionality in future Camel releases.</p>
                     </div>
     </div>
-
-
-<p>For example in the unit test below you can see we multicast the message to 3 destinations. We have a timeout of 2 seconds, which means only the last two messages can be completed within the timeframe. This means we will only aggregate the last two which yields a result aggregation which outputs <code>"BC"</code>.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<p>For example in the unit test below you can see we multicast the message to 3 destinations. We have a timeout of 2 seconds, which means only the last two messages can be completed within the timeframe. This means we will only aggregate the last two which yields a result aggregation which outputs <code>"BC"</code>.</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;direct:start&quot;)
     .multicast(new AggregationStrategy() {
@@ -430,22 +266,15 @@ from(&quot;direct:b&quot;).to(&quot;mock
 
 from(&quot;direct:c&quot;).to(&quot;mock:C&quot;).setBody(constant(&quot;C&quot;));
 ]]></script>
-</div></div>
-
-    <div class="aui-message success shadowed information-macro">
+</div></div>    <div class="aui-message success shadowed information-macro">
                     <p class="title">Timeout in other EIPs</p>
                             <span class="aui-icon icon-success">Icon</span>
                 <div class="message-content">
-                            
-<p>This <code>timeout</code> feature is also supported by <a shape="rect" href="splitter.html">Splitter</a> and both <code>multicast</code> and <code>recipientList</code>.</p>
+                            <p>This <code>timeout</code> feature is also supported by <a shape="rect" href="splitter.html">Splitter</a> and both <code>multicast</code> and <code>recipientList</code>.</p>
                     </div>
     </div>
-
-
-<p>By default if a timeout occurs the <code>AggregationStrategy</code> is not invoked. However you can implement a specialized version</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[
-public interface TimeoutAwareAggregationStrategy extends AggregationStrategy {
+<p>By default if a timeout occurs the <code>AggregationStrategy</code> is not invoked. However you can implement a specialized version</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>TimeoutAwareAggregationStrategy</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[public interface TimeoutAwareAggregationStrategy extends AggregationStrategy {
 
     /**
      * A timeout occurred
@@ -457,28 +286,14 @@ public interface TimeoutAwareAggregation
      */
     void timeout(Exchange oldExchange, int index, int total, long timeout);
 ]]></script>
-</div></div>
-
-<p>This allows you to deal with the timeout in the <code>AggregationStrategy</code> if you really need to. </p>
-
-    <div class="aui-message hint shadowed information-macro">
+</div></div><p>This allows you to deal with the timeout in the <code>AggregationStrategy</code> if you really need to.</p>    <div class="aui-message hint shadowed information-macro">
                     <p class="title">Timeout is total</p>
                             <span class="aui-icon icon-hint">Icon</span>
                 <div class="message-content">
-                            
-<p>The timeout is total, which means that after X time, Camel will aggregate the messages which has completed within the timeframe. The remainders will be cancelled. Camel will also only invoke the <code>timeout</code> method in the <code>TimeoutAwareAggregationStrategy</code> once, for the first index which caused the timeout.</p>
+                            <p>The timeout is total, which means that after X time, Camel will aggregate the messages which has completed within the timeframe. The remainders will be cancelled. Camel will also only invoke the <code>timeout</code> method in the <code>TimeoutAwareAggregationStrategy</code> once, for the first index which caused the timeout.</p>
                     </div>
     </div>
-
-
-
-<h3 id="RecipientList-UsingonPreparetoexecutecustomlogicwhenpreparingmessages">Using onPrepare to execute custom logic when preparing messages</h3>
-<p><strong>Available as of Camel 2.8</strong></p>
-
-<p>See details at <a shape="rect" href="multicast.html">Multicast</a></p>
-
-
-<h4 id="RecipientList-UsingThisPattern">Using This Pattern</h4>
+<h3 id="RecipientList-UsingonPreparetoexecutecustomlogicwhenpreparingmessages">Using onPrepare to execute custom logic when preparing messages</h3><p><strong>Available as of Camel 2.8</strong></p><p>See details at <a shape="rect" href="multicast.html">Multicast</a></p><p></p><h4 id="RecipientList-UsingThisPattern">Using This Pattern</h4>
 
 <p>If you would like to use this EIP Pattern then please read the <a shape="rect" href="getting-started.html">Getting Started</a>, you may also find the <a shape="rect" href="architecture.html">Architecture</a> useful particularly the description of <a shape="rect" href="endpoint.html">Endpoint</a> and <a shape="rect" href="uris.html">URIs</a>. Then you could try out some of the <a shape="rect" href="examples.html">Examples</a> first before trying this pattern out.</p></div>
         </td>

Modified: websites/production/camel/content/scala-dsl-eip.html
==============================================================================
--- websites/production/camel/content/scala-dsl-eip.html (original)
+++ websites/production/camel/content/scala-dsl-eip.html Mon Dec 16 20:05:17 2013
@@ -98,11 +98,11 @@ You can check the <a shape="rect" class=
 
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1387214546747 {padding: 0px;}
-div.rbtoc1387214546747 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1387214546747 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1387224145834 {padding: 0px;}
+div.rbtoc1387224145834 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1387224145834 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1387214546747">
+/*]]>*/</style><div class="toc-macro rbtoc1387224145834">
 <ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#ScalaDSL-EIP-Messagingsystems">Messaging systems</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#ScalaDSL-EIP-Pipelinepipeline">Pipeline</a></li><li><span class="TOCOutline">1.2</span> <a shape="rect" href="#ScalaDSL-EIP-Filterfilter">Filter</a></li></ul>
 </li><li><span class="TOCOutline">2</span> <a shape="rect" href="#ScalaDSL-EIP-Messagingchannels">Messaging channels</a>

Modified: websites/production/camel/content/siteindex.html
==============================================================================
--- websites/production/camel/content/siteindex.html (original)
+++ websites/production/camel/content/siteindex.html Mon Dec 16 20:05:17 2013
@@ -381,7 +381,7 @@
              <div class="smalltext" style="margin: 0 0 0 36px">Camel 2.11.1 release {div:style=padding-right:20px;float:left;margin-left:-20px;} !http://camel.apache.org/download.data/camel-box-v1.0-150x200.png! {div} {div:style=min-height:200px} {div} New and Noteworthy Welcome to the 2.11.1 release which is mainly </div>
                              <span class="icon icon-page" title="Page">Page:</span>                 <a shape="rect" href="camel-2112-release.html">Camel 2.11.2 release</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Camel 2.11.2 release {div:style=padding-right:20px;float:left;margin-left:-20px;} !http://camel.apache.org/download.data/camel-box-v1.0-150x200.png! {div} {div:style=min-height:200px} {div} New and Noteworthy Welcome to the 2.11.2 release which mainly add</div>
+             <div class="smalltext" style="margin: 0 0 0 36px">Camel 2.11.2 release {div:style=padding-right:20px;float:left;margin-left:-20px;} !http://camel.apache.org/download.data/camel-box-v1.0-150x200.png! {div}{div:style=min-height:200px} {div} New and Noteworthy Welcome to the 2.11.2 release which mainly addr</div>
                              <span class="icon icon-page" title="Page">Page:</span>                 <a shape="rect" href="camel-2120-release.html">Camel 2.12.0 Release</a>
         <br clear="none">
              <div class="smalltext" style="margin: 0 0 0 36px">Camel 2.12.0 release {div:style=padding-right:20px;float:left;margin-left:-20px;} !http://camel.apache.org/download.data/camel-box-v1.0-150x200.png! {div} {div:style=min-height:200px} {div} New and Noteworthy Welcome to the 2.12.0 release which approx XXX</div>
@@ -390,7 +390,7 @@
              <div class="smalltext" style="margin: 0 0 0 36px">Camel 2.12.1 release {div:style=padding-right:20px;float:left;margin-left:-20px;} !http://camel.apache.org/download.data/camel-box-v1.0-150x200.png! {div} {div:style=min-height:200px} {div} New and Noteworthy Welcome to the 2.12.1 release which mainly add</div>
                              <span class="icon icon-page" title="Page">Page:</span>                 <a shape="rect" href="camel-2122-release.html">Camel 2.12.2 Release</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Camel 2.12.2 release {div:style=padding-right:20px;float:left;margin-left:-20px;} !http://camel.apache.org/download.data/camel-box-v1.0-150x200.png! {div} {div:style=min-height:200px} {div} New and Noteworthy Welcome to the 2.12.2 release which is mainly </div>
+             <div class="smalltext" style="margin: 0 0 0 36px">Camel 2.12.2 release {div:style=padding-right:20px;float:left;margin-left:-20px;} !http://camel.apache.org/download.data/camel-box-v1.0-150x200.png! {div}{div:style=min-height:200px} {div} New and Noteworthy Welcome to the 2.12.2 release which is mainly a</div>
                              <span class="icon icon-page" title="Page">Page:</span>                 <a shape="rect" href="camel-2130-release.html">Camel 2.13.0 Release</a>
         <br clear="none">
              <div class="smalltext" style="margin: 0 0 0 36px">Camel 2.13.0 release (currently in progress) {div:style=padding-right:20px;float:left;margin-left:-20px;} !http://camel.apache.org/download.data/camel-box-v1.0-150x200.png! {div}{div:style=min-height:200px} {div} New and Noteworthy Welcome to the 2.13.0 r</div>

Modified: websites/production/camel/content/spring-testing.html
==============================================================================
--- websites/production/camel/content/spring-testing.html (original)
+++ websites/production/camel/content/spring-testing.html Mon Dec 16 20:05:17 2013
@@ -252,22 +252,22 @@ public class FilterTest extends Abstract
 @ContextConfiguration
 public class MyCamelTest {
 
-    @Autowired
-    protected CamelContext camelContext;
+Ê Ê @Autowired
+Ê Ê protected CamelContext camelContext;
 
-    @EndpointInject(uri = &quot;mock:foo&quot;)
-    protected MockEndpoint foo;
+Ê Ê @EndpointInject(uri = &quot;mock:foo&quot;)
+Ê Ê protected MockEndpoint foo;
 
 
     @Test
     @DirtiesContext
-    public void testMocksAreValid() throws Exception {
-        ...       
+Ê Ê public void testMocksAreValid() throws Exception {
+        ...Ê Ê Ê Ê
 
-        foo.message(0).header(&quot;bar&quot;).isEqualTo(&quot;ABC&quot;);
+Ê Ê Ê Ê foo.message(0).header(&quot;bar&quot;).isEqualTo(&quot;ABC&quot;);
 
-        MockEndpoint.assertIsSatisfied(camelContext);
-    }
+Ê Ê Ê Ê MockEndpoint.assertIsSatisfied(camelContext);
+Ê Ê }
 }
 ]]></script>
 </div></div>

Modified: websites/production/camel/content/tutorial-axis-camel.html
==============================================================================
--- websites/production/camel/content/tutorial-axis-camel.html (original)
+++ websites/production/camel/content/tutorial-axis-camel.html Mon Dec 16 20:05:17 2013
@@ -97,11 +97,11 @@
 
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1387214504449 {padding: 0px;}
-div.rbtoc1387214504449 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1387214504449 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1387224028765 {padding: 0px;}
+div.rbtoc1387224028765 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1387224028765 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1387214504449">
+/*]]>*/</style><div class="toc-macro rbtoc1387224028765">
 <ul class="toc-indentation"><li><a shape="rect" href="#Tutorial-AXIS-Camel-TutorialusingAxis1.4withApacheCamel">Tutorial using Axis 1.4 with Apache Camel</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#Tutorial-AXIS-Camel-Prerequisites">Prerequisites</a></li><li><a shape="rect" href="#Tutorial-AXIS-Camel-Distribution">Distribution</a></li><li><a shape="rect" href="#Tutorial-AXIS-Camel-Introduction">Introduction</a></li><li><a shape="rect" href="#Tutorial-AXIS-Camel-SettinguptheprojecttorunAxis">Setting up the project to run Axis</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#Tutorial-AXIS-Camel-Maven2">Maven 2</a></li><li><a shape="rect" href="#Tutorial-AXIS-Camel-wsdl">wsdl</a></li><li><a shape="rect" href="#Tutorial-AXIS-Camel-ConfiguringAxis">Configuring Axis</a></li><li><a shape="rect" href="#Tutorial-AXIS-Camel-RunningtheExample">Running the Example</a></li></ul>

Modified: websites/production/camel/content/tutorial-jmsremoting.html
==============================================================================
--- websites/production/camel/content/tutorial-jmsremoting.html (original)
+++ websites/production/camel/content/tutorial-jmsremoting.html Mon Dec 16 20:05:17 2013
@@ -101,11 +101,11 @@
 
 <p>This tutorial aims to guide the reader through the stages of creating a project which uses Camel to facilitate the routing of messages from a JMS queue to a <a shape="rect" class="external-link" href="http://www.springramework.org" rel="nofollow">Spring</a> service.  The route works in a synchronous fashion returning a response to the client.</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1387214477047 {padding: 0px;}
-div.rbtoc1387214477047 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1387214477047 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1387223929546 {padding: 0px;}
+div.rbtoc1387223929546 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1387223929546 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1387214477047">
+/*]]>*/</style><div class="toc-macro rbtoc1387223929546">
 <ul class="toc-indentation"><li><a shape="rect" href="#Tutorial-JmsRemoting-TutorialonSpringRemotingwithJMS">Tutorial on Spring Remoting with JMS</a></li><li><a shape="rect" href="#Tutorial-JmsRemoting-Preface">Preface</a></li><li><a shape="rect" href="#Tutorial-JmsRemoting-Prerequisites">Prerequisites</a></li><li><a shape="rect" href="#Tutorial-JmsRemoting-Distribution">Distribution</a></li><li><a shape="rect" href="#Tutorial-JmsRemoting-About">About</a></li><li><a shape="rect" href="#Tutorial-JmsRemoting-CreatetheCamelProject">Create the Camel Project</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#Tutorial-JmsRemoting-UpdatethePOMwithDependencies">Update the POM with Dependencies</a></li></ul>
 </li><li><a shape="rect" href="#Tutorial-JmsRemoting-WritingtheServer">Writing the Server</a>

Modified: websites/production/camel/content/tutorial-osgi-camel-part2c.html
==============================================================================
--- websites/production/camel/content/tutorial-osgi-camel-part2c.html (original)
+++ websites/production/camel/content/tutorial-osgi-camel-part2c.html Mon Dec 16 20:05:17 2013
@@ -1270,7 +1270,7 @@ State         Version        Name       
 005,24-04-2009,James,Anstey,incident smx-023,this is a report incident for smx-023,janstey@gmail.com,+555 10 20 300
 007,01-04-2009,Willem,Jiang,incident smx-456,this is a report incident for smx-456,wjiang@gmail.com,+666 10 20 300
 008,27-04-2009,Matt,Raibble,incident appfuse-123,this is a report incident for appfuse-123,mraibble@gmail.com,+777 10 20 300
-009,12-04-2009,Jean-Baptiste,Onofré,incident smx3-088,this is a report incident for smx3-088,cjbonofre@gmail.com,+888 10 20 300
+009,12-04-2009,Jean-Baptiste,OnofrŽ,incident smx3-088,this is a report incident for smx3-088,cjbonofre@gmail.com,+888 10 20 300
 010,17-04-2009,Hadrian,Zbarcea,incident camel-005,this is a report incident for camel-005,hzbarcea@gmail.com,+999 10 20 300
 ]]></script>
 </div></div>

Modified: websites/production/camel/content/user-guide.html
==============================================================================
--- websites/production/camel/content/user-guide.html (original)
+++ websites/production/camel/content/user-guide.html Mon Dec 16 20:05:17 2013
@@ -79,11 +79,11 @@
 
 <p>If you want to get more familiar with what Apache Camel has to offer, please try the following resources:</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1387214470917 {padding: 0px;}
-div.rbtoc1387214470917 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1387214470917 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1387223904409 {padding: 0px;}
+div.rbtoc1387223904409 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1387223904409 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1387214470917">
+/*]]>*/</style><div class="toc-macro rbtoc1387223904409">
 <ul class="toc-indentation"><li><a shape="rect" href="#UserGuide-Wikipages">Wiki pages</a></li><li><a shape="rect" href="#UserGuide-PDF">PDF</a></li><li><a shape="rect" href="#UserGuide-OtherResources.">Other Resources.</a></li></ul>
 </div>
 

Modified: websites/production/camel/content/zip-dataformat.html
==============================================================================
--- websites/production/camel/content/zip-dataformat.html (original)
+++ websites/production/camel/content/zip-dataformat.html Mon Dec 16 20:05:17 2013
@@ -127,7 +127,7 @@ from(&quot;direct:start&quot;).marshal()
 <p>In this example we unmarshal&#160;a zipped&#160;payload from an ActiveMQ queue called MY_QUEUE&#160;to its original format,&#160;and forward it for&#160;processing&#160;to the UnZippedMessageProcessor. Note that the compression Level employed during the marshalling should be identical to the one employed during unmarshalling to avoid errors.</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;activemq:queue:MY_QUEUE&quot;).unmarshal().zip().process(new UnZippedMessageProcessor()); 
+from(&quot;activemq:queue:MY_QUEUE&quot;).unmarshal().zip().process(new UnZippedMessageProcessor());Ê
 ]]></script>
 </div></div>
 

Modified: websites/production/camel/content/zip-file-dataformat.html
==============================================================================
--- websites/production/camel/content/zip-file-dataformat.html (original)
+++ websites/production/camel/content/zip-file-dataformat.html Mon Dec 16 20:05:17 2013
@@ -124,7 +124,7 @@
 <p>In this example we unmarshal a Zip file payload from an ActiveMQ queue called MY_QUEUE to its original format, and forward it for processing to the <code>UnZippedMessageProcessor</code>.</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;activemq:queue:MY_QUEUE&quot;).unmarshal().zipFile().process(new UnZippedMessageProcessor()); 
+from(&quot;activemq:queue:MY_QUEUE&quot;).unmarshal().zipFile().process(new UnZippedMessageProcessor());Ê
 ]]></script>
 </div></div>