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/04/29 11:24:06 UTC

svn commit: r814953 - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache camel-2100-release.html velocity.html

Author: buildbot
Date: Sun Apr 29 09:24:05 2012
New Revision: 814953

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/camel-2100-release.html
    websites/production/camel/content/velocity.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 Sun Apr 29 09:24:05 2012
@@ -16368,7 +16368,7 @@ velocity:templateName[?options]
 
 <p>The velocity component sets a couple headers on the message (you can't set these yourself and from Camel 2.1 velocity component will not set these headers which will cause some side effect on the dynamic template support):</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"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.velocity.resource</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 1.x: The resource as an <tt>org.springframework.core.io.Resource</tt> object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.velocity.resourceUri</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 1.x: The <b>templateName</b> as a <tt>String</tt> object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelVelocityResource</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 2.0: The resource as an <tt>org.springframework.core.io.Resource</tt> object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelVelocityResourceUri</tt> </td><td colsp
 an="1" rowspan="1" class="confluenceTd"> Camel 2.0: The <b>templateName</b> as a <tt>String</tt> object. </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"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelVelocityResourceUri</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 2.0: The <b>templateName</b> as a <tt>String</tt> object. </td></tr></tbody></table>
 </div>
 </div>
 

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 Sun Apr 29 09:24:05 2012
@@ -36607,7 +36607,7 @@ velocity:templateName[?options]
 
 <p>The velocity component sets a couple headers on the message (you can't set these yourself and from Camel 2.1 velocity component will not set these headers which will cause some side effect on the dynamic template support):</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"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.velocity.resource</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 1.x: The resource as an <tt>org.springframework.core.io.Resource</tt> object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.velocity.resourceUri</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 1.x: The <b>templateName</b> as a <tt>String</tt> object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelVelocityResource</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 2.0: The resource as an <tt>org.springframework.core.io.Resource</tt> object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelVelocityResourceUri</tt> </td><td colsp
 an="1" rowspan="1" class="confluenceTd"> Camel 2.0: The <b>templateName</b> as a <tt>String</tt> object. </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"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelVelocityResourceUri</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 2.0: The <b>templateName</b> as a <tt>String</tt> object. </td></tr></tbody></table>
 </div>
 </div>
 

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

Modified: websites/production/camel/content/camel-2100-release.html
==============================================================================
--- websites/production/camel/content/camel-2100-release.html (original)
+++ websites/production/camel/content/camel-2100-release.html Sun Apr 29 09:24:05 2012
@@ -84,7 +84,7 @@
 
 <p>Welcome to the 2.10.0 release with approximately XXX issues resolved - including new features, improvements, and bug fixes, such as: </p>
 
-<ul><li>Internal code cleanup to reduce warnings reported by Eclipse</li><li>Moved <a shape="rect" href="spring-testing.html" title="Spring Testing">Spring Testing</a> from <tt>camel-test</tt> to <tt>camel-test-spring</tt> component.</li><li>Camel <a shape="rect" href="using-propertyplaceholder.html" title="Using PropertyPlaceholder">Property Placeholders</a> are now supported in embedded <a shape="rect" href="expression.html" title="Expression">Expression</a>s within Camel routes.</li><li>Added missing options in the XML DSL for the <a shape="rect" href="xpath.html" title="XPath">XPath</a> language to control and set which XPath Engine to use, etc.</li><li>Added option <tt>logNamespaces</tt> to the <a shape="rect" href="xpath.html" title="XPath">XPath</a> language to have <tt>INFO</tt> logging of detected namespaces from message.  This can be used to troubleshoot issues where an <a shape="rect" href="xpath.html" title="XPath">XPath</a> expression doesn't work as expected (a
 s it's often a namespace conflict).</li><li>Added <tt>replyToCacheLevelName</tt> option to the <a shape="rect" href="jms.html" title="JMS">JMS</a> component, allowing configuration of cache levels for persistent reply consumers when doing request/reply over JMS. Some message brokers do not work well with caching, so users may need to set this option to <tt>CACHE_NONE</tt>.</li><li>Added <tt>antInclude</tt> and <tt>antExclude</tt> options to <a shape="rect" href="file2.html" title="File2">File</a> and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> components to make it easier to specify include/exclude filters using ANT syntax.</li><li>The <a shape="rect" href="camel-maven-archetypes.html" title="Camel Maven Archetypes">Camel archetypes</a> for Java and Scala no longer generate projects with Spring dependencies.</li><li>Improved <tt>JdbcMessageIdRepository</tt> in the <a shape="rect" href="sql-component.html" title="SQL Component">SQL</a> to use custom SQL statements/q
 ueries.</li><li>Added option to <a shape="rect" href="properties.html" title="Properties">Properties</a> to allow silently ignoring property locations not found, such as a .properties file.</li><li>Added <tt>managementNamePattern</tt> attribute to <tt>&lt;camelContext&gt;</tt> to make it very easy to customize and control the JMX naming of the Camel application. See details at <a shape="rect" href="camel-jmx.html#CamelJMX-CamelJMXManagementNamingStrategy">Camel JMX</a>. For example, in OSGi environments you can explicitly configure a <tt>managementNamePattern</tt> in case you do not want the bundleId as part of MBean names.</li><li>Added streaming update support to <a shape="rect" href="solr.html" title="Solr">Solr</a> as well as support for SolrInputDocuments</li><li>Added SolrJ DirectXMLRequest support to <a shape="rect" href="solr.html" title="Solr">Solr</a> to support XML based index updates</li><li>Improved Camel <a shape="rect" href="mail.html" title="Mail">Mail</a> to
  support the <tt>replyTo</tt> option</li><li>Added <tt>traceEnabled</tt> option to <a shape="rect" href="jetty.html" title="Jetty">Jetty</a> component so you have control over whether to allow HTTP TRACE calls against your Jetty endpoints.</li><li>Polished the <a shape="rect" href="camel-maven-archetypes.html" title="Camel Maven Archetypes">Camel Maven Archetypes</a> to let the projects be prepared for <a shape="rect" href="testing.html" title="Testing">Testing</a>, and fixed any WARNs from Maven.</li><li>Added <tt>dumpRouteStatsAsXml</tt> methods to <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a> to make it easier to get the total performance stats as XML, and in one JMX call.</li><li><a shape="rect" href="graceful-shutdown.html" title="Graceful Shutdown">Graceful Shutdown</a> is now more aggressive if timeout occurred during shutdown, rejecting continued processing of messages or redeliveries.</li><li>Add <tt>ShutdownPrepared</tt> SPI to allow custom Servic
 es (also EIPs) in routes to do custom code in preparation for shutdown.</li><li>The <tt>camel-archetype-java</tt> <a shape="rect" href="camel-maven-archetypes.html" title="Camel Maven Archetypes">Camel Maven Archetypes</a> is now a pure Java DSL based project (no longer Spring)</li><li><a shape="rect" href="jms.html" title="JMS">JMS</a> consumer is less verbose when logging uncaught exceptions thrown while processing a message. Added <tt>errorHandlerLoggingLevel</tt>, and <tt>errorHandlerLogStackTrace</tt> options to tweak the logging verbosity.</li><li>Added <tt>messageId</tt> as an <a shape="rect" href="mdc-logging.html" title="MDC logging">MDC logging</a> key.</li><li>Improved Camel's Transaction <a shape="rect" href="error-handler.html" title="Error Handler">Error Handler</a> logging to better pinpoint and correlate redelivered messages (from, e.g., a JMS broker), making the logs much easier to read.</li><li>Added a timeout option to <a shape="rect" href="spring-web-serv
 ices.html" title="Spring Web Services">Spring Web Services</a> for specifying the read timeout while invoking a webservice.</li><li>Optimized <a shape="rect" href="type-converter.html" title="Type Converter">Type Converter</a> registry for possible concurrency contention when looking up a type converter.</li><li>Improved <a shape="rect" href="simple.html" title="Simple">Simple</a> language to work better with floating point numbers in <a shape="rect" href="predicate.html" title="Predicate">Predicate</a>s</li><li>Camel is now less verbose when starting and stopping, with less being logged at <tt>INFO</tt> level.</li><li>Add support for keyed data queues to <a shape="rect" href="jt400.html" title="JT400">JT400</a> component.</li><li><a shape="rect" href="idempotent-consumer.html" title="Idempotent Consumer">Idempotent Consumer</a> is now enlisted in JMX, which allows monitoring the duplicate message count as well as the operation to reset it.</li><li>Thread pools registered in
  <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a> are now unregistered when Camel shuts them down. Note that all MBeans will be unregistered from JMX when Camel shuts itself down. This improvement is to unregister thread pools more eagerly, such as when routes are removed at runtime.</li><li>Camel will now also copy the message headers for a <tt>JmsMessage</tt> if you leverage <tt>useOriginalMessage</tt> in an <tt>onException</tt> definition.</li><li>Added <tt>mockEndpointsAndSkip</tt> to <a shape="rect" href="advicewith.html" title="AdviceWith">AdviceWith</a> and the <a shape="rect" href="testing.html" title="Testing">Test Kit</a></li><li>The <a shape="rect" href="file2.html" title="File2">File</a> and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> components now support filtering directories. The <tt>isDirectory</tt> method on the <tt>GenericFile</tt> class can be used to skip unwanted directories, accelerating file consumption.</li><li><a shape="rect
 " href="smpp.html" title="SMPP">SMPP</a> connections can now be tunneled through an HTTP proxy by configuring HTTP proxy settings.</li><li>Camel now also checks, when starting a route dynamically, whether there would be any violations on multiple consumers from the same <a shape="rect" href="endpoint.html" title="Endpoint">Endpoint</a>. Previously this check only occurred during Camel startup - now it always happens.</li><li>Stopping a <tt>ConsumerTemplate</tt> or a <tt>ProducerTemplate</tt> will now stop and shutdown its cache to cleanup any resources which otherwise may not have been reclaimed until shutdown.</li><li><a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/impl/ScheduledPollConsumer.html">ScheduledPollConsumer</a> will now shutdown thread pools more eagerly, such as when stopping a <tt>ConsumerTemplate</tt>.</li><li>Added option <tt>asyncStartListener</tt> to <a shape="rect" href="jms.html" title
 ="JMS">JMS</a> to allow starting JMS consumers (e.g. routes) asynchronously. This can be used to avoid blocking in case the JMS consumer takes long time to establish a connection to the JMS broker.</li><li><a shape="rect" href="wire-tap.html" title="Wire Tap">Wire Tap</a> now supports <a shape="rect" href="error-handling-in-camel.html" title="Error handling in Camel">Error Handling</a> when sending a tapped message to an <a shape="rect" href="endpoint.html" title="Endpoint">Endpoint</a>.</li><li>Added the autogenColumns, configRef and strategyRef options to the <a shape="rect" href="csv.html" title="CSV">CSV</a> dataformat in XML DSL whereas the new skipFirstLine option is provided in Java API as well.</li><li><a shape="rect" href="validation.html" title="Validation">Validator</a> component will now fail with a better error message if resource schema refers to element which cannot be resolved.</li><li>Added support for retrieving generated keys from <a shape="rect" href="jdb
 c.html" title="JDBC">JDBC</a> component.</li><li>Added support for Spring 3.1.x.</li><li>Added <tt>retainFirst</tt>, and <tt>retainLast</tt> options to <a shape="rect" href="mock.html" title="Mock">Mock</a> component.</li><li>Improved <a shape="rect" href="simple.html" title="Simple">Simple</a> language to allow referring to headers using bracket notation.</li><li>Added support for the scp: protocol via <a shape="rect" href="jsch.html" title="Jsch">Jsch</a>.</li><li>Added support to exclude certain fields when marshalling POJO's to <a shape="rect" href="json.html" title="JSON">JSON</a>. Available with both the Jackson and GSON library.</li><li>Allow to configure frequency of timeout checker when doing request/reply over <a shape="rect" href="jms.html" title="JMS">JMS</a></li><li>Improved the Java DSL to make it easier to use predicates from the build-in DSL, that has commonly used predicates and expressions.</li><li><a shape="rect" href="aggregator2.html" title="Aggregator2"
 >Aggregate</a> EIP now supports <tt>TimeoutAwareAggregationStrategy</tt> aggregation strategies.</li><li>The default <tt>Injector</tt> now performs bean post processing to inject @Produce, @Consume, @EndpointInject fields etc.</li><li>The <a shape="rect" href="camel-run-maven-goal.html" title="Camel Run Maven Goal">camel-run</a> maven plugin now supports running <a shape="rect" href="using-osgi-blueprint-with-camel.html" title="Using OSGi blueprint with Camel">OSGi Blueprint applications</a>.</li><li>Added utilization statistics to type converter registry which can be access from <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a> and is logged when Camel is shutting down.</li><li>Improved <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a> to work better with servers such as WebSphere which alters MBean names when enlisting mbeans into the server (Camel now have an internal mapping table).</li><li>All <a shape="rect" href="eip.html" title="EIP">EIP</
 a>s out of the box from Camel now provides <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a> utilization statistics.</li><li>The <a shape="rect" href="file2.html" title="File2">File</a> and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> consumers will now let <tt>org.apache.camel.spi.ExceptionHandler</tt> deal with exceptions occurred during acquiring real lock as well. See <a shape="rect" href="file2.html" title="File2">File</a> page for example of using a custom <tt>ExceptionHandler</tt>.</li><li>Reduce the logging level from ERROR to WARN on the default <tt>LoggingExceptionHandler</tt>.</li><li>Added option <tt>consumer.bridgeErrorHandler</tt> to allow consumers such as <a shape="rect" href="file2.html" title="File2">File</a> and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> to use the routing engine <a shape="rect" href="error-handler.html" title="Error Handler">Error Handler</a> to deal with exceptions occurring in the consumer (outside the 
 routing engine), for example if having trouble picking up a file from a shared network drive etc. See more details at <a shape="rect" href="file2.html" title="File2">File</a> page. This option applies to all consumers which extends the <tt>DefaultConsumer</tt> from <tt>camel-core</tt>.</li><li>Added <tt>eagerMaxMessagesPerPoll</tt> option to <a shape="rect" href="file2.html" title="File2">File</a>, and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> endpoints to allow to do a full sorting of the files and also limit the pool at the same time</li></ul>
+<ul><li>Internal code cleanup to reduce warnings reported by Eclipse</li><li>Moved <a shape="rect" href="spring-testing.html" title="Spring Testing">Spring Testing</a> from <tt>camel-test</tt> to <tt>camel-test-spring</tt> component.</li><li>Camel <a shape="rect" href="using-propertyplaceholder.html" title="Using PropertyPlaceholder">Property Placeholders</a> are now supported in embedded <a shape="rect" href="expression.html" title="Expression">Expression</a>s within Camel routes.</li><li>Added missing options in the XML DSL for the <a shape="rect" href="xpath.html" title="XPath">XPath</a> language to control and set which XPath Engine to use, etc.</li><li>Added option <tt>logNamespaces</tt> to the <a shape="rect" href="xpath.html" title="XPath">XPath</a> language to have <tt>INFO</tt> logging of detected namespaces from message.  This can be used to troubleshoot issues where an <a shape="rect" href="xpath.html" title="XPath">XPath</a> expression doesn't work as expected (a
 s it's often a namespace conflict).</li><li>Added <tt>replyToCacheLevelName</tt> option to the <a shape="rect" href="jms.html" title="JMS">JMS</a> component, allowing configuration of cache levels for persistent reply consumers when doing request/reply over JMS. Some message brokers do not work well with caching, so users may need to set this option to <tt>CACHE_NONE</tt>.</li><li>Added <tt>antInclude</tt> and <tt>antExclude</tt> options to <a shape="rect" href="file2.html" title="File2">File</a> and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> components to make it easier to specify include/exclude filters using ANT syntax.</li><li>The <a shape="rect" href="camel-maven-archetypes.html" title="Camel Maven Archetypes">Camel archetypes</a> for Java and Scala no longer generate projects with Spring dependencies.</li><li>Improved <tt>JdbcMessageIdRepository</tt> in the <a shape="rect" href="sql-component.html" title="SQL Component">SQL</a> to use custom SQL statements/q
 ueries.</li><li>Added option to <a shape="rect" href="properties.html" title="Properties">Properties</a> to allow silently ignoring property locations not found, such as a .properties file.</li><li>Added <tt>managementNamePattern</tt> attribute to <tt>&lt;camelContext&gt;</tt> to make it very easy to customize and control the JMX naming of the Camel application. See details at <a shape="rect" href="camel-jmx.html#CamelJMX-CamelJMXManagementNamingStrategy">Camel JMX</a>. For example, in OSGi environments you can explicitly configure a <tt>managementNamePattern</tt> in case you do not want the bundleId as part of MBean names.</li><li>Added streaming update support to <a shape="rect" href="solr.html" title="Solr">Solr</a> as well as support for SolrInputDocuments</li><li>Added SolrJ DirectXMLRequest support to <a shape="rect" href="solr.html" title="Solr">Solr</a> to support XML based index updates</li><li>Improved Camel <a shape="rect" href="mail.html" title="Mail">Mail</a> to
  support the <tt>replyTo</tt> option</li><li>Added <tt>traceEnabled</tt> option to <a shape="rect" href="jetty.html" title="Jetty">Jetty</a> component so you have control over whether to allow HTTP TRACE calls against your Jetty endpoints.</li><li>Polished the <a shape="rect" href="camel-maven-archetypes.html" title="Camel Maven Archetypes">Camel Maven Archetypes</a> to let the projects be prepared for <a shape="rect" href="testing.html" title="Testing">Testing</a>, and fixed any WARNs from Maven.</li><li>Added <tt>dumpRouteStatsAsXml</tt> methods to <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a> to make it easier to get the total performance stats as XML, and in one JMX call.</li><li><a shape="rect" href="graceful-shutdown.html" title="Graceful Shutdown">Graceful Shutdown</a> is now more aggressive if timeout occurred during shutdown, rejecting continued processing of messages or redeliveries.</li><li>Add <tt>ShutdownPrepared</tt> SPI to allow custom Servic
 es (also EIPs) in routes to do custom code in preparation for shutdown.</li><li>The <tt>camel-archetype-java</tt> <a shape="rect" href="camel-maven-archetypes.html" title="Camel Maven Archetypes">Camel Maven Archetypes</a> is now a pure Java DSL based project (no longer Spring)</li><li><a shape="rect" href="jms.html" title="JMS">JMS</a> consumer is less verbose when logging uncaught exceptions thrown while processing a message. Added <tt>errorHandlerLoggingLevel</tt>, and <tt>errorHandlerLogStackTrace</tt> options to tweak the logging verbosity.</li><li>Added <tt>messageId</tt> as an <a shape="rect" href="mdc-logging.html" title="MDC logging">MDC logging</a> key.</li><li>Improved Camel's Transaction <a shape="rect" href="error-handler.html" title="Error Handler">Error Handler</a> logging to better pinpoint and correlate redelivered messages (from, e.g., a JMS broker), making the logs much easier to read.</li><li>Added a timeout option to <a shape="rect" href="spring-web-serv
 ices.html" title="Spring Web Services">Spring Web Services</a> for specifying the read timeout while invoking a webservice.</li><li>Optimized <a shape="rect" href="type-converter.html" title="Type Converter">Type Converter</a> registry for possible concurrency contention when looking up a type converter.</li><li>Improved <a shape="rect" href="simple.html" title="Simple">Simple</a> language to work better with floating point numbers in <a shape="rect" href="predicate.html" title="Predicate">Predicate</a>s</li><li>Camel is now less verbose when starting and stopping, with less being logged at <tt>INFO</tt> level.</li><li>Add support for keyed data queues to <a shape="rect" href="jt400.html" title="JT400">JT400</a> component.</li><li><a shape="rect" href="idempotent-consumer.html" title="Idempotent Consumer">Idempotent Consumer</a> is now enlisted in JMX, which allows monitoring the duplicate message count as well as the operation to reset it.</li><li>Thread pools registered in
  <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a> are now unregistered when Camel shuts them down. Note that all MBeans will be unregistered from JMX when Camel shuts itself down. This improvement is to unregister thread pools more eagerly, such as when routes are removed at runtime.</li><li>Camel will now also copy the message headers for a <tt>JmsMessage</tt> if you leverage <tt>useOriginalMessage</tt> in an <tt>onException</tt> definition.</li><li>Added <tt>mockEndpointsAndSkip</tt> to <a shape="rect" href="advicewith.html" title="AdviceWith">AdviceWith</a> and the <a shape="rect" href="testing.html" title="Testing">Test Kit</a></li><li>The <a shape="rect" href="file2.html" title="File2">File</a> and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> components now support filtering directories. The <tt>isDirectory</tt> method on the <tt>GenericFile</tt> class can be used to skip unwanted directories, accelerating file consumption.</li><li><a shape="rect
 " href="smpp.html" title="SMPP">SMPP</a> connections can now be tunneled through an HTTP proxy by configuring HTTP proxy settings.</li><li>Camel now also checks, when starting a route dynamically, whether there would be any violations on multiple consumers from the same <a shape="rect" href="endpoint.html" title="Endpoint">Endpoint</a>. Previously this check only occurred during Camel startup - now it always happens.</li><li>Stopping a <tt>ConsumerTemplate</tt> or a <tt>ProducerTemplate</tt> will now stop and shutdown its cache to cleanup any resources which otherwise may not have been reclaimed until shutdown.</li><li><a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/impl/ScheduledPollConsumer.html">ScheduledPollConsumer</a> will now shutdown thread pools more eagerly, such as when stopping a <tt>ConsumerTemplate</tt>.</li><li>Added option <tt>asyncStartListener</tt> to <a shape="rect" href="jms.html" title
 ="JMS">JMS</a> to allow starting JMS consumers (e.g. routes) asynchronously. This can be used to avoid blocking in case the JMS consumer takes long time to establish a connection to the JMS broker.</li><li><a shape="rect" href="wire-tap.html" title="Wire Tap">Wire Tap</a> now supports <a shape="rect" href="error-handling-in-camel.html" title="Error handling in Camel">Error Handling</a> when sending a tapped message to an <a shape="rect" href="endpoint.html" title="Endpoint">Endpoint</a>.</li><li>Added the autogenColumns, configRef and strategyRef options to the <a shape="rect" href="csv.html" title="CSV">CSV</a> dataformat in XML DSL whereas the new skipFirstLine option is provided in Java API as well.</li><li><a shape="rect" href="validation.html" title="Validation">Validator</a> component will now fail with a better error message if resource schema refers to element which cannot be resolved.</li><li>Added support for retrieving generated keys from <a shape="rect" href="jdb
 c.html" title="JDBC">JDBC</a> component.</li><li>Added support for Spring 3.1.x.</li><li>Added <tt>retainFirst</tt>, and <tt>retainLast</tt> options to <a shape="rect" href="mock.html" title="Mock">Mock</a> component.</li><li>Improved <a shape="rect" href="simple.html" title="Simple">Simple</a> language to allow referring to headers using bracket notation.</li><li>Added support for the scp: protocol via <a shape="rect" href="jsch.html" title="Jsch">Jsch</a>.</li><li>Added support to exclude certain fields when marshalling POJO's to <a shape="rect" href="json.html" title="JSON">JSON</a>. Available with both the Jackson and GSON library.</li><li>Allow to configure frequency of timeout checker when doing request/reply over <a shape="rect" href="jms.html" title="JMS">JMS</a></li><li>Improved the Java DSL to make it easier to use predicates from the build-in DSL, that has commonly used predicates and expressions.</li><li><a shape="rect" href="aggregator2.html" title="Aggregator2"
 >Aggregate</a> EIP now supports <tt>TimeoutAwareAggregationStrategy</tt> aggregation strategies.</li><li>The default <tt>Injector</tt> now performs bean post processing to inject @Produce, @Consume, @EndpointInject fields etc.</li><li>The <a shape="rect" href="camel-run-maven-goal.html" title="Camel Run Maven Goal">camel-run</a> maven plugin now supports running <a shape="rect" href="using-osgi-blueprint-with-camel.html" title="Using OSGi blueprint with Camel">OSGi Blueprint applications</a>.</li><li>Added utilization statistics to type converter registry which can be access from <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a> and is logged when Camel is shutting down.</li><li>Improved <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a> to work better with servers such as WebSphere which alters MBean names when enlisting mbeans into the server (Camel now have an internal mapping table).</li><li>All <a shape="rect" href="eip.html" title="EIP">EIP</
 a>s out of the box from Camel now provides <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a> utilization statistics.</li><li>The <a shape="rect" href="file2.html" title="File2">File</a> and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> consumers will now let <tt>org.apache.camel.spi.ExceptionHandler</tt> deal with exceptions occurred during acquiring real lock as well. See <a shape="rect" href="file2.html" title="File2">File</a> page for example of using a custom <tt>ExceptionHandler</tt>.</li><li>Reduce the logging level from ERROR to WARN on the default <tt>LoggingExceptionHandler</tt>.</li><li>Added option <tt>consumer.bridgeErrorHandler</tt> to allow consumers such as <a shape="rect" href="file2.html" title="File2">File</a> and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> to use the routing engine <a shape="rect" href="error-handler.html" title="Error Handler">Error Handler</a> to deal with exceptions occurring in the consumer (outside the 
 routing engine), for example if having trouble picking up a file from a shared network drive etc. See more details at <a shape="rect" href="file2.html" title="File2">File</a> page. This option applies to all consumers which extends the <tt>DefaultConsumer</tt> from <tt>camel-core</tt>.</li><li>Added <tt>eagerMaxMessagesPerPoll</tt> option to <a shape="rect" href="file2.html" title="File2">File</a>, and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> endpoints to allow to do a full sorting of the files and also limit the pool at the same time</li><li>The <a shape="rect" href="xslt.html" title="XSLT">XSLT</a> component using http resource for the template now supports query parameters</li></ul>
 
 
 

Modified: websites/production/camel/content/velocity.html
==============================================================================
--- websites/production/camel/content/velocity.html (original)
+++ websites/production/camel/content/velocity.html Sun Apr 29 09:24:05 2012
@@ -113,7 +113,7 @@ velocity:templateName[?options]
 
 <p>The velocity component sets a couple headers on the message (you can't set these yourself and from Camel 2.1 velocity component will not set these headers which will cause some side effect on the dynamic template support):</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"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.velocity.resource</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 1.x: The resource as an <tt>org.springframework.core.io.Resource</tt> object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>org.apache.camel.velocity.resourceUri</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 1.x: The <b>templateName</b> as a <tt>String</tt> object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelVelocityResource</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 2.0: The resource as an <tt>org.springframework.core.io.Resource</tt> object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelVelocityResourceUri</tt> </td><td colsp
 an="1" rowspan="1" class="confluenceTd"> Camel 2.0: The <b>templateName</b> as a <tt>String</tt> object. </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"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelVelocityResourceUri</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Camel 2.0: The <b>templateName</b> as a <tt>String</tt> object. </td></tr></tbody></table>
 </div>
 </div>