camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1036341 [15/17] - in /websites/production/camel/content: ./ 2015/10/14/ 2018/10/ 2018/10/17/ cache/
Date Wed, 17 Oct 2018 09:28:10 GMT
Modified: websites/production/camel/content/netty4-http.html
==============================================================================
--- websites/production/camel/content/netty4-http.html (original)
+++ websites/production/camel/content/netty4-http.html Wed Oct 17 09:28:08 2018
@@ -208,8 +208,8 @@ from("netty4-http:http://0.0.0.0:{{port}
    ...
 </route>
 </pre>
-</div></div><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="Netty4HTTP-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 class="alternate"><li><a shape="rect" href="netty.html">Netty</a></li><li><a shape="rect" href="netty-http-server-example.html">Netty HTTP Server Example</a></li><li><a shape="rect" href="jetty.html">Jetty</a></li></ul></div>
+</div></div><p></p><h3 id="Netty4HTTP-SeeAlso">See Also</h3>
+<ul><li><a shape="rect" href="configuring-camel.html">Configuring Camel</a></li><li><a shape="rect" href="component.html">Component</a></li><li><a shape="rect" href="endpoint.html">Endpoint</a></li><li><a shape="rect" href="getting-started.html">Getting Started</a></li></ul><ul class="alternate"><li><a shape="rect" href="netty.html">Netty</a></li><li><a shape="rect" href="netty-http-server-example.html">Netty HTTP Server Example</a></li><li><a shape="rect" href="jetty.html">Jetty</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/netty4.html
==============================================================================
--- websites/production/camel/content/netty4.html (original)
+++ websites/production/camel/content/netty4.html Wed Oct 17 09:28:08 2018
@@ -339,8 +339,8 @@ context.addRoutes(new RouteBuilder() {
       ...
     &lt;/route&gt;
 </pre>
-</div></div><p>... and so forth.</p><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="Netty4-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 class="alternate"><li><a shape="rect" href="netty-http.html">Netty HTTP</a></li><li><a shape="rect" href="mina.html">MINA</a></li></ul><div><span style="white-space: pre-wrap;background-color: rgb(237,245,255);"><br clear="none"></span></div></div>
+</div></div><p>... and so forth.</p><p></p><h3 id="Netty4-SeeAlso">See Also</h3>
+<ul><li><a shape="rect" href="configuring-camel.html">Configuring Camel</a></li><li><a shape="rect" href="component.html">Component</a></li><li><a shape="rect" href="endpoint.html">Endpoint</a></li><li><a shape="rect" href="getting-started.html">Getting Started</a></li></ul><ul class="alternate"><li><a shape="rect" href="netty-http.html">Netty HTTP</a></li><li><a shape="rect" href="mina.html">MINA</a></li></ul><div><span style="white-space: pre-wrap;background-color: rgb(237,245,255);"><br clear="none"></span></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/news.html
==============================================================================
--- websites/production/camel/content/news.html (original)
+++ websites/production/camel/content/news.html Wed Oct 17 09:28:08 2018
@@ -89,6 +89,30 @@
             <span class="logoBlock">
                  <span class="aui-avatar aui-avatar-large">
                      <span class="aui-avatar-inner">
+                         <a shape="rect" class="userLogoLink" href="    /confluence/display/~davsclaus ">
+              <img class="userLogo logo" src="news.userimage/user-avatar" alt="User icon: davsclaus" title="davsclaus">
+           </a>                     </span>
+                 </span>
+            </span>
+            <span class="blogHeading">
+                <a shape="rect" class="blogHeading" href="2018/10/17/announcing-apache-camel-k.html">Announcing Apache Camel K</a>
+                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="    /confluence/display/~davsclaus ">Claus Ibsen</a> posted on Oct 17, 2018</div>
+            
+        </div>
+    
+    <div class="wiki-content">
+        <p>After some months of brainstorming with the community and a bit more than<br clear="none">one month of development, our Camel K project has reached a good level of<br clear="none">stability and Nicola Ferraro published the first blog post about it yesterday.</p><p>For those of you who haven't heard of Camel K, it's now a subproject of<br clear="none">Apache Camel (<a shape="rect" class="external-link" href="https://github.com/apache/camel-k" rel="nofollow">https://github.com/apache/camel-k</a>) with the target of<br clear="none">building a lightweight runtime for running integration code directly on<br clear="none">cloud platforms like Kubernetes and OpenShift. It was inspired by<br clear="none">"serverless" principles and it will also target Knative shortly.</p><p>With the exception of the runtime code, that remains the good old Apache Camel<br clear="none">Java framework with 200+ components and full of EIPs, most of the<br clear="none">"operator" code in Camel K is wri
 tten in Go. But the new language has not<br clear="none">stopped many adventurer Camel developers that have actively contributed to<br clear="none">the project during last month. We still have a long way in front of us,<br clear="none">let's continue to make Camel awesome!</p><p>So, please.. check the project out! Spread it to the world!<br clear="none">And provide your feedback, so we can make it always better. We love any<br clear="none">kind of contribution!</p><p>For more details then check out the <a shape="rect" class="external-link" href="https://www.nicolaferraro.me/2018/10/15/introducing-camel-k/" rel="nofollow">blog article</a> by Nicola, and watch the 7<br clear="none">minute video, showing Camel K in action.</p><p>Links follow:</p><p>Announcement tweet: <a shape="rect" class="external-link" href="https://twitter.com/ni_ferraro/status/1051872786946363392" rel="nofollow">https://twitter.com/ni_ferraro/status/1051872786946363392</a><br clear="none">Blog article: <a shape="r
 ect" class="external-link" href="https://www.nicolaferraro.me/2018/10/15/introducing-camel-k/" rel="nofollow">https://www.nicolaferraro.me/2018/10/15/introducing-camel-k/</a><br clear="none">Github home: <a shape="rect" class="external-link" href="https://github.com/apache/camel-k" rel="nofollow">https://github.com/apache/camel-k</a></p>
+    </div>
+    
+        
+    </div>
+    
+        
+<div class="blog-post-listing">
+            <div class="logo-heading-block">
+            <span class="logoBlock">
+                 <span class="aui-avatar aui-avatar-large">
+                     <span class="aui-avatar-inner">
                          <a shape="rect" class="userLogoLink" href="    /confluence/display/~gzurowski ">
               <img class="userLogo logo" src="news.userimage/gzurowski-89607-pp-wojtek-avatar.png" alt="User icon: gzurowski" title="gzurowski">
            </a>                     </span>
@@ -537,30 +561,6 @@
     </div>
     
         
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                 <span class="aui-avatar aui-avatar-large">
-                     <span class="aui-avatar-inner">
-                         <a shape="rect" class="userLogoLink" href="    /confluence/display/~davsclaus ">
-              <img class="userLogo logo" src="news.userimage/user-avatar" alt="User icon: davsclaus" title="davsclaus">
-           </a>                     </span>
-                 </span>
-            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2017/06/17/new-camel-committers.html">New Camel committers</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="    /confluence/display/~davsclaus ">Claus Ibsen</a> posted on Jun 17, 2017</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p>New Camel committers</p><p>A couple of week ago the Camel PMC voted in three new contributors to become committers:</p><p>- Onder Sezgin<br clear="none">- Quinn Stevenson<br clear="none">- Tomohisa Igarashi</p><p>On behalf of the Camel PMC, welcome aboard Onder, Quinn, and Tomo and keep up the great work!<br clear="none">Claus Ibsen</p>
-    </div>
-    
-        
     </div>
     </div></div>
         </td>

Modified: websites/production/camel/content/nmr.html
==============================================================================
--- websites/production/camel/content/nmr.html (original)
+++ websites/production/camel/content/nmr.html Wed Oct 17 09:28:08 2018
@@ -242,8 +242,8 @@ public class ExchangeUsingNMRTest extend
 </div></div>
 
 
-<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="NMR-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>
+<h3 id="NMR-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>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/openshift.html
==============================================================================
--- websites/production/camel/content/openshift.html (original)
+++ websites/production/camel/content/openshift.html Wed Oct 17 09:28:08 2018
@@ -117,8 +117,8 @@ from("direct:control")
 <pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">// trigger when state changes on our gears
 from("openshift:myClient?username=foo&amp;password=secret&amp;delay=30s")
     .log("Event ${header.CamelOpenShiftEventType} on application ${body.name} changed state to ${header.CamelOpenShiftEventNewState}");</pre>
-</div></div><p>&#160;</p><p>When the consumer emits an Exchange then the body contains the&#160;<code>com.openshift.client.IApplication</code> as the message body. And the following headers is included.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Header</th><th colspan="1" rowspan="1" class="confluenceTh">May be null</th><th colspan="1" rowspan="1" class="confluenceTh">Description</th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">CamelOpenShiftEventType</td><td colspan="1" rowspan="1" class="confluenceTd">No</td><td colspan="1" rowspan="1" class="confluenceTd">The type of the event which can be one of: added, removed or changed.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">CamelOpenShiftEventOldState</td><td colspan="1" rowspan="1" class="confluenceTd">Yes</td><td colspan="1" rowspan="1" class="confluenceTd">The old state, when the event type is changed.</td></tr><tr><td colspan="1
 " rowspan="1" class="confluenceTd">CamelOpenShiftEventNewState</td><td colspan="1" rowspan="1" class="confluenceTd">No</td><td colspan="1" rowspan="1" class="confluenceTd">The new state, for any of the event types</td></tr></tbody></table></div><p>&#160;</p><p>&#160;</p><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="Openshift-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>
+</div></div><p>&#160;</p><p>When the consumer emits an Exchange then the body contains the&#160;<code>com.openshift.client.IApplication</code> as the message body. And the following headers is included.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Header</th><th colspan="1" rowspan="1" class="confluenceTh">May be null</th><th colspan="1" rowspan="1" class="confluenceTh">Description</th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">CamelOpenShiftEventType</td><td colspan="1" rowspan="1" class="confluenceTd">No</td><td colspan="1" rowspan="1" class="confluenceTd">The type of the event which can be one of: added, removed or changed.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">CamelOpenShiftEventOldState</td><td colspan="1" rowspan="1" class="confluenceTd">Yes</td><td colspan="1" rowspan="1" class="confluenceTd">The old state, when the event type is changed.</td></tr><tr><td colspan="1
 " rowspan="1" class="confluenceTd">CamelOpenShiftEventNewState</td><td colspan="1" rowspan="1" class="confluenceTd">No</td><td colspan="1" rowspan="1" class="confluenceTd">The new state, for any of the event types</td></tr></tbody></table></div><p>&#160;</p><p>&#160;</p><p></p><h3 id="Openshift-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>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/optaplanner.html
==============================================================================
--- websites/production/camel/content/optaplanner.html (original)
+++ websites/production/camel/content/optaplanner.html Wed Oct 17 09:28:08 2018
@@ -118,8 +118,8 @@
 <pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">from("cxfrs:bean:rsServer?bindingStyle=SimpleConsumer")
   .to("optaplanner:/org/foo/barSolverConfig.xml");
 </pre>
-</div></div><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="OptaPlanner-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>
+</div></div><p></p><h3 id="OptaPlanner-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>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/paho.html
==============================================================================
--- websites/production/camel/content/paho.html (original)
+++ websites/production/camel/content/paho.html Wed Oct 17 09:28:08 2018
@@ -146,8 +146,8 @@ MqttConnectOptions connectOptions() {
 </div></div><p><span style="line-height: 1.4285715;"><br clear="none"></span></p><h3 id="Paho-Headers">Headers</h3><p>The following headers are recognized by the Paho component:</p><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>Header</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Java constant</p></th><th colspan="1" rowspan="1" class="confluenceTh">Endpoint type</th><th colspan="1" rowspan="1" class="confluenceTh">Value type</th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><code>PahoOriginalMessage</code></td><td colspan="1" rowspan="1" class="confluenceTd"><code><span>PahoConstants.</span><span>HEADER_ORIGINAL_MESSAGE</span></code></td><td colspan="1" rowspan="1" class="confluenceTd">Consumer</td><td colspan="1" row
 span="1" class="confluenceTd"><code>org.eclipse.paho.client.mqttv3.MqttMessage</code></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The original Paho message instance received by the client.</p><p><strong>Deprecated: </strong>from Camel 2.17 onwards the original MqttMessage is not stored as a header but on the <code>org.apache.camel.component.paho.PahoMessage</code> message that has a getter <code>getMqttMessage</code>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><code>CamelMqttTopic</code></td><td colspan="1" rowspan="1" class="confluenceTd"><span>PahoConstants.MQTT_TOPIC</span></td><td colspan="1" rowspan="1" class="confluenceTd">Consumer</td><td colspan="1" rowspan="1" class="confluenceTd">String</td><td colspan="1" rowspan="1" class="confluenceTd"><strong>Camel 2.17:</strong>The topic</td></tr></tbody></table></div></div>
 
 
-<p>&#160;</p><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="Paho-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>
+<p>&#160;</p><p></p><h3 id="Paho-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>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/parameter-binding-annotations.html
==============================================================================
--- websites/production/camel/content/parameter-binding-annotations.html (original)
+++ websites/production/camel/content/parameter-binding-annotations.html Wed Oct 17 09:28:08 2018
@@ -168,7 +168,7 @@ from("activemq:someQueue").
 </pre>
 </div></div>
 
-<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="ParameterBindingAnnotations-AnnotationBasedExpressionLanguage">Annotation Based Expression Language</h3>
+<h3 id="ParameterBindingAnnotations-AnnotationBasedExpressionLanguage">Annotation Based Expression Language</h3>
 
 <p>You can also use any of the <a shape="rect" href="languages.html">Languages</a> supported in Camel to bind expressions to method parameters when using <a shape="rect" href="bean-integration.html">Bean Integration</a>. For example you can use any of these annotations:</p>
 
@@ -257,7 +257,7 @@ public class MySimpleIdGenerator {
 </pre>
 </div></div>
 
-<p>Groovy supports GStrings that is like a template where we can insert $ placeholders that will be evaluated by Groovy.</p></div></div>
+<p>Groovy supports GStrings that is like a template where we can insert $ placeholders that will be evaluated by Groovy.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/pdf.html
==============================================================================
--- websites/production/camel/content/pdf.html (original)
+++ websites/production/camel/content/pdf.html Wed Oct 17 09:28:08 2018
@@ -106,8 +106,8 @@
 <h3 id="PDF-Headers">Headers</h3><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">Header</th><th colspan="1" rowspan="1" class="confluenceTh">&#160;</th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>pdf-document</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><strong>Mandatory</strong> header for <code>append</code> operation and ignored in all other operations. Expected type is <a shape="rect" class="external-link" href="https://pdfbox.apache.org/docs/1.8.9/javadocs/org/apache/pdfbox/pdmodel/PDDocument.html">PDDocument</a>. Stores PDF document which will be used for append operation.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>protection-policy</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Expected type is<a shape="rect" class="externa
 l-link" href="https://pdfbox.apache.org/docs/1.8.9/javadocs/org/apache/pdfbox/pdmodel/encryption/ProtectionPolicy.html"> ProtectionPolicy</a>. If specified then PDF document will be encrypted with it.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>decryption-material</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Expected type is<a shape="rect" class="external-link" href="https://pdfbox.apache.org/docs/1.8.9/javadocs/org/apache/pdfbox/pdmodel/encryption/DecryptionMaterial.html"> DecryptionMaterial</a>. <strong>Mandatory</strong> header if PDF document is encrypted.</p></td></tr></tbody></table></div></div>
 
 
-<p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="PDF-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><pre>&#160;</pre></div>
+<p></p><h3 id="PDF-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><pre>&#160;</pre></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/pgevent.html
==============================================================================
--- websites/production/camel/content/pgevent.html (original)
+++ websites/production/camel/content/pgevent.html Wed Oct 17 09:28:08 2018
@@ -102,8 +102,8 @@ pgevent://host:port/database/channel[?pa
 </div></div><p>&#160;</p><p>You can append query options to the URI in the following format, <code>?option=value&amp;option=value&amp;...</code></p><h3 id="PGEvent-Options">Options</h3><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>Option</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>datasource</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="font-family: monospace;">String</span></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Name of datasource to lookup from the registry to 
 use</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>hostname</p></td><td colspan="1" rowspan="1" class="confluenceTd">String</td><td colspan="1" rowspan="1" class="confluenceTd">localhost</td><td colspan="1" rowspan="1" class="confluenceTd">Instead of using datasource, then connect to the PostgresSQL database using this hostname and port</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">port</td><td colspan="1" rowspan="1" class="confluenceTd">int</td><td colspan="1" rowspan="1" class="confluenceTd">5432</td><td colspan="1" rowspan="1" class="confluenceTd"><span>Instead of using datasource, then connect to the PostgresSQL database using this hostname and port</span></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">database</td><td colspan="1" rowspan="1" class="confluenceTd">String</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">The database name</td></tr><tr><td colspan="1
 " rowspan="1" class="confluenceTd">channel</td><td colspan="1" rowspan="1" class="confluenceTd">String</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">The channel name</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">user</td><td colspan="1" rowspan="1" class="confluenceTd">String</td><td colspan="1" rowspan="1" class="confluenceTd">postgres</td><td colspan="1" rowspan="1" class="confluenceTd">Username</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">pass</td><td colspan="1" rowspan="1" class="confluenceTd">String</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">Password</td></tr></tbody></table></div></div>
 
 
-<p>&#160;</p><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="PGEvent-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>
+<p>&#160;</p><p></p><h3 id="PGEvent-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>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/php.html
==============================================================================
--- websites/production/camel/content/php.html (original)
+++ websites/production/camel/content/php.html Wed Oct 17 09:28:08 2018
@@ -103,7 +103,7 @@
 
 <p>For example you could use the <strong>php</strong> function to create an <a shape="rect" href="predicate.html">Predicate</a> in a <a shape="rect" href="message-filter.html">Message Filter</a> or as an <a shape="rect" href="expression.html">Expression</a> for a <a shape="rect" href="recipient-list.html">Recipient List</a></p>
 
-<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="PHP-ScriptContextOptions"><code>ScriptContext</code> Options</h3><p>&#160;</p><p>The&#160;<code>JSR-223</code> scripting language's&#160;<strong><code>ScriptContext</code></strong> is pre-configured with the following attributes all set at <strong><code>ENGINE_SCOPE</code></strong>.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Attribute</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Value</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span><code>camelContext</code><br clear="none"></span></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.CamelContext</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The Camel Context.</p></td></tr><tr><td colspan="1" rowspan="1" class="
 confluenceTd"><p><code>context</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.CamelContext</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The Camel Context (cannot be used in groovy).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>exchange</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Exchange</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The current Exchange.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.builder.script.PropertiesFunction</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Camel 2.9:</strong> Function with a <strong><code>resolve</code></strong> method to make it easier to use Camels <a shape="rect" href="properties.html">Properties</a> component from scripts. Se
 e further below for example.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>request</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The&#160;<strong><code>IN</code></strong> message.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>response</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Deprecated</strong>: The&#160;<strong><code>OUT</code></strong> message. The&#160;<strong><code>OUT</code></strong> message is&#160;<strong><code>null</code></strong> by default. Use the <strong><code>IN</code></strong> message instead.</p></td></tr></tbody></table></div><p>See <a shape="rect" href="scripting-languages.html">Scripting Languages</a> for the list of languages with explicit DSL support.</p><h3 i
 d="PHP-PassingAdditionalArgumentstotheScriptingEngine">Passing Additional Arguments to the&#160;<code>ScriptingEngine</code></h3><p><strong>Available from Camel 2.8</strong></p><p>You can provide additional arguments to the <strong><code>ScriptingEngine</code></strong> using a header on the Camel message with the key <strong><code>CamelScriptArguments</code></strong>.</p><p>Example:</p><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">
+<h3 id="PHP-ScriptContextOptions"><code>ScriptContext</code> Options</h3><p>&#160;</p><p>The&#160;<code>JSR-223</code> scripting language's&#160;<strong><code>ScriptContext</code></strong> is pre-configured with the following attributes all set at <strong><code>ENGINE_SCOPE</code></strong>.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Attribute</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Value</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span><code>camelContext</code><br clear="none"></span></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.CamelContext</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The Camel Context.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>context</code></p></td><td colspan="1" rowspan="1" class="con
 fluenceTd"><p><code>org.apache.camel.CamelContext</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The Camel Context (cannot be used in groovy).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>exchange</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Exchange</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The current Exchange.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.builder.script.PropertiesFunction</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Camel 2.9:</strong> Function with a <strong><code>resolve</code></strong> method to make it easier to use Camels <a shape="rect" href="properties.html">Properties</a> component from scripts. See further below for example.</p></td></tr><tr><td colspan="1" rowspan="1" class="con
 fluenceTd"><p><code>request</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The&#160;<strong><code>IN</code></strong> message.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>response</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Deprecated</strong>: The&#160;<strong><code>OUT</code></strong> message. The&#160;<strong><code>OUT</code></strong> message is&#160;<strong><code>null</code></strong> by default. Use the <strong><code>IN</code></strong> message instead.</p></td></tr></tbody></table></div><p>See <a shape="rect" href="scripting-languages.html">Scripting Languages</a> for the list of languages with explicit DSL support.</p><h3 id="PHP-PassingAdditionalArgumentstotheScriptingEngine">Passing Additional Arguments 
 to the&#160;<code>ScriptingEngine</code></h3><p><strong>Available from Camel 2.8</strong></p><p>You can provide additional arguments to the <strong><code>ScriptingEngine</code></strong> using a header on the Camel message with the key <strong><code>CamelScriptArguments</code></strong>.</p><p>Example:</p><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">public void testArgumentsExample() throws Exception {
     getMockEndpoint("mock:result").expectedMessageCount(0);
     getMockEndpoint("mock:unmatched").expectedMessageCount(1);
@@ -132,7 +132,7 @@
  &lt;artifactId&gt;camel-script&lt;/artifactId&gt;
  &lt;version&gt;x.x.x&lt;/version&gt;
 &lt;/dependency&gt;</pre>
-</div></div></div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/point-to-point-channel.html
==============================================================================
--- websites/production/camel/content/point-to-point-channel.html (original)
+++ websites/production/camel/content/point-to-point-channel.html Wed Oct 17 09:28:08 2018
@@ -96,9 +96,9 @@
 	&lt;from uri="direct:start"/&gt;
 	&lt;to uri="jms:queue:foo"/&gt;
 &lt;/route&gt;</pre>
-</div></div><p>&#160;</p><p>&#160;</p><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h4 id="PointtoPointChannel-UsingThisPattern">Using This Pattern</h4>
+</div></div><p>&#160;</p><p>&#160;</p><p></p><h4 id="PointtoPointChannel-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></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>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/pojo.html
==============================================================================
--- websites/production/camel/content/pojo.html (original)
+++ websites/production/camel/content/pojo.html Wed Oct 17 09:28:08 2018
@@ -84,8 +84,8 @@
 
 <p><strong>Has been removed in Camel 2.0.</strong></p>
 
-<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="Pojo-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>
+<h3 id="Pojo-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>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/predicate.html
==============================================================================
--- websites/production/camel/content/predicate.html (original)
+++ websites/production/camel/content/predicate.html Wed Oct 17 09:28:08 2018
@@ -200,7 +200,7 @@ from("direct:start").choice()
 
 <h3 id="Predicate-ExtensiblePredicates">Extensible Predicates</h3>
 <p>Camel supports extensible Predicates using multiple <a shape="rect" href="languages.html">Languages</a>; the following languages are supported out of the box</p>
-<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><ul><li><a shape="rect" href="bean-language.html">Bean Language</a> for using Java for expressions</li><li><a shape="rect" href="constant.html">Constant</a></li><li>the unified <a shape="rect" href="el.html">EL</a> from JSP and JSF</li><li><a shape="rect" href="header.html">Header</a></li><li><a shape="rect" href="jsonpath.html">JSonPath</a></li><li><a shape="rect" href="jxpath.html">JXPath</a></li><li><a shape="rect" href="mvel.html">Mvel</a></li><li><a shape="rect" href="ognl.html">OGNL</a></li><li><a shape="rect" href="ref-language.html">Ref Language</a></li><li><a shape="rect" href="exchangeproperty.html">ExchangeProperty</a> /&#160;<a shape="rect" href="property.html">Property</a></li><li><a shape="rect" href="scripting-languages.html">Scripting Languages</a> such as<ul><li><a shape="rect" href="beanshell.html">BeanShell</a></li><li><a shape="rect" href="javascript.html">JavaScript</a></li><li><
 a shape="rect" href="groovy.html">Groovy</a></li><li><a shape="rect" href="python.html">Python</a></li><li><a shape="rect" href="php.html">PHP</a></li><li><a shape="rect" href="ruby.html">Ruby</a></li></ul></li><li><a shape="rect" href="simple.html">Simple</a><ul><li><a shape="rect" href="file-language.html">File Language</a></li></ul></li><li><a shape="rect" href="spel.html">Spring Expression Language</a></li><li><a shape="rect" href="sql.html">SQL</a></li><li><a shape="rect" href="tokenizer.html">Tokenizer</a></li><li><a shape="rect" href="xpath.html">XPath</a></li><li><a shape="rect" href="xquery.html">XQuery</a></li><li><a shape="rect" href="vtd-xml.html">VTD-XML</a></li></ul><p>Most of these languages is also supported used as <a shape="rect" href="annotation-based-expression-language.html">Annotation Based Expression Language</a>.</p></div>
+<ul><li><a shape="rect" href="bean-language.html">Bean Language</a> for using Java for expressions</li><li><a shape="rect" href="constant.html">Constant</a></li><li>the unified <a shape="rect" href="el.html">EL</a> from JSP and JSF</li><li><a shape="rect" href="header.html">Header</a></li><li><a shape="rect" href="jsonpath.html">JSonPath</a></li><li><a shape="rect" href="jxpath.html">JXPath</a></li><li><a shape="rect" href="mvel.html">Mvel</a></li><li><a shape="rect" href="ognl.html">OGNL</a></li><li><a shape="rect" href="ref-language.html">Ref Language</a></li><li><a shape="rect" href="exchangeproperty.html">ExchangeProperty</a> /&#160;<a shape="rect" href="property.html">Property</a></li><li><a shape="rect" href="scripting-languages.html">Scripting Languages</a> such as<ul><li><a shape="rect" href="beanshell.html">BeanShell</a></li><li><a shape="rect" href="javascript.html">JavaScript</a></li><li><a shape="rect" href="groovy.html">Groovy</a></li><li><a shape="rect" href="python.ht
 ml">Python</a></li><li><a shape="rect" href="php.html">PHP</a></li><li><a shape="rect" href="ruby.html">Ruby</a></li></ul></li><li><a shape="rect" href="simple.html">Simple</a><ul><li><a shape="rect" href="file-language.html">File Language</a></li></ul></li><li><a shape="rect" href="spel.html">Spring Expression Language</a></li><li><a shape="rect" href="sql.html">SQL</a></li><li><a shape="rect" href="tokenizer.html">Tokenizer</a></li><li><a shape="rect" href="xpath.html">XPath</a></li><li><a shape="rect" href="xquery.html">XQuery</a></li><li><a shape="rect" href="vtd-xml.html">VTD-XML</a></li></ul><p>Most of these languages is also supported used as <a shape="rect" href="annotation-based-expression-language.html">Annotation Based Expression Language</a>.</p>
 
 <p>You can easily write your own plugin predicate by implementing the <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Predicate.html">Predicate interface</a>. </p>
 
@@ -209,7 +209,7 @@ from("direct:start").choice()
 <h3 id="Predicate-UsingPredicatesinyourIDE">Using Predicates in your IDE</h3>
 To use different expression and predicates in your IDE you need to perform a static import of the builder class for the language(s) you wish to use.
 
-<div class="table-wrap conf-macro output-block" data-hasbody="false" data-macro-name="include"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Language(s) </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Builder class to import </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="scripting-languages.html">Scripting Languages</a> such as <a shape="rect" href="beanshell.html">BeanShell</a>, <a shape="rect" href="javascript.html">JavaScript</a>, <a shape="rect" href="groovy.html">Groovy</a>, <a shape="rect" href="php.html">PHP</a>, <a shape="rect" href="python.html">Python</a> and <a shape="rect" href="ruby.html">Ruby</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>  <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-script/apidocs/org/apache/camel/builder/script/ScriptBuilder.html">org.apache.camel.builder.script.ScriptBuilder</a> </
 p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="sql.html">SQL</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-josql/apidocs/org/apache/camel/builder/sql/SqlBuilder.html">org.apache.camel.builder.josql.SqlBuilder</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="xpath.html">XPath</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/builder/xml/XPathBuilder.html">org.apache.camel.builder.xml.XPathBuilder</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="xquery.html">XQuery</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current
 /camel-saxon/apidocs/org/apache/camel/builder/saxon/XQueryBuilder.html">org.apache.camel.builder.saxon.XQueryBuilder</a> </p></td></tr></tbody></table></div>
+<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Language(s) </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Builder class to import </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="scripting-languages.html">Scripting Languages</a> such as <a shape="rect" href="beanshell.html">BeanShell</a>, <a shape="rect" href="javascript.html">JavaScript</a>, <a shape="rect" href="groovy.html">Groovy</a>, <a shape="rect" href="php.html">PHP</a>, <a shape="rect" href="python.html">Python</a> and <a shape="rect" href="ruby.html">Ruby</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>  <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-script/apidocs/org/apache/camel/builder/script/ScriptBuilder.html">org.apache.camel.builder.script.ScriptBuilder</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a
  shape="rect" href="sql.html">SQL</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-josql/apidocs/org/apache/camel/builder/sql/SqlBuilder.html">org.apache.camel.builder.josql.SqlBuilder</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="xpath.html">XPath</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/builder/xml/XPathBuilder.html">org.apache.camel.builder.xml.XPathBuilder</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="xquery.html">XQuery</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-saxon/apidocs/org/apache/camel/builder/saxon/XQueryBuilder.html"
 >org.apache.camel.builder.saxon.XQueryBuilder</a> </p></td></tr></tbody></table></div>
 
 
 

Modified: websites/production/camel/content/properties.html
==============================================================================
--- websites/production/camel/content/properties.html (original)
+++ websites/production/camel/content/properties.html Wed Oct 17 09:28:08 2018
@@ -93,7 +93,7 @@
 </div></div><p>Where <strong><code>key</code></strong> is the key for the property to be looked up.</p><h3 id="Properties-Options">Options</h3><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>Option</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>cache</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>boolean</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Whether or not to cache loaded properties.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code
 >encoding</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><strong>Camel 2.14.3/2.15.1:</strong> The charset to use when loading properties, such as <strong><code>UTF-8</code></strong>.</p><p>The default charset is: <strong><code>ISO-8859-1</code></strong> (<strong><code>latin1</code></strong>).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>fallbackToUnaugmentedProperty</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>boolean</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Camel 2.9</strong> If <strong><code>true</code></strong>, first attempt resolution of property name augmented with <strong><code>propertyPrefix</code></strong> and <strong><code>propert
 ySuffix</code></strong> before falling back the plain property name specified.</p><p>If <strong><code>false</code></strong>, only the augmented property name is searched.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>defaultFallbackEnabled</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>boolean</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Camel 2.19</strong>: If&#160;<strong><code>false</code></strong> the component will not attempt to find a default for the key by looking after the colon separator.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ignoreMissingLocation</code></p></td><td colspan="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><stron
 g>Camel 2.10:</strong> Whether to silently ignore if a location cannot be located, such as a properties file not found.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>locations</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>A comma separated list of one or more locations of property files to be loaded. Property resolution will use the given property files exclusively. Any default location(s) are ignored.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>prefixToken</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>{{</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Camel 2.9</strong> This token is used to mark the start of a prop
 erty placeholder definition.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>propertyPrefix</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><strong>Camel 2.9</strong> An optional prefix that's <em>prepended</em> to each property name prior to resolution.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>propertySuffix</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><strong>Camel 2.9</strong> An optional suffix that's <em>appended</em> to each property name prior to resolution.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>suffixToken</code></p></td><td col
 span="1" rowspan="1" class="confluenceTd"><p><code>String</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>}}<br clear="none"></code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Camel 2.9</strong> This token is used to mark the end of a property placeholder definition.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>systemPropertiesMode</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>int</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>2</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Camel 2.16</strong> The mode to use for whether to resolve and use system properties:</p><p><strong><code>0</code></strong>&#160;= never - JVM system properties are never used.<br clear="none"><strong><code>1</code></strong>&#160;= fallback - JVM system properties are only used as fallback if no regular property with the key exists.<br clear="none"><stro
 ng><code>2</code></strong>&#160;= override - JVM system properties are used if exists, otherwise the regular property will be used.</p><div class="confluence-information-macro confluence-information-macro-warning conf-macro output-block" data-hasbody="true" data-macro-name="warning"><p class="title">Bridging Spring and Camel Property Placeholders</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"> </span><div class="confluence-information-macro-body"><p>When bridging to Spring's property placeholder using <strong><code>org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer</code></strong> the configuration on <strong><code>BridgePropertyPlaceholderConfigurer</code></strong> will take precedence over the configuration on the <strong><code>PropertiesComponent</code></strong>.&#160;</p></div></div></td></tr></tbody></table></div></div>
 
 
-<div class="confluence-information-macro confluence-information-macro-tip conf-macro output-block" data-hasbody="true" data-macro-name="tip"><p class="title">Resolving property from Java code</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"> </span><div class="confluence-information-macro-body"><p>You can use the method <strong><code>resolvePropertyPlaceholders</code></strong> on the <strong><code>CamelContext</code></strong> to resolve a property from any Java code.</p></div></div><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h2 id="Properties-UsingPropertyPlaceholder">Using&#160;<strong><code>PropertyPlaceholder</code></strong></h2><p><strong>Available as of Camel 2.3</strong></p><p>Camel now provides a new <strong><code>PropertiesComponent</code></strong> in&#160;<strong><code>camel-core</code></strong> which allows you to use property placeholders when defining Camel <a shape="rect" href
 ="endpoint.html">Endpoint</a> URIs. This works much like you would do if using Spring's <strong><code>&lt;property-placeholder&gt;</code></strong> tag. However Spring has a limitation that prevents third-party frameworks from fully leveraging Spring property placeholders.</p><p>For more details see: <a shape="rect" href="how-do-i-use-spring-property-placeholder-with-camel-xml.html">How do I use Spring Property Placeholder with Camel XML</a>.</p><parameter ac:name="title">Bridging Spring and Camel Property Placeholders</parameter><rich-text-body><p>From <strong>Camel 2.10</strong>: Spring's property placeholder can be bridged with Camel's. See below for more details.</p></rich-text-body><p>The property placeholder is typically used when trying to do any of the following:</p><ul class="alternate"><li>Lookup or creating endpoints.</li><li>Lookup of beans in the <a shape="rect" href="registry.html">Registry.</a></li><li>Additional supported in Spring XML (see below in examples).</li><li
 >Using Blueprint&#160;<strong><code>PropertyPlaceholder</code></strong> with Camel <a shape="rect" href="properties.html">Properties</a> component.</li><li>Using <strong><code>@PropertyInject</code></strong> to inject a property in a POJO.</li><li><strong>Camel 2.14.1</strong> Using default value if a property does not exists.</li><li><strong>Camel 2.14.1</strong> Include out of the box functions, to lookup property values from OS environment variables, JVM system properties, or the service idiom.</li><li><strong>Camel 2.14.1</strong> Using custom functions, which can be plugged into the property component.</li></ul><h3 id="Properties-Format">Format</h3><p>The value of a Camel property can be obtained by specifying its key name within a property placeholder, using the following format: <strong>{{<code>key</code>}}</strong>.</p><p>For example:</p><plain-text-body>{{file.uri}}</plain-text-body><p>where <strong><code>file.uri</code></strong> is the property key.</p><p>Property placehol
 ders can be used to specify parts, or all, of an endpoint's URI by embedding one or more placeholders in the URI's string definition.</p><p>From&#160;<strong>Camel 2.14.1</strong>: you can specify a default value to use if a property with the key does not exists, e.g., <strong><code>file.url:/some/path</code></strong> where the default value is the text after the colon, e.g., <strong><code>/some/path</code></strong>.</p><rich-text-body><p>From <strong>Camel 2.14.1</strong>: do <em>not</em> use a colon in the property key. The colon character is used as a token separator when providing a default value.</p></rich-text-body><h3 id="Properties-UsingPropertyResolver">Using&#160;<code>PropertyResolver</code></h3><p>Camel provides a pluggable mechanism that allows third-parties to specify their own resolver to use for the lookup of properties.</p><p>Camel provides a default implementation <strong><code>org.apache.camel.component.properties.DefaultPropertiesResolver</code></strong> which is
  capable of loading properties from the file system, classpath or <a shape="rect" href="registry.html">Registry</a>. To indicate which source to use the location must contain the appropriate prefix.</p><p>The list of prefixes is:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Prefix</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ref:</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Lookup in the <a shape="rect" href="registry.html">Registry.</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>file:</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Load the from file system.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>classpath:</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Load from the classpath (th
 is is also the default if no prefix is provided).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>blueprint:</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Use a specific OSGi blueprint placeholder service.</p></td></tr></tbody></table></div><h3 id="Properties-DefiningLocation">Defining Location</h3><p>The <strong><code>PropertiesResolver</code></strong> must be configured with the location(s) to use when resolving properties. One or more locations can be given. Specifying multiple locations can be done a couple of ways: using either a single comma separated string, or an array of strings.</p><parameter ac:name="language">java</parameter><plain-text-body>pc.setLocation("com/mycompany/myprop.properties,com/mycompany/other.properties");
+<div class="confluence-information-macro confluence-information-macro-tip conf-macro output-block" data-hasbody="true" data-macro-name="tip"><p class="title">Resolving property from Java code</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"> </span><div class="confluence-information-macro-body"><p>You can use the method <strong><code>resolvePropertyPlaceholders</code></strong> on the <strong><code>CamelContext</code></strong> to resolve a property from any Java code.</p></div></div><p></p><h2 id="Properties-UsingPropertyPlaceholder">Using&#160;<strong><code>PropertyPlaceholder</code></strong></h2><p><strong>Available as of Camel 2.3</strong></p><p>Camel now provides a new <strong><code>PropertiesComponent</code></strong> in&#160;<strong><code>camel-core</code></strong> which allows you to use property placeholders when defining Camel <a shape="rect" href="endpoint.html">Endpoint</a> URIs. This works much like you would do if using Sprin
 g's <strong><code>&lt;property-placeholder&gt;</code></strong> tag. However Spring has a limitation that prevents third-party frameworks from fully leveraging Spring property placeholders.</p><p>For more details see: <a shape="rect" href="how-do-i-use-spring-property-placeholder-with-camel-xml.html">How do I use Spring Property Placeholder with Camel XML</a>.</p><parameter ac:name="title">Bridging Spring and Camel Property Placeholders</parameter><rich-text-body><p>From <strong>Camel 2.10</strong>: Spring's property placeholder can be bridged with Camel's. See below for more details.</p></rich-text-body><p>The property placeholder is typically used when trying to do any of the following:</p><ul class="alternate"><li>Lookup or creating endpoints.</li><li>Lookup of beans in the <a shape="rect" href="registry.html">Registry.</a></li><li>Additional supported in Spring XML (see below in examples).</li><li>Using Blueprint&#160;<strong><code>PropertyPlaceholder</code></strong> with Camel <
 a shape="rect" href="properties.html">Properties</a> component.</li><li>Using <strong><code>@PropertyInject</code></strong> to inject a property in a POJO.</li><li><strong>Camel 2.14.1</strong> Using default value if a property does not exists.</li><li><strong>Camel 2.14.1</strong> Include out of the box functions, to lookup property values from OS environment variables, JVM system properties, or the service idiom.</li><li><strong>Camel 2.14.1</strong> Using custom functions, which can be plugged into the property component.</li></ul><h3 id="Properties-Format">Format</h3><p>The value of a Camel property can be obtained by specifying its key name within a property placeholder, using the following format: <strong>{{<code>key</code>}}</strong>.</p><p>For example:</p><plain-text-body>{{file.uri}}</plain-text-body><p>where <strong><code>file.uri</code></strong> is the property key.</p><p>Property placeholders can be used to specify parts, or all, of an endpoint's URI by embedding one or 
 more placeholders in the URI's string definition.</p><p>From&#160;<strong>Camel 2.14.1</strong>: you can specify a default value to use if a property with the key does not exists, e.g., <strong><code>file.url:/some/path</code></strong> where the default value is the text after the colon, e.g., <strong><code>/some/path</code></strong>.</p><rich-text-body><p>From <strong>Camel 2.14.1</strong>: do <em>not</em> use a colon in the property key. The colon character is used as a token separator when providing a default value.</p></rich-text-body><h3 id="Properties-UsingPropertyResolver">Using&#160;<code>PropertyResolver</code></h3><p>Camel provides a pluggable mechanism that allows third-parties to specify their own resolver to use for the lookup of properties.</p><p>Camel provides a default implementation <strong><code>org.apache.camel.component.properties.DefaultPropertiesResolver</code></strong> which is capable of loading properties from the file system, classpath or <a shape="rect" hr
 ef="registry.html">Registry</a>. To indicate which source to use the location must contain the appropriate prefix.</p><p>The list of prefixes is:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Prefix</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ref:</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Lookup in the <a shape="rect" href="registry.html">Registry.</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>file:</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Load the from file system.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>classpath:</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Load from the classpath (this is also the default if no prefix is provided).</p></td></tr><tr><td colspan="1" r
 owspan="1" class="confluenceTd"><p><code>blueprint:</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Use a specific OSGi blueprint placeholder service.</p></td></tr></tbody></table></div><h3 id="Properties-DefiningLocation">Defining Location</h3><p>The <strong><code>PropertiesResolver</code></strong> must be configured with the location(s) to use when resolving properties. One or more locations can be given. Specifying multiple locations can be done a couple of ways: using either a single comma separated string, or an array of strings.</p><parameter ac:name="language">java</parameter><plain-text-body>pc.setLocation("com/mycompany/myprop.properties,com/mycompany/other.properties");
 pc.setLocation(new String[] {"com/mycompany/myprop.properties", "com/mycompany/other.properties"});&#160;</plain-text-body><div><p>From<strong> Camel 2.19.0</strong>: you can set which location can be discarded if missing by setting&#160; <strong><code>optional=true</code></strong>, (<strong><code>false</code></strong> by default).</p><p>Example:</p></div><div><p>&#160;</p><parameter ac:name="language">java</parameter><plain-text-body>pc.setLocations("com/mycompany/override.properties;optional=true,com/mycompany/defaults.properties");</plain-text-body><p>&#160;</p></div><h4 id="Properties-UsingSystemandEnvironmentVariablesinLocations">Using System and Environment Variables in Locations</h4><p><strong>Available as of Camel 2.7</strong></p><p>The location now supports using placeholders for JVM system properties and OS environments variables.</p><p>Example:</p><plain-text-body>location=file:${karaf.home}/etc/foo.properties
 </plain-text-body><p>In the location above we defined a location using the file scheme using the JVM system property with key <strong><code>karaf.home</code></strong>.</p><p>To use an OS environment variable instead you would have to prefix with <strong><code>env</code></strong>:</p><plain-text-body>location=file:${env:APP_HOME}/etc/foo.properties
 </plain-text-body><p>Where <strong><code>APP_HOME</code></strong> is an OS environment variable.</p><p>You can have multiple placeholders in the same location, such as:</p><plain-text-body>location=file:${env:APP_HOME}/etc/${prop.name}.properties
@@ -391,8 +391,8 @@ export $FOO_SERVICE_PORT=8888</plain-tex
   }
 }</plain-text-body><p>The function must implement the&#160;<strong><code>org.apache.camel.component.properties.PropertiesFunction</code></strong> interface. The method&#160;<strong><code>getName</code></strong> is &#160;the name of the function, e.g., <strong><code>beer</code></strong>. And the&#160;<strong><code>apply</code></strong> method is where we implement the custom logic to do. As the sample code is from an unit test, it just returns a value to refer to a mock endpoint.</p><p>To register a custom function from Java code is as shown below:</p><parameter ac:name="language">java</parameter><plain-text-body>PropertiesComponent pc = context.getComponent("properties", PropertiesComponent.class);
 pc.addFunction(new MyBeerFunction());
-</plain-text-body><h2 id="Properties-SeeAlso">See Also</h2><ul class="alternate"><li><a shape="rect" href="properties.html">Properties</a> component</li></ul></div> <div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="Properties-SeeAlso.1">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 class="alternate"><li><a shape="rect" href="jasypt.html">Jasypt</a> for using encrypted values e.g., passwords, in properties.</li></ul></div>
+</plain-text-body><h2 id="Properties-SeeAlso">See Also</h2><ul class="alternate"><li><a shape="rect" href="properties.html">Properties</a> component</li></ul> <h3 id="Properties-SeeAlso.1">See Also</h3>
+<ul><li><a shape="rect" href="configuring-camel.html">Configuring Camel</a></li><li><a shape="rect" href="component.html">Component</a></li><li><a shape="rect" href="endpoint.html">Endpoint</a></li><li><a shape="rect" href="getting-started.html">Getting Started</a></li></ul><ul class="alternate"><li><a shape="rect" href="jasypt.html">Jasypt</a> for using encrypted values e.g., passwords, in properties.</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/publish-subscribe-channel.html
==============================================================================
--- websites/production/camel/content/publish-subscribe-channel.html (original)
+++ websites/production/camel/content/publish-subscribe-channel.html Wed Oct 17 09:28:08 2018
@@ -128,9 +128,9 @@ Error rendering macro 'code': Invalid va
 &lt;/camelContext&gt;
 </pre>
 
-<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h4 id="PublishSubscribeChannel-UsingThisPattern">Using This Pattern</h4>
+<h4 id="PublishSubscribeChannel-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></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>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/python.html
==============================================================================
--- websites/production/camel/content/python.html (original)
+++ websites/production/camel/content/python.html Wed Oct 17 09:28:08 2018
@@ -114,7 +114,7 @@
         &lt;/choice&gt;
     &lt;/route&gt;
 </pre>
-</div></div><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="Python-ScriptContextOptions"><code>ScriptContext</code> Options</h3><p>&#160;</p><p>The&#160;<code>JSR-223</code> scripting language's&#160;<strong><code>ScriptContext</code></strong> is pre-configured with the following attributes all set at <strong><code>ENGINE_SCOPE</code></strong>.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Attribute</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Value</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span><code>camelContext</code><br clear="none"></span></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.CamelContext</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The Camel Context.</p></td></tr><tr><td colspan="
 1" rowspan="1" class="confluenceTd"><p><code>context</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.CamelContext</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The Camel Context (cannot be used in groovy).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>exchange</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Exchange</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The current Exchange.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.builder.script.PropertiesFunction</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Camel 2.9:</strong> Function with a <strong><code>resolve</code></strong> method to make it easier to use Camels <a shape="rect" href="properties.html">Properties</a> comp
 onent from scripts. See further below for example.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>request</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The&#160;<strong><code>IN</code></strong> message.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>response</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Deprecated</strong>: The&#160;<strong><code>OUT</code></strong> message. The&#160;<strong><code>OUT</code></strong> message is&#160;<strong><code>null</code></strong> by default. Use the <strong><code>IN</code></strong> message instead.</p></td></tr></tbody></table></div><p>See <a shape="rect" href="scripting-languages.html">Scripting Languages</a> for the list of languages with explicit
  DSL support.</p><h3 id="Python-PassingAdditionalArgumentstotheScriptingEngine">Passing Additional Arguments to the&#160;<code>ScriptingEngine</code></h3><p><strong>Available from Camel 2.8</strong></p><p>You can provide additional arguments to the <strong><code>ScriptingEngine</code></strong> using a header on the Camel message with the key <strong><code>CamelScriptArguments</code></strong>.</p><p>Example:</p><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">
+</div></div><p></p><h3 id="Python-ScriptContextOptions"><code>ScriptContext</code> Options</h3><p>&#160;</p><p>The&#160;<code>JSR-223</code> scripting language's&#160;<strong><code>ScriptContext</code></strong> is pre-configured with the following attributes all set at <strong><code>ENGINE_SCOPE</code></strong>.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Attribute</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Value</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span><code>camelContext</code><br clear="none"></span></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.CamelContext</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The Camel Context.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>context</code></p></td><td colspan="1" 
 rowspan="1" class="confluenceTd"><p><code>org.apache.camel.CamelContext</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The Camel Context (cannot be used in groovy).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>exchange</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Exchange</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The current Exchange.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.builder.script.PropertiesFunction</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Camel 2.9:</strong> Function with a <strong><code>resolve</code></strong> method to make it easier to use Camels <a shape="rect" href="properties.html">Properties</a> component from scripts. See further below for example.</p></td></tr><tr><td colspan="1" 
 rowspan="1" class="confluenceTd"><p><code>request</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The&#160;<strong><code>IN</code></strong> message.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>response</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.camel.Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>Deprecated</strong>: The&#160;<strong><code>OUT</code></strong> message. The&#160;<strong><code>OUT</code></strong> message is&#160;<strong><code>null</code></strong> by default. Use the <strong><code>IN</code></strong> message instead.</p></td></tr></tbody></table></div><p>See <a shape="rect" href="scripting-languages.html">Scripting Languages</a> for the list of languages with explicit DSL support.</p><h3 id="Python-PassingAdditionalArgumentstotheScriptingEngine">Pass
 ing Additional Arguments to the&#160;<code>ScriptingEngine</code></h3><p><strong>Available from Camel 2.8</strong></p><p>You can provide additional arguments to the <strong><code>ScriptingEngine</code></strong> using a header on the Camel message with the key <strong><code>CamelScriptArguments</code></strong>.</p><p>Example:</p><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">public void testArgumentsExample() throws Exception {
     getMockEndpoint("mock:result").expectedMessageCount(0);
     getMockEndpoint("mock:unmatched").expectedMessageCount(1);
@@ -143,7 +143,7 @@
  &lt;artifactId&gt;camel-script&lt;/artifactId&gt;
  &lt;version&gt;x.x.x&lt;/version&gt;
 &lt;/dependency&gt;</pre>
-</div></div></div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/quartz.html
==============================================================================
--- websites/production/camel/content/quartz.html (original)
+++ websites/production/camel/content/quartz.html Wed Oct 17 09:28:08 2018
@@ -136,8 +136,8 @@ from("quartz://myGroup/myTimerName?trigg
 <h3 id="Quartz-Specifyingtimezone">Specifying time zone</h3><p><strong>Available as of Camel 2.8.1</strong><br clear="none"> The Quartz Scheduler allows you to configure time zone per trigger. For example to use a timezone of your country, then you can do as follows:</p><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">quartz://groupName/timerName?cron=0+0/5+12-18+?+*+MON-FRI&amp;trigger.timeZone=Europe/Stockholm
 </pre>
-</div></div><p>The timeZone value is the values accepted by <code>java.util.TimeZone</code>.</p><p>In Camel 2.8.0 or older versions you would have to provide your custom <code>String</code> to <code>java.util.TimeZone</code> <a shape="rect" href="type-converter.html">Type Converter</a> to be able configure this from the endpoint uri.<br clear="none"> From Camel 2.8.1 onwards we have included such a <a shape="rect" href="type-converter.html">Type Converter</a> in the camel-core.</p><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="Quartz-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="quartz2.html">Quartz2</a></li><li><a shape="rect" href="timer.html">Timer</a></li></ul></div>
+</div></div><p>The timeZone value is the values accepted by <code>java.util.TimeZone</code>.</p><p>In Camel 2.8.0 or older versions you would have to provide your custom <code>String</code> to <code>java.util.TimeZone</code> <a shape="rect" href="type-converter.html">Type Converter</a> to be able configure this from the endpoint uri.<br clear="none"> From Camel 2.8.1 onwards we have included such a <a shape="rect" href="type-converter.html">Type Converter</a> in the camel-core.</p><p></p><h3 id="Quartz-SeeAlso">See Also</h3>
+<ul><li><a shape="rect" href="configuring-camel.html">Configuring Camel</a></li><li><a shape="rect" href="component.html">Component</a></li><li><a shape="rect" href="endpoint.html">Endpoint</a></li><li><a shape="rect" href="getting-started.html">Getting Started</a></li></ul><ul><li><a shape="rect" href="quartz2.html">Quartz2</a></li><li><a shape="rect" href="timer.html">Timer</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/quartz2.html
==============================================================================
--- websites/production/camel/content/quartz2.html (original)
+++ websites/production/camel/content/quartz2.html Wed Oct 17 09:28:08 2018
@@ -151,8 +151,8 @@ quartz2://timerName?cron=expression
 <pre class="syntaxhighlighter-pre" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Default" data-theme="Default">    from("file:inbox?scheduler=spring&amp;scheduler.cron=0/2+*+*+*+*+?")
        .to("bean:process");
 </pre>
-</div></div><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="Quartz2-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="quartz.html">Quartz</a></li><li><a shape="rect" href="timer.html">Timer</a></li></ul></div>
+</div></div><p></p><h3 id="Quartz2-SeeAlso">See Also</h3>
+<ul><li><a shape="rect" href="configuring-camel.html">Configuring Camel</a></li><li><a shape="rect" href="component.html">Component</a></li><li><a shape="rect" href="endpoint.html">Endpoint</a></li><li><a shape="rect" href="getting-started.html">Getting Started</a></li></ul><ul><li><a shape="rect" href="quartz.html">Quartz</a></li><li><a shape="rect" href="timer.html">Timer</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/queue.html
==============================================================================
--- websites/production/camel/content/queue.html (original)
+++ websites/production/camel/content/queue.html Wed Oct 17 09:28:08 2018
@@ -108,8 +108,8 @@ queue:someName
 
 <p>Where <strong>someName</strong> can be any string to uniquely identify the endpoint within the current <a shape="rect" href="camelcontext.html">CamelContext</a></p>
 
-<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="Queue-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>
+<h3 id="Queue-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>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/rabbitmq.html
==============================================================================
--- websites/production/camel/content/rabbitmq.html (original)
+++ websites/production/camel/content/rabbitmq.html Wed Oct 17 09:28:08 2018
@@ -131,8 +131,8 @@
 </div></div><p>To send messages to an exchange called C</p><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">...to("rabbitmq://localhost/B")
 </pre>
-</div></div><p></p><div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="RabbitMQ-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>
+</div></div><p></p><h3 id="RabbitMQ-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>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/rcode.html
==============================================================================
--- websites/production/camel/content/rcode.html (original)
+++ websites/production/camel/content/rcode.html Wed Oct 17 09:28:08 2018
@@ -139,8 +139,8 @@ template.sendBody("direct:rcode", "c &lt
 <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> user </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> String </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> null </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Configures the username to authenticate secured Rserve instances </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> password </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> String </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> null </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Adds the password to the endpoint to access a
  secured R environment </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> bufferSize </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> long </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 2097152 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Defines the buffer size for the transport between Rserve and the rcode component. The lowest possible value is 32KB, the highest value is at 1GB. Both values are bound to the available RAM. </p></td></tr></tbody></table></div>
 
 
-<div class="conf-macro output-block" data-hasbody="false" data-macro-name="include"><h3 id="RCode-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>
+<h3 id="RCode-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>
         </td>
         <td valign="top">
           <div class="navigation">



Mime
View raw message