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/06/12 12:18:02 UTC

svn commit: r821395 - in /websites/production/camel/content: cache/main.pageCache camel-2100-release.html websocket.html

Author: buildbot
Date: Tue Jun 12 10:18:01 2012
New Revision: 821395

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/camel-2100-release.html
    websites/production/camel/content/websocket.html

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 Tue Jun 12 10:18:01 2012
@@ -89,7 +89,7 @@
 
 <h3><a shape="rect" name="Camel2.10.0Release-Fixedissues"></a>Fixed issues</h3>
 
-<ul><li>Fixed memory leak when dynamically adding and removing many routes at runtime. See this <a shape="rect" href="memory-leak-when-adding-and-removing-routes-at-runtime.html" title="Memory leak when adding and removing routes at runtime">FAQ</a> for more information.</li><li>Fixed potential NPE in <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> consumer when using double slashes as starting directory.</li><li>Fixed <a shape="rect" href="intercept.html#Intercept-InterceptSendToEndpoint">InterceptSendToEndpoint</a> when using <tt>skipSendToEndpoint=true</tt> with a <a shape="rect" href="predicate.html" title="Predicate">when</a> predicate to only skip sending if the predicate was true.</li><li>Fixed an issue with <a shape="rect" href="bean-binding.html" title="Bean Binding">Bean Binding</a> directly in a method name not working properly with method call expressions.</li><li>Fixed issue with using custom namespaces in <a shape="rect" href="xpath.html" title="XPath">XP
 ath</a> expressions when using <a shape="rect" href="using-osgi-blueprint-with-camel.html" title="Using OSGi blueprint with Camel">OSGi Blueprint</a></li><li>Fixed <a shape="rect" href="validation.html" title="Validation">Validation</a> to support <tt>xs:import</tt> in the schema files.</li><li>Fixed <a shape="rect" href="content-enricher.html" title="Content Enricher">Poll Enrich</a> where the timeout was not explicitly configured to use blocking mode (was wrongly using non-blocking mode).</li><li>Fixed <a shape="rect" href="async.html" title="Async">Threads EIP</a> to handle rejected policies, ensuring the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> will finish the <tt>UnitOfWork</tt> and will be de-registered from the inflight registry.</li><li>Fixed <a shape="rect" href="delayer.html" title="Delayer">Delayer</a> not working with a <a shape="rect" href="bean.html" title="Bean">Bean</a> expression to define the delay when using XML DSL</li><li>Fixed 
 <a shape="rect" href="jms.html" title="JMS">JMS</a> consumer to no longer complain by default if no errorHandler is configured when an uncaught exception was thrown while processing a message.</li><li>Fixed the String trim issue in <a shape="rect" href="simple.html" title="Simple">Simple</a> expressions.</li><li>Fixed the issue with <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a> not triggering <a shape="rect" href="error-handler.html" title="Error Handler">Error Handler</a> for endpoints with non existing <a shape="rect" href="component.html" title="Component">Component</a>s.</li><li>Fixed <a shape="rect" href="load-balancer.html" title="Load Balancer">Load Balancer</a> to update statistics in <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a></li><li>Fixed <a shape="rect" href="seda.html" title="SEDA">SEDA</a> producer configured with <tt>waitForTaskToComplete=Always</tt> to not hand over on-completion tasks, which otherwis
 e could be processed prematurely.</li><li>Fixed a potential issue with configuring custom start and end tokens for the <a shape="rect" href="simple.html" title="Simple">Simple</a> language when using Spring XML.</li><li>Fixed an issue with <a shape="rect" href="type-converter.html" title="Type Converter">Type Converter</a> where NaN values were converted to integers.</li><li>Fixed <a shape="rect" href="http.html" title="HTTP">HTTP</a>, <a shape="rect" href="http4.html" title="HTTP4">HTTP4</a>, and <a shape="rect" href="jetty.html" title="Jetty">Jetty</a> producers to send empty HTTP headers for <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> headers with an empty value.</li><li>Fixed an issue with configuring a custom thread pool profile on some <a shape="rect" href="eip.html" title="EIP">EIP</a>s.</li><li>Fixed an issue with <a shape="rect" href="intercept.html" title="Intercept">Intercept</a> causing processors to not update their performance statistics 
 in <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a></li><li>Fixed using &lt;errorHandler&gt; with embedded &lt;redeliveryPolicy&gt; to support <a shape="rect" href="using-propertyplaceholder.html" title="Using PropertyPlaceholder">Using PropertyPlaceholder</a></li><li>Fixed issue with using &lt;redeliveryPolicy&gt;, and &lt;redeliveryPolicyProfile&gt; with OSGi Blueprint.</li><li>Fixed failover <a shape="rect" href="load-balancer.html" title="Load Balancer">Load Balancer</a> to perform defensive copy of the message before attempting failover, to ensure previous attempts do not propagate back into succeeding attempts.</li><li>Fixed issue when restarting application using <a shape="rect" href="quartz.html" title="Quartz">Quartz</a> with a persistent (non clustered) job store, where the app was not shutdown cleanly (such as crashed)</li><li>Fixed issue when using consumer endpoints with <a shape="rect" href="using-propertyplaceholder.html" title="Using PropertyPl
 aceholder">Property placeholders</a> not working with <a shape="rect" href="intercept.html" title="Intercept">inteceptors</a> such as <tt>interceptFrom</tt>.</li><li>Fixed issue with suspend/resume a <a shape="rect" href="timer.html" title="Timer">Timer</a> consumer, not causing timer task to stop firing.</li><li>Fixed <a shape="rect" href="netty.html" title="Netty">Netty</a> producer to re-use existing connections when sending. This avoid re-creating a new connection for every message being sent.</li><li>Fixed issue with <a shape="rect" href="simple.html" title="Simple">Simple</a> invoking overloaded methods using OGNL notation, where method name was explicitly declared to invoke the no-parameter method</li><li>Fixed continued and handled <a shape="rect" href="predicate.html" title="Predicate">Predicates</a> of <a shape="rect" href="exception-clause.html" title="Exception Clause">OnException</a> to be evaluated once per exception, instead of twice.</li><li>Fixed <a shape="r
 ect" href="throttler.html" title="Throttler">Throttler</a> and <a shape="rect" href="delayer.html" title="Delayer">Delayer</a> EIPs when evaluating of max/delay expression fails at runtime, not causing error handling to react.</li><li>Fixed <a shape="rect" href="mail.html" title="Mail">Mail</a> message with attachments may appear to be lost when <a shape="rect" href="error-handler.html" title="Error Handler">Error Handler</a> performs 2+ redelivery attempts.</li><li>Fixed issue with a failed type conversion using <a shape="rect" href="jaxb.html" title="JAXB">JAXB</a> may cause subsequent attempts to be regarded as failed as well</li><li>Fixed method call <a shape="rect" href="expression.html" title="Expression">Expression</a> to preserve headers and <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> properties, which allow to use it for storing state with the <a shape="rect" href="dynamic-router.html" title="Dynamic Router">Dynamic Router</a> EIP</li><li>Fixe
 d locale issue with configuring endpoints using uris, such as Turkish with the lower/upper case of the letter i.</li><li>Fixed issue reading and writing files when a <tt>charset</tt> was configured on the file endpoint.</li><li>Fixed issue with <tt>convertBodyTo</tt> not working internally as <tt>transform</tt> and <tt>setBody</tt>, by resetting the message type to <tt>DefaultMessage</tt>.</li><li>Fixed issue with <a shape="rect" href="loop.html" title="Loop">Loop</a> using <tt>copy</tt> and an exception occurred</li><li>Fixed so <a shape="rect" href="file2.html" title="File2">File</a> consumer using done file name, will not automatic delete the done file if <tt>noop=true</tt> is configured.</li><li>Fixed issue with <a shape="rect" href="servlet.html" title="SERVLET">SERVLET</a> may send back incorrect content length for data with unicode characters outside the normal ASCII range.</li><li>Fixed <a shape="rect" href="jetty.html" title="Jetty">Jetty</a> http producer (client) 
 may corrupt streams if used in a bridge mode (eg like a proxy)</li><li>Fixed issue with <tt>camel-blueprint</tt> and using <tt>CamelContextAware</tt> beans for <tt>EventNotifier</tt> (and the beans from this <a shape="rect" href="advanced-configuration-of-camelcontext-using-spring.html" title="Advanced configuration of CamelContext using Spring">list</a>) injecting the <tt>CamelContext</tt> which is not ready, causing the blueprint container to hang waiting for the service.</li><li>Fixed <a shape="rect" href="bindy.html" title="Bindy">Bindy</a> to not use default locale, but only use locale if explicit configured.</li><li>Fixed <a shape="rect" href="restlet.html" title="Restlet">Restlet</a> not propagating headers during routing.</li><li>Fixed running multiple Camel apps with same CamelContext name in a single JVM with <a shape="rect" href="quartz.html" title="Quartz">Quartz</a> component, causing jobs to pick wrong CamelContext.</li></ul>
+<ul><li>Fixed memory leak when dynamically adding and removing many routes at runtime. See this <a shape="rect" href="memory-leak-when-adding-and-removing-routes-at-runtime.html" title="Memory leak when adding and removing routes at runtime">FAQ</a> for more information.</li><li>Fixed potential NPE in <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> consumer when using double slashes as starting directory.</li><li>Fixed <a shape="rect" href="intercept.html#Intercept-InterceptSendToEndpoint">InterceptSendToEndpoint</a> when using <tt>skipSendToEndpoint=true</tt> with a <a shape="rect" href="predicate.html" title="Predicate">when</a> predicate to only skip sending if the predicate was true.</li><li>Fixed an issue with <a shape="rect" href="bean-binding.html" title="Bean Binding">Bean Binding</a> directly in a method name not working properly with method call expressions.</li><li>Fixed issue with using custom namespaces in <a shape="rect" href="xpath.html" title="XPath">XP
 ath</a> expressions when using <a shape="rect" href="using-osgi-blueprint-with-camel.html" title="Using OSGi blueprint with Camel">OSGi Blueprint</a></li><li>Fixed <a shape="rect" href="validation.html" title="Validation">Validation</a> to support <tt>xs:import</tt> in the schema files.</li><li>Fixed <a shape="rect" href="content-enricher.html" title="Content Enricher">Poll Enrich</a> where the timeout was not explicitly configured to use blocking mode (was wrongly using non-blocking mode).</li><li>Fixed <a shape="rect" href="async.html" title="Async">Threads EIP</a> to handle rejected policies, ensuring the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> will finish the <tt>UnitOfWork</tt> and will be de-registered from the inflight registry.</li><li>Fixed <a shape="rect" href="delayer.html" title="Delayer">Delayer</a> not working with a <a shape="rect" href="bean.html" title="Bean">Bean</a> expression to define the delay when using XML DSL</li><li>Fixed 
 <a shape="rect" href="jms.html" title="JMS">JMS</a> consumer to no longer complain by default if no errorHandler is configured when an uncaught exception was thrown while processing a message.</li><li>Fixed the String trim issue in <a shape="rect" href="simple.html" title="Simple">Simple</a> expressions.</li><li>Fixed the issue with <a shape="rect" href="recipient-list.html" title="Recipient List">Recipient List</a> not triggering <a shape="rect" href="error-handler.html" title="Error Handler">Error Handler</a> for endpoints with non existing <a shape="rect" href="component.html" title="Component">Component</a>s.</li><li>Fixed <a shape="rect" href="load-balancer.html" title="Load Balancer">Load Balancer</a> to update statistics in <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a></li><li>Fixed <a shape="rect" href="seda.html" title="SEDA">SEDA</a> producer configured with <tt>waitForTaskToComplete=Always</tt> to not hand over on-completion tasks, which otherwis
 e could be processed prematurely.</li><li>Fixed a potential issue with configuring custom start and end tokens for the <a shape="rect" href="simple.html" title="Simple">Simple</a> language when using Spring XML.</li><li>Fixed an issue with <a shape="rect" href="type-converter.html" title="Type Converter">Type Converter</a> where NaN values were converted to integers.</li><li>Fixed <a shape="rect" href="http.html" title="HTTP">HTTP</a>, <a shape="rect" href="http4.html" title="HTTP4">HTTP4</a>, and <a shape="rect" href="jetty.html" title="Jetty">Jetty</a> producers to send empty HTTP headers for <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> headers with an empty value.</li><li>Fixed an issue with configuring a custom thread pool profile on some <a shape="rect" href="eip.html" title="EIP">EIP</a>s.</li><li>Fixed an issue with <a shape="rect" href="intercept.html" title="Intercept">Intercept</a> causing processors to not update their performance statistics 
 in <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a></li><li>Fixed using &lt;errorHandler&gt; with embedded &lt;redeliveryPolicy&gt; to support <a shape="rect" href="using-propertyplaceholder.html" title="Using PropertyPlaceholder">Using PropertyPlaceholder</a></li><li>Fixed issue with using &lt;redeliveryPolicy&gt;, and &lt;redeliveryPolicyProfile&gt; with OSGi Blueprint.</li><li>Fixed failover <a shape="rect" href="load-balancer.html" title="Load Balancer">Load Balancer</a> to perform defensive copy of the message before attempting failover, to ensure previous attempts do not propagate back into succeeding attempts.</li><li>Fixed issue when restarting application using <a shape="rect" href="quartz.html" title="Quartz">Quartz</a> with a persistent (non clustered) job store, where the app was not shutdown cleanly (such as crashed)</li><li>Fixed issue when using consumer endpoints with <a shape="rect" href="using-propertyplaceholder.html" title="Using PropertyPl
 aceholder">Property placeholders</a> not working with <a shape="rect" href="intercept.html" title="Intercept">inteceptors</a> such as <tt>interceptFrom</tt>.</li><li>Fixed issue with suspend/resume a <a shape="rect" href="timer.html" title="Timer">Timer</a> consumer, not causing timer task to stop firing.</li><li>Fixed <a shape="rect" href="netty.html" title="Netty">Netty</a> producer to re-use existing connections when sending. This avoid re-creating a new connection for every message being sent.</li><li>Fixed issue with <a shape="rect" href="simple.html" title="Simple">Simple</a> invoking overloaded methods using OGNL notation, where method name was explicitly declared to invoke the no-parameter method</li><li>Fixed continued and handled <a shape="rect" href="predicate.html" title="Predicate">Predicates</a> of <a shape="rect" href="exception-clause.html" title="Exception Clause">OnException</a> to be evaluated once per exception, instead of twice.</li><li>Fixed <a shape="r
 ect" href="throttler.html" title="Throttler">Throttler</a> and <a shape="rect" href="delayer.html" title="Delayer">Delayer</a> EIPs when evaluating of max/delay expression fails at runtime, not causing error handling to react.</li><li>Fixed <a shape="rect" href="mail.html" title="Mail">Mail</a> message with attachments may appear to be lost when <a shape="rect" href="error-handler.html" title="Error Handler">Error Handler</a> performs 2+ redelivery attempts.</li><li>Fixed issue with a failed type conversion using <a shape="rect" href="jaxb.html" title="JAXB">JAXB</a> may cause subsequent attempts to be regarded as failed as well</li><li>Fixed method call <a shape="rect" href="expression.html" title="Expression">Expression</a> to preserve headers and <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> properties, which allow to use it for storing state with the <a shape="rect" href="dynamic-router.html" title="Dynamic Router">Dynamic Router</a> EIP</li><li>Fixe
 d locale issue with configuring endpoints using uris, such as Turkish with the lower/upper case of the letter i.</li><li>Fixed issue reading and writing files when a <tt>charset</tt> was configured on the file endpoint.</li><li>Fixed issue with <tt>convertBodyTo</tt> not working internally as <tt>transform</tt> and <tt>setBody</tt>, by resetting the message type to <tt>DefaultMessage</tt>.</li><li>Fixed issue with <a shape="rect" href="loop.html" title="Loop">Loop</a> using <tt>copy</tt> and an exception occurred</li><li>Fixed so <a shape="rect" href="file2.html" title="File2">File</a> consumer using done file name, will not automatic delete the done file if <tt>noop=true</tt> is configured.</li><li>Fixed issue with <a shape="rect" href="servlet.html" title="SERVLET">SERVLET</a> may send back incorrect content length for data with unicode characters outside the normal ASCII range.</li><li>Fixed <a shape="rect" href="jetty.html" title="Jetty">Jetty</a> http producer (client) 
 may corrupt streams if used in a bridge mode (eg like a proxy)</li><li>Fixed issue with <tt>camel-blueprint</tt> and using <tt>CamelContextAware</tt> beans for <tt>EventNotifier</tt> (and the beans from this <a shape="rect" href="advanced-configuration-of-camelcontext-using-spring.html" title="Advanced configuration of CamelContext using Spring">list</a>) injecting the <tt>CamelContext</tt> which is not ready, causing the blueprint container to hang waiting for the service.</li><li>Fixed <a shape="rect" href="bindy.html" title="Bindy">Bindy</a> to not use default locale, but only use locale if explicit configured.</li><li>Fixed <a shape="rect" href="restlet.html" title="Restlet">Restlet</a> not propagating headers during routing.</li><li>Fixed running multiple Camel apps with same CamelContext name in a single JVM with <a shape="rect" href="quartz.html" title="Quartz">Quartz</a> component, causing jobs to pick wrong CamelContext.</li><li>Fixed URI normalization to support % 
 sign itself, by specifying the % sign using its encoded value (eg %25).</li></ul>
 
 
 <h3><a shape="rect" name="Camel2.10.0Release-NewEnterpriseIntegrationPatterns"></a>New <a shape="rect" href="enterprise-integration-patterns.html" title="Enterprise Integration Patterns">Enterprise Integration Patterns</a></h3>
@@ -129,7 +129,7 @@
 
 <h2><a shape="rect" name="Camel2.10.0Release-Internal%2FNonAPIrefactoringsthatmayaffectusers"></a>Internal/Non API refactorings that may affect users</h2>
 
-<ul><li>Removed method <tt>setManagementName</tt> from <tt>CamelContext</tt> as it should not be used by Camel end users</li><li>Added method <tt>isTransactedRedelivered</tt> to <a shape="rect" href="exchange.html" title="Exchange">Exchange</a></li><li>Added method <tt>isDirectory</tt> to <tt>GenericFile</tt></li><li>API changed in the <tt>ClientPipelineFactory</tt> and <tt>ServerPipelineFactory</tt> abstract classes in <a shape="rect" href="netty.html" title="Netty">Netty</a></li><li>Added <tt>getStatistics</tt> method to <tt>TypeConverterRegistry</tt>, and the registry now extends <tt>Service</tt> as well.</li><li>The <tt>convertBodyTo</tt> with a charset configured, will not propagate the charset as an Exchange property (<tt>Exchange.CHARSET_NAME</tt>), which otherwise may lead to payload being double converted.</li><li>Added <tt>abort</tt> method to <tt>GenericFileProcessStrategy</tt>.</li><li><tt>camel-mail</tt> now excludes dependency on javax activation JAR as thats e
 mbedded in the JVM from JRE6 onwards.</li></ul>
+<ul><li>Removed method <tt>setManagementName</tt> from <tt>CamelContext</tt> as it should not be used by Camel end users</li><li>Added method <tt>isTransactedRedelivered</tt> to <a shape="rect" href="exchange.html" title="Exchange">Exchange</a></li><li>Added method <tt>isDirectory</tt> to <tt>GenericFile</tt></li><li>API changed in the <tt>ClientPipelineFactory</tt> and <tt>ServerPipelineFactory</tt> abstract classes in <a shape="rect" href="netty.html" title="Netty">Netty</a></li><li>Added <tt>getStatistics</tt> method to <tt>TypeConverterRegistry</tt>, and the registry now extends <tt>Service</tt> as well.</li><li>The <tt>convertBodyTo</tt> with a charset configured, will not propagate the charset as an Exchange property (<tt>Exchange.CHARSET_NAME</tt>), which otherwise may lead to payload being double converted.</li><li>Added <tt>abort</tt> method to <tt>GenericFileProcessStrategy</tt>.</li><li><tt>camel-mail</tt> now excludes dependency on javax activation JAR as thats e
 mbedded in the JVM from JRE6 onwards.</li><li>URI normalization will now better detect <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Url_encode" rel="nofollow">pre existing % decimal encoded values</a>.</li></ul>
 
 
 <h2><a shape="rect" name="Camel2.10.0Release-KnownIssues"></a>Known Issues</h2>
@@ -139,7 +139,7 @@
 
 <h2><a shape="rect" name="Camel2.10.0Release-DependencyUpgrades"></a>Dependency Upgrades</h2>
 
-<ul><li>AHC 1.6.5 to 1.7.5</li><li>AWS 1.2.2 to 1.3.10</li><li>Commons-codec 1.4 to 1.6</li><li>Commons-net 2.2 to 3.1.0</li><li>CXF 2.5.1 to 2.6.0</li><li>EHCache 2.4.3 to 2.5.1</li><li>Freemarker 2.3.18 to 2.3.19</li><li>Google App Engine 1.5.0 to 1.6.6</li><li>Groovy 1.8.5 to 1.8.6</li><li>Hadoop 0.20.203.0 to 1.0.0</li><li>HTTP4 core 4.1.2 to 4.1.4</li><li>HTTP4 client 4.1.2 to 4.1.3</li><li>Hazelcast 1.9.4.4 to 2.0.2</li><li>Hawtbuf 1.7 to 1.9</li><li>Jackson 1.9.2 to 1.9.7</li><li>Jackrabbit 2.2.4 to 2.2.11</li><li>Jasypt 1.7 to 1.9.0</li><li>Javax Mail 1.4.4. to 1.4.5</li><li>Jersey 1.10 to 1.12</li><li>JClouds 1.3.1 to 1.4.0</li><li>Jettison 1.3 to 1.3.1</li><li>Jetty 7.5.3 to 7.5.4</li><li>JRuby 1.6.6 to 1.6.7</li><li>JSCH 0.1.44 to 0.1.46</li><li>JuEL 2.1.3 to 2.1.4</li><li>Kratti 0.4.1 to 0.4.5</li><li>Logback 1.0.0 to 1.0.1</li><li>Lucene 3.0.3 to 3.6.0</li><li>MyBatis 3.0.6 to 3.1.1</li><li>Netty 3.2.6 to 3.4.5</li><li>OGNL 3.0.2 to 3.0.4</li><li>QPid 0.12 to 0.
 16</li><li>QuickFIX/J 1.5.1 to 1.5.2</li><li>Resetlet 2.0.10 to 2.0.14</li><li>SNMP 1.8.1 to 1.10.1</li><li>Solr 3.5.0 to 3.6.0</li><li>Shiro 1.1.0 to 1.2.0</li><li>Stringtemplate 3.0 to 3.2.1</li><li>Spring 3.0.6 to 3.0.7/3.1.1</li><li>Spring Integration 2.0.5 to 2.1.2</li><li>Spring Security 3.0.7 to 3.1.0</li><li>Spring WebServices 2.0.3 to 2.0.5</li><li>Spymemcached 2.5 to 2.8.0</li><li>Tagsoup 1.2 to 1.2.1</li><li>Woodstox 4.1.1 to 4.1.2</li><li>XStream 1.4.1 to 1.4.2</li><li>XML Security 1.4.5 to 1.5.1</li></ul>
+<ul><li>AHC 1.6.5 to 1.7.5</li><li>AWS 1.2.2 to 1.3.10</li><li>Commons-codec 1.4 to 1.6</li><li>Commons-net 2.2 to 3.1.0</li><li>CXF 2.5.1 to 2.6.1</li><li>EHCache 2.4.3 to 2.5.1</li><li>Freemarker 2.3.18 to 2.3.19</li><li>Google App Engine 1.5.0 to 1.6.6</li><li>Groovy 1.8.5 to 1.8.6</li><li>Hadoop 0.20.203.0 to 1.0.3</li><li>HTTP4 core 4.1.2 to 4.1.4</li><li>HTTP4 client 4.1.2 to 4.1.3</li><li>Hazelcast 1.9.4.4 to 2.0.2</li><li>Hawtbuf 1.7 to 1.9</li><li>Jackson 1.9.2 to 1.9.7</li><li>Jackrabbit 2.2.4 to 2.2.11</li><li>Jasypt 1.7 to 1.9.0</li><li>Javax Mail 1.4.4. to 1.4.5</li><li>Jersey 1.10 to 1.12</li><li>JClouds 1.3.1 to 1.4.0</li><li>Jettison 1.3 to 1.3.1</li><li>Jetty 7.5.3 to 7.5.4</li><li>JRuby 1.6.6 to 1.6.7</li><li>JSCH 0.1.44 to 0.1.48</li><li>JuEL 2.1.3 to 2.1.4</li><li>Kratti 0.4.1 to 0.4.5</li><li>Logback 1.0.0 to 1.0.6</li><li>Lucene 3.0.3 to 3.6.0</li><li>MyBatis 3.0.6 to 3.1.1</li><li>Netty 3.2.6 to 3.4.5</li><li>OGNL 3.0.2 to 3.0.4</li><li>QPid 0.12 to 0.
 16</li><li>QuickFIX/J 1.5.1 to 1.5.2</li><li>Resetlet 2.0.10 to 2.0.14</li><li>SNMP 1.8.1 to 1.10.1</li><li>Solr 3.5.0 to 3.6.0</li><li>Shiro 1.1.0 to 1.2.0</li><li>Stringtemplate 3.0 to 3.2.1</li><li>Spring 3.0.6 to 3.0.7/3.1.1</li><li>Spring Integration 2.0.5 to 2.1.2</li><li>Spring Security 3.0.7 to 3.1.0</li><li>Spring WebServices 2.0.3 to 2.0.5</li><li>Spymemcached 2.5 to 2.8.0</li><li>Tagsoup 1.2 to 1.2.1</li><li>Woodstox 4.1.1 to 4.1.2</li><li>XStream 1.4.1 to 1.4.2</li><li>XML Security 1.4.5 to 1.5.1</li></ul>
 
 
 <h2><a shape="rect" name="Camel2.10.0Release-Importantchangestoconsiderwhenupgrading"></a>Important changes to consider when upgrading</h2>

Modified: websites/production/camel/content/websocket.html
==============================================================================
--- websites/production/camel/content/websocket.html (original)
+++ websites/production/camel/content/websocket.html Tue Jun 12 10:18:01 2012
@@ -106,7 +106,7 @@ websocket:<span class="code-comment">//h
 <p>The <tt>WebsocketEndpoint</tt> can be configured prior to use</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"> sslContextParameters </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.util.jsse.SSLContextParameters</tt> in the <a shape="rect" class="external-link" href="http://camel.apache.org/registry.html">Registry</a>.&#160; This reference overrides any configured SSLContextParameters at the component level.&#160; See <a shape="rect" href="camel-configuration-utilities.html" title="Camel Configuration Utilities">Using the JSSE Configuration Utility</a>. <br clear="none" class="atl-forced-newline"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> sendToAll </td><td colspan="1" rowsp
 an="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Producer only:</b> To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the <tt>WebsocketConstants.SEND_TO_ALL</tt> header on the message. </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"> sslContextParameters </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> Reference to a <tt>org.apache.camel.util.jsse.SSLContextParameters</tt> in the <a shape="rect" class="external-link" href="http://camel.apache.org/registry.html">Registry</a>.&#160; This reference overrides any configured SSLContextParameters at the component level.&#160; See <a shape="rect" href="camel-configuration-utilities.html" title="Camel Configuration Utilities">Using the JSSE Configuration Utility</a>. <br clear="none" class="atl-forced-newline"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> sendToAll </td><td colspan="1" rowsp
 an="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Producer only:</b> To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the <tt>WebsocketConstants.SEND_TO_ALL</tt> header on the message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> staticResources </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The root directory for the web resources or classpath. Use the protocol file: or classpath: depending if you want that the component loads the resource from file system or classpath. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -139,6 +139,18 @@ because by default the messaging is InOn
 
 <p>This example is part of an unit test, which you can find <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java">here</a>. As a client we use the <a shape="rect" href="ahc.html" title="AHC">AHC</a> library which offers support for web socket as well. </p>
 
+<p>Here is another example where webapp resources location have been defined to allow the Jetty Application Server to not only register the WebSocket servlet but also to expose web resources for the browser. Resources should be defined under the webapp directory.</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+...
+           from(<span class="code-quote">"activemq:topic:newsTopic"</span>)
+             .routeId(<span class="code-quote">"fromJMStoWebSocketSecure"</span>)
+             .to(<span class="code-quote">"websocket:<span class="code-comment">//localhost:8443/newsTopic?sendToAll=<span class="code-keyword">true</span>&amp;staticResources=classpath:webapp"</span>);
+</span>...
+</pre>
+</div></div>
+
 <h3><a shape="rect" name="Websocket-SettingupSSLforWebSocketComponent"></a>Setting up SSL for WebSocket Component</h3>
 
 <h4><a shape="rect" name="Websocket-UsingtheJSSEConfigurationUtility"></a>Using the JSSE Configuration Utility</h4>