Modified: websites/production/camel/content/languages.html
==============================================================================
--- websites/production/camel/content/languages.html (original)
+++ websites/production/camel/content/languages.html Thu Feb 5 09:18:49 2015
@@ -91,14 +91,7 @@
<p>The following languages are supported:</p>
-<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="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>
+<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> / <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>
</div>
</td>
<td valign="top">
Modified: websites/production/camel/content/predicate.html
==============================================================================
--- websites/production/camel/content/predicate.html (original)
+++ websites/production/camel/content/predicate.html Thu Feb 5 09:18:49 2015
@@ -201,14 +201,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>
-<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="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>
+<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> / <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>
Modified: websites/production/camel/content/property.html
==============================================================================
--- websites/production/camel/content/property.html (original)
+++ websites/production/camel/content/property.html Thu Feb 5 09:18:49 2015
@@ -86,15 +86,13 @@
<tbody>
<tr>
<td valign="top" width="100%">
-<div class="wiki-content maincontent"><h2
id="Property-PropertyExpressionLanguage">Property Expression Language</h2>
-
-<p>The Property Expression Language allows you to extract values of named
exchange properties.</p>
-
-<h3 id="Property-Exampleusage">Example usage</h3>
-
-<p>The recipientList element of the Spring DSL can utilize a property
expression like: </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
+<div class="wiki-content maincontent"><h2
id="Property-PropertyExpressionLanguage">Property Expression
Language</h2><p>The Property Expression Language allows you to extract values
of named exchange properties.</p> <div class="aui-message warning shadowed
information-macro">
+ <span class="aui-icon icon-warning">Icon</span>
+ <div class="message-content">
+ <p>From <strong>Camel 2.15</strong> onwards the
property language has been renamed to exchangeProperty to avoid ambiguity,
confusion and clash with properties as a general term. So use exchangeProperty
instead of property when using Camel 2.15 onwards.</p>
+ </div>
+ </div>
+<p> </p><h3 id="Property-Exampleusage">Example usage</h3><p>The
recipientList element of the Spring DSL can utilize a property expression
like:</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[
<route>
<from uri="direct:a" />
@@ -103,27 +101,14 @@
</recipientList>
</route>
]]></script>
-</div></div>
-
-<p>In this case, the list of recipients are contained in the property
'myProperty'. </p>
-
-<p>And the same example in Java DSL:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
+</div></div><p>In this case, the list of recipients are contained in the
property 'myProperty'.</p><p>And the same example in Java DSL:</p><div
class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
<script class="theme: Default; brush: java; gutter: false"
type="syntaxhighlighter"><![CDATA[
from("direct:a").recipientList(property("myProperty"));
]]></script>
-</div></div>
-
-<p>And with a slightly different syntax where you use the builder to the
fullest (i.e. avoid using parameters but using stacked operations, notice that
property is not a parameter but a stacked method call)</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("direct:a").recipientList().property("myProperty");
+</div></div><p>And with a slightly different syntax where you use the builder
to the fullest (i.e. avoid using parameters but using stacked operations,
notice that property is not a parameter but a stacked method call)</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("direct:a").recipientList().property("myProperty");
]]></script>
-</div></div>
-
-<h3 id="Property-Dependencies">Dependencies</h3>
-<p>The Property language is part of <strong>camel-core</strong>.</p></div>
+</div></div><h3 id="Property-Dependencies">Dependencies</h3><p>The Property
language is part of <strong>camel-core</strong>.</p></div>
</td>
<td valign="top">
<div class="navigation">
Modified: websites/production/camel/content/what-languages-are-supported.html
==============================================================================
--- websites/production/camel/content/what-languages-are-supported.html
(original)
+++ websites/production/camel/content/what-languages-are-supported.html Thu Feb
5 09:18:49 2015
@@ -79,14 +79,7 @@
<p>Camel supports multiple <a shape="rect" href="languages.html">Languages</a>
in the <a shape="rect" href="dsl.html">DSL</a> or <a shape="rect"
href="xml-configuration.html">Xml Configuration</a> for maximum extensibility.
The following is the list of currently supported languages</p>
-<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="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> / <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></div>
</td>
<td valign="top">
<div class="navigation">
