Modified: websites/production/camel/content/component.html
==============================================================================
--- websites/production/camel/content/component.html (original)
+++ websites/production/camel/content/component.html Tue Sep 23 12:50:14 2014
@@ -136,7 +136,10 @@
 </div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>For 
working with <a shape="rect" class="external-link" 
href="http://aws.amazon.com/s3/"; rel="nofollow">Amazon's Simple Storage Service 
(S3)</a>.</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p><a shape="rect" href="bean.html">Bean</a> / 
camel-core</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
 <script class="theme: Default; brush: plain; gutter: false" 
type="syntaxhighlighter"><![CDATA[bean:beanName[?options]
 ]]></script>
-</div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Uses the 
<a shape="rect" href="bean-binding.html">Bean Binding</a> to bind message 
exchanges to beans in the <a shape="rect" href="registry.html">Registry</a>. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p><a shape="rect" href="bean-validator.html">Bean 
Validator</a> / camel-bean-validator</p><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Uses the 
<a shape="rect" href="bean-binding.html">Bean Binding</a> to bind message 
exchanges to beans in the <a shape="rect" href="registry.html">Registry</a>. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p><a shape="rect" 
href="beanstalk.html">Beanstalk</a><span> / camel-beanstalk</span></p><div 
class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
+<script class="theme: Default; brush: plain; gutter: false" 
type="syntaxhighlighter"><![CDATA[beanstalk:hostname:port/tube[?options]
+]]></script>
+</div></div><p><span><br clear="none"></span></p></td><td colspan="1" 
rowspan="1" class="confluenceTd">For working with <a shape="rect" 
class="external-link" href="http://aws.amazon.com/elasticbeanstalk/"; 
rel="nofollow">Amazon's Beanstalk</a>.</td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p><a shape="rect" href="bean-validator.html">Bean 
Validator</a> / camel-bean-validator</p><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: plain; gutter: false" 
type="syntaxhighlighter"><![CDATA[bean-validator:label[?options]
 ]]></script>
 </div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Validates 
the payload of a message using the Java Validation API (<a shape="rect" 
class="external-link" href="http://jcp.org/en/jsr/detail?id=303"; 
rel="nofollow">JSR 303</a> and JAXP Validation) and its reference 
implementation <a shape="rect" class="external-link" 
href="http://docs.jboss.org/hibernate/stable/validator/reference/en/html_single/";
 rel="nofollow">Hibernate Validator</a></p></td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"><p><a shape="rect" href="box.html">Box</a> / 
camel-box</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
@@ -387,10 +390,16 @@ disruptor-vm:someName[?&lt;option&gt;]
 </div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sending 
passive checks to <a shape="rect" class="external-link" 
href="http://www.nagios.org/"; rel="nofollow">Nagios</a> using <a shape="rect" 
class="external-link" href="http://code.google.com/p/jsendnsca/"; 
rel="nofollow">JSendNSCA</a></p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p><a shape="rect" href="netty.html">Netty</a> / 
camel-netty</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
 <script class="theme: Default; brush: plain; gutter: false" 
type="syntaxhighlighter"><![CDATA[netty:&lt;tcp|udp&gt;//host[:port][?options]
 ]]></script>
-</div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Working 
with TCP and UDP protocols using Java NIO based capabilities offered by the <a 
shape="rect" class="external-link" href="http://netty.io/"; 
rel="nofollow">Netty</a> project</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p><a shape="rect" href="netty-http.html">Netty HTTP</a> / 
camel-netty-http</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
+</div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Working 
with TCP and UDP protocols using Java NIO based capabilities offered by the <a 
shape="rect" class="external-link" href="http://netty.io/"; 
rel="nofollow">Netty</a> project</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p><a shape="rect" href="netty4.html">Netty4</a><span> / 
camel-netty4</span></p><div class="code panel pdl" style="border-width: 
1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: plain; gutter: false" 
type="syntaxhighlighter"><![CDATA[netty4:&lt;tcp|udp&gt;//host[:port][?options]
+]]></script>
+</div></div><p><span><br clear="none"></span></p></td><td colspan="1" 
rowspan="1" class="confluenceTd">&#160;<span>Working with TCP and UDP protocols 
using Java NIO based capabilities offered by the </span><a shape="rect" 
class="external-link" href="http://netty.io/"; rel="nofollow">Netty</a><span> 
project </span></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p><a shape="rect" href="netty-http.html">Netty HTTP</a> / 
camel-netty-http</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
 <script class="theme: Default; brush: plain; gutter: false" 
type="syntaxhighlighter"><![CDATA[netty-http:http:[port]/context-path[?options]
 ]]></script>
-</div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Netty 
HTTP server and client using the <a shape="rect" class="external-link" 
href="http://netty.io/"; rel="nofollow">Netty</a> project</p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" 
href="olingo2.html">Olingo2</a> / camel-olingo2</p><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Netty 
HTTP server and client using the <a shape="rect" class="external-link" 
href="http://netty.io/"; rel="nofollow">Netty</a> project</p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" 
href="netty4-http.html">Netty4 HTTP</a> / camel-netty4-http</p><div class="code 
panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: plain; gutter: false" 
type="syntaxhighlighter"><![CDATA[netty4-http:http:[port]/context-path[?options]
+]]></script>
+</div></div></td><td colspan="1" rowspan="1" 
class="confluenceTd">&#160;<span>Netty HTTP server and client using the 
</span><a shape="rect" class="external-link" href="http://netty.io/"; 
rel="nofollow">Netty</a><span> project 4.x</span></td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"><p><a shape="rect" 
href="olingo2.html">Olingo2</a> / camel-olingo2</p><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: plain; gutter: false" 
type="syntaxhighlighter"><![CDATA[olingo2:endpoint/resource-path[?options]
 ]]></script>
 </div></div></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>Communicates with <a shape="rect" class="external-link" 
href="http://www.odata.org/documentation/odata-version-2-0"; 
rel="nofollow">OData 2.0</a> services using <a shape="rect" 
class="external-link" href="http://olingo.apache.org/";>Apache Olingo</a> 
2.0.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a 
shape="rect" href="optaplanner.html">O</a><a shape="rect" 
href="openshift.html">penshift</a> / camel-openshift</p><div class="code panel 
pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
@@ -455,7 +464,10 @@ disruptor-vm:someName[?&lt;option&gt;]
 </div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>To 
integrate with Salesforce</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p><a shape="rect" href="sap-netweaver.html">SAP 
NetWeaver</a> / camel-sap-netweaver</p><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: plain; gutter: false" 
type="syntaxhighlighter"><![CDATA[sap-netweaver:hostName[:port][?options]
 ]]></script>
-</div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>To 
integrate with <a shape="rect" class="external-link" 
href="http://scn.sap.com/docs/DOC-31221"; rel="nofollow">SAP NetWeaver 
Gateway</a></p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p><a shape="rect" href="seda.html">SEDA</a> / 
camel-core</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
+</div></div></td><td colspan="1" rowspan="1" class="confluenceTd"><p>To 
integrate with <a shape="rect" class="external-link" 
href="http://scn.sap.com/docs/DOC-31221"; rel="nofollow">SAP NetWeaver 
Gateway</a></p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p><a shape="rect" href="schematron.html">schematron</a> / 
camel-schematron</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
+<script class="theme: Default; brush: plain; gutter: false" 
type="syntaxhighlighter"><![CDATA[schematron://path?[options]
+]]></script>
+</div></div></td><td colspan="1" rowspan="1" class="confluenceTd">Camel 
component of <a shape="rect" class="external-link" 
href="http://www.schematron.com/index.html"; 
rel="nofollow">Schematron</a>&#160;which supports to validate the XML instance 
documents.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a 
shape="rect" href="seda.html">SEDA</a> / camel-core</p><div class="code panel 
pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: plain; gutter: false" 
type="syntaxhighlighter"><![CDATA[seda:someName[?options]
 ]]></script>
 </div></div></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>Asynchronous call to another endpoint in the same Camel 
Context</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a 
shape="rect" href="servlet.html">SERVLET</a> / camel-servlet</p><div 
class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">

Modified: websites/production/camel/content/csv.html
==============================================================================
--- websites/production/camel/content/csv.html (original)
+++ websites/production/camel/content/csv.html Tue Sep 23 12:50:14 2014
@@ -101,7 +101,7 @@ from(&quot;direct:start&quot;).
 </div></div><p>... you will end up with a String containing this CSV 
message</p><div class="preformatted panel" style="border-width: 1px;"><div 
class="preformattedContent panelContent">
 <pre>abc,123</pre>
 </div></div><p>Sending the Map below through this route will result in a CSV 
message that looks like <code>foo,bar</code></p><h3 
id="CSV-UnmarshallingaCSVmessageintoaJavaList">Unmarshalling a CSV message into 
a Java List</h3><p>Unmarshalling will transform a CSV messsage into a Java List 
with CSV file lines (containing another List with all the field 
values).</p><p>An example: we have a CSV file with names of persons, their IQ 
and their current activity.</p><div class="code panel pdl" style="border-width: 
1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: sql; gutter: false" 
type="syntaxhighlighter"><![CDATA[
+<script class="theme: Default; brush: text; gutter: false" 
type="syntaxhighlighter"><![CDATA[
 Jack Dalton, 115, mad at Averell
 Joe Dalton, 105, calming Joe
 William Dalton, 105, keeping Joe from killing Averell

Modified: websites/production/camel/content/cxf.html
==============================================================================
--- websites/production/camel/content/cxf.html (original)
+++ websites/production/camel/content/cxf.html Tue Sep 23 12:50:14 2014
@@ -99,11 +99,11 @@
                     </div>
     </div>
 <p>The <strong>cxf:</strong> component provides integration with <a 
shape="rect" href="http://cxf.apache.org";>Apache CXF</a> for connecting to 
JAX-WS services hosted in CXF.</p><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1410837596425 {padding: 0px;}
-div.rbtoc1410837596425 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1410837596425 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1411476475995 {padding: 0px;}
+div.rbtoc1411476475995 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1411476475995 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1410837596425">
+/*]]>*/</style></p><div class="toc-macro rbtoc1411476475995">
 <ul class="toc-indentation"><li><a shape="rect" href="#CXF-CXFComponent">CXF 
Component</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#CXF-URIformat">URI 
format</a></li><li><a shape="rect" href="#CXF-Options">Options</a>
 <ul class="toc-indentation"><li><a shape="rect" 
href="#CXF-Thedescriptionsofthedataformats">The descriptions of the 
dataformats</a>

Modified: websites/production/camel/content/download-archives.html
==============================================================================
--- websites/production/camel/content/download-archives.html (original)
+++ websites/production/camel/content/download-archives.html Tue Sep 23 
12:50:14 2014
@@ -82,7 +82,7 @@
                             <p>The links below contains the release notes for 
all the Camel release. However if you want to download the release, you 
<strong>must</strong> use the download archives, which is the two links 
above.</p>
                     </div>
     </div>
-<p>All time Apache Camel releases notes:</p><p></p><ul 
class="childpages-macro"><li><a shape="rect" 
href="camel-100-release.html">Camel 1.0.0 Release</a></li><li><a shape="rect" 
href="camel-110-release.html">Camel 1.1.0 Release</a></li><li><a shape="rect" 
href="camel-120-release.html">Camel 1.2.0 Release</a></li><li><a shape="rect" 
href="camel-130-release.html">Camel 1.3.0 Release</a></li><li><a shape="rect" 
href="camel-140-release.html">Camel 1.4.0 Release</a></li><li><a shape="rect" 
href="camel-150-release.html">Camel 1.5.0 Release</a></li><li><a shape="rect" 
href="camel-160-release.html">Camel 1.6.0 Release</a></li><li><a shape="rect" 
href="camel-161-release.html">Camel 1.6.1 Release</a></li><li><a shape="rect" 
href="camel-162-release.html">Camel 1.6.2 Release</a></li><li><a shape="rect" 
href="camel-163-release.html">Camel 1.6.3 Release</a></li><li><a shape="rect" 
href="camel-164-release.html">Camel 1.6.4 Release</a></li><li><a shape="rect" 
href="camel-200-release.html">Camel 2.0
 .0 Release</a></li><li><a shape="rect" href="camel-20-m1-release.html">Camel 
2.0-M1 Release</a></li><li><a shape="rect" 
href="camel-20-m2-release.html">Camel 2.0-M2 Release</a></li><li><a 
shape="rect" href="camel-20-m3-release.html">Camel 2.0-M3 
Release</a></li><li><a shape="rect" href="camel-210-release.html">Camel 2.1.0 
Release</a></li><li><a shape="rect" href="camel-220-release.html">Camel 2.2.0 
Release</a></li><li><a shape="rect" href="camel-230-release.html">Camel 2.3.0 
Release</a></li><li><a shape="rect" href="camel-240-release.html">Camel 2.4.0 
Release</a></li><li><a shape="rect" href="camel-250-release.html">Camel 2.5.0 
Release</a></li><li><a shape="rect" href="camel-260-release.html">Camel 2.6.0 
Release</a></li><li><a shape="rect" href="camel-270-release.html">Camel 2.7.0 
Release</a></li><li><a shape="rect" href="camel-271-release.html">Camel 2.7.1 
Release</a></li><li><a shape="rect" href="camel-272-release.html">Camel 2.7.2 
Release</a></li><li><a shape="rect" href="camel-2
 73-release.html">Camel 2.7.3 Release</a></li><li><a shape="rect" 
href="camel-274-release.html">Camel 2.7.4 Release</a></li><li><a shape="rect" 
href="camel-275-release.html">Camel 2.7.5 Release</a></li><li><a shape="rect" 
href="camel-280-release.html">Camel 2.8.0 Release</a></li><li><a shape="rect" 
href="camel-281-release.html">Camel 2.8.1 Release</a></li><li><a shape="rect" 
href="camel-282-release.html">Camel 2.8.2 Release</a></li><li><a shape="rect" 
href="camel-283-release.html">Camel 2.8.3 Release</a></li><li><a shape="rect" 
href="camel-284-release.html">Camel 2.8.4 Release</a></li><li><a shape="rect" 
href="camel-285-release.html">Camel 2.8.5 Release</a></li><li><a shape="rect" 
href="camel-286-release.html">Camel 2.8.6 Release</a></li><li><a shape="rect" 
href="camel-290-release.html">Camel 2.9.0 Release</a></li><li><a shape="rect" 
href="camel-291-release.html">Camel 2.9.1 Release</a></li><li><a shape="rect" 
href="camel-292-release.html">Camel 2.9.2 Release</a></li><li><a shape="re
 ct" href="camel-293-release.html">Camel 2.9.3 Release</a></li><li><a 
shape="rect" href="camel-294-release.html">Camel 2.9.4 Release</a></li><li><a 
shape="rect" href="camel-295-release.html">Camel 2.9.5 Release</a></li><li><a 
shape="rect" href="camel-296-release.html">Camel 2.9.6 Release</a></li><li><a 
shape="rect" href="camel-297-release.html">Camel 2.9.7 Release</a></li><li><a 
shape="rect" href="camel-298-release.html">Camel 2.9.8 Release</a></li><li><a 
shape="rect" href="camel-2100-release.html">Camel 2.10.0 Release</a></li><li><a 
shape="rect" href="camel-2101-release.html">Camel 2.10.1 Release</a></li><li><a 
shape="rect" href="camel-2102-release.html">Camel 2.10.2 Release</a></li><li><a 
shape="rect" href="camel-2103-release.html">Camel 2.10.3 Release</a></li><li><a 
shape="rect" href="camel-2104-release.html">Camel 2.10.4 Release</a></li><li><a 
shape="rect" href="camel-2105-release.html">Camel 2.10.5 Release</a></li><li><a 
shape="rect" href="camel-2106-release.html">Camel 2.10.6 R
 elease</a></li><li><a shape="rect" href="camel-2107-release.html">Camel 2.10.7 
Release</a></li><li><a shape="rect" href="camel-2110-release.html">Camel 2.11.0 
Release</a></li><li><a shape="rect" href="camel-2111-release.html">Camel 2.11.1 
Release</a></li><li><a shape="rect" href="camel-2112-release.html">Camel 2.11.2 
release</a></li><li><a shape="rect" href="camel-2113-release.html">Camel 2.11.3 
release</a></li><li><a shape="rect" href="camel-2114-release.html">Camel 2.11.4 
Release</a></li><li><a shape="rect" href="camel-2120-release.html">Camel 2.12.0 
Release</a></li><li><a shape="rect" href="camel-2121-release.html">Camel 2.12.1 
Release</a></li><li><a shape="rect" href="camel-2122-release.html">Camel 2.12.2 
Release</a></li><li><a shape="rect" href="camel-2123-release.html">Camel 2.12.3 
Release</a></li><li><a shape="rect" href="camel-2124-release.html">Camel 2.12.4 
Release</a></li><li><a shape="rect" href="camel-2130-release.html">Camel 2.13.0 
Release</a></li><li><a shape="rect" hr
 ef="camel-2131-release.html">Camel 2.13.1 Release</a></li><li><a shape="rect" 
href="camel-2132-release.html">Camel 2.13.2 Release</a></li><li><a shape="rect" 
href="download-archives.html">Download Archives</a></li></ul></div>
+<p>All time Apache Camel releases notes:</p><p></p><ul 
class="childpages-macro"><li><a shape="rect" 
href="camel-100-release.html">Camel 1.0.0 Release</a></li><li><a shape="rect" 
href="camel-110-release.html">Camel 1.1.0 Release</a></li><li><a shape="rect" 
href="camel-120-release.html">Camel 1.2.0 Release</a></li><li><a shape="rect" 
href="camel-130-release.html">Camel 1.3.0 Release</a></li><li><a shape="rect" 
href="camel-140-release.html">Camel 1.4.0 Release</a></li><li><a shape="rect" 
href="camel-150-release.html">Camel 1.5.0 Release</a></li><li><a shape="rect" 
href="camel-160-release.html">Camel 1.6.0 Release</a></li><li><a shape="rect" 
href="camel-161-release.html">Camel 1.6.1 Release</a></li><li><a shape="rect" 
href="camel-162-release.html">Camel 1.6.2 Release</a></li><li><a shape="rect" 
href="camel-163-release.html">Camel 1.6.3 Release</a></li><li><a shape="rect" 
href="camel-164-release.html">Camel 1.6.4 Release</a></li><li><a shape="rect" 
href="camel-200-release.html">Camel 2.0
 .0 Release</a></li><li><a shape="rect" href="camel-20-m1-release.html">Camel 
2.0-M1 Release</a></li><li><a shape="rect" 
href="camel-20-m2-release.html">Camel 2.0-M2 Release</a></li><li><a 
shape="rect" href="camel-20-m3-release.html">Camel 2.0-M3 
Release</a></li><li><a shape="rect" href="camel-210-release.html">Camel 2.1.0 
Release</a></li><li><a shape="rect" href="camel-220-release.html">Camel 2.2.0 
Release</a></li><li><a shape="rect" href="camel-230-release.html">Camel 2.3.0 
Release</a></li><li><a shape="rect" href="camel-240-release.html">Camel 2.4.0 
Release</a></li><li><a shape="rect" href="camel-250-release.html">Camel 2.5.0 
Release</a></li><li><a shape="rect" href="camel-260-release.html">Camel 2.6.0 
Release</a></li><li><a shape="rect" href="camel-270-release.html">Camel 2.7.0 
Release</a></li><li><a shape="rect" href="camel-271-release.html">Camel 2.7.1 
Release</a></li><li><a shape="rect" href="camel-272-release.html">Camel 2.7.2 
Release</a></li><li><a shape="rect" href="camel-2
 73-release.html">Camel 2.7.3 Release</a></li><li><a shape="rect" 
href="camel-274-release.html">Camel 2.7.4 Release</a></li><li><a shape="rect" 
href="camel-275-release.html">Camel 2.7.5 Release</a></li><li><a shape="rect" 
href="camel-280-release.html">Camel 2.8.0 Release</a></li><li><a shape="rect" 
href="camel-281-release.html">Camel 2.8.1 Release</a></li><li><a shape="rect" 
href="camel-282-release.html">Camel 2.8.2 Release</a></li><li><a shape="rect" 
href="camel-283-release.html">Camel 2.8.3 Release</a></li><li><a shape="rect" 
href="camel-284-release.html">Camel 2.8.4 Release</a></li><li><a shape="rect" 
href="camel-285-release.html">Camel 2.8.5 Release</a></li><li><a shape="rect" 
href="camel-286-release.html">Camel 2.8.6 Release</a></li><li><a shape="rect" 
href="camel-290-release.html">Camel 2.9.0 Release</a></li><li><a shape="rect" 
href="camel-291-release.html">Camel 2.9.1 Release</a></li><li><a shape="rect" 
href="camel-292-release.html">Camel 2.9.2 Release</a></li><li><a shape="re
 ct" href="camel-293-release.html">Camel 2.9.3 Release</a></li><li><a 
shape="rect" href="camel-294-release.html">Camel 2.9.4 Release</a></li><li><a 
shape="rect" href="camel-295-release.html">Camel 2.9.5 Release</a></li><li><a 
shape="rect" href="camel-296-release.html">Camel 2.9.6 Release</a></li><li><a 
shape="rect" href="camel-297-release.html">Camel 2.9.7 Release</a></li><li><a 
shape="rect" href="camel-298-release.html">Camel 2.9.8 Release</a></li><li><a 
shape="rect" href="camel-2100-release.html">Camel 2.10.0 Release</a></li><li><a 
shape="rect" href="camel-2101-release.html">Camel 2.10.1 Release</a></li><li><a 
shape="rect" href="camel-2102-release.html">Camel 2.10.2 Release</a></li><li><a 
shape="rect" href="camel-2103-release.html">Camel 2.10.3 Release</a></li><li><a 
shape="rect" href="camel-2104-release.html">Camel 2.10.4 Release</a></li><li><a 
shape="rect" href="camel-2105-release.html">Camel 2.10.5 Release</a></li><li><a 
shape="rect" href="camel-2106-release.html">Camel 2.10.6 R
 elease</a></li><li><a shape="rect" href="camel-2107-release.html">Camel 2.10.7 
Release</a></li><li><a shape="rect" href="camel-2110-release.html">Camel 2.11.0 
Release</a></li><li><a shape="rect" href="camel-2111-release.html">Camel 2.11.1 
Release</a></li><li><a shape="rect" href="camel-2112-release.html">Camel 2.11.2 
release</a></li><li><a shape="rect" href="camel-2113-release.html">Camel 2.11.3 
release</a></li><li><a shape="rect" href="camel-2114-release.html">Camel 2.11.4 
Release</a></li><li><a shape="rect" href="camel-2120-release.html">Camel 2.12.0 
Release</a></li><li><a shape="rect" href="camel-2121-release.html">Camel 2.12.1 
Release</a></li><li><a shape="rect" href="camel-2122-release.html">Camel 2.12.2 
Release</a></li><li><a shape="rect" href="camel-2123-release.html">Camel 2.12.3 
Release</a></li><li><a shape="rect" href="camel-2124-release1.html">Camel 
2.12.4 Release1</a></li><li><a shape="rect" 
href="camel-2130-release.html">Camel 2.13.0 Release</a></li><li><a shape="rect" 
 href="camel-2131-release.html">Camel 2.13.1 Release</a></li><li><a 
shape="rect" href="camel-2132-release.html">Camel 2.13.2 Release</a></li><li><a 
shape="rect" href="camel-2140-release.html">Camel 2.14.0 Release</a></li><li><a 
shape="rect" href="download-archives.html">Download Archives</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/elasticsearch.html
==============================================================================
--- websites/production/camel/content/elasticsearch.html (original)
+++ websites/production/camel/content/elasticsearch.html Tue Sep 23 12:50:14 
2014
@@ -102,7 +102,7 @@
                             <p>if you want to run against a local (in 
JVM/classloader) ElasticSearch server, just set the clusterName value in the 
URI to "local". See the <a shape="rect" class="external-link" 
href="http://www.elasticsearch.org/guide/reference/java-api/client.html"; 
rel="nofollow">client guide</a> for more details.</p>
                     </div>
     </div>
-<h3 id="ElasticSearch-EndpointOptions">Endpoint Options</h3><p>The following 
options may be configured on the ElasticSearch endpoint. All are required to be 
set as either an endpoint URI parameter or as a header (headers override 
endpoint properties)</p><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>description</p></th></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"><p>operation</p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>required, indicates the operation to 
perform</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p>indexName</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>the name of the index to act 
against</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p>indexType</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>the type of the index to act against</p></td></tr
 ><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>ip</p></td><td 
 >colspan="1" rowspan="1" class="confluenceTd"><p>the TransportClient remote 
 >host ip to use <strong>Camel 2.12</strong></p></td></tr><tr><td colspan="1" 
 >rowspan="1" class="confluenceTd"><p>port</p></td><td colspan="1" rowspan="1" 
 >class="confluenceTd"><p>the TransportClient remote port to use (defaults to 
 >9300) <strong>Camel 2.12</strong></p></td></tr></tbody></table></div><h3 
 >id="ElasticSearch-MessageOperations">Message Operations</h3><p>The following 
 >ElasticSearch operations are currently supported. Simply set an endpoint URI 
 >option or exchange header with a key of "operation" and a value set to one of 
 >the following. Some operations also require other parameters or the message 
 >body to be set.</p><div class="table-wrap"><table 
 >class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
 >class="confluenceTh"><p>operation</p></th><th colspan="1" rowspan="1" 
 >class="confluenceTh"><p>message body</p></th><th colspan=
 "1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"><p>INDEX</p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>Map, String, byte[] or XContentBuilder 
content to index</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>adds content to an index and returns the content's 
indexId in the body</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p>GET_BY_ID</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>index id of content to retrieve</p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>retrives the specified index and returns a 
GetResult object in the body</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p>DELETE</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>index id of content to delete</p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>deletes the specified indexId and returns a 
DeleteResult object in the body</p></td></tr><tr><
 td colspan="1" rowspan="1" class="confluenceTd"><p 
class="p1">BULK_INDEX</p></td><td colspan="1" rowspan="1" 
class="confluenceTd">a&#160;<strong>List</strong>&#160;or 
<strong>Collection</strong> of any type that is already accepted 
(XContentBuilder, Map, byte[], String)</td><td colspan="1" rowspan="1" 
class="confluenceTd"><strong>Since Camel 2.14, </strong>adds content to an 
index and return a&#160;List of the id&#160;of the successfully indexed 
documents in the body</td></tr></tbody></table></div><h3 
id="ElasticSearch-IndexExample">Index Example</h3><p>Below is a simple INDEX 
example</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
+<h3 id="ElasticSearch-EndpointOptions">Endpoint Options</h3><p>The following 
options may be configured on the ElasticSearch endpoint. All are required to be 
set as either an endpoint URI parameter or as a header (headers override 
endpoint properties)</p><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>description</p></th></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"><p>operation</p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>required, indicates the operation to 
perform</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p>indexName</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>the name of the index to act 
against</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p>indexType</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>the type of the index to act against</p></td></tr
 ><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>ip</p></td><td 
 >colspan="1" rowspan="1" class="confluenceTd"><p>the TransportClient remote 
 >host ip to use <strong>Camel 2.12</strong></p></td></tr><tr><td colspan="1" 
 >rowspan="1" class="confluenceTd"><p>port</p></td><td colspan="1" rowspan="1" 
 >class="confluenceTd"><p>the TransportClient remote port to use (defaults to 
 >9300) <strong>Camel 2.12</strong></p></td></tr></tbody></table></div><h3 
 >id="ElasticSearch-MessageOperations">Message Operations</h3><p>The following 
 >ElasticSearch operations are currently supported. Simply set an endpoint URI 
 >option or exchange header with a key of "operation" and a value set to one of 
 >the following. Some operations also require other parameters or the message 
 >body to be set.</p><div class="table-wrap"><table 
 >class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
 >class="confluenceTh"><p>operation</p></th><th colspan="1" rowspan="1" 
 >class="confluenceTh"><p>message body</p></th><th colspan=
 "1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"><p>INDEX</p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>Map, String, byte[] or XContentBuilder 
content to index</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>adds content to an index and returns the content's 
indexId in the body.</p><p><strong>Since Camel 2.15,</strong> you can set the 
<span style="line-height: 1.4285715;">indexId by setting the message header 
with the key "indexId".</span></p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p>GET_BY_ID</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>index id of content to retrieve</p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>retrieves the specified index and returns a 
GetResult object in the body</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p>DELETE</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>index id of conten
 t to delete</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>deletes the specified indexId and returns a 
DeleteResult object in the body</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p class="p1">BULK_INDEX</p></td><td colspan="1" 
rowspan="1" class="confluenceTd">a&#160;<strong>List</strong>&#160;or 
<strong>Collection</strong> of any type that is already accepted 
(XContentBuilder, Map, byte[], String)</td><td colspan="1" rowspan="1" 
class="confluenceTd"><strong>Since Camel 2.14, </strong>adds content to an 
index and return a&#160;List of the id&#160;of the successfully indexed 
documents in the body</td></tr></tbody></table></div><h3 
id="ElasticSearch-IndexExample">Index Example</h3><p>Below is a simple INDEX 
example</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[from(&quot;direct:index&quot;)
 
.to(&quot;elasticsearch://local?operation=INDEX&amp;indexName=twitter&amp;indexType=tweet&quot;);
 ]]></script>

Modified: websites/production/camel/content/file-language.html
==============================================================================
--- websites/production/camel/content/file-language.html (original)
+++ websites/production/camel/content/file-language.html Tue Sep 23 12:50:14 
2014
@@ -85,92 +85,33 @@
        <tbody>
         <tr>
         <td valign="top" width="100%">
-<div class="wiki-content maincontent"><h2 
id="FileLanguage-FileExpressionLanguage">File Expression Language</h2>
-
-    <div class="aui-message hint shadowed information-macro">
+<div class="wiki-content maincontent"><h2 
id="FileLanguage-FileExpressionLanguage">File Expression Language</h2>    <div 
class="aui-message hint shadowed information-macro">
                     <p class="title">File language is now merged with Simple 
language</p>
                             <span class="aui-icon icon-hint">Icon</span>
                 <div class="message-content">
-                            
-<p>From Camel 2.2 onwards, the file language is now merged with <a 
shape="rect" href="simple.html">Simple</a> language which means you can use all 
the file syntax directly within the simple language.</p>
+                            <p>From Camel 2.2 onwards, the file language is 
now merged with <a shape="rect" href="simple.html">Simple</a> language which 
means you can use all the file syntax directly within the simple language.</p>
                     </div>
     </div>
-
-
-<p>The File Expression Language is an extension to the <a shape="rect" 
href="simple.html">Simple</a> language, adding file related capabilities. These 
capabilities are related to common use cases working with file path and names. 
The goal is to allow expressions to be used with the <a shape="rect" 
href="file2.html">File</a> and <a shape="rect" href="ftp.html">FTP</a> 
components for setting dynamic file patterns for both consumer and producer. 
</p>
-
-<h3 id="FileLanguage-Syntax">Syntax</h3>
-<p>This language is an <strong>extension</strong> to the <a shape="rect" 
href="simple.html">Simple</a> language so the <a shape="rect" 
href="simple.html">Simple</a> syntax applies also. So the table below only 
lists the additional. <br clear="none">
-As opposed to <a shape="rect" href="simple.html">Simple</a> language <a 
shape="rect" href="file-language.html">File Language</a> also supports <a 
shape="rect" href="constant.html">Constant</a> expressions so you can enter a 
fixed filename.</p>
-
-<p>All the file tokens use the same expression name as the method on the 
<code>java.io.File</code> object, for instance <code>file:absolute</code> 
refers to the <code>java.io.File.getAbsolute()</code> method. Notice that not 
all expressions are supported by the current Exchange. For instance the <a 
shape="rect" href="ftp.html">FTP</a> component supports some of the options, 
where as the <a shape="rect" href="file2.html">File</a> component supports all 
of them.</p>
-
-<div class="confluenceTableSmall">
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th 
colspan="1" rowspan="1" class="confluenceTh"><p> Expression </p></th><th 
colspan="1" rowspan="1" class="confluenceTh"><p> Type </p></th><th colspan="1" 
rowspan="1" class="confluenceTh"><p> File Consumer </p></th><th colspan="1" 
rowspan="1" class="confluenceTh"><p> File Producer </p></th><th colspan="1" 
rowspan="1" class="confluenceTh"><p> FTP Consumer </p></th><th colspan="1" 
rowspan="1" class="confluenceTh"><p> FTP Producer </p></th><th colspan="1" 
rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:name </td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> String </p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspa
 n="1" rowspan="1" class="confluenceTd"><p> refers to the file name (is 
relative to the starting directory, see note below) </p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:name.ext </td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> String </p></td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> yes </p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> <strong>Camel 2.3:</strong> refers to the file 
extension only </p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> file:name.noext </td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> String </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>
  yes </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> no 
</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> refers to the 
file name with no extension (is relative to the starting directory, see note 
below) </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
file:onlyname </td><td colspan="1" rowspan="1" class="confluenceTd"><p> String 
</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> yes </p></td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> no </p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> refers to the file name only with no leading paths. 
</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
file:onlyname.noext </td><td colspan="1" rowspan="1" class="confluenceTd"><p> 
String </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> yes 
</p></td><td colspan="1" 
 rowspan="1" class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> refers to the file name only with no extension and 
with no leading paths. </p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> file:ext </td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> String </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> refers to the file extension only 
</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> file:parent 
</td><td colspan="1" rowspan="1" class="confluenceTd"><p> String </p></td><td 
colspan="1" rowspan="1" class="c
 onfluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> refers to the file parent </p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:path </td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> String </p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> refers to the file path </p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:absolute </td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> Boolean </p></td><td 
colspan="1" rowspan="1" class="confluenc
 eTd"><p> yes </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> no 
</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> no </p></td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> no </p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> refers to whether the file is regarded as 
absolute or relative </p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> file:absolute.path </td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> String </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> refers to the absolute file path </p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:length </td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> Long </p></td><td 
 colspan="1" rowspan="1" class="confluenceTd"><p> yes </p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> refers to the file length returned as a Long type 
</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> file:size 
</td><td colspan="1" rowspan="1" class="confluenceTd"><p> Long </p></td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> yes </p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> <strong>Camel 2.5:</strong> refers to the file length 
returned as a Long type </p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> file:modified </td><td co
 lspan="1" rowspan="1" class="confluenceTd"><p> Date </p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> no </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> efers to the file last modified returned as a Date 
type </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 
date:<em>command:pattern</em> </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> String </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> yes </p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> for date formatting using the 
<code>java.text.SimepleDataFormat</code
 > patterns. Is an <strong>extension</strong> to the <a shape="rect" 
 > href="simple.html">Simple</a> language. Additional command is: 
 > <strong>file</strong> (consumers only) for the last modified timestamp of 
 > the file. Notice: all the commands from the <a shape="rect" 
 > href="simple.html">Simple</a> language can also be used. 
 > </p></td></tr></tbody></table></div>
-</div>
-
-<h3 id="FileLanguage-Filetokenexample">File token example</h3>
-
-<h4 id="FileLanguage-Relativepaths">Relative paths</h4>
-<p>We have a <code>java.io.File</code> handle for the file 
<code>hello.txt</code> in the following <strong>relative</strong> directory: 
<code>.\filelanguage\test</code>. And we configure our endpoint to use this 
starting directory <code>.\filelanguage</code>. The file tokens will return 
as:</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th 
colspan="1" rowspan="1" class="confluenceTh"><p> Expression </p></th><th 
colspan="1" rowspan="1" class="confluenceTh"><p> Returns </p></th></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:name </td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> test\hello.txt </p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:name.ext </td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> txt </p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:name.noext </td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> test\hello 
</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
file:onlyname </td><td colspan="1" rowspan="1" class="confluenceTd"><p> 
hello.txt </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
file:onlyname.noext </td><td colspan="1" rowspan="1" class="confluenceTd"><p> 
hello </p></td></tr><tr><td colspan="1" rowspan="1" c
 lass="confluenceTd"> file:ext </td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> txt </p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> file:parent </td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> filelanguage\test </p></td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> file:path </td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> filelanguage\test\hello.txt </p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:absolute </td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:absolute.path </td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> 
\workspace\camel\camel-core\target\filelanguage\test\hello.txt 
</p></td></tr></tbody></table></div>
-
-
-<h4 id="FileLanguage-Absolutepaths">Absolute paths</h4>
-<p>We have a <code>java.io.File</code> handle for the file 
<code>hello.txt</code> in the following <strong>absolute</strong> directory: 
<code>\workspace\camel\camel-core\target\filelanguage\test</code>. And we 
configure out endpoint to use the absolute starting directory 
<code>\workspace\camel\camel-core\target\filelanguage</code>. The file tokens 
will return as:</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th 
colspan="1" rowspan="1" class="confluenceTh"><p> Expression </p></th><th 
colspan="1" rowspan="1" class="confluenceTh"><p> Returns </p></th></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:name </td><td colspan="1" 
rowspan="1" class="confluenceTd"><p> test\hello.txt </p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:name.ext </td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> txt </p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> file:name.noext </td><td 
colspan="1" rowspan="1" class="confluenceTd"><p> test\hello 
</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
file:onlyname </td><td colspan="1" rowspan="1" class="confluenceTd"><p> 
hello.txt </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
file:onlyname.noext </td><td colspan="1" rowspan="1" class="confluenceTd"><p> 
hello </p></td></tr><tr><td colspan="1" rowspan="1" c
 lass="confluenceTd"> file:ext </td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> txt </p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> file:parent </td><td colspan="1" rowspan="1" 
class="confluenceTd"><p> \workspace\camel\camel-core\target\filelanguage\test 
</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> file:path 
</td><td colspan="1" rowspan="1" class="confluenceTd"><p> 
\workspace\camel\camel-core\target\filelanguage\test\hello.txt 
</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
file:absolute </td><td colspan="1" rowspan="1" class="confluenceTd"><p> true 
</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
file:absolute.path </td><td colspan="1" rowspan="1" class="confluenceTd"><p> 
\workspace\camel\camel-core\target\filelanguage\test\hello.txt 
</p></td></tr></tbody></table></div>
-
-
-<h3 id="FileLanguage-Samples">Samples</h3>
-<p>You can enter a fixed <a shape="rect" href="constant.html">Constant</a> 
expression such as <code>myfile.txt</code>:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-fileName=&quot;myfile.txt&quot;
+<p>The File Expression Language is an extension to the <a shape="rect" 
href="simple.html">Simple</a> language, adding file related capabilities. These 
capabilities are related to common use cases working with file path and names. 
The goal is to allow expressions to be used with the <a shape="rect" 
href="file2.html">File</a> and <a shape="rect" href="ftp.html">FTP</a> 
components for setting dynamic file patterns for both consumer and 
producer.</p><h3 id="FileLanguage-Syntax">Syntax</h3><p>This language is an 
<strong>extension</strong> to the <a shape="rect" href="simple.html">Simple</a> 
language so the <a shape="rect" href="simple.html">Simple</a> syntax applies 
also. So the table below only lists the additional. <br clear="none"> As 
opposed to <a shape="rect" href="simple.html">Simple</a> language <a 
shape="rect" href="file-language.html">File Language</a> also supports <a 
shape="rect" href="constant.html">Constant</a> expressions so you can enter a 
fixed filename.</p><p>All the fil
 e tokens use the same expression name as the method on the 
<code>java.io.File</code> object, for instance <code>file:absolute</code> 
refers to the <code>java.io.File.getAbsolute()</code> method. Notice that not 
all expressions are supported by the current Exchange. For instance the <a 
shape="rect" href="ftp.html">FTP</a> component supports some of the options, 
where as the <a shape="rect" href="file2.html">File</a> component supports all 
of them.</p><div class="confluenceTableSmall"><div class="table-wrap"><table 
class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"><p>Expression</p></th><th colspan="1" rowspan="1" 
class="confluenceTh"><p>Type</p></th><th colspan="1" rowspan="1" 
class="confluenceTh"><p>File Consumer</p></th><th colspan="1" rowspan="1" 
class="confluenceTh"><p>File Producer</p></th><th colspan="1" rowspan="1" 
class="confluenceTh"><p>FTP Consumer</p></th><th colspan="1" rowspan="1" 
class="confluenceTh"><p>FTP Producer</p></th><th colspan="
 1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd">file:name</td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>refers to the file name (is relative to the starting 
directory, see note below)</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:name.ext</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td cols
 pan="1" rowspan="1" class="confluenceTd"><p><strong>Camel 2.3:</strong> refers 
to the file extension only</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:name.noext</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>refers to the file name with no extension (is relative 
to the starting directory, see note below)</p></td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd">file:onlyname</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes<
 /p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td 
colspan="1" rowspan="1" class="confluenceTd"><p>refers to the file name only 
with no leading paths.</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:onlyname.noext</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>refers to the file name only with no extension and with 
no leading paths.</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:ext</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan=
 "1" rowspan="1" class="confluenceTd"><p>yes</p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>refers to the file extension only</p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd">file:parent</td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>refers to the file parent</p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd">file:path</td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>refers to the file path</p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd">file:absolute</td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>Boolean</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>refers to whether the file is regarded as absolute or 
relative</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:absolute.path</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" clas
 s="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>refers to the absolute file path</p></td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd">file:length</td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>Long</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>refers to the file length returned as a Long 
type</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:size</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>Long</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluen
 ceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p><strong>Camel 2.5:</strong> refers to the file length 
returned as a Long type</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:modified</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>Date</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>efers to the file last modified returned as a Date 
type</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><p>date:<em>command:pattern</em></p></td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" class=
 "confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>for date formatting using the 
<code>java.text.SimepleDateFormate</code> patterns. Is an 
<strong>extension</strong> to the <a shape="rect" href="simple.html">Simple</a> 
language. Additional command is: <strong>file</strong> (consumers only) for the 
last modified timestamp of the file. Notice: all the commands from the <a 
shape="rect" href="simple.html">Simple</a> language can also be 
used.</p></td></tr></tbody></table></div></div><h3 
id="FileLanguage-Filetokenexample">File token example</h3><h4 
id="FileLanguage-Relativepaths">Relative paths</h4><p>We have a 
<code>java.io.File</code> handle for the file <code>hello.txt</code> in the 
following <strong>relative</strong> directory: 
<code>.\filelanguage\test</code>. And we configure our endpoint to use this 
starting directory <code>
 .\filelanguage</code>. The file tokens will return as:</p><div 
class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" 
rowspan="1" class="confluenceTh"><p>Expression</p></th><th colspan="1" 
rowspan="1" class="confluenceTh"><p>Returns</p></th></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd">file:name</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>test\hello.txt</p></td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd">file:name.ext</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>txt</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:name.noext</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>test\hello</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:onlyname</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>hello.txt</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:onlyname.noext</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>hello</p></td></tr
 ><tr><td colspan="1" rowspan="1" class="confluenceTd">file:ext</td><td 
 >colspan="1" rowspan="1" class="confluenceTd"><p>txt</p></td></tr><tr><td 
 >colspan="1" rowspan="1" class="confluenceTd">file:parent</td><td colspan="1" 
 >rowspan="1" class="confluenceTd"><p>filelanguage\test</p></td></tr><tr><td 
 >colspan="1" rowspan="1" class="confluenceTd">file:path</td><td colspan="1" 
 >rowspan="1" 
 >class="confluenceTd"><p>filelanguage\test\hello.txt</p></td></tr><tr><td 
 >colspan="1" rowspan="1" class="confluenceTd">file:absolute</td><td 
 >colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td></tr><tr><td 
 >colspan="1" rowspan="1" class="confluenceTd">file:absolute.path</td><td 
 >colspan="1" rowspan="1" 
 >class="confluenceTd"><p>\workspace\camel\camel-core\target\filelanguage\test\hello.txt</p></td></tr></tbody></table></div><h4
 > id="FileLanguage-Absolutepaths">Absolute paths</h4><p>We have a 
 ><code>java.io.File</code> handle for the file <code>hello.txt</code> in the 
 >following <strong>absolute</strong> d
 irectory: <code>\workspace\camel\camel-core\target\filelanguage\test</code>. 
And we configure out endpoint to use the absolute starting directory 
<code>\workspace\camel\camel-core\target\filelanguage</code>. The file tokens 
will return as:</p><div class="table-wrap"><table 
class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"><p>Expression</p></th><th colspan="1" rowspan="1" 
class="confluenceTh"><p>Returns</p></th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:name</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>test\hello.txt</p></td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd">file:name.ext</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>txt</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:name.noext</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>test\hello</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:onlyname</td><td colspan="1" rowspan="1" class="co
 nfluenceTd"><p>hello.txt</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:onlyname.noext</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>hello</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:ext</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>txt</p></td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd">file:parent</td><td colspan="1" rowspan="1" 
class="confluenceTd"><p>\workspace\camel\camel-core\target\filelanguage\test</p></td></tr><tr><td
 colspan="1" rowspan="1" class="confluenceTd">file:path</td><td colspan="1" 
rowspan="1" 
class="confluenceTd"><p>\workspace\camel\camel-core\target\filelanguage\test\hello.txt</p></td></tr><tr><td
 colspan="1" rowspan="1" class="confluenceTd">file:absolute</td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>true</p></td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd">file:absolute.path</td><td colspan="1" 
rowspan="1" class="confluenceTd"><p>\workspace\camel\camel-co
 re\target\filelanguage\test\hello.txt</p></td></tr></tbody></table></div><h3 
id="FileLanguage-Samples">Samples</h3><p>You can enter a fixed <a shape="rect" 
href="constant.html">Constant</a> expression such as 
<code>myfile.txt</code>:</p><div class="code panel pdl" style="border-width: 
1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[fileName=&quot;myfile.txt&quot;
 ]]></script>
-</div></div>
-
-<p>Lets assume we use the file consumer to read files and want to move the 
read files to backup folder with the current date as a sub folder. This can be 
archieved using an expression like:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-fileName=&quot;backup/${date:now:yyyyMMdd}/${file:name.noext}.bak&quot;
+</div></div><p>Lets assume we use the file consumer to read files and want to 
move the read files to backup folder with the current date as a sub folder. 
This can be archieved using an expression like:</p><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[fileName=&quot;backup/${date:now:yyyyMMdd}/${file:name.noext}.bak&quot;
 ]]></script>
-</div></div>
-
-<p>relative folder names are also supported so suppose the backup folder 
should be a sibling folder then you can append .. as:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-fileName=&quot;../backup/${date:now:yyyyMMdd}/${file:name.noext}.bak&quot;
+</div></div><p>relative folder names are also supported so suppose the backup 
folder should be a sibling folder then you can append .. as:</p><div 
class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[fileName=&quot;../backup/${date:now:yyyyMMdd}/${file:name.noext}.bak&quot;
 ]]></script>
-</div></div>
-
-<p>As this is an extension to the <a shape="rect" 
href="simple.html">Simple</a> language we have access to all the goodies from 
this language also, so in this use case we want to use the in.header.type as a 
parameter in the dynamic expression:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-fileName=&quot;../backup/${date:now:yyyyMMdd}/type-${in.header.type}/backup-of-${file:name.noext}.bak&quot;
+</div></div><p>As this is an extension to the <a shape="rect" 
href="simple.html">Simple</a> language we have access to all the goodies from 
this language also, so in this use case we want to use the in.header.type as a 
parameter in the dynamic expression:</p><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[fileName=&quot;../backup/${date:now:yyyyMMdd}/type-${in.header.type}/backup-of-${file:name.noext}.bak&quot;
 ]]></script>
-</div></div>
-
-<p>If you have a custom Date you want to use in the expression then Camel 
supports retrieving dates from the message header.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-fileName=&quot;orders/order-${in.header.customerId}-${date:in.header.orderDate:yyyyMMdd}.xml&quot;
+</div></div><p>If you have a custom Date you want to use in the expression 
then Camel supports retrieving dates from the message header.</p><div 
class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[fileName=&quot;orders/order-${in.header.customerId}-${date:in.header.orderDate:yyyyMMdd}.xml&quot;
 ]]></script>
-</div></div>
-
-<p>And finally we can also use a bean expression to invoke a POJO class that 
generates some String output (or convertible to String) to be used:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-fileName=&quot;uniquefile-${bean:myguidgenerator.generateid}.txt&quot;
+</div></div><p>And finally we can also use a bean expression to invoke a POJO 
class that generates some String output (or convertible to String) to be 
used:</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[fileName=&quot;uniquefile-${bean:myguidgenerator.generateid}.txt&quot;
 ]]></script>
-</div></div>
-
-<p>And of course all this can be combined in one expression where you can use 
the <a shape="rect" href="file-language.html">File Language</a>, <a 
shape="rect" href="simple.html">Simple</a> and the <a shape="rect" 
href="bean.html">Bean</a> language in one combined expression. This is pretty 
powerful for those common file path patterns.</p>
-
-<h3 
id="FileLanguage-UsingSpringPropertyPlaceholderConfigurertogetherwiththeFilecomponent">Using
 Spring PropertyPlaceholderConfigurer together with the <a shape="rect" 
href="file2.html">File</a> component </h3>
-<p>In Camel you can use the <a shape="rect" href="file-language.html">File 
Language</a> directly from the <a shape="rect" href="simple.html">Simple</a> 
language which makes a <a shape="rect" href="content-based-router.html">Content 
Based Router</a> easier to do in Spring XML, where we can route based on file 
extensions as shown below:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-  &lt;from uri=&quot;file://input/orders&quot;/&gt;
+</div></div><p>And of course all this can be combined in one expression where 
you can use the <a shape="rect" href="file-language.html">File Language</a>, <a 
shape="rect" href="simple.html">Simple</a> and the <a shape="rect" 
href="bean.html">Bean</a> language in one combined expression. This is pretty 
powerful for those common file path patterns.</p><h3 
id="FileLanguage-UsingSpringPropertyPlaceholderConfigurertogetherwiththeFilecomponent">Using
 Spring PropertyPlaceholderConfigurer together with the <a shape="rect" 
href="file2.html">File</a> component</h3><p>In Camel you can use the <a 
shape="rect" href="file-language.html">File Language</a> directly from the <a 
shape="rect" href="simple.html">Simple</a> language which makes a <a 
shape="rect" href="content-based-router.html">Content Based Router</a> easier 
to do in Spring XML, where we can route based on file extensions as shown 
below:</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl"
 >
+<script class="theme: Default; brush: xml; gutter: false" 
type="syntaxhighlighter"><![CDATA[  &lt;from 
uri=&quot;file://input/orders&quot;/&gt;
      &lt;choice&gt;
        &lt;when&gt;
            &lt;simple&gt;${file:ext} == &#39;txt&#39;&lt;/simple&gt;
@@ -185,14 +126,8 @@ fileName=&quot;uniquefile-${bean:myguidg
        &lt;/otherwise&gt;
     &lt;/choice&gt;
 ]]></script>
-</div></div>
-
-<p>If you use the <code>fileName</code> option on the <a shape="rect" 
href="file2.html">File</a> endpoint to set a dynamic filename using the <a 
shape="rect" href="file-language.html">File Language</a> then make sure you <br 
clear="none">
-use the alternative syntax (available from Camel 2.5 onwards) to avoid 
clashing with Springs <code>PropertyPlaceholderConfigurer</code>.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader 
panelHeader pdl" style="border-bottom-width: 
1px;"><b>bundle-context.xml</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-&lt;bean id=&quot;propertyPlaceholder&quot; 
class=&quot;org.springframework.beans.factory.config.PropertyPlaceholderConfigurer&quot;&gt;
+</div></div><p>If you use the <code>fileName</code> option on the <a 
shape="rect" href="file2.html">File</a> endpoint to set a dynamic filename 
using the <a shape="rect" href="file-language.html">File Language</a> then make 
sure you <br clear="none"> use the alternative syntax (available from Camel 2.5 
onwards) to avoid clashing with Springs 
<code>PropertyPlaceholderConfigurer</code>.</p><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeHeader panelHeader pdl" 
style="border-bottom-width: 1px;"><b>bundle-context.xml</b></div><div 
class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[&lt;bean id=&quot;propertyPlaceholder&quot; 
class=&quot;org.springframework.beans.factory.config.PropertyPlaceholderConfigurer&quot;&gt;
     &lt;property name=&quot;location&quot; 
value=&quot;classpath:bundle-context.cfg&quot; /&gt;
 &lt;/bean&gt;
 
@@ -201,28 +136,16 @@ use the alternative syntax (available fr
     &lt;property name=&quot;toEndpoint&quot; value=&quot;${toEndpoint}&quot; 
/&gt;
 &lt;/bean&gt;
 ]]></script>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader 
panelHeader pdl" style="border-bottom-width: 
1px;"><b>bundle-context.cfg</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-fromEndpoint=activemq:queue:test
+</div></div><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeHeader panelHeader pdl" style="border-bottom-width: 
1px;"><b>bundle-context.cfg</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[fromEndpoint=activemq:queue:test
 toEndpoint=file://fileRoute/out?fileName=test-$simple{date:now:yyyyMMdd}.txt
 ]]></script>
-</div></div>
-
-<p>Notice how we use the $simple{ } syntax in the <code>toEndpoint</code> 
above.<br clear="none">
-If you don't do this, there is a clash and Spring will throw an exception 
like</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[
-org.springframework.beans.factory.BeanDefinitionStoreException:
+</div></div><p>Notice how we use the $simple{ } syntax in the 
<code>toEndpoint</code> above.<br clear="none"> If you don't do this, there is 
a clash and Spring will throw an exception like</p><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" 
type="syntaxhighlighter"><![CDATA[org.springframework.beans.factory.BeanDefinitionStoreException:
 Invalid bean definition with name &#39;sampleRoute&#39; defined in class path 
resource [bundle-context.xml]:
 Could not resolve placeholder &#39;date:now:yyyyMMdd&#39;
 ]]></script>
-</div></div>
-
-
-<h3 id="FileLanguage-Dependencies">Dependencies</h3>
-<p>The File language is part of <strong>camel-core</strong>.</p></div>
+</div></div><h3 id="FileLanguage-Dependencies">Dependencies</h3><p>The File 
language is part of <strong>camel-core</strong>.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/in-progress.html
==============================================================================
--- websites/production/camel/content/in-progress.html (original)
+++ websites/production/camel/content/in-progress.html Tue Sep 23 12:50:14 2014
@@ -79,7 +79,7 @@
 
 <p>The following releases are currently in progress</p>
 
-<ul class="childpages-macro"><li><a shape="rect" 
href="camel-2150-release.html">Camel 2.15.0 Release</a></li><li><a shape="rect" 
href="camel-2140-release.html">Camel 2.14.0 Release</a></li><li><a shape="rect" 
href="camel-xyz-release-template.html">Camel x.y.z Release 
(template)</a></li></ul></div>
+<ul class="childpages-macro"><li><a shape="rect" 
href="camel-2150-release.html">Camel 2.15.0 Release</a></li><li><a shape="rect" 
href="camel-xyz-release-template.html">Camel x.y.z Release 
(template)</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/release-guide.html
==============================================================================
--- websites/production/camel/content/release-guide.html (original)
+++ websites/production/camel/content/release-guide.html Tue Sep 23 12:50:14 
2014
@@ -86,7 +86,7 @@
        <tbody>
         <tr>
         <td valign="top" width="100%">
-<div class="wiki-content maincontent"><h1 
id="ReleaseGuide-HowtocreateandannounceaCamelrelease.">How to create and 
announce a Camel release.</h1><p>This release guide is based on the <a 
shape="rect" class="external-link" 
href="http://maven.apache.org/developers/release/apache-release.html";>General 
guide for releasing Maven-based projects at Apache</a>, so be sure to check it 
out before continuing and meet all prerequisites.</p><p><span style="font-size: 
20.0px;line-height: 1.5;">Prerequisites</span></p><p>To prepare or perform a 
release you MUST BE at least an Apache Camel committer.</p><ul><li>The 
artifacts for each and every release must be SIGNED; your public key should be 
added to the KEYS file</li><li>Your public key must also be cross-signed by 
other Apache committers (this can be done at key signing parties at ApacheCon 
for instance)</li><li>Make sure you have the correct maven configuration in 
<code>~/.m2/settings.xml</code></li><li>From Camel 2.10 onwards we will require 
to
  use Maven [3.0.2,3.1.0)</li><li>From Camel 2.11 onwards we will require to 
use Maven [3.0.4,3.1.0]</li><li>You may want to get familiar with the release 
settings in the parent apache POM.<br clear="none"><br 
clear="none"></li></ul><h2 id="ReleaseGuide-Maven2Setup">Maven 2 
Setup</h2><p>Before you deploy anything to the maven repository using Maven 2, 
you should configure your ~/.m2/settings.xml file so that the file permissions 
of the deployed artifacts are group writable. If you do not do this, other 
developers will not able to overwrite your SNAPSHOT releases with newer 
versions. The settings follow the <a shape="rect" class="external-link" 
href="http://maven.apache.org/developers/committer-settings.html";>guidelines 
</a> used by the Maven project. Please pay particular attention to the <a 
shape="rect" class="external-link" 
href="http://maven.apache.org/guides/mini/guide-encryption.html";>password 
encryption recommendations</a>.</p><div class="code panel pdl" 
style="border-width: 1p
 x;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h1 
id="ReleaseGuide-HowtocreateandannounceaCamelrelease.">How to create and 
announce a Camel release.</h1><p>This release guide is based on the <a 
shape="rect" class="external-link" 
href="http://maven.apache.org/developers/release/apache-release.html";>General 
guide for releasing Maven-based projects at Apache</a>, so be sure to check it 
out before continuing and meet all prerequisites.</p><p><span style="font-size: 
20.0px;line-height: 1.5;">Prerequisites</span></p><p>To prepare or perform a 
release you MUST BE at least an Apache Camel committer.</p><ul><li>The 
artifacts for each and every release must be SIGNED; your public key should be 
added to the KEYS file</li><li>Your public key must also be cross-signed by 
other Apache committers (this can be done at key signing parties at ApacheCon 
for instance)</li><li>Make sure you have the correct maven configuration in 
<code>~/.m2/settings.xml</code></li><li>From Camel 2.10 onwards we will require 
to
  use Maven [3.0.2,3.1.0)</li><li>From Camel 2.11 onwards we will require to 
use Maven [3.0.4,3.1.0]</li><li>You may want to get familiar with the release 
settings in the parent apache POM.</li><li>Make sure you are using Java 1.7 for 
Apache Camel 2.14.0 and later (Java 1.6 for older versions).<br 
clear="none"><br clear="none"></li></ul><h2 id="ReleaseGuide-Maven2Setup">Maven 
2 Setup</h2><p>Before you deploy anything to the maven repository using Maven 
2, you should configure your ~/.m2/settings.xml file so that the file 
permissions of the deployed artifacts are group writable. If you do not do 
this, other developers will not able to overwrite your SNAPSHOT releases with 
newer versions. The settings follow the <a shape="rect" class="external-link" 
href="http://maven.apache.org/developers/committer-settings.html";>guidelines 
</a> used by the Maven project. Please pay particular attention to the <a 
shape="rect" class="external-link" 
href="http://maven.apache.org/guides/mini/guide-encryp
 tion.html">password encryption recommendations</a>.</p><div class="code panel 
pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: xml; gutter: false" 
type="syntaxhighlighter"><![CDATA[&lt;settings&gt;
   ...
   &lt;servers&gt;

Modified: websites/production/camel/content/scala-dsl-eip.html
==============================================================================
--- websites/production/camel/content/scala-dsl-eip.html (original)
+++ websites/production/camel/content/scala-dsl-eip.html Tue Sep 23 12:50:14 
2014
@@ -100,11 +100,11 @@ You can check the <a shape="rect" class=
 
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1410837621098 {padding: 0px;}
-div.rbtoc1410837621098 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1410837621098 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1411476513473 {padding: 0px;}
+div.rbtoc1411476513473 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1411476513473 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1410837621098">
+/*]]>*/</style><div class="toc-macro rbtoc1411476513473">
 <ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a 
shape="rect" href="#ScalaDSL-EIP-Messagingsystems">Messaging systems</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a 
shape="rect" href="#ScalaDSL-EIP-Pipelinepipeline">Pipeline</a></li><li><span 
class="TOCOutline">1.2</span> <a shape="rect" 
href="#ScalaDSL-EIP-Filterfilter">Filter</a></li></ul>
 </li><li><span class="TOCOutline">2</span> <a shape="rect" 
href="#ScalaDSL-EIP-Messagingchannels">Messaging channels</a>


Reply via email to