camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r877251 - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache dozer-type-conversion.html jpa.html log.html type-converter.html
Date Wed, 04 Sep 2013 09:20:51 GMT
Author: buildbot
Date: Wed Sep  4 09:20:50 2013
New Revision: 877251

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/book-component-appendix.html
    websites/production/camel/content/book-in-one-page.html
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/dozer-type-conversion.html
    websites/production/camel/content/jpa.html
    websites/production/camel/content/log.html
    websites/production/camel/content/type-converter.html

Modified: websites/production/camel/content/book-component-appendix.html
==============================================================================
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Wed Sep  4 09:20:50 2013
@@ -10040,7 +10040,7 @@ jpa:[entityClassName][?options]
 
 <h3><a shape="rect" name="BookComponentAppendix-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> 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 only:</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>maximumResults</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"> This option is <a shape="rect" href="registry.html" title="Registry">Registry</a> based which requires the <tt>#</tt> notation so that the given <tt>transactionManager</tt> being specified can be looked up properly, e.g. <tt>transactionManager=#myTransactionManager</tt>. It 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>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/j2
 se/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">&#160;</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" row
 span="1" class="confluenceTd">&#160;</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">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom native query when consuming data. You may want to use the option <tt>consumer.resultClass</tt> also when using native queries. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.parameters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.12: JPA consumer only:</b> the parameters map which will be used for building the query. The parameters is an instance of Map which key is String and value is Object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consum
 er.resultClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</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="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 mess
 ages, and only rollback the last failed message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.lockModeType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>WRITE</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11.2/2.12.1:</b> To configure the lock mode on the consumer. The possible values is defined in the enum <tt>javax.persistence.LockModeType</tt>. </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 only:</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>maximumResults</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"> This option is <a shape="rect" href="registry.html" title="Registry">Registry</a> based which requires the <tt>#</tt> notation so that the given <tt>transactionManager</tt> being specified can be looked up properly, e.g. <tt>transactionManager=#myTransactionManager</tt>. It 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>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/j2
 se/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">&#160;</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" row
 span="1" class="confluenceTd">&#160;</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">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom native query when consuming data. You may want to use the option <tt>consumer.resultClass</tt> also when using native queries. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.parameters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.12: JPA consumer only:</b> the parameters map which will be used for building the query. The parameters is an instance of Map which key is String and value is Object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consum
 er.resultClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</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="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 mess
 ages, and only rollback the last failed message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.lockModeType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>WRITE</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11.2/2.12:</b> To configure the lock mode on the consumer. The possible values is defined in the enum <tt>javax.persistence.LockModeType</tt>. </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>
 
@@ -10743,7 +10743,7 @@ Headers:{breadcrumbId=ID-machine-local-5
 
 <p>NOTE: the <tt>ExchangeFormatter</tt> gets applied to <b>all Log endpoints within that Camel Context</b>. If you need different ExchangeFormatters for different endpoints, just instantiate the LogComponent as many times as needed, and use the relevant bean name as the endpoint prefix.</p>
 
-<p>From <b>Camel 2.11.2/2.12.1</b> onwards when using a custom log formatter, you can specify parameters in the log uri, which gets configured on the custom log formatter. Though when you do that you should define the "logForamtter" as prototype scoped so its not shared if you have different parameters, eg:</p>
+<p>From <b>Camel 2.11.2/2.12</b> onwards when using a custom log formatter, you can specify parameters in the log uri, which gets configured on the custom log formatter. Though when you do that you should define the "logForamtter" as prototype scoped so its not shared if you have different parameters, eg:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[

Modified: websites/production/camel/content/book-in-one-page.html
==============================================================================
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Wed Sep  4 09:20:50 2013
@@ -31765,7 +31765,7 @@ jpa:[entityClassName][?options]
 
 <h3><a shape="rect" name="BookInOnePage-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 only:</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>maximumResults</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"> This option is <a shape="rect" href="registry.html" title="Registry">Registry</a> based which requires the <tt>#</tt> notation so that the given <tt>transactionManager</tt> being specified can be looked up properly, e.g. <tt>transactionManager=#myTransactionManager</tt>. It 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>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/j2
 se/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">&#160;</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" row
 span="1" class="confluenceTd">&#160;</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">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom native query when consuming data. You may want to use the option <tt>consumer.resultClass</tt> also when using native queries. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.parameters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.12: JPA consumer only:</b> the parameters map which will be used for building the query. The parameters is an instance of Map which key is String and value is Object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consum
 er.resultClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</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="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 mess
 ages, and only rollback the last failed message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.lockModeType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>WRITE</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11.2/2.12.1:</b> To configure the lock mode on the consumer. The possible values is defined in the enum <tt>javax.persistence.LockModeType</tt>. </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 only:</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>maximumResults</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"> This option is <a shape="rect" href="registry.html" title="Registry">Registry</a> based which requires the <tt>#</tt> notation so that the given <tt>transactionManager</tt> being specified can be looked up properly, e.g. <tt>transactionManager=#myTransactionManager</tt>. It 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>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/j2
 se/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">&#160;</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" row
 span="1" class="confluenceTd">&#160;</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">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom native query when consuming data. You may want to use the option <tt>consumer.resultClass</tt> also when using native queries. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.parameters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.12: JPA consumer only:</b> the parameters map which will be used for building the query. The parameters is an instance of Map which key is String and value is Object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consum
 er.resultClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</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="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 mess
 ages, and only rollback the last failed message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.lockModeType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>WRITE</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11.2/2.12:</b> To configure the lock mode on the consumer. The possible values is defined in the enum <tt>javax.persistence.LockModeType</tt>. </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>
 
@@ -32468,7 +32468,7 @@ Headers:{breadcrumbId=ID-machine-local-5
 
 <p>NOTE: the <tt>ExchangeFormatter</tt> gets applied to <b>all Log endpoints within that Camel Context</b>. If you need different ExchangeFormatters for different endpoints, just instantiate the LogComponent as many times as needed, and use the relevant bean name as the endpoint prefix.</p>
 
-<p>From <b>Camel 2.11.2/2.12.1</b> onwards when using a custom log formatter, you can specify parameters in the log uri, which gets configured on the custom log formatter. Though when you do that you should define the "logForamtter" as prototype scoped so its not shared if you have different parameters, eg:</p>
+<p>From <b>Camel 2.11.2/2.12</b> onwards when using a custom log formatter, you can specify parameters in the log uri, which gets configured on the custom log formatter. Though when you do that you should define the "logForamtter" as prototype scoped so its not shared if you have different parameters, eg:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[

Modified: websites/production/camel/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/camel/content/dozer-type-conversion.html
==============================================================================
--- websites/production/camel/content/dozer-type-conversion.html (original)
+++ websites/production/camel/content/dozer-type-conversion.html Wed Sep  4 09:20:50 2013
@@ -220,7 +220,7 @@ new DozerTypeConverterLoader(camelContex
 </div></div>
 
 <h4><a shape="rect" name="DozerTypeConversion-ConfiguringinOSGiblueprint"></a>Configuring in OSGi blueprint</h4>
-<p><b>Available as of Camel 2.12.1</b></p>
+<p><b>Available as of Camel 2.12</b></p>
 
 <p>When using Dozer with OSGi Blueprint then its works better by configuring dozer using the <tt>org.apache.camel.converter.dozer.DozerBeanMapperConfiguration</tt> instead of <tt>org.dozer.DozerBeanMapper</tt>, as shown below:</p>
 

Modified: websites/production/camel/content/jpa.html
==============================================================================
--- websites/production/camel/content/jpa.html (original)
+++ websites/production/camel/content/jpa.html Wed Sep  4 09:20:50 2013
@@ -131,7 +131,7 @@ 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 only:</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>maximumResults</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"> This option is <a shape="rect" href="registry.html" title="Registry">Registry</a> based which requires the <tt>#</tt> notation so that the given <tt>transactionManager</tt> being specified can be looked up properly, e.g. <tt>transactionManager=#myTransactionManager</tt>. It 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>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/j2
 se/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">&#160;</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" row
 span="1" class="confluenceTd">&#160;</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">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom native query when consuming data. You may want to use the option <tt>consumer.resultClass</tt> also when using native queries. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.parameters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.12: JPA consumer only:</b> the parameters map which will be used for building the query. The parameters is an instance of Map which key is String and value is Object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consum
 er.resultClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</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="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 mess
 ages, and only rollback the last failed message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.lockModeType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>WRITE</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11.2/2.12.1:</b> To configure the lock mode on the consumer. The possible values is defined in the enum <tt>javax.persistence.LockModeType</tt>. </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 only:</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>maximumResults</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"> This option is <a shape="rect" href="registry.html" title="Registry">Registry</a> based which requires the <tt>#</tt> notation so that the given <tt>transactionManager</tt> being specified can be looked up properly, e.g. <tt>transactionManager=#myTransactionManager</tt>. It 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>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/j2
 se/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">&#160;</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" row
 span="1" class="confluenceTd">&#160;</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">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom native query when consuming data. You may want to use the option <tt>consumer.resultClass</tt> also when using native queries. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.parameters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.12: JPA consumer only:</b> the parameters map which will be used for building the query. The parameters is an instance of Map which key is String and value is Object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consum
 er.resultClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</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="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 mess
 ages, and only rollback the last failed message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.lockModeType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>WRITE</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11.2/2.12:</b> To configure the lock mode on the consumer. The possible values is defined in the enum <tt>javax.persistence.LockModeType</tt>. </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>
 

Modified: websites/production/camel/content/log.html
==============================================================================
--- websites/production/camel/content/log.html (original)
+++ websites/production/camel/content/log.html Wed Sep  4 09:20:50 2013
@@ -241,7 +241,7 @@ Headers:{breadcrumbId=ID-machine-local-5
 
 <p>NOTE: the <tt>ExchangeFormatter</tt> gets applied to <b>all Log endpoints within that Camel Context</b>. If you need different ExchangeFormatters for different endpoints, just instantiate the LogComponent as many times as needed, and use the relevant bean name as the endpoint prefix.</p>
 
-<p>From <b>Camel 2.11.2/2.12.1</b> onwards when using a custom log formatter, you can specify parameters in the log uri, which gets configured on the custom log formatter. Though when you do that you should define the "logForamtter" as prototype scoped so its not shared if you have different parameters, eg:</p>
+<p>From <b>Camel 2.11.2/2.12</b> onwards when using a custom log formatter, you can specify parameters in the log uri, which gets configured on the custom log formatter. Though when you do that you should define the "logForamtter" as prototype scoped so its not shared if you have different parameters, eg:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[

Modified: websites/production/camel/content/type-converter.html
==============================================================================
--- websites/production/camel/content/type-converter.html (original)
+++ websites/production/camel/content/type-converter.html Wed Sep  4 09:20:50 2013
@@ -205,7 +205,7 @@ public class IOConverter {
 
 <h4><a shape="rect" name="TypeConverter-Returningnullvalues"></a>Returning null values</h4>
 
-<p>By default when using a method in a POJO annotation with @Converter returning null is not a valid response. If null is returned, then Camel will regard that type converter as a <em>miss</em>, and prevent from using it in the future. If null should be allowed as a valid response, then from <b>Camel 2.11.2/2.12.1</b> onwards you can specify this in the annotation as shown:</p>
+<p>By default when using a method in a POJO annotation with @Converter returning null is not a valid response. If null is returned, then Camel will regard that type converter as a <em>miss</em>, and prevent from using it in the future. If null should be allowed as a valid response, then from <b>Camel 2.11.2/2.12</b> onwards you can specify this in the annotation as shown:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[



Mime
View raw message