You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bu...@apache.org on 2018/05/21 05:25:24 UTC

svn commit: r1030133 [7/14] - in /websites/production/camel/content: ./ cache/

Modified: websites/production/camel/content/cafe-example.html
==============================================================================
--- websites/production/camel/content/cafe-example.html (original)
+++ websites/production/camel/content/cafe-example.html Mon May 21 05:25:23 2018
@@ -96,50 +96,48 @@
 <p>First It uses the splitter to dispatch the order, then sends the orders to barista by checking if the coffee is hot or cold. When the coffee is ready, we use a aggregate to gather the drinks for waiter to deliver.</p>
 
 <p>Here is the route builder code for it.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 public void configure() {
     
-    from(&quot;direct:cafe&quot;)
-        .split().method(&quot;orderSplitter&quot;).to(&quot;direct:drink&quot;);
+    from("direct:cafe")
+        .split().method("orderSplitter").to("direct:drink");
     
-    from(&quot;direct:drink&quot;).recipientList().method(&quot;drinkRouter&quot;);
+    from("direct:drink").recipientList().method("drinkRouter");
     
-    from(&quot;seda:coldDrinks?concurrentConsumers=2&quot;).to(&quot;bean:barista?method=prepareColdDrink&quot;).to(&quot;direct:deliveries&quot;);
-    from(&quot;seda:hotDrinks?concurrentConsumers=3&quot;).to(&quot;bean:barista?method=prepareHotDrink&quot;).to(&quot;direct:deliveries&quot;);
+    from("seda:coldDrinks?concurrentConsumers=2").to("bean:barista?method=prepareColdDrink").to("direct:deliveries");
+    from("seda:hotDrinks?concurrentConsumers=3").to("bean:barista?method=prepareHotDrink").to("direct:deliveries");
     
-    from(&quot;direct:deliveries&quot;)
-        .aggregate(new CafeAggregationStrategy()).method(&quot;waiter&quot;, &quot;checkOrder&quot;).completionTimeout(5 * 1000L)
-        .to(&quot;bean:waiter?method=prepareDelivery&quot;)
-        .to(&quot;bean:waiter?method=deliverCafes&quot;);
+    from("direct:deliveries")
+        .aggregate(new CafeAggregationStrategy()).method("waiter", "checkOrder").completionTimeout(5 * 1000L)
+        .to("bean:waiter?method=prepareDelivery")
+        .to("bean:waiter?method=deliverCafes");
 
 }
-]]></script>
-</div></div>
+</pre>
 
 <h3 id="CafeExample-Running">Running</h3>
 
 <p>You will need to compile this example first:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
   mvn compile
-]]></script>
+</pre>
 </div></div>
 
 <p>The example should run if you type:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
   mvn exec:java 
 
-]]></script>
+</pre>
 </div></div>
 
 <p>To stop the server hit ctrl + c</p>
 
 <h3 id="CafeExample-Sampleoutput">Sample output</h3>
 <p>When the client is running it outputs all requests and responses on the screen.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
 
 Camel thread 4: seda://coldDrinks?concurrentConsumers=2 prepared cold drink #1 for order #2: iced 2 shot ESPRESSO
 Camel thread 3: seda://hotDrinks?concurrentConsumers=3 prepared hot drink #1 for order #2: hot 2 shot MOCHA
@@ -153,7 +151,7 @@ Hot CAPPUCCINO, 4 shots.
 Hot LATTE, 4 shots.
 -----------------------
 
-]]></script>
+</pre>
 </div></div>
 
 

Modified: websites/production/camel/content/composed-message-processor.html
==============================================================================
--- websites/production/camel/content/composed-message-processor.html (original)
+++ websites/production/camel/content/composed-message-processor.html Mon May 21 05:25:23 2018
@@ -102,64 +102,62 @@
 <p>The difference is when using only a <a shape="rect" href="splitter.html">Splitter</a> it aggregates back all the splitted messages into the same aggregation group, eg like a fork/join pattern.<br clear="none">
 Whereas using the <a shape="rect" href="aggregator2.html">Aggregator</a> allows you group into multiple groups, a pattern which provides more options.</p>
 
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<div class="confluence-information-macro confluence-information-macro-tip conf-macro output-block" data-hasbody="true" data-macro-name="tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"> </span><div class="confluence-information-macro-body">
 <p>Using the splitter alone is often easier and possibly a better solution. So take a look at this first, before involving the aggregator.</p></div></div>
 
 <h3 id="ComposedMessageProcessor-ExampleusingbothSplitterandAggregator">Example using both Splitter and Aggregator</h3>
 
 <p>In this example we want to check that a multipart order can be filled. Each part of the order requires a check at a different inventory.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 // split up the order so individual OrderItems can be validated by the appropriate bean
-from(&quot;direct:start&quot;)
+from("direct:start")
     .split().body()
     .choice() 
-        .when().method(&quot;orderItemHelper&quot;, &quot;isWidget&quot;)
-            .to(&quot;bean:widgetInventory&quot;)
+        .when().method("orderItemHelper", "isWidget")
+            .to("bean:widgetInventory")
         .otherwise()
-            .to(&quot;bean:gadgetInventory&quot;)
+            .to("bean:gadgetInventory")
     .end()
-    .to(&quot;seda:aggregate&quot;);
+    .to("seda:aggregate");
 
 // collect and re-assemble the validated OrderItems into an order again
-from(&quot;seda:aggregate&quot;)
-    .aggregate(new MyOrderAggregationStrategy()).header(&quot;orderId&quot;).completionTimeout(100).completionTimeoutCheckerInterval(10)
-        .to(&quot;mock:result&quot;);
-]]></script>
-</div></div>
+from("seda:aggregate")
+    .aggregate(new MyOrderAggregationStrategy()).header("orderId").completionTimeout(100).completionTimeoutCheckerInterval(10)
+        .to("mock:result");
+</pre>
 
 <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="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
 &lt;route&gt;
-  &lt;from uri=&quot;direct:start&quot;/&gt;
+  &lt;from uri="direct:start"/&gt;
   &lt;split&gt;
     &lt;simple&gt;body&lt;/simple&gt;
     &lt;choice&gt;
       &lt;when&gt;
-        &lt;method bean=&quot;orderItemHelper&quot; method=&quot;isWidget&quot;/&gt;
-	&lt;to uri=&quot;bean:widgetInventory&quot;/&gt;
+        &lt;method bean="orderItemHelper" method="isWidget"/&gt;
+	&lt;to uri="bean:widgetInventory"/&gt;
       &lt;/when&gt;
       &lt;otherwise&gt;
-	&lt;to uri=&quot;bean:gadgetInventory&quot;/&gt;
+	&lt;to uri="bean:gadgetInventory"/&gt;
       &lt;/otherwise&gt;
     &lt;/choice&gt;
-    &lt;to uri=&quot;seda:aggregate&quot;/&gt;
+    &lt;to uri="seda:aggregate"/&gt;
   &lt;/split&gt;
 &lt;/route&gt;
 
 &lt;route&gt;
-  &lt;from uri=&quot;seda:aggregate&quot;/&gt;
-  &lt;aggregate strategyRef=&quot;myOrderAggregatorStrategy&quot; completionTimeout=&quot;1000&quot;&gt;
+  &lt;from uri="seda:aggregate"/&gt;
+  &lt;aggregate strategyRef="myOrderAggregatorStrategy" completionTimeout="1000"&gt;
     &lt;correlationExpression&gt;
       &lt;simple&gt;header.orderId&lt;/simple&gt;
     &lt;/correlationExpression&gt;
-    &lt;to uri=&quot;mock:result&quot;/&gt;
+    &lt;to uri="mock:result"/&gt;
   &lt;/aggregate&gt;
 &lt;/route&gt;
-]]></script>
+</pre>
 </div></div>
 
 <p>To do this we split up the order using a <a shape="rect" href="splitter.html">Splitter</a>. The <a shape="rect" href="splitter.html">Splitter</a> then sends individual <code>OrderItems</code> to a <a shape="rect" href="content-based-router.html">Content Based Router</a> which checks the item type. Widget items get sent for checking in the <code>widgetInventory</code> bean and gadgets get sent to the <code>gadgetInventory</code> bean. Once these <code>OrderItems</code> have been validated by the appropriate bean, they are sent on to the <a shape="rect" href="aggregator2.html">Aggregator</a> which collects and re-assembles the validated <code>OrderItems</code> into an order again.</p>
@@ -173,33 +171,30 @@ from(&quot;seda:aggregate&quot;)
 <h3 id="ComposedMessageProcessor-ExampleusingonlySplitter">Example using only Splitter</h3>
 
 <p>In this example we want to split an incoming order using the <a shape="rect" href="splitter.html">Splitter</a> eip, transform each order line, and then combine the order lines into a new order message.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 // this routes starts from the direct:start endpoint
 // the body is then splitted based on @ separator
 // the splitter in Camel supports InOut as well and for that we need
 // to be able to aggregate what response we need to send back, so we provide our
 // own strategy with the class MyOrderStrategy.
-from(&quot;direct:start&quot;)
-    .split(body().tokenize(&quot;@&quot;), new MyOrderStrategy())
+from("direct:start")
+    .split(body().tokenize("@"), new MyOrderStrategy())
         // each splitted message is then send to this bean where we can process it
-        .to(&quot;bean:MyOrderService?method=handleOrder&quot;)
+        .to("bean:MyOrderService?method=handleOrder")
         // this is important to end the splitter route as we do not want to do more routing
         // on each splitted message
     .end()
     // after we have splitted and handled each message we want to send a single combined
     // response back to the original caller, so we let this bean build it for us
     // this bean will receive the result of the aggregate strategy: MyOrderStrategy
-    .to(&quot;bean:MyOrderService?method=buildCombinedResponse&quot;)
-]]></script>
-</div></div>
+    .to("bean:MyOrderService?method=buildCombinedResponse")
+</pre>
 
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Using XML</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<div class="confluence-information-macro confluence-information-macro-tip conf-macro output-block" data-hasbody="true" data-macro-name="tip"><p class="title">Using XML</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"> </span><div class="confluence-information-macro-body">
 <p>If you use XML, then the &lt;split&gt; tag offers the strategyRef attribute to refer to your custom <code>AggregationStrategy</code></p></div></div>
 
 <p>The bean with the methods to transform the order line and process the order as well:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 public static class MyOrderService {
 
     private static int counter;
@@ -208,8 +203,8 @@ public static class MyOrderService {
      * We just handle the order by returning a id line for the order
      */
     public String handleOrder(String line) {
-        LOG.debug(&quot;HandleOrder: &quot; + line);
-        return &quot;(id=&quot; + ++counter + &quot;,item=&quot; + line + &quot;)&quot;;
+        LOG.debug("HandleOrder: " + line);
+        return "(id=" + ++counter + ",item=" + line + ")";
     }
 
     /**
@@ -217,16 +212,14 @@ public static class MyOrderService {
      * back to the original caller
      */
     public String buildCombinedResponse(String line) {
-        LOG.debug(&quot;BuildCombinedResponse: &quot; + line);
-        return &quot;Response[&quot; + line + &quot;]&quot;;
+        LOG.debug("BuildCombinedResponse: " + line);
+        return "Response[" + line + "]";
     }
 }
-]]></script>
-</div></div>
+</pre>
 
 <p>And the <code>AggregationStrategy</code> we use with the <a shape="rect" href="splitter.html">Splitter</a> eip to combine the orders back again (eg fork/join):</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 /**
  * This is our own order aggregation strategy where we can control
  * how each splitted message should be combined. As we do not want to
@@ -247,11 +240,11 @@ public static class MyOrderStrategy impl
         String orders = oldExchange.getIn().getBody(String.class);
         String newLine = newExchange.getIn().getBody(String.class);
 
-        LOG.debug(&quot;Aggregate old orders: &quot; + orders);
-        LOG.debug(&quot;Aggregate new order: &quot; + newLine);
+        LOG.debug("Aggregate old orders: " + orders);
+        LOG.debug("Aggregate new order: " + newLine);
 
         // put orders together separating by semi colon
-        orders = orders + &quot;;&quot; + newLine;
+        orders = orders + ";" + newLine;
         // put combined order back on old to preserve it
         oldExchange.getIn().setBody(orders);
 
@@ -259,13 +252,12 @@ public static class MyOrderStrategy impl
         return oldExchange;
     }
 }
-]]></script>
-</div></div>
+</pre>
 
 
-<h4 id="ComposedMessageProcessor-UsingThisPattern">Using This Pattern</h4>
+<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h4 id="ComposedMessageProcessor-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>
+<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></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/content-filter.html
==============================================================================
--- websites/production/camel/content/content-filter.html (original)
+++ websites/production/camel/content/content-filter.html Mon May 21 05:25:23 2018
@@ -103,23 +103,19 @@
 <p><strong>Using the <a shape="rect" href="fluent-builders.html">Fluent Builders</a></strong></p>
 
 <p>Here is a simple example using the <a shape="rect" href="dsl.html">DSL</a> directly</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-from(&quot;direct:start&quot;).setBody(body().append(&quot; World!&quot;)).to(&quot;mock:result&quot;);
-]]></script>
-</div></div>
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
+from("direct:start").setBody(body().append(" World!")).to("mock:result");
+</pre>
 
 <p>In this example we add our own <a shape="rect" href="processor.html">Processor</a></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-from(&quot;direct:start&quot;).process(new Processor() {
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
+from("direct:start").process(new Processor() {
     public void process(Exchange exchange) {
         Message in = exchange.getIn();
-        in.setBody(in.getBody(String.class) + &quot; World!&quot;);
+        in.setBody(in.getBody(String.class) + " World!");
     }
-}).to(&quot;mock:result&quot;);
-]]></script>
-</div></div>
+}).to("mock:result");
+</pre>
 
 <p>For further examples of this pattern in use you could look at one of the JUnit tests</p>
 
@@ -128,31 +124,31 @@ from(&quot;direct:start&quot;).process(n
 
 <p><strong>Using Spring XML</strong></p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
 &lt;route&gt;
-  &lt;from uri=&quot;activemq:Input&quot;/&gt;
-  &lt;bean ref=&quot;myBeanName&quot; method=&quot;doTransform&quot;/&gt;
-  &lt;to uri=&quot;activemq:Output&quot;/&gt;
+  &lt;from uri="activemq:Input"/&gt;
+  &lt;bean ref="myBeanName" method="doTransform"/&gt;
+  &lt;to uri="activemq:Output"/&gt;
 &lt;/route&gt;
-]]></script>
+</pre>
 </div></div>
 
 <p>You can also use XPath to filter out part of the message you are interested in:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
 &lt;route&gt;
-  &lt;from uri=&quot;activemq:Input&quot;/&gt;
-  &lt;setBody&gt;&lt;xpath resultType=&quot;org.w3c.dom.Document&quot;&gt;//foo:bar&lt;/xpath&gt;&lt;/setBody&gt;
-  &lt;to uri=&quot;activemq:Output&quot;/&gt;
+  &lt;from uri="activemq:Input"/&gt;
+  &lt;setBody&gt;&lt;xpath resultType="org.w3c.dom.Document"&gt;//foo:bar&lt;/xpath&gt;&lt;/setBody&gt;
+  &lt;to uri="activemq:Output"/&gt;
 &lt;/route&gt; 
-]]></script>
+</pre>
 </div></div>
 
-<h4 id="ContentFilter-UsingThisPattern">Using This Pattern</h4>
+<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h4 id="ContentFilter-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>
+<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></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/custom-dataformat.html
==============================================================================
--- websites/production/camel/content/custom-dataformat.html (original)
+++ websites/production/camel/content/custom-dataformat.html Mon May 21 05:25:23 2018
@@ -92,8 +92,7 @@
 <div class="wiki-content maincontent"><h2 id="CustomDataFormat-CustomDataFormat">Custom DataFormat</h2>
 
 <p>You can use your custom <a shape="rect" href="data-format.html">Data Format</a> implementation with Camel. All you have to do is to implement the <code>DataFormat</code> interface. For example in the following we will implement a reverse data format as shown below:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Custom implementation of DataFormat that reverses data</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 public static final class MyReverseDataFormat extends ServiceSupport implements DataFormat {
 
     public void marshal(Exchange exchange, Object graph, OutputStream stream) throws Exception {
@@ -127,68 +126,63 @@ public static final class MyReverseDataF
         // noop
     }
 }
-]]></script>
-</div></div> 
+</pre> 
 
 <p>And to use it in Java DSL:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-from(&quot;direct:a&quot;)
-    .marshal().custom(&quot;reverse&quot;)
-    .to(&quot;mock:a&quot;);
-
-from(&quot;direct:b&quot;)
-    .unmarshal().custom(&quot;reverse&quot;)
-    .to(&quot;mock:b&quot;);
-]]></script>
-</div></div> 
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
+from("direct:a")
+    .marshal().custom("reverse")
+    .to("mock:a");
+
+from("direct:b")
+    .unmarshal().custom("reverse")
+    .to("mock:b");
+</pre> 
 
 <p>Notice we use custom to refer to the <a shape="rect" href="data-format.html">Data Format</a> in the <a shape="rect" href="registry.html">Registry</a>. In Java DSL you can also provide the instance directly as shown:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-from(&quot;direct:a&quot;)
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
+from("direct:a")
     .marshal(new MyReverseDataFormat())
-    .to(&quot;mock:a&quot;);
-]]></script>
+    .to("mock:a");
+</pre>
 </div></div>
 
 <p>And likewise to use it in XML DSL:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 &lt;!-- this is our custom data format implementation --&gt;
-&lt;bean id=&quot;reverse&quot; class=&quot;org.apache.camel.impl.RefDataFormatTest$MyReverseDataFormat&quot;/&gt;
+&lt;bean id="reverse" class="org.apache.camel.impl.RefDataFormatTest$MyReverseDataFormat"/&gt;
 
-&lt;camelContext xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
+&lt;camelContext xmlns="http://camel.apache.org/schema/spring"&gt;
   &lt;route&gt;
-    &lt;from uri=&quot;direct:a&quot;/&gt;
+    &lt;from uri="direct:a"/&gt;
     &lt;marshal&gt;
       &lt;!-- refer to my custom data format --&gt;
-      &lt;custom ref=&quot;reverse&quot;/&gt;
+      &lt;custom ref="reverse"/&gt;
     &lt;/marshal&gt;
-    &lt;to uri=&quot;mock:a&quot;/&gt;
+    &lt;to uri="mock:a"/&gt;
   &lt;/route&gt;
 
   &lt;route&gt;
-    &lt;from uri=&quot;direct:b&quot;/&gt;
+    &lt;from uri="direct:b"/&gt;
     &lt;unmarshal&gt;
       &lt;!-- refer to my custom data format --&gt;
-      &lt;custom ref=&quot;reverse&quot;/&gt;
+      &lt;custom ref="reverse"/&gt;
     &lt;/unmarshal&gt;
-    &lt;to uri=&quot;mock:b&quot;/&gt;
+    &lt;to uri="mock:b"/&gt;
   &lt;/route&gt;
 &lt;/camelContext&gt;
-]]></script>
-</div></div> 
+</pre> 
 
 <p>Notice in the XML DSL example above we use &lt;custom&gt; to refer to a custom data format. This requires <strong>Camel 2.8</strong> or better. In older releases you would have to use the <code>ref</code> attribute as shown below. Notice the <code>ref</code> attribute has been @deprecated and you should prefer to use the &lt;custom&gt; way:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
- &lt;marshal ref=&quot;reverse&quot;/&gt;
-]]></script>
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
+ &lt;marshal ref="reverse"/&gt;
+</pre>
 </div></div>
 
-<h3 id="CustomDataFormat-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></div>
+<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="CustomDataFormat-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></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/cxf-tomcat-example.html
==============================================================================
--- websites/production/camel/content/cxf-tomcat-example.html (original)
+++ websites/production/camel/content/cxf-tomcat-example.html Mon May 21 05:25:23 2018
@@ -96,10 +96,10 @@
 There is a <code>README.txt</code> file with instructions how to run it.</p>
 
 <p>If you use maven then you can easily package the example from the command line:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
 mvn package
-]]></script>
+</pre>
 </div></div>
 
 <h3 id="CXFTomcatExample-About">About</h3>
@@ -110,8 +110,7 @@ mvn package
 <h3 id="CXFTomcatExample-Implementation">Implementation</h3>
 
 <p>The web service we want to expose is defined as an interface which has 2 operations:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>IncidentService.java</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 public interface IncidentService {
 
     /**
@@ -124,40 +123,38 @@ public interface IncidentService {
      */
     OutputStatusIncident statusIncident(InputStatusIncident input);
 }
-]]></script>
-</div></div>
+</pre>
 
 <p>In this example we are not using any JAX-WS annotations. You can use those annotations to fine control the web service wsdl contract.</p>
 
 <p>In the Camel route we expose this web service very easily using the Camel <a shape="rect" href="cxf.html">CXF</a> component.<br clear="none">
 All we have to do is to define an endpoint uri in the format</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
 cxf:/incident?serviceClass=org.apache.camel.example.cxf.incident.IncidentService
-]]></script>
+</pre>
 </div></div>
 
 <p>This means Camel will expose the web service using the relative address <code>/incident</code> and the serviceClass parameter links to the interface which defines the code first approach. </p>
 
 <p>In this example we want to be flexible, so if we add a 3rd operation to the web service we want it to be easily to add a route to handle this operation. Therefore we use the <a shape="rect" href="recipient-list.html">Recipient List</a> EIP pattern to route to the route which handles the given operation. Notice how we use a <a shape="rect" href="direct.html">Direct</a> endpoint to link the routes.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>CamelRoute.java</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 public class CamelRoute extends RouteBuilder {
 
     // CXF webservice using code first approach
-    private String uri = &quot;cxf:/incident?serviceClass=&quot; + IncidentService.class.getName();
+    private String uri = "cxf:/incident?serviceClass=" + IncidentService.class.getName();
 
     @Override
     public void configure() throws Exception {
         from(uri)
-            .to(&quot;log:input&quot;)
+            .to("log:input")
             // send the request to the route to handle the operation
             // the name of the operation is in that header
-            .recipientList(simple(&quot;direct:${header.operationName}&quot;));
+            .recipientList(simple("direct:${header.operationName}"));
 
         // report incident
-        from(&quot;direct:reportIncident&quot;)
+        from("direct:reportIncident")
             .process(new Processor() {
                 public void process(Exchange exchange) throws Exception {
                     // get the id of the input
@@ -165,62 +162,58 @@ public class CamelRoute extends RouteBui
 
                     // set reply including the id
                     OutputReportIncident output = new OutputReportIncident();
-                    output.setCode(&quot;OK;&quot; + id);
+                    output.setCode("OK;" + id);
                     exchange.getOut().setBody(output);
                 }
             })
-            .to(&quot;log:output&quot;);
+            .to("log:output");
 
         // status incident
-        from(&quot;direct:statusIncident&quot;)
+        from("direct:statusIncident")
             .process(new Processor() {
                 public void process(Exchange exchange) throws Exception {
                     // set reply
                     OutputStatusIncident output = new OutputStatusIncident();
-                    output.setStatus(&quot;IN PROGRESS&quot;);
+                    output.setStatus("IN PROGRESS");
                     exchange.getOut().setBody(output);
                 }
             })
-            .to(&quot;log:output&quot;);
+            .to("log:output");
     }
 }
-]]></script>
-</div></div>
+</pre>
 
 <h4 id="CXFTomcatExample-SpringXML">Spring XML</h4>
 
 <p>In the Spring XML file we have to import some <a shape="rect" href="cxf.html">CXF</a> mandatory imports. Notice we use the <code>cxf-servlet</code> to leverage HTTP Servlet with <a shape="rect" href="cxf.html">CXF</a>.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>camel-config.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 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;
-       xmlns:camel=&quot;http://camel.apache.org/schema/spring&quot;
-       xmlns:cxf=&quot;http://camel.apache.org/schema/cxf&quot;
-       xsi:schemaLocation=&quot;
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
+&lt;beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:camel="http://camel.apache.org/schema/spring"
+       xmlns:cxf="http://camel.apache.org/schema/cxf"
+       xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-       http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd&quot;&gt;
+       http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd"&gt;
   &lt;!-- We still need it for loading the CXFServlet --&gt; 
-  &lt;import resource=&quot;classpath:META-INF/cxf/cxf.xml&quot;/&gt;
+  &lt;import resource="classpath:META-INF/cxf/cxf.xml"/&gt;
   
-  &lt;bean id=&quot;myRoutes&quot; class=&quot;org.apache.camel.example.cxf.CamelRoute&quot;/&gt;
+  &lt;bean id="myRoutes" class="org.apache.camel.example.cxf.CamelRoute"/&gt;
 
-  &lt;camelContext xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
-    &lt;routeBuilder ref=&quot;myRoutes&quot;/&gt;
+  &lt;camelContext xmlns="http://camel.apache.org/schema/spring"&gt;
+    &lt;routeBuilder ref="myRoutes"/&gt;
   &lt;/camelContext&gt;
 
 &lt;/beans&gt;
-]]></script>
-</div></div>
+</pre>
 
 <h4 id="CXFTomcatExample-web.xml">web.xml</h4>
 
 <p>In the <code>web.xml</code> file we have just to setup Spring and CXF the usual way.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>web.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;web-app version=&quot;2.4&quot; xmlns=&quot;http://java.sun.com/xml/ns/j2ee&quot;
-		xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
-		xsi:schemaLocation=&quot;http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd&quot;&gt;
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
+&lt;web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"&gt;
 
 	&lt;display-name&gt;My Web Application&lt;/display-name&gt;
 
@@ -240,7 +233,7 @@ public class CamelRoute extends RouteBui
 		&lt;servlet-name&gt;CXFServlet&lt;/servlet-name&gt;
 		&lt;servlet-class&gt;org.apache.cxf.transport.servlet.CXFServlet&lt;/servlet-class&gt;
 		&lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-		&lt;!-- If you want to leverage the Servlet3&#39;s async feature in Tomcat, 
+		&lt;!-- If you want to leverage the Servlet3's async feature in Tomcat, 
 		 please enable this feature 
 		&lt;async-supported&gt;true&lt;/async-supported&gt;
 		--&gt;
@@ -253,8 +246,7 @@ public class CamelRoute extends RouteBui
 	&lt;/servlet-mapping&gt;
 
 &lt;/web-app&gt;
-]]></script>
-</div></div>
+</pre>
 
 <h3 id="CXFTomcatExample-Runningtheexample">Running the example</h3>
 

Modified: websites/production/camel/content/data-format.html
==============================================================================
--- websites/production/camel/content/data-format.html (original)
+++ websites/production/camel/content/data-format.html Mon May 21 05:25:23 2018
@@ -95,7 +95,7 @@
 
 <p>The following data formats are currently supported:</p>
 
-<ul><li>Standard JVM object marshalling<ul><li><a shape="rect" href="serialization.html">Serialization</a></li><li><a shape="rect" href="string.html">String</a></li></ul></li></ul><ul><li>Object marshalling<ul><li><a shape="rect" href="avro.html">Avro</a></li><li><a shape="rect" href="boon.html">Boon</a></li><li><a shape="rect" href="hessian.html">Hessian</a></li><li><a shape="rect" href="json.html">JSON</a></li><li><a shape="rect" href="protobuf.html">Protobuf</a></li><li><a shape="rect" href="yaml-data-format.html">YAML</a></li></ul></li></ul><ul><li>Object/XML marshalling<ul><li><a shape="rect" href="castor.html">Castor</a></li><li><a shape="rect" href="jaxb.html">JAXB</a></li><li><a shape="rect" href="xmlbeans.html">XmlBeans</a></li><li><a shape="rect" href="xstream.html">XStream</a></li><li><a shape="rect" href="jibx.html">JiBX</a></li><li><a shape="rect" href="jackson-xml.html">Jackson XML</a></li></ul></li></ul><ul><li>Object/XML/Webservice marshalling<ul><li><a shape="rect" 
 href="soap.html">SOAP</a></li></ul></li></ul><ul><li>Direct JSON / XML marshalling<ul><li><a shape="rect" href="xmljson.html">XmlJson</a></li></ul></li></ul><ul><li>Flat data structure marshalling<ul><li><a shape="rect" href="beanio.html">BeanIO</a></li><li><a shape="rect" href="bindy.html">Bindy</a></li><li><a shape="rect" href="csv.html">CSV</a></li><li><a shape="rect" href="edi.html">EDI</a></li><li><a shape="rect" href="flatpack-dataformat.html">Flatpack DataFormat</a></li><li><a shape="rect" href="univocity-parsers-formats.html">uniVocity-parsers formats</a></li></ul></li></ul><ul><li>Domain specific marshalling<ul><li><a shape="rect" href="hl7-dataformat.html">HL7 DataFormat</a></li></ul></li></ul><ul><li>Compression<ul><li><a shape="rect" href="gzip-data-format.html">GZip data format</a></li><li><a shape="rect" href="zip-dataformat.html">Zip DataFormat</a></li><li><a shape="rect" href="zip-file-dataformat.html">Zip File DataFormat</a></li><li><a shape="rect" href="lzf-data-fo
 rmat.html">LZF Data Format</a></li><li><a shape="rect" href="tar-dataformat.html">Tar DataFormat</a></li></ul></li></ul><ul><li>Security<ul><li><a shape="rect" href="crypto.html">Crypto</a></li><li><a shape="rect" href="crypto.html">PGP</a></li><li><a shape="rect" href="xmlsecurity-dataformat.html">XMLSecurity DataFormat</a></li></ul></li></ul><ul><li>Misc.<ul><li><a shape="rect" href="base64.html">Base64</a></li><li><a shape="rect" href="custom-dataformat.html">Custom DataFormat</a> - to use your own custom implementation</li><li><a shape="rect" href="mime-multipart.html">MIME-Multipart</a></li><li><a shape="rect" href="rss.html">RSS</a></li><li><a shape="rect" href="tidymarkup.html">TidyMarkup</a></li><li><a shape="rect" href="syslog.html">Syslog</a></li><li><a shape="rect" href="ical.html">ICal</a></li><li><a shape="rect" href="barcode-data-format.html">Barcode </a>- to read and generate barcodes (QR-Code, PDF417, ...)</li></ul></li></ul>
+<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><ul><li>Standard JVM object marshalling<ul><li><a shape="rect" href="serialization.html">Serialization</a></li><li><a shape="rect" href="string.html">String</a></li></ul></li></ul><ul><li>Object marshalling<ul><li><a shape="rect" href="avro.html">Avro</a></li><li><a shape="rect" href="boon.html">Boon</a></li><li><a shape="rect" href="hessian.html">Hessian</a></li><li><a shape="rect" href="json.html">JSON</a></li><li><a shape="rect" href="protobuf.html">Protobuf</a></li><li><a shape="rect" href="yaml-data-format.html">YAML</a></li></ul></li></ul><ul><li>Object/XML marshalling<ul><li><a shape="rect" href="castor.html">Castor</a></li><li><a shape="rect" href="jaxb.html">JAXB</a></li><li><a shape="rect" href="xmlbeans.html">XmlBeans</a></li><li><a shape="rect" href="xstream.html">XStream</a></li><li><a shape="rect" href="jibx.html">JiBX</a></li><li><a shape="rect" href="jackson-xml.html">Jackson XML</a><
 /li></ul></li></ul><ul><li>Object/XML/Webservice marshalling<ul><li><a shape="rect" href="soap.html">SOAP</a></li></ul></li></ul><ul><li>Direct JSON / XML marshalling<ul><li><a shape="rect" href="xmljson.html">XmlJson</a></li></ul></li></ul><ul><li>Flat data structure marshalling<ul><li><a shape="rect" href="beanio.html">BeanIO</a></li><li><a shape="rect" href="bindy.html">Bindy</a></li><li><a shape="rect" href="csv.html">CSV</a></li><li><a shape="rect" href="edi.html">EDI</a></li><li><a shape="rect" href="flatpack-dataformat.html">Flatpack DataFormat</a></li><li><a shape="rect" href="univocity-parsers-formats.html">uniVocity-parsers formats</a></li></ul></li></ul><ul><li>Domain specific marshalling<ul><li><a shape="rect" href="hl7-dataformat.html">HL7 DataFormat</a></li></ul></li></ul><ul><li>Compression<ul><li><a shape="rect" href="gzip-data-format.html">GZip data format</a></li><li><a shape="rect" href="zip-dataformat.html">Zip DataFormat</a></li><li><a shape="rect" href="zip-fil
 e-dataformat.html">Zip File DataFormat</a></li><li><a shape="rect" href="lzf-data-format.html">LZF Data Format</a></li><li><a shape="rect" href="tar-dataformat.html">Tar DataFormat</a></li></ul></li></ul><ul><li>Security<ul><li><a shape="rect" href="crypto.html">Crypto</a></li><li><a shape="rect" href="crypto.html">PGP</a></li><li><a shape="rect" href="xmlsecurity-dataformat.html">XMLSecurity DataFormat</a></li></ul></li></ul><ul><li>Misc.<ul><li><a shape="rect" href="base64.html">Base64</a></li><li><a shape="rect" href="custom-dataformat.html">Custom DataFormat</a> - to use your own custom implementation</li><li><a shape="rect" href="mime-multipart.html">MIME-Multipart</a></li><li><a shape="rect" href="rss.html">RSS</a></li><li><a shape="rect" href="tidymarkup.html">TidyMarkup</a></li><li><a shape="rect" href="syslog.html">Syslog</a></li><li><a shape="rect" href="ical.html">ICal</a></li><li><a shape="rect" href="barcode-data-format.html">Barcode </a>- to read and generate barcodes 
 (QR-Code, PDF417, ...)</li></ul></li></ul></div>
 
 <p>And related is the following:</p>
 <ul class="alternate"><li><a shape="rect" href="dataformat-component.html">DataFormat Component</a> for working with <a shape="rect" href="data-format.html">Data Format</a>s as if it was a regular <a shape="rect" href="component.html">Component</a> supporting <a shape="rect" href="endpoint.html">Endpoint</a>s and <a shape="rect" href="uris.html">URIs</a>.</li><li><a shape="rect" href="dozer-type-conversion.html">Dozer Type Conversion</a> using Dozer for type converting POJOs</li></ul>
@@ -107,26 +107,26 @@
 
 <p>For example</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-DataFormat jaxb = new JaxbDataFormat(&quot;com.acme.model&quot;);
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
+DataFormat jaxb = new JaxbDataFormat("com.acme.model");
 
-from(&quot;activemq:My.Queue&quot;).
+from("activemq:My.Queue").
   unmarshal(jaxb).
-  to(&quot;mqseries:Another.Queue&quot;);
-]]></script>
+  to("mqseries:Another.Queue");
+</pre>
 </div></div>
 
 <p>The above uses a named DataFormat of <em>jaxb</em> which is configured with a number of Java package names. You can if you prefer use a named reference to a data format which can then be defined in your <a shape="rect" href="registry.html">Registry</a> such as via your <a shape="rect" href="spring.html">Spring</a> XML file.</p>
 
 <p>You can also use the DSL itself to define the data format as you use it. For example the following uses Java serialization to unmarshal a binary file then send it as an ObjectMessage to <a shape="rect" href="activemq.html">ActiveMQ</a></p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-from(&quot;file://foo/bar&quot;).
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
+from("file://foo/bar").
   unmarshal().serialization().
-  to(&quot;activemq:Some.Queue&quot;);
-]]></script>
+  to("activemq:Some.Queue");
+</pre>
 </div></div>
 
 <h3 id="DataFormat-Marshalling">Marshalling</h3>
@@ -135,13 +135,13 @@ from(&quot;file://foo/bar&quot;).
 
 <p>The following example unmarshals via serialization then marshals using a named JAXB data format to perform a kind of <a shape="rect" href="message-translator.html">Message Translator</a></p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-from(&quot;file://foo/bar&quot;).
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
+from("file://foo/bar").
   unmarshal().serialization(). 
-  marshal(&quot;jaxb&quot;).
-  to(&quot;activemq:Some.Queue&quot;);
-]]></script>
+  marshal("jaxb").
+  to("activemq:Some.Queue");
+</pre>
 </div></div>
 
 
@@ -149,37 +149,35 @@ from(&quot;file://foo/bar&quot;).
 
 <p>This example shows how to configure the data type just once and reuse it on multiple routes</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;camelContext id=&quot;camel&quot; xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
+&lt;camelContext id="camel" xmlns="http://camel.apache.org/schema/spring"&gt;
   &lt;dataFormats&gt;
-    &lt;jaxb id=&quot;myJaxb&quot; prettyPrint=&quot;true&quot; contextPath=&quot;org.apache.camel.example&quot;/&gt;
+    &lt;jaxb id="myJaxb" prettyPrint="true" contextPath="org.apache.camel.example"/&gt;
   &lt;/dataFormats&gt;
 
   &lt;route&gt;
-    &lt;from uri=&quot;direct:start&quot;/&gt;
-    &lt;marshal ref=&quot;myJaxb&quot;/&gt;
-    &lt;to uri=&quot;direct:marshalled&quot;/&gt;
+    &lt;from uri="direct:start"/&gt;
+    &lt;marshal ref="myJaxb"/&gt;
+    &lt;to uri="direct:marshalled"/&gt;
   &lt;/route&gt;
   &lt;route&gt;
-    &lt;from uri=&quot;direct:marshalled&quot;/&gt;
-    &lt;unmarshal ref=&quot;myJaxb&quot;/&gt;
-    &lt;to uri=&quot;mock:result&quot;/&gt;
+    &lt;from uri="direct:marshalled"/&gt;
+    &lt;unmarshal ref="myJaxb"/&gt;
+    &lt;to uri="mock:result"/&gt;
   &lt;/route&gt;
 
 &lt;/camelContext&gt;
-]]></script>
-</div></div>
+</pre>
 
 <p>You can also define reusable data formats as Spring beans </p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;bean id=&quot;myJaxb&quot; class=&quot;org.apache.camel.model.dataformat.JaxbDataFormat&quot;&gt;
-  &lt;property name=&quot;prettyPrint&quot; value=&quot;true&quot;/&gt;
-  &lt;property name=&quot;contextPath&quot; value=&quot;org.apache.camel.example&quot;/&gt;
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
+&lt;bean id="myJaxb" class="org.apache.camel.model.dataformat.JaxbDataFormat"&gt;
+  &lt;property name="prettyPrint" value="true"/&gt;
+  &lt;property name="contextPath" value="org.apache.camel.example"/&gt;
 &lt;/bean&gt;  
-]]></script>
+</pre>
 </div></div></div>
         </td>
         <td valign="top">

Modified: websites/production/camel/content/detour.html
==============================================================================
--- websites/production/camel/content/detour.html (original)
+++ websites/production/camel/content/detour.html Mon May 21 05:25:23 2018
@@ -98,29 +98,27 @@
 
 <p>In this example we essentially have a route like <code>from("direct:start").to("mock:result")</code> with a conditional detour to the <code>mock:detour</code> endpoint in the middle of the route..</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-from(&quot;direct:start&quot;).choice()
-    .when().method(&quot;controlBean&quot;, &quot;isDetour&quot;).to(&quot;mock:detour&quot;).end()
-    .to(&quot;mock:result&quot;);                
-]]></script>
-</div></div>
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
+from("direct:start").choice()
+    .when().method("controlBean", "isDetour").to("mock:detour").end()
+    .to("mock:result");                
+</pre>
 
 <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="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
 &lt;route&gt;
-  &lt;from uri=&quot;direct:start&quot;/&gt;
+  &lt;from uri="direct:start"/&gt;
     &lt;choice&gt;
       &lt;when&gt;
-        &lt;method bean=&quot;controlBean&quot; method=&quot;isDetour&quot;/&gt;
-	&lt;to uri=&quot;mock:detour&quot;/&gt;
+        &lt;method bean="controlBean" method="isDetour"/&gt;
+	&lt;to uri="mock:detour"/&gt;
       &lt;/when&gt;
     &lt;/choice&gt;
-    &lt;to uri=&quot;mock:result&quot;/&gt;
+    &lt;to uri="mock:result"/&gt;
 &lt;/route&gt;
-]]></script>
+</pre>
 </div></div>
 
 <p>whether the detour is turned on or off is decided by the <code>ControlBean</code>. So, when the detour is on the message is routed to <code>mock:detour</code> and then <code>mock:result</code>. When the detour is off, the message is routed to <code>mock:result</code>.</p>
@@ -129,9 +127,9 @@ from(&quot;direct:start&quot;).choice()
 
 <p><a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DetourTest.java">camel-core/src/test/java/org/apache/camel/processor/DetourTest.java</a></p>
 
-<h4 id="Detour-UsingThisPattern">Using This Pattern</h4>
+<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h4 id="Detour-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>
+<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></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/ejb.html
==============================================================================
--- websites/production/camel/content/ejb.html (original)
+++ websites/production/camel/content/ejb.html Mon May 21 05:25:23 2018
@@ -95,29 +95,29 @@
 <p>The <strong>ejb:</strong> component binds EJBs to Camel message exchanges.</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="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.camel&lt;/groupId&gt;
     &lt;artifactId&gt;camel-ejb&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>
+</pre>
 </div></div>
 
 
 <h3 id="EJB-URIformat">URI format</h3>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">
 ejb:ejbName[?options]
-]]></script>
+</pre>
 </div></div>
 <p>Where <strong>ejbName</strong> can be any string which is used to look up the EJB in the Application Server JNDI <a shape="rect" href="registry.html">Registry</a></p>
 
 <h3 id="EJB-Options">Options</h3>
-<div class="confluenceTableSmall">
+<div class="confluenceTableSmall conf-macro output-block" data-hasbody="true" data-macro-name="div">
 <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> Type </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>method</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>String</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>null</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The method name that bean will be invoked. If not provided, Camel will try to pick the method itself. In case of ambiguity an exception is thrown. See <a shape="rect" href="bean-binding.html">Bean Binding</a> for more details. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>multiParameterArray</code> </p></td><td col
 span="1" rowspan="1" class="confluenceTd"><p> <code>boolean</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>false</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> How to treat the parameters which are passed from the message body; if it is <code>true</code>, the In message body should be an array of parameters. </p></td></tr></tbody></table></div>
 </div>
 
@@ -135,8 +135,7 @@ ejb:ejbName[?options]
 <h3 id="EJB-Examples">Examples</h3>
 
 <p>In the following examples we use the Greater EJB which is defined as follows:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>GreaterLocal.java</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 public interface GreaterLocal {
 
     String hello(String name);
@@ -144,39 +143,35 @@ public interface GreaterLocal {
     String bye(String name);
 
 }
-]]></script>
-</div></div>
+</pre>
 
 <p>And the implementation</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>GreaterImpl.java</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 @Stateless
 public class GreaterImpl implements GreaterLocal {
 
     public String hello(String name) {
-        return &quot;Hello &quot; + name;
+        return "Hello " + name;
     }
 
     public String bye(String name) {
-        return &quot;Bye &quot; + name;
+        return "Bye " + name;
     }
 
 }
-]]></script>
-</div></div>
+</pre>
 
 <h4 id="EJB-UsingJavaDSL">Using Java DSL</h4>
 
 <p>In this example we want to invoke the <code>hello</code> method on the EJB. Since this example is based on an unit test using Apache OpenEJB we have to set a <code>JndiContext</code> on the <a shape="rect" href="ejb.html">EJB</a> component with the OpenEJB settings.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 @Override
 protected CamelContext createCamelContext() throws Exception {
     CamelContext answer = new DefaultCamelContext();
 
     // enlist EJB component using the JndiContext
-    EjbComponent ejb = answer.getComponent(&quot;ejb&quot;, EjbComponent.class);
+    EjbComponent ejb = answer.getComponent("ejb", EjbComponent.class);
     ejb.setContext(createEjbContext());
 
     return answer;
@@ -185,25 +180,22 @@ protected CamelContext createCamelContex
 private static Context createEjbContext() throws NamingException {
     // here we need to define our context factory to use OpenEJB for our testing
     Properties properties = new Properties();
-    properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, &quot;org.apache.openejb.client.LocalInitialContextFactory&quot;);
+    properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
 
     return new InitialContext(properties);
 }
-]]></script>
-</div></div>
+</pre>
 
 <p>Then we are ready to use the EJB in the Camel route:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-from(&quot;direct:start&quot;)
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
+from("direct:start")
     // invoke the greeter EJB using the local interface and invoke the hello method
-    .to(&quot;ejb:GreaterImplLocal?method=hello&quot;)
-    .to(&quot;mock:result&quot;);
-]]></script>
-</div></div>
+    .to("ejb:GreaterImplLocal?method=hello")
+    .to("mock:result");
+</pre>
 
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">In a real application server</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<div class="confluence-information-macro confluence-information-macro-tip conf-macro output-block" data-hasbody="true" data-macro-name="tip"><p class="title">In a real application server</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"> </span><div class="confluence-information-macro-body">
 <p>In a real application server you most likely do not have to setup a <code>JndiContext</code> on the <a shape="rect" href="ejb.html">EJB</a> component as it will create a default <code>JndiContext</code> on the same JVM as the application server, which usually allows it to access the JNDI registry and lookup the <a shape="rect" href="ejb.html">EJB</a>s.<br clear="none">
 However if you need to access a application server on a remote JVM or the likes, you have to prepare the properties beforehand.</p></div></div>
 
@@ -213,38 +205,34 @@ However if you need to access a applicat
 
 <p>Again since this is based on an unit test we need to setup the <a shape="rect" href="ejb.html">EJB</a> component:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 &lt;!-- setup Camel EJB component --&gt;
-&lt;bean id=&quot;ejb&quot; class=&quot;org.apache.camel.component.ejb.EjbComponent&quot;&gt;
-    &lt;property name=&quot;properties&quot; ref=&quot;jndiProperties&quot;/&gt;
+&lt;bean id="ejb" class="org.apache.camel.component.ejb.EjbComponent"&gt;
+    &lt;property name="properties" ref="jndiProperties"/&gt;
 &lt;/bean&gt;
 
 &lt;!-- use OpenEJB context factory --&gt;
-&lt;p:properties id=&quot;jndiProperties&quot;&gt;
-    &lt;prop key=&quot;java.naming.factory.initial&quot;&gt;org.apache.openejb.client.LocalInitialContextFactory&lt;/prop&gt;
+&lt;p:properties id="jndiProperties"&gt;
+    &lt;prop key="java.naming.factory.initial"&gt;org.apache.openejb.client.LocalInitialContextFactory&lt;/prop&gt;
 &lt;/p:properties&gt;
-]]></script>
-</div></div>
+</pre>
 
 <p>Before we are ready to use <a shape="rect" href="ejb.html">EJB</a> in the Camel routes:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;camelContext xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
+&lt;camelContext xmlns="http://camel.apache.org/schema/spring"&gt;
     &lt;route&gt;
-        &lt;from uri=&quot;direct:start&quot;/&gt;
-        &lt;to uri=&quot;ejb:GreaterImplLocal?method=hello&quot;/&gt;
-        &lt;to uri=&quot;mock:result&quot;/&gt;
+        &lt;from uri="direct:start"/&gt;
+        &lt;to uri="ejb:GreaterImplLocal?method=hello"/&gt;
+        &lt;to uri="mock:result"/&gt;
     &lt;/route&gt;
 &lt;/camelContext&gt;
-]]></script>
-</div></div>
+</pre>
 
 
 
-<h3 id="EJB-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>
+<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="EJB-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></div>
 <ul><li><a shape="rect" href="bean.html">Bean</a></li><li><a shape="rect" href="bean-binding.html">Bean Binding</a></li><li><a shape="rect" href="bean-integration.html">Bean Integration</a></li></ul></div>
         </td>
         <td valign="top">

Modified: websites/production/camel/content/eventnotifier-to-log-details-about-all-sent-exchanges.html
==============================================================================
--- websites/production/camel/content/eventnotifier-to-log-details-about-all-sent-exchanges.html (original)
+++ websites/production/camel/content/eventnotifier-to-log-details-about-all-sent-exchanges.html Mon May 21 05:25:23 2018
@@ -89,15 +89,14 @@
 	<tbody>
         <tr>
         <td valign="top" width="100%">
-<div class="wiki-content maincontent"><h2 id="EventNotifiertologdetailsaboutallsentExchanges-EventNotifiertologdetailsaboutallsentExchanges"><code>EventNotifier</code> to log details about all sent Exchanges</h2><p>If you want to log information all time taken to send and receive replies when sending to external endpoints, then you can leverage the <strong><code>EventNotifier</code></strong> in Camel. It allows you to subscribe to events and react upon them.</p><p>For example we want to log the time it takes to send to endpoints which can be done by implementing a class which this logic as follows:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyLoggingSentEventNotifier</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<div class="wiki-content maincontent"><h2 id="EventNotifiertologdetailsaboutallsentExchanges-EventNotifiertologdetailsaboutallsentExchanges"><code>EventNotifier</code> to log details about all sent Exchanges</h2><p>If you want to log information all time taken to send and receive replies when sending to external endpoints, then you can leverage the <strong><code>EventNotifier</code></strong> in Camel. It allows you to subscribe to events and react upon them.</p><p>For example we want to log the time it takes to send to endpoints which can be done by implementing a class which this logic as follows:Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'</p><pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 public class MyLoggingSentEventNotifer extends EventNotifierSupport {
 
     public void notify(EventObject event) throws Exception {
         // react only when its the sent event
         if (event instanceof ExchangeSentEvent) {
             ExchangeSentEvent sent = (ExchangeSentEvent) event;
-            log.info(&quot;Took {} millis to send to: {}&quot;, sent.getTimeTaken(), sent.getEndpoint());
+            log.info("Took {} millis to send to: {}", sent.getTimeTaken(), sent.getEndpoint());
         }
 
     }
@@ -115,36 +114,33 @@ public class MyLoggingSentEventNotifer e
     }
 
 }
-]]></script>
-</div></div>Then in Java DSL you can tell Camel to use your custom <code>EventNotifier</code> simply by adding it:<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[context.getManagementStrategy().addEventNotifier(new MyLoggingSentEventNotifer());
-]]></script>
-</div></div><p>And in Spring XML you declare a Spring bean and Camel will automatically pick it up:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;bean id=&quot;myLoggingEventNotifier&quot; class=&quot;org.apache.camel.processor.MyLoggingSentEventNotifer&quot;/&gt;
+</pre>Then in Java DSL you can tell Camel to use your custom <code>EventNotifier</code> simply by adding it:<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">context.getManagementStrategy().addEventNotifier(new MyLoggingSentEventNotifer());
+</pre>
+</div></div><p>And in Spring XML you declare a Spring bean and Camel will automatically pick it up:Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'</p><pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
+&lt;bean id="myLoggingEventNotifier" class="org.apache.camel.processor.MyLoggingSentEventNotifer"/&gt;
 
-&lt;camelContext xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
+&lt;camelContext xmlns="http://camel.apache.org/schema/spring"&gt;
 
     &lt;route&gt;
-        &lt;from uri=&quot;direct:start&quot;/&gt;
-        &lt;to uri=&quot;direct:bar&quot;/&gt;
-        &lt;to uri=&quot;mock:result&quot;/&gt;
+        &lt;from uri="direct:start"/&gt;
+        &lt;to uri="direct:bar"/&gt;
+        &lt;to uri="mock:result"/&gt;
     &lt;/route&gt;
 
     &lt;route&gt;
-        &lt;from uri=&quot;direct:bar&quot;/&gt;
+        &lt;from uri="direct:bar"/&gt;
         &lt;delay&gt;&lt;constant&gt;1000&lt;/constant&gt;&lt;/delay&gt;
     &lt;/route&gt;
 
 &lt;/camelContext&gt;
-]]></script>
-</div></div>If you run this example you will notice how Camel logs this now:<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[INFO  CamelContextFactoryBean        - Using custom EventNotifier with id: myLoggingEventNotifier and implementation: org.apache.camel.processor.MyLoggingSentEventNotifer@76bf9e
+</pre>If you run this example you will notice how Camel logs this now:<div class="code panel pdl conf-macro output-block" data-hasbody="true" data-macro-name="code" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">INFO  CamelContextFactoryBean        - Using custom EventNotifier with id: myLoggingEventNotifier and implementation: org.apache.camel.processor.MyLoggingSentEventNotifer@76bf9e
 INFO  MyLoggingSentEventNotifer      - Took 1001 millis to send to: Endpoint[direct://bar]
 INFO  MyLoggingSentEventNotifer      - Took 0 millis to send to: Endpoint[mock://result]
 INFO  MyLoggingSentEventNotifer      - Took 1013 millis to send to: Endpoint[direct://start]
-]]></script>
-</div></div><p>You can implement logic to filter which endpoints to log, and maybe also thresholds to skip logging if it was fast, e.g. &lt; 1 sec. Then you have a logger which logs all <em>slow</em> events.</p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">Tip you can use the <strong><code>EndpointHelper.matchEndpoint</code></strong> method to leverage the same filtering capabilities that for example the <a shape="rect" href="intercept.html">Intercept</a> uses in Camel.</div></div><p>You can see which <strong><code>EventObject</code></strong> Camel provides from the <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/management/event/package-summary.html">javadoc</a>.</p><p>From <strong>Camel 2.10</strong>: there is also a <strong><code>Exc
 hangeSendingEvent</code></strong> which is an event triggered before sending the message to the endpoint. Then we have an even for both before and after sending the message.</p></div>
+</pre>
+</div></div><p>You can implement logic to filter which endpoints to log, and maybe also thresholds to skip logging if it was fast, e.g. &lt; 1 sec. Then you have a logger which logs all <em>slow</em> events.</p><div class="confluence-information-macro confluence-information-macro-information conf-macro output-block" data-hasbody="true" data-macro-name="info"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"> </span><div class="confluence-information-macro-body">Tip you can use the <strong><code>EndpointHelper.matchEndpoint</code></strong> method to leverage the same filtering capabilities that for example the <a shape="rect" href="intercept.html">Intercept</a> uses in Camel.</div></div><p>You can see which <strong><code>EventObject</code></strong> Camel provides from the <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/management/event/package-summary.html">javadoc</a>.</p><p
 >From <strong>Camel 2.10</strong>: there is also a <strong><code>ExchangeSendingEvent</code></strong> which is an event triggered before sending the message to the endpoint. Then we have an even for both before and after sending the message.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/how-can-i-stop-a-route-from-a-route.html
==============================================================================
--- websites/production/camel/content/how-can-i-stop-a-route-from-a-route.html (original)
+++ websites/production/camel/content/how-can-i-stop-a-route-from-a-route.html Mon May 21 05:25:23 2018
@@ -103,8 +103,7 @@
 
 <h3 id="HowcanIstoparoutefromaroute-UsingalatchtostopCamelfromaroute">Using a latch to stop Camel from a route</h3>
 <p>In this example we use a <code>CountdownLatch</code> to signal when Camel should stop, triggered from a route.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 // use a latch as signal when to stop Camel
 private final CountDownLatch latch = new CountDownLatch(1);
 
@@ -115,14 +114,14 @@ public void testStopCamelFromRoute() thr
     context.start();
 
     // setup mock expectations for unit test
-    MockEndpoint start = context.getEndpoint(&quot;mock:start&quot;, MockEndpoint.class);
+    MockEndpoint start = context.getEndpoint("mock:start", MockEndpoint.class);
     start.expectedMessageCount(1);
-    MockEndpoint done = context.getEndpoint(&quot;mock:done&quot;, MockEndpoint.class);
+    MockEndpoint done = context.getEndpoint("mock:done", MockEndpoint.class);
     done.expectedMessageCount(1);
 
     // send a message to the route
     ProducerTemplate template = context.createProducerTemplate();
-    template.sendBody(&quot;direct:start&quot;, &quot;Hello Camel&quot;);
+    template.sendBody("direct:start", "Hello Camel");
 
     // wait for the latch (use 1 minute as fail safe, due unit test)
     assertTrue(latch.await(1, TimeUnit.MINUTES));
@@ -134,59 +133,55 @@ public void testStopCamelFromRoute() thr
     start.assertIsSatisfied();
     done.assertIsSatisfied();
 }
-]]></script>
-</div></div>
+</pre>
 <p>And in the route we call the latch as shown:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 public RouteBuilder createMyRoutes() throws Exception {
     return new RouteBuilder() {
         @Override
         public void configure() throws Exception {
-            from(&quot;direct:start&quot;).routeId(&quot;myRoute&quot;)
-                .to(&quot;mock:start&quot;)
+            from("direct:start").routeId("myRoute")
+                .to("mock:start")
                 .process(new Processor() {
                     @Override
                     public void process(Exchange exchange) throws Exception {
                         // stop Camel by signalling to the latch
                         latch.countDown();
                     }
-                }).to(&quot;mock:done&quot;);
+                }).to("mock:done");
         }
     };
 }
-]]></script>
-</div></div>
+</pre>
 
 <h3 id="HowcanIstoparoutefromaroute-Usingathreadtostoparoutefromaroute">Using a thread to stop a route from a route</h3>
 <p>In this example we use a separate <code>Thread</code> to stop the route, triggered from the route itself.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 public void testStopRouteFromRoute() throws Exception {
     // create camel, add routes, and start camel
     CamelContext context = new DefaultCamelContext();
     context.addRoutes(createMyRoutes());
     context.start();
 
-    assertTrue(&quot;Route myRoute should be started&quot;, context.getRouteStatus(&quot;myRoute&quot;).isStarted());
-    assertTrue(&quot;Route bar should be started&quot;, context.getRouteStatus(&quot;bar&quot;).isStarted());
+    assertTrue("Route myRoute should be started", context.getRouteStatus("myRoute").isStarted());
+    assertTrue("Route bar should be started", context.getRouteStatus("bar").isStarted());
 
     // setup mock expectations for unit test
-    MockEndpoint start = context.getEndpoint(&quot;mock:start&quot;, MockEndpoint.class);
+    MockEndpoint start = context.getEndpoint("mock:start", MockEndpoint.class);
     start.expectedMessageCount(1);
-    MockEndpoint done = context.getEndpoint(&quot;mock:done&quot;, MockEndpoint.class);
+    MockEndpoint done = context.getEndpoint("mock:done", MockEndpoint.class);
     done.expectedMessageCount(1);
 
     // send a message to the route
     ProducerTemplate template = context.createProducerTemplate();
-    template.sendBody(&quot;direct:start&quot;, &quot;Hello Camel&quot;);
+    template.sendBody("direct:start", "Hello Camel");
 
     // just wait a bit for the thread to stop the route
     latch.await(5, TimeUnit.SECONDS);
 
     // the route should now be stopped
-    assertTrue(&quot;Route myRoute should be stopped&quot;, context.getRouteStatus(&quot;myRoute&quot;).isStopped());
-    assertTrue(&quot;Route bar should be started&quot;, context.getRouteStatus(&quot;bar&quot;).isStarted());
+    assertTrue("Route myRoute should be stopped", context.getRouteStatus("myRoute").isStopped());
+    assertTrue("Route bar should be started", context.getRouteStatus("bar").isStarted());
 
     // stop camel
     context.stop();
@@ -195,17 +190,15 @@ public void testStopRouteFromRoute() thr
     start.assertIsSatisfied();
     done.assertIsSatisfied();
 }
-]]></script>
-</div></div>
+</pre>
 <p>And in the route we create the thread and call the <code>stopRoute</code> method as shown:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre class="conf-macro output-inline" data-hasbody="true" data-macro-name="unmigrated-inline-wiki-markup">
 public RouteBuilder createMyRoutes() throws Exception {
     return new RouteBuilder() {
         @Override
         public void configure() throws Exception {
-            from(&quot;direct:start&quot;).routeId(&quot;myRoute&quot;)
-                .to(&quot;mock:start&quot;)
+            from("direct:start").routeId("myRoute")
+                .to("mock:start")
                 .process(new Processor() {
                     Thread stop;
 
@@ -218,7 +211,7 @@ public RouteBuilder createMyRoutes() thr
                                 @Override
                                 public void run() {
                                     try {
-                                        exchange.getContext().stopRoute(&quot;myRoute&quot;);
+                                        exchange.getContext().stopRoute("myRoute");
                                     } catch (Exception e) {
                                         // ignore
                                     } finally {
@@ -232,15 +225,14 @@ public RouteBuilder createMyRoutes() thr
                         // start the thread that stops this route
                         stop.start();
                     }
-                }).to(&quot;mock:done&quot;);
+                }).to("mock:done");
             
-            from(&quot;direct:bar&quot;).routeId(&quot;bar&quot;)
-                .to(&quot;mock:bar&quot;);
+            from("direct:bar").routeId("bar")
+                .to("mock:bar");
         }
     };
 }
-]]></script>
-</div></div>
+</pre>
 
 
 <h3 id="HowcanIstoparoutefromaroute-Alternativesolutions">Alternative solutions</h3>
@@ -254,7 +246,7 @@ public RouteBuilder createMyRoutes() thr
 
 <p>See more details about the <a shape="rect" href="lifecycle.html">Lifecycle</a>.</p>
 
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<div class="confluence-information-macro confluence-information-macro-tip conf-macro output-block" data-hasbody="true" data-macro-name="tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"> </span><div class="confluence-information-macro-body">
 <p>You can also use the <a shape="rect" href="controlbus.html">ControlBus</a> component to let it stop/start routes.</p></div></div>
 
 <h3 id="HowcanIstoparoutefromaroute-SeeAlso">See Also</h3>