You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bu...@apache.org on 2012/09/08 00:36:15 UTC
svn commit: r831334 [11/14] - in /websites/production/camel/content: ./
cache/
Modified: websites/production/camel/content/jpa.html
==============================================================================
--- websites/production/camel/content/jpa.html (original)
+++ websites/production/camel/content/jpa.html Fri Sep 7 22:36:12 2012
@@ -121,14 +121,14 @@ jpa:[entityClassName][?options]
<h3><a shape="rect" name="JPA-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"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>entityType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>entityClassName</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> Overrides the <em>entityClassName</em> from the URI. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>persistenceUnit</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>camel</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The JPA persistence unit used by default. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumeDelete</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer o
nly:</b> If <tt>true</tt>, the entity is deleted after it is consumed; if <tt>false</tt>, the entity is not deleted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumeLockEntity</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Specifies whether or not to set an exclusive lock on each entity bean while processing the results from polling. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>flushOnSend</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA producer only:</b> Flushes the <a shape="rect" class="external-link" href="http://java.sun.com/javaee/5/docs/api/javax/persistence/EntityManager.html" rel="nofollow">EntityManager</a> after the entity bean has been persisted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maximumR
esults</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>-1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Set the maximum number of results to retrieve on the <a shape="rect" class="external-link" href="http://java.sun.com/javaee/5/docs/api/javax/persistence/Query.html" rel="nofollow">Query</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transactionManager</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> Specifies the transaction manager to use. If none provided, Camel will use a <tt>JpaTransactionManager</tt> by default. Can be used to set a JTA transaction manager (for integration with an EJB container). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.delay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>500</tt> </td><td colspan="1" rowspan="1" cl
ass="confluenceTd"> <b>JPA consumer only:</b> Delay in milliseconds between each poll. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.initialDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Milliseconds before polling starts. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.useFixedDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Set to <tt>true</tt> to use fixed delay between polls, otherwise fixed rate is used. See <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/ScheduledExecutorService.html" rel="nofollow">ScheduledExecutorService</a> in JDK for details. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxMessagesPerPol
l</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> <b>JPA consumer only:</b> An integer value to define the maximum number of messages to gather per poll. By default, no maximum is set. Can be used to avoid polling many thousands of messages when starting up the server. Set a value of 0 or negative to disable. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.query</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.namedQuery</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a named query when consuming data. </td></tr><tr><td colspan="1" rows
pan="1" class="confluenceTd"> <tt>consumer.nativeQuery</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom native query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.resultClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.7: JPA consumer only:</b> Defines the type of the returned payload (we will call <tt>entityManager.createNativeQuery(nativeQuery, resultClass)</tt> instead of <tt>entityManager.createNativeQuery(nativeQuery)</tt>). Without this option, we will return an object array. Only has an affect when using in conjunction with native query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.transacted</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </t
d><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.7.5/2.8.3/2.9: JPA consumer only:</b> Whether to run the consumer in transacted mode, by which all messages will either commit or rollback, when the entire batch has been processed. The default behavior (false) is to commit all the previously successfully processed messages, and only rollback the last failed message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>usePersist</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5: JPA producer only:</b> Indicates to use <tt>entityManager.persist(entity)</tt> instead of <tt>entityManager.merge(entity)</tt>. Note: <tt>entityManager.persist(entity)</tt> doesn't work for detached entities (where the EntityManager has to execute an UPDATE instead of an INSERT query)! </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>entityType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>entityClassName</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> Overrides the <em>entityClassName</em> from the URI. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>persistenceUnit</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>camel</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The JPA persistence unit used by default. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumeDelete</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer o
nly:</b> If <tt>true</tt>, the entity is deleted after it is consumed; if <tt>false</tt>, the entity is not deleted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumeLockEntity</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Specifies whether or not to set an exclusive lock on each entity bean while processing the results from polling. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>flushOnSend</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA producer only:</b> Flushes the <a shape="rect" class="external-link" href="http://java.sun.com/javaee/5/docs/api/javax/persistence/EntityManager.html" rel="nofollow">EntityManager</a> after the entity bean has been persisted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maximumR
esults</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>-1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Set the maximum number of results to retrieve on the <a shape="rect" class="external-link" href="http://java.sun.com/javaee/5/docs/api/javax/persistence/Query.html" rel="nofollow">Query</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transactionManager</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies the transaction manager to use. If none provided, Camel will use a <tt>JpaTransactionManager</tt> by default. Can be used to set a JTA transaction manager (for integration with an EJB container). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.delay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>500</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>J
PA consumer only:</b> Delay in milliseconds between each poll. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.initialDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Milliseconds before polling starts. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.useFixedDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Set to <tt>true</tt> to use fixed delay between polls, otherwise fixed rate is used. See <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/ScheduledExecutorService.html" rel="nofollow">ScheduledExecutorService</a> in JDK for details. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxMessagesPerPoll</tt> </td><td colspan=
"1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> An integer value to define the maximum number of messages to gather per poll. By default, no maximum is set. Can be used to avoid polling many thousands of messages when starting up the server. Set a value of 0 or negative to disable. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.query</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.namedQuery</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a named query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer
.nativeQuery</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom native query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.resultClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.7: JPA consumer only:</b> Defines the type of the returned payload (we will call <tt>entityManager.createNativeQuery(nativeQuery, resultClass)</tt> instead of <tt>entityManager.createNativeQuery(nativeQuery)</tt>). Without this option, we will return an object array. Only has an affect when using in conjunction with native query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.transacted</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confl
uenceTd"> <b>Camel 2.7.5/2.8.3/2.9: JPA consumer only:</b> Whether to run the consumer in transacted mode, by which all messages will either commit or rollback, when the entire batch has been processed. The default behavior (false) is to commit all the previously successfully processed messages, and only rollback the last failed message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>usePersist</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5: JPA producer only:</b> Indicates to use <tt>entityManager.persist(entity)</tt> instead of <tt>entityManager.merge(entity)</tt>. Note: <tt>entityManager.persist(entity)</tt> doesn't work for detached entities (where the EntityManager has to execute an UPDATE instead of an INSERT query)! </td></tr></tbody></table>
</div>
</div>
<h3><a shape="rect" name="JPA-MessageHeaders"></a>Message Headers</h3>
<p>Camel adds the following message headers to the exchange:</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>CamelJpaTemplate</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>JpaTemplate</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> The <tt>JpaTemplate</tt> object that is used to access the entity bean. You need this object in some situations, for instance in a type converter or when you are doing some custom processing. </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>CamelJpaTemplate</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>JpaTemplate</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The <tt>JpaTemplate</tt> object that is used to access the entity bean. You need this object in some situations, for instance in a type converter or when you are doing some custom processing. </td></tr></tbody></table>
</div>
</div>
Modified: websites/production/camel/content/jsch.html
==============================================================================
--- websites/production/camel/content/jsch.html (original)
+++ websites/production/camel/content/jsch.html Fri Sep 7 22:36:12 2012
@@ -85,7 +85,8 @@
<span class="code-tag"><dependency></span>
<span class="code-tag"><groupId></span>org.apache.camel<span class="code-tag"></groupId></span>
<span class="code-tag"><artifactId></span>camel-jsch<span class="code-tag"></artifactId></span>
- <span class="code-tag"><version></span>${camel.version}<span class="code-tag"></version></span> <span class="code-tag"><span class="code-comment"><!-- use the same version as your Camel core version --></span></span>
+ <span class="code-tag"><version></span>x.x.x<span class="code-tag"></version></span>
+ <span class="code-tag"><span class="code-comment"><!-- use the same version as your Camel core version --></span></span>
<span class="code-tag"></dependency></span>
</pre>
</div></div>
Modified: websites/production/camel/content/jxpath.html
==============================================================================
--- websites/production/camel/content/jxpath.html (original)
+++ websites/production/camel/content/jxpath.html Fri Sep 7 22:36:12 2012
@@ -79,7 +79,7 @@
<p>Camel supports <a shape="rect" class="external-link" href="http://commons.apache.org/jxpath/">JXPath</a> to allow <a shape="rect" href="xpath.html" title="XPath">XPath</a> expressions to be used on beans in an <a shape="rect" href="expression.html" title="Expression">Expression</a> or <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> to be used in the <a shape="rect" href="dsl.html" title="DSL">DSL</a> or <a shape="rect" href="xml-configuration.html" title="Xml Configuration">Xml Configuration</a>. For example you could use JXPath to create an <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> in a <a shape="rect" href="message-filter.html" title="Message Filter">Message Filter</a> or as an <a shape="rect" href="expression.html" title="Expression">Expression</a> for a <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a>.</p>
-<p>From 1.3 of Camel onwards you can use XPath expressions directly using smart completion in your IDE as follows</p>
+<p>You can use XPath expressions directly using smart completion in your IDE as follows</p>
<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
<pre class="code-java">
@@ -105,7 +105,7 @@ from(<span class="code-quote">"queue:foo
<beans xmlns=<span class="code-quote">"http://www.springframework.org/schema/beans"</span>
<span class="code-keyword">xmlns:xsi</span>=<span class="code-quote">"http://www.w3.org/2001/XMLSchema-instance"</span>
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<span class="code-tag"><camelContext id=<span class="code-quote">"camel"</span> xmlns=<span class="code-quote">"http://activemq.apache.org/camel/schema/spring"</span>></span>
@@ -161,7 +161,7 @@ from(<span class="code-quote">"queue:foo
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jxpath</artifactId>
- <version>1.4.0</version>
+ <version>x.x.x</version>
</dependency>
</pre>
</div></div>
Modified: websites/production/camel/content/ldap.html
==============================================================================
--- websites/production/camel/content/ldap.html (original)
+++ websites/production/camel/content/ldap.html Fri Sep 7 22:36:12 2012
@@ -135,8 +135,6 @@ ldap:ldapServerBean[?options]
<div class="panelMacro"><table class="noteMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><tt>DirContext</tt> objects are <b>not</b> required to support concurrency by contract. It is therefore important that the directory context is declared with the setting, <tt>scope="prototype"</tt>, in the <tt>bean</tt> definition or that the context supports concurrency. In the Spring framework, <tt>prototype</tt> scoped objects are instantiated each time they are looked up.</td></tr></table></div>
-<div class="panelMacro"><table class="noteMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">Camel 1.6.1 and Camel 2.0 include a <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/CAMEL-1583?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=51503">fix</a> to support concurrency for LDAP producers. <em>ldapServerBean</em> contexts are now looked up each time a request is sent to the LDAP server. In addition, the contexts are released as soon as the producer completes.</td></tr></table></div>
-
<h3><a shape="rect" name="LDAP-Samples"></a>Samples</h3>
<p>Following on from the Spring configuration above, the code sample below sends an LDAP request to filter search a group for a member. The Common Name is then extracted from the response.</p>
Modified: websites/production/camel/content/load-balancer.html
==============================================================================
--- websites/production/camel/content/load-balancer.html (original)
+++ websites/production/camel/content/load-balancer.html Fri Sep 7 22:36:12 2012
@@ -83,7 +83,7 @@
<p>Camel provides the following policies out-of-the-box:</p>
<div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Policy </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.html">Round Robin</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> The exchanges are selected from in a round robin fashion. This is a well known and classic policy, which spreads the load evenly. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.html">Random</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> A random endpoint is selected for each exchange. </td></tr><tr><td colspan="1" rowspan="1" c
lass="confluenceTd"> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.html">Sticky</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sticky load balancing using an Expression to calculate a correlation key to perform the sticky load balancing; rather like jsessionid in the web or JMSXGroupID in JMS. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.html">Topic</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> Topic which sends to all destinations (rather like JMS Topics) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/loadbalancer/FailOv
erLoadBalancer.html">Failover</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> In case of failures the exchange will be tried on the next endpoint. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Weighted Round-Robin </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> The weighted load balancing policy allows you to specify a processing load distribution ratio for each server with respect to the others. In addition to the weight, endpoint selection is then further refined using <b>round-robin</b> distribution based on weight. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Weighted Random </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> The weighted load balancing policy allows you to specify a processing load distribution ratio for each server with respect to others.In addition to the weight, endpoint selection is then further refined using <b>random</b> distribution ba
sed on weight. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Custom </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> From Camel 2.8 onwards the preferred way of using a custom <a shape="rect" href="load-balancer.html" title="Load Balancer">Load Balancer</a> is to use this policy, instead of using the @deprecated <tt>ref</tt> attribute. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Policy </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.html">Round Robin</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> The exchanges are selected from in a round robin fashion. This is a well known and classic policy, which spreads the load evenly. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.html">Random</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> A random endpoint is selected for each exchange. </td></tr><tr><td colspan="1" rowspan="1" c
lass="confluenceTd"> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.html">Sticky</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sticky load balancing using an Expression to calculate a correlation key to perform the sticky load balancing; rather like jsessionid in the web or JMSXGroupID in JMS. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.html">Topic</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> Topic which sends to all destinations (rather like JMS Topics) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/loadbalancer/FailOv
erLoadBalancer.html">Failover</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> In case of failures the exchange will be tried on the next endpoint. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Weighted Round-Robin </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> The weighted load balancing policy allows you to specify a processing load distribution ratio for each server with respect to the others. In addition to the weight, endpoint selection is then further refined using <b>round-robin</b> distribution based on weight. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Weighted Random </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> The weighted load balancing policy allows you to specify a processing load distribution ratio for each server with respect to others.In addition to the weight, endpoint selection is then further refined using <b>random</b> distribution based on weight. </t
d></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Custom </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> From Camel 2.8 onwards the preferred way of using a custom <a shape="rect" href="load-balancer.html" title="Load Balancer">Load Balancer</a> is to use this policy, instead of using the @deprecated <tt>ref</tt> attribute. </td></tr></tbody></table>
</div>
@@ -123,8 +123,7 @@ roundRobin().to(<span class="code-quote"
For further examples of this pattern look at <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoundRobinLoadBalanceTest.java?view=markup">this junit test case</a></p>
<h3><a shape="rect" name="LoadBalancer-Failover"></a>Failover</h3>
-<p><b>Available as of Camel 2.0</b><br clear="none">
-The <tt>failover</tt> load balancer is capable of trying the next processor in case an <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> failed with an <tt>exception</tt> during processing.<br clear="none">
+<p>The <tt>failover</tt> load balancer is capable of trying the next processor in case an <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> failed with an <tt>exception</tt> during processing.<br clear="none">
You can constrain the <tt>failover</tt> to activate only when one exception of a list you specify occurs. If you do not specify a list any exception will cause fail over to occur. This balancer uses the same strategy for matching exceptions as the <a shape="rect" href="exception-clause.html" title="Exception Clause">Exception Clause</a> does for the <b>onException</b>.</p>
<div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Enable stream caching if using streams</b><br clear="none">If you use streaming then you should enable <a shape="rect" href="stream-caching.html" title="Stream caching">Stream caching</a> when using the failover load balancer. This is needed so the stream can be re-read after failing over to the next processor.</td></tr></table></div>
Modified: websites/production/camel/content/log.html
==============================================================================
--- websites/production/camel/content/log.html (original)
+++ websites/production/camel/content/log.html Fri Sep 7 22:36:12 2012
@@ -114,7 +114,7 @@ log:org.apache.camel.example?level=DEBUG
<h3><a shape="rect" name="Log-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"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>level</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>INFO</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Logging level to use. Possible values: <tt>FATAL</tt>, <tt>ERROR</tt>, <tt>WARN</tt>, <tt>INFO</tt>, <tt>DEBUG</tt>, <tt>TRACE</tt>, <tt>OFF</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>marker</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Ca
mel 2.9:</b> An optional <a shape="rect" class="external-link" href="http://www.slf4j.org/api/org/slf4j/Marker.html" rel="nofollow">Marker</a> name to use. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> An integer that specifies a group size for throughput logging.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupInterval</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: If specified will group message stats by this time interval (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupDelay</tt> </td><td colspan="1" rowspan="1" cl
ass="confluenceTd"> <tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: Set the initial delay for stats (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupActiveOnly</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: If true, will hide stats when no new messages have been received for a time interval, if false, show stats regardless of message traffic </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"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>level</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>INFO</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Logging level to use. Possible values: <tt>ERROR</tt>, <tt>WARN</tt>, <tt>INFO</tt>, <tt>DEBUG</tt>, <tt>TRACE</tt>, <tt>OFF</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>marker</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> An
optional <a shape="rect" class="external-link" href="http://www.slf4j.org/api/org/slf4j/Marker.html" rel="nofollow">Marker</a> name to use. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> An integer that specifies a group size for throughput logging.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupInterval</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: If specified will group message stats by this time interval (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceT
d"> <tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>Integer</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: Set the initial delay for stats (in millis) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>groupActiveOnly</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6</b>: If true, will hide stats when no new messages have been received for a time interval, if false, show stats regardless of message traffic </td></tr></tbody></table>
</div>
</div>
<p><b>note</b>: groupDelay and groupActiveOnly are only applicable when using groupInterval</p>
@@ -125,7 +125,7 @@ log:org.apache.camel.example?level=DEBUG
<p>The log formats the execution of exchanges to log lines. <br clear="none">
By default, the log uses <tt>LogFormatter</tt> to format the log output, where <tt>LogFormatter</tt> has the following options:</p>
<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>showAll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangeId</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the unique exchange ID. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangePattern</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluence
Td"> <b>Camel 2.3:</b> Shows the Message Exchange Pattern (or MEP for short). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showProperties</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the exchange properties. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showHeaders</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In message headers. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBodyType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In body Java type. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="
confluenceTd"> Show the In body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showOut</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an Out message, show the Out message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showException</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> If the exchange has an exception, show the exception message (no stack trace). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showCaughtException</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> If the exchange has a caught exception, show the exception message (no stack trace). A caught exception is stored as a property on the exchange (us
ing the key <tt>Exchange.EXCEPTION_CAUGHT</tt>) and for instance a <tt>doCatch</tt> can catch exceptions. See <a shape="rect" href="try-catch-finally.html" title="Try Catch Finally">Try Catch Finally</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStackTrace</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> Show the stack trace, if an exchange has an exception. Only effective if one of <tt>showAll</tt>, <tt>showException</tt> or <tt>showCaughtException</tt> are enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFiles</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Whether Camel should show file bodies or not (eg such as java.io.File). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFuture</tt> </td>
<td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.1:</b> Whether Camel should show <tt>java.util.concurrent.Future</tt> bodies or not. If enabled Camel could potentially wait until the <tt>Future</tt> task is done. Will by default not wait. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStreams</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use <a shape="rect" href="stream-caching.html" title="Stream caching">Stream caching</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>multiline</tt> </td><td
colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If <tt>true</tt>, each piece of information is logged on a new line. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxChars</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> Limits the number of characters logged per line. The default value is <tt>10000</tt> from <b>Camel 2.9</b> onwards. </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>showAll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangeId</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the unique exchange ID. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showExchangePattern</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluence
Td"> <b>Camel 2.3:</b> Shows the Message Exchange Pattern (or MEP for short). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showProperties</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the exchange properties. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showHeaders</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In message headers. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBodyType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the In body Java type. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="
confluenceTd"> Show the In body. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showOut</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an Out message, show the Out message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has an exception, show the exception message (no stack trace). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showCaughtException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If the exchange has a caught exception, show the exception message (no stack trace). A caught exception is stored as a property on the exchange (using the key <tt>Exchange.EXCEPTION_C
AUGHT</tt>) and for instance a <tt>doCatch</tt> can catch exceptions. See <a shape="rect" href="try-catch-finally.html" title="Try Catch Finally">Try Catch Finally</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStackTrace</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Show the stack trace, if an exchange has an exception. Only effective if one of <tt>showAll</tt>, <tt>showException</tt> or <tt>showCaughtException</tt> are enabled. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFiles</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Whether Camel should show file bodies or not (eg such as java.io.File). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showFuture</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>
false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.1:</b> Whether Camel should show <tt>java.util.concurrent.Future</tt> bodies or not. If enabled Camel could potentially wait until the <tt>Future</tt> task is done. Will by default not wait. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>showStreams</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use <a shape="rect" href="stream-caching.html" title="Stream caching">Stream caching</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>multiline</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>fals
e</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If <tt>true</tt>, each piece of information is logged on a new line. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxChars</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> Limits the number of characters logged per line. The default value is <tt>10000</tt> from <b>Camel 2.9</b> onwards. </td></tr></tbody></table>
</div>
</div>
Modified: websites/production/camel/content/mina.html
==============================================================================
--- websites/production/camel/content/mina.html (original)
+++ websites/production/camel/content/mina.html Fri Sep 7 22:36:12 2012
@@ -100,7 +100,7 @@ mina:tcp:<span class="code-comment">//ho
</span>mina:vm:<span class="code-comment">//hostname[:port][?options]</span>
</pre>
</div></div>
-<p>From Camel 1.3 onwards you can specify a codec in the <a shape="rect" href="registry.html" title="Registry">Registry</a> using the <b>codec</b> option. If you are using TCP and no codec is specified then the <tt>textline</tt> flag is used to determine if text line based codec or object serialization should be used instead. By default the object serialization is used.</p>
+<p>You can specify a codec in the <a shape="rect" href="registry.html" title="Registry">Registry</a> using the <b>codec</b> option. If you are using TCP and no codec is specified then the <tt>textline</tt> flag is used to determine if text line based codec or object serialization should be used instead. By default the object serialization is used.</p>
<p>For UDP if no codec is specified the default uses a basic <tt>ByteBuffer</tt> based codec.</p>
@@ -115,21 +115,12 @@ However, the option, <b>transferExchange
<h3><a shape="rect" name="MINA-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 Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>codec</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of 1.3, you can refer to a named <tt>ProtocolCodecFactory</tt> instance in your <a shape="rect" href="registry.html" title="Registry">Registry</a> such as your Spring <tt>ApplicationContext</tt>, which is then used for the marshalling. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>codec</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> You must use the <tt>#</tt> notation to look up your codec in the <a shape="rect" href="reg
istry.html" title="Registry">Registry</a>. For example, use <tt>#myCodec</tt> to look up a bean with the <tt>id</tt> value, <tt>myCodec</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>disconnect</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>textline</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Only used for TCP. If no codec is specified, you can use this flag in 1.3 or later to indicate a text line based codec; if not specified or the value is <tt>false</tt>, then Object Serialization is assumed over TCP. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>textlineDelimi
ter</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>DEFAULT</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 1.6.0/2.0</b> Only used for TCP and if <b>textline=true</b>. Sets the text line delimiter to use. Possible values are: <tt>DEFAULT</tt>, <tt>AUTO</tt>, <tt>WINDOWS</tt>, <tt>UNIX</tt> or <tt>MAC</tt>. If none provided, Camel will use <tt>DEFAULT</tt>. This delimiter is used to mark the end of text. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>sync</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt>/<tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of 1.3, you can configure the exchange pattern to be either InOnly (default) or InOut. Setting <tt>sync=true</tt> means a synchronous exchange (InOut), where the client can read the response from MINA (the exchange Out message). The default value has changed in Camel 1.5 to <tt>true</tt>. In older releases, the default val
ue is <tt>false</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>lazySessionCreation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>See description</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of 1.3, sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. From Camel 2.0 onwards, the default is <tt>true</tt>. In Camel 1.x, the default is <tt>false</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeout</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>3000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of 1.3, you can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. The timeout is only used for Mina producer. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>encoding</
tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>JVM Default</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of 1.3, you can configure the encoding (a <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/java/nio/charset/Charset.html" rel="nofollow">charset name</a>) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/java/nio/charset/Charset.html#defaultCharset()" rel="nofollow">JVM default Charset</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transferExchange</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Only used for TCP. As of 1.3, you can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, O
ut headers, fault headers, exchange properties, exchange exception. This requires that the objects are <em>serializable</em>. Camel will exclude any non-serializable objects and log it at <tt>WARN</tt> level. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>minaLogger</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of 1.3, you can enable the Apache MINA logging filter. Apache MINA uses <tt>slf4j</tt> logging at <tt>INFO</tt> level to log all input and output. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>filters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of 2.0, you can set a list of <a shape="rect" class="external-link" href="http://mina.apache.org/iofilter.html">Mina IoFilters</a> to register. The <tt>filters</tt> value must be one of the following:
-<ul><li><b>Camel 2.2:</b> comma-separated list of bean references (e.g. <tt>#filterBean1,#filterBean2</tt>) where each bean must be of type <tt>org.apache.mina.common.IoFilter</tt>.</li><li><b>Camel 2.0:</b> a reference to a bean of type <tt>List<org.apache.mina.common.IoFilter></tt>.</li></ul>
-</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>encoderMaxLineLength</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>-1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of 2.1, you can set the textline protocol encoder max line length. By default the default value of Mina itself is used which are <tt>Integer.MAX_VALUE</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>decoderMaxLineLength</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>-1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of 2.1, you can set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>producerPoolSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 16 </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>1.6.2 (only in 1.6.x)</b>: The TCP producer is now th
read safe and supports concurrency much better. This option allows you to configure the number of threads in its thread pool for concurrent producers. <b>Note:</b> Camel 2.0 have a pooled service which ensured it was already thread safe and supported concurrency already. So this is a special patch for 1.6.x. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>allowDefaultCodec</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The mina component installs a default codec if both, <tt>codec</tt> is <tt>null</tt> and <tt>textline</tt> is <tt>false</tt>. Setting <tt>allowDefaultCodec</tt> to <tt>false</tt> prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain, like the SSL filter. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>discon
nectOnNoReply</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> If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>noReplyLogLevel</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>WARN</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back. Values are: <tt>FATAL, ERROR, INFO, DEBUG, OFF</tt>. </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 Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>codec</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> You can refer to a named <tt>ProtocolCodecFactory</tt> instance in your <a shape="rect" href="registry.html" title="Registry">Registry</a> such as your Spring <tt>ApplicationContext</tt>, which is then used for the marshalling. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>codec</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> You must use the <tt>#</tt> notation to look up your codec in the <a shape="rect" href="registry.html" title="Registry">
Registry</a>. For example, use <tt>#myCodec</tt> to look up a bean with the <tt>id</tt> value, <tt>myCodec</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>disconnect</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>textline</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is <tt>false</tt>, then Object Serialization is assumed over TCP. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>textlineDelimiter</tt> </td><td colspan="1" rowspan="1" cla
ss="confluenceTd"> <tt>DEFAULT</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Only used for TCP and if <b>textline=true</b>. Sets the text line delimiter to use. Possible values are: <tt>DEFAULT</tt>, <tt>AUTO</tt>, <tt>WINDOWS</tt>, <tt>UNIX</tt> or <tt>MAC</tt>. If none provided, Camel will use <tt>DEFAULT</tt>. This delimiter is used to mark the end of text. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>sync</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> You can configure the exchange pattern to be either InOnly (default) or InOut. Setting <tt>sync=true</tt> means a synchronous exchange (InOut), where the client can read the response from MINA (the exchange Out message). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>lazySessionCreation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspa
n="1" class="confluenceTd"> Sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeout</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>3000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. The timeout is only used for Mina producer. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>encoding</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>JVM Default</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> You can configure the encoding (a <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/java/nio/charset/Charset.html" rel="nofollow">charset name</a>) to use for the TCP textlin
e codec and the UDP protocol. If not provided, Camel will use the <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/java/nio/charset/Charset.html#defaultCharset()" rel="nofollow">JVM default Charset</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transferExchange</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are <em>serializable</em>. Camel will exclude any non-serializable objects and log it at <tt>WARN</tt> level. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>minaLogger</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </
td><td colspan="1" rowspan="1" class="confluenceTd"> You can enable the Apache MINA logging filter. Apache MINA uses <tt>slf4j</tt> logging at <tt>INFO</tt> level to log all input and output. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>filters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> You can set a list of <a shape="rect" class="external-link" href="http://mina.apache.org/iofilter.html">Mina IoFilters</a> to register. The <tt>filters</tt> value must be one of the following:
+<ul><li><b>Camel 2.2:</b> comma-separated list of bean references (e.g. <tt>#filterBean1,#filterBean2</tt>) where each bean must be of type <tt>org.apache.mina.common.IoFilter</tt>.</li><li><b>before Camel 2.2:</b> a reference to a bean of type <tt>List<org.apache.mina.common.IoFilter></tt>.</li></ul>
+</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>encoderMaxLineLength</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>-1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of 2.1, you can set the textline protocol encoder max line length. By default the default value of Mina itself is used which are <tt>Integer.MAX_VALUE</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>decoderMaxLineLength</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>-1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> As of 2.1, you can set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>producerPoolSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 16 </td><td colspan="1" rowspan="1" class="confluenceTd"> The TCP producer is thread safe and supports concurrency
much better. This option allows you to configure the number of threads in its thread pool for concurrent producers. <b>Note:</b> Camel has a pooled service which ensured it was already thread safe and supported concurrency already. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>allowDefaultCodec</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The mina component installs a default codec if both, <tt>codec</tt> is <tt>null</tt> and <tt>textline</tt> is <tt>false</tt>. Setting <tt>allowDefaultCodec</tt> to <tt>false</tt> prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain, like the SSL filter. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>disconnectOnNoReply</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> If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>noReplyLogLevel</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>WARN</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back. Values are: <tt>FATAL, ERROR, INFO, DEBUG, OFF</tt>. </td></tr></tbody></table>
</div>
</div>
-<h3><a shape="rect" name="MINA-Defaultbehaviorchanged"></a>Default behavior changed</h3>
-
-<p>In Camel 2.0 the <b>codec</b> option must use <tt>#</tt> notation for lookup of the codec bean in the <a shape="rect" href="registry.html" title="Registry">Registry</a>.<br clear="none">
-In Camel 2.0 the <b>lazySessionCreation</b> option now defaults to <tt>true</tt>.</p>
-
-<p>In Camel 1.5 the <tt>sync</tt> option has changed its default value from <tt>false</tt> to <tt>true</tt>, as we felt it was confusing for end-users when they used <a shape="rect" href="mina.html" title="MINA">MINA</a> to call remote servers and Camel wouldn't wait for the response.</p>
-
-<p>In Camel 1.4 or later <tt>codec=textline</tt> is no longer supported. Use the <tt>textline=true</tt> option instead.</p>
-
<h3><a shape="rect" name="MINA-Usingacustomcodec"></a>Using a custom codec</h3>
<p>See the <a shape="rect" class="external-link" href="http://mina.apache.org/tutorial-on-protocolcodecfilter.html">Mina documentation</a> how to write your own codec. To use your custom codec with <tt>camel-mina</tt>, you should register your codec in the <a shape="rect" href="registry.html" title="Registry">Registry</a>; for example, by creating a bean in the Spring XML file. Then use the <tt>codec</tt> option to specify the bean ID of your codec. See <a shape="rect" href="hl7.html" title="HL7">HL7</a> that has a custom codec.</p>
@@ -202,9 +193,7 @@ assertMockEndpointsSatisfied();
<h3><a shape="rect" name="MINA-ConfiguringMinaendpointsusingSpringbeanstyle"></a>Configuring Mina endpoints using Spring bean style</h3>
-<p><b>Available as of Camel 2.0</b></p>
-
-<p>Configuration of Mina endpoints is now possible using regular Spring bean style configuration in the Spring DSL.</p>
+<p>Configuration of Mina endpoints is possible using regular Spring bean style configuration in the Spring DSL.</p>
<p>However, in the underlying Apache Mina toolkit, it is relatively difficult to set up the acceptor and the connector, because you can <em>not</em> use simple setters. To resolve this difficulty, we leverage the <tt>MinaComponent</tt> as a Spring factory bean to configure this for us. If you really need to configure this yourself, there are setters on the <tt>MinaEndpoint</tt> to set these when needed.</p>
@@ -249,8 +238,6 @@ assertMockEndpointsSatisfied();
<h3><a shape="rect" name="MINA-ClosingSessionWhenComplete"></a>Closing Session When Complete</h3>
-<p><b>Available as of Camel 1.6.1</b></p>
-
<p>When acting as a server you sometimes want to close the session when, for example, a client conversion is finished. To instruct Camel to close the session, you should add a header with the key <tt>CamelMinaCloseSessionWhenComplete</tt> set to a boolean <tt>true</tt> value.</p>
<p>For instance, the example below will close the session after it has written the <tt>bye</tt> message back to the client:</p>
@@ -273,8 +260,6 @@ You can get the IoSession from the messa
<h3><a shape="rect" name="MINA-ConfiguringMinafilters"></a>Configuring Mina filters</h3>
-<p><b>Available since Camel 2.0</b></p>
-
<p>Filters permit you to use some Mina Filters, such as <tt>SslFilter</tt>. You can also implement some customized filters. Please note that <tt>codec</tt> and <tt>logger</tt> are also implemented as Mina filters of type, <tt>IoFilter</tt>. Any filters you may define are appended to the end of the filter chain; that is, after <tt>codec</tt> and <tt>logger</tt>.</p>
<p>For instance, the example below will send a keep-alive message after 10 seconds of inactivity:</p>
Modified: websites/production/camel/content/msv.html
==============================================================================
--- websites/production/camel/content/msv.html (original)
+++ websites/production/camel/content/msv.html Fri Sep 7 22:36:12 2012
@@ -115,7 +115,7 @@ msv:http:<span class="code-comment">//ac
<h3><a shape="rect" name="MSV-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>useDom</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> Whether DOMSource/DOMResult or SaxSource/SaxResult should be used by the validator. <b>Note:</b> DOM must be used by the <a shape="rect" href="msv.html" title="MSV">MSV</a> component. </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>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether DOMSource/DOMResult or SaxSource/SaxResult should be used by the validator. <b>Note:</b> DOM must be used by the <a shape="rect" href="msv.html" title="MSV">MSV</a> component. </td></tr></tbody></table>
</div>
</div>
Modified: websites/production/camel/content/multicast.html
==============================================================================
--- websites/production/camel/content/multicast.html (original)
+++ websites/production/camel/content/multicast.html Fri Sep 7 22:36:12 2012
@@ -81,7 +81,7 @@
<h3><a shape="rect" name="Multicast-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"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>strategyRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> Refers to an <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/AggregationStrategy.html">AggregationStrategy</a> to be used to assemble the replies from the multicasts, into a single outgoing message from the <a shape="rect" href="multicast.html" title="Multicast">Multicast</a>. By default Camel will use the last reply as the outgoing message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>parallelProcessing</tt> </td><td colspan="1" rowspan="
1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If enables then sending messages to the multicasts occurs concurrently. Note the caller thread will still wait until all messages has been fully processed, before it continues. Its only the sending and processing the replies from the multicasts which happens concurrently. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>executorServiceRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> Refers to a custom <a shape="rect" href="threading-model.html" title="Threading Model">Thread Pool</a> to be used for parallel processing. Notice if you set this option, then parallel processing is automatic implied, and you do not have to enable that option as well. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>stopOnException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <t
t>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.2:</b> Whether or not to stop continue processing immediately when an exception occurred. If disable, then Camel will send the message to all multicasts regardless if one of them failed. You can deal with exceptions in the <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/AggregationStrategy.html">AggregationStrategy</a> class where you have full control how to handle that. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>streaming</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If enabled then Camel will process replies out-of-order, eg in the order they come back. If disabled, Camel will process replies in the same order as multicasted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeou
t</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> Sets a total timeout specified in millis. If the <a shape="rect" href="multicast.html" title="Multicast">Multicast</a> hasn't been able to send and process all replies within the given timeframe, then the timeout triggers and the <a shape="rect" href="multicast.html" title="Multicast">Multicast</a> breaks out and continues. Notice if you provide a <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/TimeoutAwareAggregationStrategy.html">TimeoutAwareAggregationStrategy</a> then the <tt>timeout</tt> method is invoked before breaking out. When a timeout is hit, and there is already running tasks, then these tasks may run for a while, as its hard to cancel/interrupt these tasks in a graceful manner. So use this option with a bit of care. In a future Camel re
lease we may have improved this. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onPrepareRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Refers to a custom <a shape="rect" href="processor.html" title="Processor">Processor</a> to prepare the copy of the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> each multicast will receive. This allows you to do any custom logic, such as deep-cloning the message payload if that's needed etc. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>shareUnitOfWork</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Whether the unit of work should be shared. See the same option on <a shape="rect" href="splitter.html" title="Splitter">Splitter</a> for more details. </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>strategyRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> Refers to an <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/AggregationStrategy.html">AggregationStrategy</a> to be used to assemble the replies from the multicasts, into a single outgoing message from the <a shape="rect" href="multicast.html" title="Multicast">Multicast</a>. By default Camel will use the last reply as the outgoing message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>parallelProcessing</tt> </td><td colspan="1" rowspan="
1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If enables then sending messages to the multicasts occurs concurrently. Note the caller thread will still wait until all messages has been fully processed, before it continues. Its only the sending and processing the replies from the multicasts which happens concurrently. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>executorServiceRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> Refers to a custom <a shape="rect" href="threading-model.html" title="Threading Model">Thread Pool</a> to be used for parallel processing. Notice if you set this option, then parallel processing is automatic implied, and you do not have to enable that option as well. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>stopOnException</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <t
t>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.2:</b> Whether or not to stop continue processing immediately when an exception occurred. If disable, then Camel will send the message to all multicasts regardless if one of them failed. You can deal with exceptions in the <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/AggregationStrategy.html">AggregationStrategy</a> class where you have full control how to handle that. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>streaming</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If enabled then Camel will process replies out-of-order, eg in the order they come back. If disabled, Camel will process replies in the same order as multicasted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeou
t</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5:</b> Sets a total timeout specified in millis. If the <a shape="rect" href="multicast.html" title="Multicast">Multicast</a> hasn't been able to send and process all replies within the given timeframe, then the timeout triggers and the <a shape="rect" href="multicast.html" title="Multicast">Multicast</a> breaks out and continues. Notice if you provide a <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/TimeoutAwareAggregationStrategy.html">TimeoutAwareAggregationStrategy</a> then the <tt>timeout</tt> method is invoked before breaking out. If the timeout is reached with running tasks still remaining, certain tasks for which it is difficult for Camel to shut down in a graceful manner may continue to run. So use this option with a bit of care. We may be able
to improve this functionality in future Camel releases. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>onPrepareRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Refers to a custom <a shape="rect" href="processor.html" title="Processor">Processor</a> to prepare the copy of the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> each multicast will receive. This allows you to do any custom logic, such as deep-cloning the message payload if that's needed etc. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>shareUnitOfWork</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Whether the unit of work should be shared. See the same option on <a shape="rect" href="splitter.html" title="Splitter">Splitter</a> for more details. </td></tr></tbo
dy></table>
</div>
</div>
Modified: websites/production/camel/content/mvel.html
==============================================================================
--- websites/production/camel/content/mvel.html (original)
+++ websites/production/camel/content/mvel.html Fri Sep 7 22:36:12 2012
@@ -76,7 +76,6 @@
<tr>
<td valign="top" width="100%">
<div class="wiki-content maincontent"><h2><a shape="rect" name="Mvel-Mvel"></a>Mvel</h2>
-<p><b>Avialable in Camel 2.0</b></p>
<p>Camel allows <a shape="rect" class="external-link" href="http://mvel.codehaus.org/" rel="nofollow">Mvel</a> to be used as an <a shape="rect" href="expression.html" title="Expression">Expression</a> or <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> the <a shape="rect" href="dsl.html" title="DSL">DSL</a> or <a shape="rect" href="xml-configuration.html" title="Xml Configuration">Xml Configuration</a>.</p>
@@ -131,7 +130,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mvel</artifactId>
- <version>2.0.0</version>
+ <version>x.x.x</version>
</dependency>
</pre>
</div></div>
Modified: websites/production/camel/content/ognl.html
==============================================================================
--- websites/production/camel/content/ognl.html (original)
+++ websites/production/camel/content/ognl.html Fri Sep 7 22:36:12 2012
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ognl</artifactId>
- <version>1.4.0</version>
+ <version>x.x.x</version>
</dependency>
</pre>
</div></div>
Modified: websites/production/camel/content/pipes-and-filters.html
==============================================================================
--- websites/production/camel/content/pipes-and-filters.html (original)
+++ websites/production/camel/content/pipes-and-filters.html Fri Sep 7 22:36:12 2012
@@ -94,7 +94,7 @@
<p>Though pipeline is the default mode of operation when you specify multiple outputs in Camel. The opposite to pipeline is multicast; which fires the same message into each of its outputs. (See the example below).</p>
-<p>In Spring XML you can use the <pipeline/> element as of 1.4.0 onwards</p>
+<p>In Spring XML you can use the <pipeline/> element</p>
<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
<pre class="code-java">
Modified: websites/production/camel/content/property.html
==============================================================================
--- websites/production/camel/content/property.html (original)
+++ websites/production/camel/content/property.html Fri Sep 7 22:36:12 2012
@@ -79,8 +79,6 @@
<p>The Property Expression Language allows you to extract values of named exchange properties.</p>
-<p><b>Available as of Camel 2.0</b></p>
-
<h3><a shape="rect" name="Property-Exampleusage"></a>Example usage</h3>
<p>The recipientList element of the Spring DSL can utilize a property expression like: </p>