Author: buildbot
Date: Thu Feb 28 06:27:17 2013
New Revision: 852352
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-pattern-appendix.html
websites/production/camel/content/content-enricher.html
websites/production/camel/content/spring-ldap.html
websites/production/camel/content/validation.html
Modified: websites/production/camel/content/book-component-appendix.html
==============================================================================
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Thu Feb 28
06:27:17 2013
@@ -15913,8 +15913,7 @@ spring-integration:defaultChannelName[?o
<ul><li><a shape="rect" href="configuring-camel.html" title="Configuring
Camel">Configuring Camel</a></li><li><a shape="rect" href="component.html"
title="Component">Component</a></li><li><a shape="rect" href="endpoint.html"
title="Endpoint">Endpoint</a></li><li><a shape="rect"
href="getting-started.html" title="Getting Started">Getting
Started</a></li></ul>
<h2><a shape="rect"
name="BookComponentAppendix-SpringLDAPComponent"></a>Spring LDAP Component</h2>
-
-<p><em>available since: 2.11</em></p>
+<p><b>Available since Camel 2.11</b></p>
<p>The <b>spring-ldap:</b> component provides a Camel wrapper for <a
shape="rect" class="external-link" href="http://www.springsource.org/ldap";
rel="nofollow">Spring LDAP</a>.</p>
@@ -17127,7 +17126,7 @@ validator:someLocalOrRemoteResource
<h3><a shape="rect" name="BookComponentAppendix-Options"></a>Options</h3>
<div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1"
class="confluenceTh"> Option </th><th colspan="1" rowspan="1"
class="confluenceTh"> Default </th><th colspan="1" rowspan="1"
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1"
class="confluenceTd"> <tt>resourceResolver</tt> </td><td colspan="1"
rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1"
rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Reference to a
<tt>org.w3c.dom.ls.LSResourceResolver</tt> in the <a shape="rect"
href="registry.html" title="Registry">Registry</a>. </td></tr><tr><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>useDom</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> Whether
<tt>DOMSource</tt>/<tt>DOMResult</tt> or <tt>SaxSource</tt>/<tt>SaxResult</tt>
should be used by the validator. </td></tr><tr><td colspan="1" rowspan="1"
class="confluenceTd"> <tt>us
eSharedSchema</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">
<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel
2.3:</b> Whether the <tt>Schema</tt> instance should be shared or not. This
option is introduced to work around a <a shape="rect" class="external-link"
href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6773084";
rel="nofollow">JDK 1.6.x bug</a>. Xerces should not have this issue.
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">
<tt>failIfNoBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">
<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel
2.9.5/2.10.3:</b> Whether to fail if no body exists. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1"
class="confluenceTh"> Option </th><th colspan="1" rowspan="1"
class="confluenceTh"> Default </th><th colspan="1" rowspan="1"
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1"
class="confluenceTd"> <tt>resourceResolver</tt> </td><td colspan="1"
rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1"
rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Reference to a
<tt>org.w3c.dom.ls.LSResourceResolver</tt> in the <a shape="rect"
href="registry.html" title="Registry">Registry</a>. </td></tr><tr><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>useDom</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> Whether
<tt>DOMSource</tt>/<tt>DOMResult</tt> or <tt>SaxSource</tt>/<tt>SaxResult</tt>
should be used by the validator. </td></tr><tr><td colspan="1" rowspan="1"
class="confluenceTd"> <tt>us
eSharedSchema</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">
<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel
2.3:</b> Whether the <tt>Schema</tt> instance should be shared or not. This
option is introduced to work around a <a shape="rect" class="external-link"
href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6773084";
rel="nofollow">JDK 1.6.x bug</a>. Xerces should not have this issue.
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">
<tt>failIfNoBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">
<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel
2.9.5/2.10.3:</b> Whether to fail if no body exists. </td></tr><tr><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>headerName</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11:</b> To validate
against a header instead of the message
body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">
<tt>failOnNullHeader</tt> </td><td colspan="1" rowspan="1"
class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1"
class="confluenceTd"> <b>Camel 2.11:</b> Whether to fail if no header exists
when validating against a header. </td></tr></tbody></table>
</div>
</div>
@@ -17136,22 +17135,20 @@ validator:someLocalOrRemoteResource
<p>The following <a shape="rect" class="external-link"
href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml";>example</a>
shows how to configure a route from endpoint <b>direct:start</b> which then
goes to one of two endpoints, either <b>mock:valid</b> or <b>mock:invalid</b>
based on whether or not the XML matches the given schema (which is supplied on
the classpath).</p>
<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
-<pre class="code-xml"><span class="code-tag"><camelContext xmlns=<span
class="code-quote">"http://camel.apache.org/schema/spring";</span>></span>
- <span class="code-tag"><route></span>
- <span class="code-tag"><from uri=<span
class="code-quote">"direct:start"</span>/></span>
- <span class="code-tag"><doTry></span>
- <span class="code-tag"><to uri=<span
class="code-quote">"validator:org/apache/camel/component/validator/schema.xsd"</span>/></span>
- <span class="code-tag"><to uri=<span
class="code-quote">"mock:valid"</span>/></span>
- <span class="code-tag"><doCatch></span>
- <span
class="code-tag"><exception></span>org.apache.camel.ValidationException<span
class="code-tag"></exception></span>
- <span class="code-tag"><to uri=<span
class="code-quote">"mock:invalid"</span>/></span>
- <span class="code-tag"></doCatch></span>
- <span class="code-tag"><doFinally></span>
- <span class="code-tag"><to uri=<span
class="code-quote">"mock:finally"</span>/></span>
- <span class="code-tag"></doFinally></span>
- <span class="code-tag"></doTry></span>
- <span class="code-tag"></route></span>
-<span class="code-tag"></camelContext></span>
+<pre class="code-xml"><span class="code-tag"><route></span>
+ <span class="code-tag"><from uri=<span
class="code-quote">"direct:start"</span>/></span>
+ <span class="code-tag"><doTry></span>
+ <span class="code-tag"><to uri=<span
class="code-quote">"validator:org/apache/camel/component/validator/schema.xsd"</span>/></span>
+ <span class="code-tag"><to uri=<span
class="code-quote">"mock:valid"</span>/></span>
+ <span class="code-tag"><doCatch></span>
+ <span
class="code-tag"><exception></span>org.apache.camel.ValidationException<span
class="code-tag"></exception></span>
+ <span class="code-tag"><to uri=<span
class="code-quote">"mock:invalid"</span>/></span>
+ <span class="code-tag"></doCatch></span>
+ <span class="code-tag"><doFinally></span>
+ <span class="code-tag"><to uri=<span
class="code-quote">"mock:finally"</span>/></span>
+ <span class="code-tag"></doFinally></span>
+ <span class="code-tag"></doTry></span>
+<span class="code-tag"></route></span>
</pre>
</div></div>
Modified: websites/production/camel/content/book-pattern-appendix.html
==============================================================================
--- websites/production/camel/content/book-pattern-appendix.html (original)
+++ websites/production/camel/content/book-pattern-appendix.html Thu Feb 28
06:27:17 2013
@@ -4372,7 +4372,7 @@ from(<span class="code-quote">"direct:re
<span class="code-keyword">public</span> Exchange aggregate(Exchange
original, Exchange resource) {
<span class="code-object">Object</span> originalBody =
original.getIn().getBody();
- <span class="code-object">Object</span> resourceResponse =
resource.getOut().getBody();
+ <span class="code-object">Object</span> resourceResponse =
resource.getIn().getBody();
<span class="code-object">Object</span> mergeResult = ... <span
class="code-comment">// combine original body and resource response
</span> <span class="code-keyword">if</span>
(original.getPattern().isOutCapable()) {
original.getOut().setBody(mergeResult);
Modified: websites/production/camel/content/content-enricher.html
==============================================================================
--- websites/production/camel/content/content-enricher.html (original)
+++ websites/production/camel/content/content-enricher.html Thu Feb 28 06:27:17
2013
@@ -179,7 +179,7 @@ from(<span class="code-quote">"direct:re
<span class="code-keyword">public</span> Exchange aggregate(Exchange
original, Exchange resource) {
<span class="code-object">Object</span> originalBody =
original.getIn().getBody();
- <span class="code-object">Object</span> resourceResponse =
resource.getOut().getBody();
+ <span class="code-object">Object</span> resourceResponse =
resource.getIn().getBody();
<span class="code-object">Object</span> mergeResult = ... <span
class="code-comment">// combine original body and resource response
</span> <span class="code-keyword">if</span>
(original.getPattern().isOutCapable()) {
original.getOut().setBody(mergeResult);
Modified: websites/production/camel/content/spring-ldap.html
==============================================================================
--- websites/production/camel/content/spring-ldap.html (original)
+++ websites/production/camel/content/spring-ldap.html Thu Feb 28 06:27:17 2013
@@ -76,8 +76,7 @@
<tr>
<td valign="top" width="100%">
<div class="wiki-content maincontent"><h2><a shape="rect"
name="SpringLDAP-SpringLDAPComponent"></a>Spring LDAP Component</h2>
-
-<p><em>available since: 2.11</em></p>
+<p><b>Available since Camel 2.11</b></p>
<p>The <b>spring-ldap:</b> component provides a Camel wrapper for <a
shape="rect" class="external-link" href="http://www.springsource.org/ldap";
rel="nofollow">Spring LDAP</a>.</p>
Modified: websites/production/camel/content/validation.html
==============================================================================
--- websites/production/camel/content/validation.html (original)
+++ websites/production/camel/content/validation.html Thu Feb 28 06:27:17 2013
@@ -114,7 +114,7 @@ validator:someLocalOrRemoteResource
<h3><a shape="rect" name="Validation-Options"></a>Options</h3>
<div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1"
class="confluenceTh"> Option </th><th colspan="1" rowspan="1"
class="confluenceTh"> Default </th><th colspan="1" rowspan="1"
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1"
class="confluenceTd"> <tt>resourceResolver</tt> </td><td colspan="1"
rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1"
rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Reference to a
<tt>org.w3c.dom.ls.LSResourceResolver</tt> in the <a shape="rect"
href="registry.html" title="Registry">Registry</a>. </td></tr><tr><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>useDom</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> Whether
<tt>DOMSource</tt>/<tt>DOMResult</tt> or <tt>SaxSource</tt>/<tt>SaxResult</tt>
should be used by the validator. </td></tr><tr><td colspan="1" rowspan="1"
class="confluenceTd"> <tt>us
eSharedSchema</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">
<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel
2.3:</b> Whether the <tt>Schema</tt> instance should be shared or not. This
option is introduced to work around a <a shape="rect" class="external-link"
href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6773084";
rel="nofollow">JDK 1.6.x bug</a>. Xerces should not have this issue.
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">
<tt>failIfNoBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">
<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel
2.9.5/2.10.3:</b> Whether to fail if no body exists. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1"
class="confluenceTh"> Option </th><th colspan="1" rowspan="1"
class="confluenceTh"> Default </th><th colspan="1" rowspan="1"
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1"
class="confluenceTd"> <tt>resourceResolver</tt> </td><td colspan="1"
rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1"
rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Reference to a
<tt>org.w3c.dom.ls.LSResourceResolver</tt> in the <a shape="rect"
href="registry.html" title="Registry">Registry</a>. </td></tr><tr><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>useDom</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> Whether
<tt>DOMSource</tt>/<tt>DOMResult</tt> or <tt>SaxSource</tt>/<tt>SaxResult</tt>
should be used by the validator. </td></tr><tr><td colspan="1" rowspan="1"
class="confluenceTd"> <tt>us
eSharedSchema</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">
<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel
2.3:</b> Whether the <tt>Schema</tt> instance should be shared or not. This
option is introduced to work around a <a shape="rect" class="external-link"
href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6773084";
rel="nofollow">JDK 1.6.x bug</a>. Xerces should not have this issue.
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">
<tt>failIfNoBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">
<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel
2.9.5/2.10.3:</b> Whether to fail if no body exists. </td></tr><tr><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>headerName</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11:</b> To validate
against a header instead of the message
body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">
<tt>failOnNullHeader</tt> </td><td colspan="1" rowspan="1"
class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1"
class="confluenceTd"> <b>Camel 2.11:</b> Whether to fail if no header exists
when validating against a header. </td></tr></tbody></table>
</div>
</div>
@@ -123,22 +123,20 @@ validator:someLocalOrRemoteResource
<p>The following <a shape="rect" class="external-link"
href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml";>example</a>
shows how to configure a route from endpoint <b>direct:start</b> which then
goes to one of two endpoints, either <b>mock:valid</b> or <b>mock:invalid</b>
based on whether or not the XML matches the given schema (which is supplied on
the classpath).</p>
<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
-<pre class="code-xml"><span class="code-tag"><camelContext xmlns=<span
class="code-quote">"http://camel.apache.org/schema/spring";</span>></span>
- <span class="code-tag"><route></span>
- <span class="code-tag"><from uri=<span
class="code-quote">"direct:start"</span>/></span>
- <span class="code-tag"><doTry></span>
- <span class="code-tag"><to uri=<span
class="code-quote">"validator:org/apache/camel/component/validator/schema.xsd"</span>/></span>
- <span class="code-tag"><to uri=<span
class="code-quote">"mock:valid"</span>/></span>
- <span class="code-tag"><doCatch></span>
- <span
class="code-tag"><exception></span>org.apache.camel.ValidationException<span
class="code-tag"></exception></span>
- <span class="code-tag"><to uri=<span
class="code-quote">"mock:invalid"</span>/></span>
- <span class="code-tag"></doCatch></span>
- <span class="code-tag"><doFinally></span>
- <span class="code-tag"><to uri=<span
class="code-quote">"mock:finally"</span>/></span>
- <span class="code-tag"></doFinally></span>
- <span class="code-tag"></doTry></span>
- <span class="code-tag"></route></span>
-<span class="code-tag"></camelContext></span>
+<pre class="code-xml"><span class="code-tag"><route></span>
+ <span class="code-tag"><from uri=<span
class="code-quote">"direct:start"</span>/></span>
+ <span class="code-tag"><doTry></span>
+ <span class="code-tag"><to uri=<span
class="code-quote">"validator:org/apache/camel/component/validator/schema.xsd"</span>/></span>
+ <span class="code-tag"><to uri=<span
class="code-quote">"mock:valid"</span>/></span>
+ <span class="code-tag"><doCatch></span>
+ <span
class="code-tag"><exception></span>org.apache.camel.ValidationException<span
class="code-tag"></exception></span>
+ <span class="code-tag"><to uri=<span
class="code-quote">"mock:invalid"</span>/></span>
+ <span class="code-tag"></doCatch></span>
+ <span class="code-tag"><doFinally></span>
+ <span class="code-tag"><to uri=<span
class="code-quote">"mock:finally"</span>/></span>
+ <span class="code-tag"></doFinally></span>
+ <span class="code-tag"></doTry></span>
+<span class="code-tag"></route></span>
</pre>
</div></div>
