camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r831334 [10/14] - in /websites/production/camel/content: ./ cache/
Date Fri, 07 Sep 2012 22:36:15 GMT
Modified: websites/production/camel/content/glogin.html
==============================================================================
--- websites/production/camel/content/glogin.html (original)
+++ websites/production/camel/content/glogin.html Fri Sep  7 22:36:12 2012
@@ -181,13 +181,11 @@ glogin:<span class="code-comment">//host
 <span class="code-tag">&lt;dependency&gt;</span>
     <span class="code-tag">&lt;groupId&gt;</span>org.apache.camel<span class="code-tag">&lt;/groupId&gt;</span>
     <span class="code-tag">&lt;artifactId&gt;</span>camel-gae<span class="code-tag">&lt;/artifactId&gt;</span>
-    <span class="code-tag">&lt;version&gt;</span>${camel-version}<span class="code-tag">&lt;/version&gt;</span>
+    <span class="code-tag">&lt;version&gt;</span>x.x.x<span class="code-tag">&lt;/version&gt;</span>
 <span class="code-tag">&lt;/dependency&gt;</span>
 </pre>
 </div></div>
 
-<p>where <tt>${camel-version</tt>} must be replaced by the actual version of Camel (2.3.0 or higher).</p>
-
 <h3><a shape="rect" name="glogin-SeeAlso"></a>See Also</h3>
 <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>
 </div>

Modified: websites/production/camel/content/gmail.html
==============================================================================
--- websites/production/camel/content/gmail.html (original)
+++ websites/production/camel/content/gmail.html Fri Sep  7 22:36:12 2012
@@ -77,7 +77,8 @@
         <td valign="top" width="100%">
 <div class="wiki-content maincontent"><h2><a shape="rect" name="gmail-%7B%7Bgmail%7D%7DComponent"></a><tt>gmail</tt> Component</h2>
 
-<p>The <tt>gmail</tt> component contributes to the <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a> (GAE). It supports sending of emails via the GAE <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/mail/" rel="nofollow">mail service</a>. Receiving mails is not supported yet but will be added later. Currently, only Google accounts that are application administrators can send emails.</p>
+<p><b>Available as of Camel 2.1</b><br clear="none">
+The <tt>gmail</tt> component contributes to the <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a> (GAE). It supports sending of emails via the GAE <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/mail/" rel="nofollow">mail service</a>. Receiving mails is not supported yet but will be added later. Currently, only Google accounts that are application administrators can send emails.</p>
 
 <h3><a shape="rect" name="gmail-URIformat"></a>URI format</h3>
 
@@ -128,13 +129,11 @@ gmail:<span class="code-comment">//user@
 <span class="code-tag">&lt;dependency&gt;</span>
     <span class="code-tag">&lt;groupId&gt;</span>org.apache.camel<span class="code-tag">&lt;/groupId&gt;</span>
     <span class="code-tag">&lt;artifactId&gt;</span>camel-gae<span class="code-tag">&lt;/artifactId&gt;</span>
-    <span class="code-tag">&lt;version&gt;</span>${camel-version}<span class="code-tag">&lt;/version&gt;</span>
+    <span class="code-tag">&lt;version&gt;</span>x.x.x<span class="code-tag">&lt;/version&gt;</span>
 <span class="code-tag">&lt;/dependency&gt;</span>
 </pre>
 </div></div>
 
-<p>where <tt>${camel-version</tt>} must be replaced by the actual version of Camel (2.1.0 or higher).</p>
-
 <h3><a shape="rect" name="gmail-SeeAlso"></a>See Also</h3>
 <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>
 </div>

Modified: websites/production/camel/content/gtask.html
==============================================================================
--- websites/production/camel/content/gtask.html (original)
+++ websites/production/camel/content/gtask.html Fri Sep  7 22:36:12 2012
@@ -77,7 +77,8 @@
         <td valign="top" width="100%">
 <div class="wiki-content maincontent"><h2><a shape="rect" name="gtask-%7B%7Bgtask%7D%7DComponent"></a><tt>gtask</tt> Component</h2>
 
-<p>The <tt>gtask</tt> component contributes to the <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a> (GAE). It supports asynchronous message processing on GAE by using the <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/taskqueue/" rel="nofollow">task queueing service</a> as message queue. For adding messages to a queue it uses the task queue API. For receiving messages from a queue it installs an HTTP callback handler. The handler is called by an HTTP POST callback (a <a shape="rect" class="external-link" href="http://www.webhooks.org/" rel="nofollow">web hook</a>) initiated by the task queueing service. Whenever a new task is added to a queue a callback will be sent. The <tt>gtask</tt> component abstracts from these details and supports endpoint URIs that make message queueing on GAE as easy as message queueing with <a shape="rect" href="jms.html" title="JMS">JMS</a> or <a shape="rect" href="seda.h
 tml" title="SEDA">SEDA</a>.</p>
+<p><b>Available as of Camel 2.1</b><br clear="none">
+The <tt>gtask</tt> component contributes to the <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a> (GAE). It supports asynchronous message processing on GAE by using the <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/taskqueue/" rel="nofollow">task queueing service</a> as message queue. For adding messages to a queue it uses the task queue API. For receiving messages from a queue it installs an HTTP callback handler. The handler is called by an HTTP POST callback (a <a shape="rect" class="external-link" href="http://www.webhooks.org/" rel="nofollow">web hook</a>) initiated by the task queueing service. Whenever a new task is added to a queue a callback will be sent. The <tt>gtask</tt> component abstracts from these details and supports endpoint URIs that make message queueing on GAE as easy as message queueing with <a shape="rect" href="jms.html" title="JMS">JMS</a> or <a shape="rect" href="seda.html
 " title="SEDA">SEDA</a>.</p>
 
 <h3><a shape="rect" name="gtask-URIformat"></a>URI format</h3>
 
@@ -153,13 +154,11 @@ from(gtask:<span class="code-keyword">de
 <span class="code-tag">&lt;dependency&gt;</span>
     <span class="code-tag">&lt;groupId&gt;</span>org.apache.camel<span class="code-tag">&lt;/groupId&gt;</span>
     <span class="code-tag">&lt;artifactId&gt;</span>camel-gae<span class="code-tag">&lt;/artifactId&gt;</span>
-    <span class="code-tag">&lt;version&gt;</span>${camel-version}<span class="code-tag">&lt;/version&gt;</span>
+    <span class="code-tag">&lt;version&gt;</span>x.x.x<span class="code-tag">&lt;/version&gt;</span>
 <span class="code-tag">&lt;/dependency&gt;</span>
 </pre>
 </div></div>
 
-<p>where <tt>${camel-version</tt>} must be replaced by the actual version of Camel (2.1.0 or higher).</p>
-
 <h3><a shape="rect" name="gtask-SeeAlso"></a>See Also</h3>
 <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>
 

Modified: websites/production/camel/content/header.html
==============================================================================
--- websites/production/camel/content/header.html (original)
+++ websites/production/camel/content/header.html Fri Sep  7 22:36:12 2012
@@ -79,8 +79,6 @@
 
 <p>The Header Expression Language allows you to extract values of named headers.</p>
 
-<p><b>Available as of Camel 1.5</b></p>
-
 <h3><a shape="rect" name="Header-Exampleusage"></a>Example usage</h3>
 
 <p>The recipientList element of the Spring DSL can utilize a header expression like: </p>

Modified: websites/production/camel/content/http.html
==============================================================================
--- websites/production/camel/content/http.html (original)
+++ websites/production/camel/content/http.html Fri Sep  7 22:36:12 2012
@@ -166,7 +166,7 @@ from(<span class="code-quote">"direct:st
 <h3><a shape="rect" name="HTTP-HttpEndpointOptions"></a>HttpEndpoint Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>throwExceptionOnFailure</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Option to disable throwing the <tt>HttpOperationFailedException</tt> in case of failed responses from the remote server. This allows you to get all responses regardles of the HTTP status code. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>bridgeEndpoint</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the option is true , HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may al
 so set the <b>throwExcpetionOnFailure</b> to be false to let the HttpProducer send all the fault response back. <br clear="none" class="atl-forced-newline">
-<b>Camel 2.3:</b> If the option is true, HttpProducer and CamelServlet will skip the gzip processing if the content-encoding is "gzip". </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>disableStreamCache</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> DefaultHttpBinding will copy the request input stream into a stream cache and put it into message body if this option is false to support read it twice, otherwise DefaultHttpBinding will set the request input stream direct into the message body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpBindingRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpBinding</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. From Camel 2.3 onwards prefer to us
 e the <tt>httpBinding</tt> option. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpBinding</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpBinding</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpClientConfigurerRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpClientConfigurer</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. From Camel 2.3 onwards prefer to use the <tt>httpClientConfigurer</tt> option. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpClientConfigurer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <
 tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpClientConfigurer</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpClient.XXX</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Setting options on the <a shape="rect" class="external-link" href="http://hc.apache.org/httpclient-3.x/apidocs/org/apache/commons/httpclient/params/HttpClientParams.html">HttpClientParams</a>. For instance <tt>httpClient.soTimeout=5000</tt> will set the <tt>SO_TIMEOUT</tt> to 5 seconds. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>clientConnectionManager</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> To use a custom <tt>org.apache.http.conn.ClientC
 onnectionManager</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transferException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6:</b> If enabled and an <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> failed processing on the consumer side, and if the caused <tt>Exception</tt> was send back serialized in the response as a <tt>application/x-java-serialized-object</tt> content type (for example using <a shape="rect" href="jetty.html" title="Jetty">Jetty</a> or <a shape="rect" href="servlet.html" title="SERVLET">SERVLET</a> Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the <tt>HttpOperationFailedException</tt>. The caused exception is required to be serialized. </td></tr></tbody></table>
+<b>Camel 2.3:</b> If the option is true, HttpProducer and CamelServlet will skip the gzip processing if the content-encoding is "gzip". </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>disableStreamCache</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> DefaultHttpBinding will copy the request input stream into a stream cache and put it into message body if this option is false to support read it twice, otherwise DefaultHttpBinding will set the request input stream direct into the message body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpBindingRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpBinding</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. From Camel 2.3 onwards prefer to us
 e the <tt>httpBinding</tt> option. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpBinding</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpBinding</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpClientConfigurerRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpClientConfigurer</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. From Camel 2.3 onwards prefer to use the <tt>httpClientConfigurer</tt> option. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpClientConfigurer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <
 tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpClientConfigurer</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpClient.XXX</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Setting options on the <a shape="rect" class="external-link" href="http://hc.apache.org/httpclient-3.x/apidocs/org/apache/commons/httpclient/params/HttpClientParams.html">HttpClientParams</a>. For instance <tt>httpClient.soTimeout=5000</tt> will set the <tt>SO_TIMEOUT</tt> to 5 seconds. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>clientConnectionManager</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> To use a custom <tt>org.apache.http.conn.ClientC
 onnectionManager</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transferException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6:</b> If enabled and an <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> failed processing on the consumer side, and if the caused <tt>Exception</tt> was send back serialized in the response as a <tt>application/x-java-serialized-object</tt> content type (for example using <a shape="rect" href="jetty.html" title="Jetty">Jetty</a> or <a shape="rect" href="servlet.html" title="SERVLET">SERVLET</a> Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the <tt>HttpOperationFailedException</tt>. The caused exception is required to be serialized. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>headerFilterStrategy</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> Reference to a instance of <tt>org.apache.camel.spi.HeaderFilterStrategy</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. It will be used to apply the custom headerFilterStrategy on the new create HttpEndpoint. </td></tr></tbody></table>
 </div>
 </div>
 

Modified: websites/production/camel/content/http4.html
==============================================================================
--- websites/production/camel/content/http4.html (original)
+++ websites/production/camel/content/http4.html Fri Sep  7 22:36:12 2012
@@ -111,7 +111,7 @@ http4:hostname[:port][/resourceUri][?opt
 <h3><a shape="rect" name="HTTP4-HttpEndpointOptions"></a>HttpEndpoint Options</h3>
 
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>x509HostnameVerifier</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>BrowserCompatHostnameVerifier</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.7:</b> You can refer to a different <tt>org.apache.http.conn.ssl.X509HostnameVerifier</tt> instance in the <a shape="rect" href="registry.html" title="Registry">Registry</a> such as <tt>org.apache.http.conn.ssl.StrictHostnameVerifier</tt> or <tt>org.apache.http.conn.ssl.AllowAllHostnameVerifier</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>throwExceptionOnFailure</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" c
 lass="confluenceTd"> Option to disable throwing the <tt>HttpOperationFailedException</tt> in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>bridgeEndpoint</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the <b>throwExcpetionOnFailure</b> to be false to let the HttpProducer send all fault responses back. Also if set to true HttpProducer and CamelServlet will skip the gzip processing if the content-encoding is "gzip". </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>disableStreamCache</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Defaul
 tHttpBinding will copy the request input stream into a stream cache and put it into the message body if this option is false to support multiple reads, otherwise DefaultHttpBinding will set the request input stream directly in the message body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpBindingRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpBinding</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. Recommended to use the <tt>httpBinding</tt> option instead. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpBinding</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> To use a custom <tt>org.apache.camel.component.http.HttpBinding</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="c
 onfluenceTd"> <tt>httpClientConfigurerRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpClientConfigurer</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. Recommended to use the <tt>httpClientConfigurer</tt> option instead. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpContext</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> To use a custom <tt>org.apache.http.protocol.HttpContext</tt> when executing requests. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpContextRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> Reference to a custom <tt>org.apache.http.protoco
 l.HttpContext</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. Recommended to use the <tt>httpContext</tt> option instead. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpClientConfigurer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpClientConfigurer</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpClient.XXX</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Setting options on the <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/org/apache/http/params/BasicHttpParams.html">BasicHttpParams</a>. For instance <tt>httpClient.soTimeout=5000</tt> will set th
 e <tt>SO_TIMEOUT</tt> to 5 seconds. Look on the setter methods of the following parameter beans for a complete reference: <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/auth/params/AuthParamBean.html">AuthParamBean</a>, <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/client/params/ClientParamBean.html">ClientParamBean</a>, <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/conn/params/ConnConnectionParamBean.html">ConnConnectionParamBean</a>, <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/conn/params/ConnRouteParamBean.html">ConnRouteParamBean</a>, <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/co
 okie/params/CookieSpecParamBean.html">CookieSpecParamBean</a>, <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/org/apache/http/params/HttpConnectionParamBean.html">HttpConnectionParamBean</a> and <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/org/apache/http/params/HttpProtocolParamBean.html">HttpProtocolParamBean</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>clientConnectionManager</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> To use a custom <tt>org.apache.http.conn.ClientConnectionManager</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transferException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If enabled and an <a shape="rect" href="exchan
 ge.html" title="Exchange">Exchange</a> failed processing on the consumer side, and if the caused <tt>Exception</tt> was send back serialized in the response as a <tt>application/x-java-serialized-object</tt> content type (for example using <a shape="rect" href="jetty.html" title="Jetty">Jetty</a> or <a shape="rect" href="servlet.html" title="SERVLET">SERVLET</a> Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the <tt>HttpOperationFailedException</tt>. The caused exception is required to be serialized. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxTotalConnections</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>200</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum number of connections. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>connectionsPerRoute</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>20</tt> </td><td colspa
 n="1" rowspan="1" class="confluenceTd"> The maximum number of connections per route. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>sslContextParametersRef</tt><br clear="none" class="atl-forced-newline"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt><br clear="none" class="atl-forced-newline"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Reference to a <tt>org.apache.camel.util.jsse.SSLContextParameters</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>.&#160; This reference overrides any configured SSLContextParameters at the component level.&#160; See <a shape="rect" href="#HTTP4-UsingtheJSSEConfigurationUtility">Using the JSSE Configuration Utility</a>.<br clear="none" class="atl-forced-newline"> </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>x509HostnameVerifier</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>BrowserCompatHostnameVerifier</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.7:</b> You can refer to a different <tt>org.apache.http.conn.ssl.X509HostnameVerifier</tt> instance in the <a shape="rect" href="registry.html" title="Registry">Registry</a> such as <tt>org.apache.http.conn.ssl.StrictHostnameVerifier</tt> or <tt>org.apache.http.conn.ssl.AllowAllHostnameVerifier</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>throwExceptionOnFailure</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" c
 lass="confluenceTd"> Option to disable throwing the <tt>HttpOperationFailedException</tt> in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>bridgeEndpoint</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the <b>throwExcpetionOnFailure</b> to be false to let the HttpProducer send all fault responses back. Also if set to true HttpProducer and CamelServlet will skip the gzip processing if the content-encoding is "gzip". </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>disableStreamCache</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Defaul
 tHttpBinding will copy the request input stream into a stream cache and put it into the message body if this option is false to support multiple reads, otherwise DefaultHttpBinding will set the request input stream directly in the message body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpBindingRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpBinding</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. Recommended to use the <tt>httpBinding</tt> option instead. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpBinding</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> To use a custom <tt>org.apache.camel.component.http.HttpBinding</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="c
 onfluenceTd"> <tt>httpClientConfigurerRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpClientConfigurer</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. Recommended to use the <tt>httpClientConfigurer</tt> option instead. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpContext</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> To use a custom <tt>org.apache.http.protocol.HttpContext</tt> when executing requests. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpContextRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.2:</b> Reference to a custom <tt>org.apache.http.protoco
 l.HttpContext</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. Recommended to use the <tt>httpContext</tt> option instead. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpClientConfigurer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.component.http.HttpClientConfigurer</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>httpClient.XXX</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Setting options on the <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/org/apache/http/params/BasicHttpParams.html">BasicHttpParams</a>. For instance <tt>httpClient.soTimeout=5000</tt> will set th
 e <tt>SO_TIMEOUT</tt> to 5 seconds. Look on the setter methods of the following parameter beans for a complete reference: <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/auth/params/AuthParamBean.html">AuthParamBean</a>, <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/client/params/ClientParamBean.html">ClientParamBean</a>, <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/conn/params/ConnConnectionParamBean.html">ConnConnectionParamBean</a>, <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/conn/params/ConnRouteParamBean.html">ConnRouteParamBean</a>, <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/co
 okie/params/CookieSpecParamBean.html">CookieSpecParamBean</a>, <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/org/apache/http/params/HttpConnectionParamBean.html">HttpConnectionParamBean</a> and <a shape="rect" class="external-link" href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/org/apache/http/params/HttpProtocolParamBean.html">HttpProtocolParamBean</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>clientConnectionManager</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> To use a custom <tt>org.apache.http.conn.ClientConnectionManager</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transferException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If enabled and an <a shape="rect" href="exchan
 ge.html" title="Exchange">Exchange</a> failed processing on the consumer side, and if the caused <tt>Exception</tt> was send back serialized in the response as a <tt>application/x-java-serialized-object</tt> content type (for example using <a shape="rect" href="jetty.html" title="Jetty">Jetty</a> or <a shape="rect" href="servlet.html" title="SERVLET">SERVLET</a> Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the <tt>HttpOperationFailedException</tt>. The caused exception is required to be serialized. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxTotalConnections</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>200</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum number of connections. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>connectionsPerRoute</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>20</tt> </td><td colspa
 n="1" rowspan="1" class="confluenceTd"> The maximum number of connections per route. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>sslContextParametersRef</tt><br clear="none" class="atl-forced-newline"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt><br clear="none" class="atl-forced-newline"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Reference to a <tt>org.apache.camel.util.jsse.SSLContextParameters</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>.&#160; This reference overrides any configured SSLContextParameters at the component level.&#160; See <a shape="rect" href="#HTTP4-UsingtheJSSEConfigurationUtility">Using the JSSE Configuration Utility</a>.<br clear="none" class="atl-forced-newline"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>headerFilterStrategy</tt><br clear="none" class="atl-forced-newline"> </td><td colspan="1" rowspan="1" class="co
 nfluenceTd"> <tt>null</tt><br clear="none" class="atl-forced-newline"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11:</b> Reference to a instance of <tt>org.apache.camel.spi.HeaderFilterStrategy</tt> in the <a shape="rect" href="registry.html" title="Registry">Registry</a>.&#160;It will be used to apply the custom headerFilterStrategy on the new create HttpEndpoint.<br clear="none" class="atl-forced-newline"> </td></tr></tbody></table>
 </div>
 </div>
 

Modified: websites/production/camel/content/ibatis.html
==============================================================================
--- websites/production/camel/content/ibatis.html (original)
+++ websites/production/camel/content/ibatis.html Fri Sep  7 22:36:12 2012
@@ -112,7 +112,7 @@ In Camel 2.2 you can configure this on t
 
 <h3><a shape="rect" name="iBATIS-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"> Type </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>consumer.onConsume</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Statements to run after consuming. Can be used, for example, to update rows after they have been consumed and processed in Camel. See sample later. Multiple statements can be separated with comma. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.useIterator</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluence
 Td"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If <tt>true</tt> each row returned when polling will be processed individually. If <tt>false</tt> the entire <tt>List</tt> of data is set as the IN body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.routeEmptyResultSet</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> Sets whether empty result set should be routed or not. By default, empty result sets are not routed. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>statementType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>StatementType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 1.6.1/2.0:</b> Mandatory to specify for Ibati
 sProducer to control which iBatis <tt>SqlMapClient</tt> method to invoke. The enum values are: <tt>QueryForObject</tt>, <tt>QueryForList</tt>, <tt>Insert</tt>, <tt>Update</tt>, <tt>Delete</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxMessagesPerPoll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> An integer to define a maximum messages to gather per poll. By default, no maximum is set. Can be used to set a limit of e.g. 1000 to avoid when starting up the server that there are thousands of files. Set a value of 0 or negative to disabled it. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>isolation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>TRANSACTION_REPEATABLE_READ</tt> </
 td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> A String the defines the transaction isolation level of the will be used. Allowed values are TRANSACTION_NONE, TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE </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"> Type </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>consumer.onConsume</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Statements to run after consuming. Can be used, for example, to update rows after they have been consumed and processed in Camel. See sample later. Multiple statements can be separated with comma. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.useIterator</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluence
 Td"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If <tt>true</tt> each row returned when polling will be processed individually. If <tt>false</tt> the entire <tt>List</tt> of data is set as the IN body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.routeEmptyResultSet</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sets whether empty result set should be routed or not. By default, empty result sets are not routed. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>statementType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>StatementType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Mandatory to specify for IbatisProducer to control which iBatis <tt>SqlM
 apClient</tt> method to invoke. The enum values are: <tt>QueryForObject</tt>, <tt>QueryForList</tt>, <tt>Insert</tt>, <tt>Update</tt>, <tt>Delete</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxMessagesPerPoll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> An integer to define a maximum messages to gather per poll. By default, no maximum is set. Can be used to set a limit of e.g. 1000 to avoid when starting up the server that there are thousands of files. Set a value of 0 or negative to disabled it. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>isolation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>TRANSACTION_REPEATABLE_READ</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Came
 l 2.9:</b> A String the defines the transaction isolation level of the will be used. Allowed values are TRANSACTION_NONE, TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE </td></tr></tbody></table>
 </div>
 
 
@@ -125,13 +125,12 @@ In Camel 2.2 you can configure this on t
 <h3><a shape="rect" name="iBATIS-MessageHeaders"></a>Message Headers</h3>
 <p>Camel will populate the result message, either IN or OUT with a header with the operationName used:</p>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.ibatis.queryName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 1.x: The <b>statementName</b> used (for example: insertAccount). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelIBatisStatementName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 2.0: The <b>statementName</b> used (for example: insertAccount). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelIBatisResult</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Object</tt> </
 td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 1.6.2/2.0: The <b>response</b> returned from iBatis in any of the operations. For instance an <tt>INSERT</tt> could return the auto-generated key, or number of rows etc. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelIBatisStatementName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The <b>statementName</b> used (for example: insertAccount). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelIBatisResult</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Object</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The <b>response</b> returned from iBatis in any of the operations. For instance an <tt>INSERT</tt> could return the auto-generated key, or number of rows etc. </td></tr></tbody></table>
 </div>
 </div>
 
 <h3><a shape="rect" name="iBATIS-MessageBody"></a>Message Body</h3>
-<p><b>Camel 1.6.1</b>: The response from iBatis will be set as OUT body <br clear="none">
-<b>Camel 1.6.2/2.0</b>: The response from iBatis will only be set as body if it's a <tt>SELECT</tt> statement. That means, for example, for <tt>INSERT</tt> statements Camel will not replace the body. This allows you to continue routing and keep the original body. The response from iBatis is always stored in the header with the key <tt>CamelIBatisResult</tt>.</p>
+<p>The response from iBatis will only be set as body if it's a <tt>SELECT</tt> statement. That means, for example, for <tt>INSERT</tt> statements Camel will not replace the body. This allows you to continue routing and keep the original body. The response from iBatis is always stored in the header with the key <tt>CamelIBatisResult</tt>.</p>
 
 <h3><a shape="rect" name="iBATIS-Samples"></a>Samples</h3>
 
@@ -165,8 +164,7 @@ from(<span class="code-quote">"activemq:
 </div></div>
 
 <h3><a shape="rect" name="iBATIS-UsingStatementTypeforbettercontrolofIBatis"></a>Using StatementType for better control of IBatis</h3>
-<p><b>Available as of Camel 1.6.1/2.0</b><br clear="none">
-When routing to an iBatis endpoint you want more fine grained control so you can control whether the SQL statement to be executed is a <tt>SELEECT</tt>, <tt>UPDATE</tt>, <tt>DELETE</tt> or <tt>INSERT</tt> etc. This is now possible in Camel 1.6.1/2.0. So for instance if we want to route to an iBatis endpoint in which the IN body contains parameters to a <tt>SELECT</tt> statement we can do:</p>
+<p>When routing to an iBatis endpoint you want more fine grained control so you can control whether the SQL statement to be executed is a <tt>SELEECT</tt>, <tt>UPDATE</tt>, <tt>DELETE</tt> or <tt>INSERT</tt> etc. So for instance if we want to route to an iBatis endpoint in which the IN body contains parameters to a <tt>SELECT</tt> statement we can do:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">from(<span class="code-quote">"direct:start"</span>)
     .to(<span class="code-quote">"ibatis:selectAccountById?statementType=QueryForObject"</span>)

Modified: websites/production/camel/content/idempotent-consumer.html
==============================================================================
--- websites/production/camel/content/idempotent-consumer.html (original)
+++ websites/production/camel/content/idempotent-consumer.html Fri Sep  7 22:36:12 2012
@@ -94,7 +94,7 @@ On completion Camel will remove the mess
 <p>The Idempotent Consumer has the following options:</p>
 
 <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"> eager </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> Eager controls whether Camel adds the message to the repository before or after the exchange has been processed. If enabled before then Camel will be able to detect duplicate messages even when messages are currently in progress. By disabling Camel will only detect duplicates when a message has successfully been processed. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> messageIdRepositoryRef </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> A reference to a <tt>
 IdempotentRepository</tt> to lookup in the registry. This option is mandatory when using XML DSL. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipDuplicate </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets whether to skip duplicate messages. If set to <tt>false</tt> then the message will be continued. However the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> has been marked as a duplicate by having the <tt>Exchange.DUPLICATE_MESSAG</tt> exchange property set to a <tt>Boolean.TRUE</tt> value. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> removeOnFailure </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Sets whether to remove the id of an Exchange that failed.</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"> eager </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> Eager controls whether Camel adds the message to the repository before or after the exchange has been processed. If enabled before then Camel will be able to detect duplicate messages even when messages are currently in progress. By disabling Camel will only detect duplicates when a message has successfully been processed. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> messageIdRepositoryRef </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> A reference to a <tt>IdempotentReposito
 ry</tt> to lookup in the registry. This option is mandatory when using XML DSL. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipDuplicate </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets whether to skip duplicate messages. If set to <tt>false</tt> then the message will be continued. However the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> has been marked as a duplicate by having the <tt>Exchange.DUPLICATE_MESSAG</tt> exchange property set to a <tt>Boolean.TRUE</tt> value. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> removeOnFailure </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Sets whether to remove the id of an Exchange that failed.</td></tr></tbody></table>
 </div>
 
 

Modified: websites/production/camel/content/irc.html
==============================================================================
--- websites/production/camel/content/irc.html (original)
+++ websites/production/camel/content/irc.html Fri Sep  7 22:36:12 2012
@@ -81,7 +81,8 @@
 
 <p>Maven users will need to add the following dependency to their <tt>pom.xml</tt> for this component:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag">&lt;dependency&gt;</span>
+<pre class="code-xml">
+<span class="code-tag">&lt;dependency&gt;</span>
     <span class="code-tag">&lt;groupId&gt;</span>org.apache.camel<span class="code-tag">&lt;/groupId&gt;</span>
     <span class="code-tag">&lt;artifactId&gt;</span>camel-irc<span class="code-tag">&lt;/artifactId&gt;</span>
     <span class="code-tag">&lt;version&gt;</span>x.x.x<span class="code-tag">&lt;/version&gt;</span>
@@ -93,14 +94,9 @@
 <h3><a shape="rect" name="IRC-URIformat"></a>URI format</h3>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">irc:nick@host[:port]/#room[?options]
-</pre>
-</div></div>
-
-<p>In Camel 2.0, you can also use the following format:</p>
-
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">irc:nick@host[:port]?channels=#channel1,#channel2,#channel3[?options]
+<pre class="code-java">
+irc:nick@host[:port]/#room[?options]
+irc:nick@host[:port]?channels=#channel1,#channel2,#channel3[?options]
 </pre>
 </div></div>
 
@@ -108,7 +104,7 @@
 
 <h3><a shape="rect" name="IRC-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th><th colspan="1" rowspan="1" class="confluenceTh"> Example </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>channels</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> Comma separated list of IRC channels to join. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>channels=#channel1,#channel2</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>nickname</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The nickname used in chat. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>irc:MyNick@irc.server.org#channel</tt> or <tt>irc:irc.server.org#channel?nickname=MyUser</tt> </td><td cols
 pan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>username</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The IRC server user name. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>irc:MyUser@irc.server.org#channel</tt> or <tt>irc:irc.server.org#channel?username=MyUser</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Same as nickname. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The IRC server password. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password=somepass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>None</em> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>realname</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The IRC user's actual name. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>realnam
 e=MyName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>None</em> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>colors</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether or not the server supports color codes. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onReply</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether or not to handle general responses to commands or informational messages. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onNick</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle nickname change events. </td><td colspan="1" rowspan="1" class="confluen
 ceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onQuit</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle user quit events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onJoin</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle user join events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onKick</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle kick events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceT
 d"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onMode</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle mode change events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onPart</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle user part events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onTopic</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle topic change events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="c
 onfluenceTd"> <tt>onPrivmsg</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle message events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>trustManager</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> The trust manager used to verify the SSL server's certificate. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>trustManager=#referenceToTrustManagerBean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The default trust manager, which accepts <em>all</em> certificates, will be used. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keys</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.2:</b> Comma separated list of IRC channel keys. Important to be listed in same order as channels. When joining multiple cha
 nnels with only some needing keys just insert an empty value for that channel. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>irc:MyNick@irc.server.org/#channel?keys=chankey</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> sslContextParameters </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Reference to a <tt>org.apache.camel.util.jsse.SSLContextParameters</tt> in the <a shape="rect" class="external-link" href="http://camel.apache.org/registry.html">Registry</a>.&#160; This reference overrides any configured SSLContextParameters at the component level.&#160; See <a shape="rect" class="external-link" href="http://camel.apache.org/http4.html#HTTP4-UsingtheJSSEConfigurationUtility">Using the JSSE Configuration Utility</a>.&#160; Note that this setting overrides the trustManager option. </td><td colspan="1" rowspan="1" class="confluenceTd"> #mySslContextP
 arameters <br clear="none" class="atl-forced-newline"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th><th colspan="1" rowspan="1" class="confluenceTh"> Example </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>channels</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Comma separated list of IRC channels to join. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>channels=#channel1,#channel2</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>nickname</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The nickname used in chat. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>irc:MyNick@irc.server.org#channel</tt> or <tt>irc:irc.server.org#channel?nickname=MyUser</tt> </td><td colspan="1" rowspan="1
 " class="confluenceTd"> <tt>null</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>username</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The IRC server user name. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>irc:MyUser@irc.server.org#channel</tt> or <tt>irc:irc.server.org#channel?username=MyUser</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Same as nickname. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The IRC server password. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password=somepass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>None</em> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>realname</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The IRC user's actual name. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>realname=MyName</tt> </td
 ><td colspan="1" rowspan="1" class="confluenceTd"> <em>None</em> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>colors</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether or not the server supports color codes. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onReply</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether or not to handle general responses to commands or informational messages. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onNick</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle nickname change events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, f
 alse</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onQuit</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle user quit events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onJoin</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle user join events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onKick</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle kick events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> 
 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onMode</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle mode change events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onPart</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle user part events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onTopic</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle topic change events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>
 onPrivmsg</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Handle message events. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true, false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>trustManager</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The trust manager used to verify the SSL server's certificate. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>trustManager=#referenceToTrustManagerBean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The default trust manager, which accepts <em>all</em> certificates, will be used. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keys</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.2:</b> Comma separated list of IRC channel keys. Important to be listed in same order as channels. When joining multiple channels with only some needing keys ju
 st insert an empty value for that channel. </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>irc:MyNick@irc.server.org/#channel?keys=chankey</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> sslContextParameters </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Reference to a <tt>org.apache.camel.util.jsse.SSLContextParameters</tt> in the <a shape="rect" class="external-link" href="http://camel.apache.org/registry.html">Registry</a>.&#160; This reference overrides any configured SSLContextParameters at the component level.&#160; See <a shape="rect" class="external-link" href="http://camel.apache.org/http4.html#HTTP4-UsingtheJSSEConfigurationUtility">Using the JSSE Configuration Utility</a>.&#160; Note that this setting overrides the trustManager option. </td><td colspan="1" rowspan="1" class="confluenceTd"> #mySslContextParameters <br clear="none" class="at
 l-forced-newline"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td></tr></tbody></table>
 </div>
 </div>
 
@@ -121,7 +117,8 @@
 <h5><a shape="rect" name="IRC-Programmaticconfigurationoftheendpoint"></a>Programmatic configuration of the endpoint</h5>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">KeyStoreParameters ksp = <span class="code-keyword">new</span> KeyStoreParameters();
+<pre class="code-java">
+KeyStoreParameters ksp = <span class="code-keyword">new</span> KeyStoreParameters();
 ksp.setResource(<span class="code-quote">"/users/home/server/truststore.jks"</span>);
 ksp.setPassword(<span class="code-quote">"keystorePassword"</span>);
 
@@ -145,7 +142,8 @@ from(...)
 <h5><a shape="rect" name="IRC-SpringDSLbasedconfigurationofendpoint"></a>Spring DSL based configuration of endpoint</h5>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">...
+<pre class="code-xml">
+...
   &lt;camel:sslContextParameters
       id=<span class="code-quote">"sslContextParameters"</span>&gt;
     <span class="code-tag">&lt;camel:trustManagers&gt;</span>
@@ -161,17 +159,19 @@ from(...)
 
 <h4><a shape="rect" name="IRC-Usingthelegacybasicconfigurationoptions"></a>Using the legacy basic configuration options</h4>
 
-<p>As of Camel 2.0, you can also connect to an SSL enabled IRC server, as follows:</p>
+<p>You can also connect to an SSL enabled IRC server, as follows:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">ircs:host[:port]/#room?username=user&amp;password=pass
+<pre class="code-java">
+ircs:host[:port]/#room?username=user&amp;password=pass
 </pre>
 </div></div>
 
 <p>By default, the IRC transport uses <a shape="rect" class="external-link" href="http://moepii.sourceforge.net/irclib/javadoc/org/schwering/irc/lib/ssl/SSLDefaultTrustManager.html" rel="nofollow">SSLDefaultTrustManager</a>. If you need to provide your own custom trust manager, use the <tt>trustManager</tt> parameter as follows:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">ircs:host[:port]/#room?username=user&amp;password=pass&amp;trustManager=#referenceToMyTrustManagerBean
+<pre class="code-java">
+ircs:host[:port]/#room?username=user&amp;password=pass&amp;trustManager=#referenceToMyTrustManagerBean
 </pre>
 </div></div>
 
@@ -183,7 +183,8 @@ from(...)
 
 <p>For example we join 3 channels where as only channel 1 and 3 uses a key.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">irc:nick@irc.server.org?channels=#chan1,#chan2,#chan3&amp;keys=chan1Key,,chan3key
+<pre class="code-java">
+irc:nick@irc.server.org?channels=#chan1,#chan2,#chan3&amp;keys=chan1Key,,chan3key
 </pre>
 </div></div>
 

Modified: websites/production/camel/content/jaxb.html
==============================================================================
--- websites/production/camel/content/jaxb.html (original)
+++ websites/production/camel/content/jaxb.html Fri Sep  7 22:36:12 2012
@@ -121,7 +121,7 @@ from(<span class="code-quote">"activemq:
 </pre>
 </div></div>
 
-<p>This example shows how to configure the data type just once and reuse it on multiple routes. For Camel versions below 1.5.0 you have to set the &lt;jaxb&gt; element directly in &lt;camelContext&gt;.</p>
+<p>This example shows how to configure the data type just once and reuse it on multiple routes.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-xml"><span class="code-tag">&lt;camelContext id=<span class="code-quote">"camel"</span> xmlns=<span class="code-quote">"http://camel.apache.org/schema/spring"</span>&gt;</span>
@@ -194,12 +194,12 @@ JaxbDataFromat supports to ignore the <a
 
 <h3><a shape="rect" name="JAXB-WorkingwiththeObjectFactory"></a>Working with the ObjectFactory</h3>
 
-<p>If you use XJC to create the java class from the schema, you will get an ObjectFactory for you JAXB context. Since the ObjectFactory uses <a shape="rect" class="external-link" href="http://java.sun.com/javase/6/docs/api/javax/xml/bind/JAXBElement.html" rel="nofollow">JAXBElement</a> to hold the reference of the schema and element instance value, from Camel 1.5.1 jaxbDataformat will ignore the JAXBElement by default and you will get the element instance value instead of the JAXBElement object form the unmarshaled message body. <br clear="none">
+<p>If you use XJC to create the java class from the schema, you will get an ObjectFactory for you JAXB context. Since the ObjectFactory uses <a shape="rect" class="external-link" href="http://java.sun.com/javase/6/docs/api/javax/xml/bind/JAXBElement.html" rel="nofollow">JAXBElement</a> to hold the reference of the schema and element instance value, jaxbDataformat will ignore the JAXBElement by default and you will get the element instance value instead of the JAXBElement object form the unmarshaled message body. <br clear="none">
 If you want to get the JAXBElement object form the unmarshaled message body, you need to set the JaxbDataFormat object's ignoreJAXBElement property to be false.</p>
 
 
 <h3><a shape="rect" name="JAXB-Settingencoding"></a>Setting encoding</h3>
-<p>In Camel 1.6.1 and newer you can set the <b>encoding</b> option to use when marshalling. Its the <tt>Marshaller.JAXB_ENCODING</tt> encoding property on the JAXB Marshaller.<br clear="none">
+<p>You can set the <b>encoding</b> option to use when marshalling. Its the <tt>Marshaller.JAXB_ENCODING</tt> encoding property on the JAXB Marshaller.<br clear="none">
 You can setup which encoding to use when you declare the JAXB data format. You can also provide the encoding in the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> property <tt>Exchange.CHARSET_NAME</tt>. This property will overrule the encoding set on the JAXB data format.</p>
 
 <p>In this Spring DSL we have defined to use <tt>iso-8859-1</tt> as the encoding:</p>
@@ -228,7 +228,7 @@ You can setup which encoding to use when
 &lt;dependency&gt;
   &lt;groupId&gt;org.apache.camel&lt;/groupId&gt;
   &lt;artifactId&gt;camel-jaxb&lt;/artifactId&gt;
-  &lt;version&gt;1.6.0&lt;/version&gt;
+  &lt;version&gt;x.x.x&lt;/version&gt;
 &lt;/dependency&gt;
 </pre>
 </div></div>

Modified: websites/production/camel/content/jbi.html
==============================================================================
--- websites/production/camel/content/jbi.html (original)
+++ websites/production/camel/content/jbi.html Fri Sep  7 22:36:12 2012
@@ -164,8 +164,8 @@ from(<span class="code-quote">"jbi:endpo
 </pre>
 </div></div>
 
-<p>From <b>Camel 1.5</b> onwards, the stream caching is default enabled, so it is not necessary to set the <tt>streamCaching()</tt> option.<br clear="none">
-In <b>Camel 2.0</b> we store big input streams (by default, over 64K) in a <tt>temp</tt> file using <tt>CachedOutputStream</tt>. When you close the input stream, the temp file will be deleted.</p>
+<p>The stream caching is default enabled, so it is not necessary to set the <tt>streamCaching()</tt> option.<br clear="none">
+We store big input streams (by default, over 64K) in a <tt>temp</tt> file using <tt>CachedOutputStream</tt>. When you close the input stream, the temp file will be deleted.</p>
 
 <h3><a shape="rect" name="JBI-CreatingaJBIServiceUnit"></a>Creating a JBI Service Unit</h3>
 
@@ -195,7 +195,7 @@ In <b>Camel 2.0</b> we store big input s
   &lt;url&gt;http:<span class="code-comment">//www.myorganization.org&lt;/url&gt;
 </span>
   &lt;properties&gt;
-    &lt;camel-version&gt;1.0.0&lt;/camel-version&gt;
+    &lt;camel-version&gt;x.x.x&lt;/camel-version&gt;
     &lt;servicemix-version&gt;3.3&lt;/servicemix-version&gt;
   &lt;/properties&gt;
 

Modified: websites/production/camel/content/jdbc.html
==============================================================================
--- websites/production/camel/content/jdbc.html (original)
+++ websites/production/camel/content/jdbc.html Fri Sep  7 22:36:12 2012
@@ -110,7 +110,7 @@ jdbc:dataSourceName[?options]
 <h3><a shape="rect" name="JDBC-Options"></a>Options</h3>
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>readSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> / <tt>2000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The default maximum number of rows that can be read by a polling query. The default value is 2000 for Camel 1.5.0 or older. In newer releases the default value is 0. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>statement.&lt;xxx&gt;</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.1:</b> Sets additional options on the <tt>java.sql.Statement</tt> that is used behind the scenes to execute the queries. For instance, <tt>st
 atement.maxRows=10</tt>. For detailed documentation, see the <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/java/sql/Statement.html" rel="nofollow"><tt>java.sql.Statement</tt> javadoc</a> documentation. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>useJDBC4ColumnNameAndLabelSemantics</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 1.6.3/2.2:</b> Sets whether to use JDBC 4/3 column label/name semantics. You can use this option to turn it <tt>false</tt> in case you have issues with your JDBC driver to select data. This only applies when using <tt>SQL SELECT</tt> using aliases (e.g. <tt>SQL SELECT id as identifier, name as given_name from persons</tt>). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>resetAutoCommit</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" ro
 wspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Camel will set the autoCommit on the JDBC connection to be false, commit the change after executed the statement and reset the autoCommit flag of the connection at the end, if the resetAutoCommit is true. If the JDBC connection doesn't support to reset the autoCommit flag, you can set the resetAutoCommit flag to be false, and Camel will not try to reset the autoCommit flag.</td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>readSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> / <tt>2000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The default maximum number of rows that can be read by a polling query. The default value is 2000 for Camel 1.5.0 or older. In newer releases the default value is 0. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>statement.&lt;xxx&gt;</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.1:</b> Sets additional options on the <tt>java.sql.Statement</tt> that is used behind the scenes to execute the queries. For instance, <tt>st
 atement.maxRows=10</tt>. For detailed documentation, see the <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/java/sql/Statement.html" rel="nofollow"><tt>java.sql.Statement</tt> javadoc</a> documentation. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>useJDBC4ColumnNameAndLabelSemantics</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.2:</b> Sets whether to use JDBC 4/3 column label/name semantics. You can use this option to turn it <tt>false</tt> in case you have issues with your JDBC driver to select data. This only applies when using <tt>SQL SELECT</tt> using aliases (e.g. <tt>SQL SELECT id as identifier, name as given_name from persons</tt>). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>resetAutoCommit</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan=
 "1" class="confluenceTd"> <b>Camel 2.9:</b> Camel will set the autoCommit on the JDBC connection to be false, commit the change after executed the statement and reset the autoCommit flag of the connection at the end, if the resetAutoCommit is true. If the JDBC connection doesn't support to reset the autoCommit flag, you can set the resetAutoCommit flag to be false, and Camel will not try to reset the autoCommit flag.</td></tr></tbody></table>
 </div>
 
 

Modified: websites/production/camel/content/jing.html
==============================================================================
--- websites/production/camel/content/jing.html (original)
+++ websites/production/camel/content/jing.html Fri Sep  7 22:36:12 2012
@@ -118,7 +118,7 @@ rnc:someLocalOrRemoteResource
 
 <h3><a shape="rect" name="Jing-Options"></a>Options</h3>
 <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>useDom</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> Specifies whether DOMSource/DOMResult or SaxSource/SaxResult should be used by the validator. </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>useDom</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies whether DOMSource/DOMResult or SaxSource/SaxResult should be used by the validator. </td></tr></tbody></table>
 </div>
 
 



Mime
View raw message