Author: buildbot Date: Thu Apr 19 15:20:47 2012 New Revision: 813663 Log: Production update by buildbot for camel
Modified: websites/production/camel/content/book-dataformat-appendix.html websites/production/camel/content/book-in-one-page.html websites/production/camel/content/book-quickstart.html websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2100-release.html websites/production/camel/content/examples.html websites/production/camel/content/json.html websites/production/camel/content/walk-through-another-example.html Modified: websites/production/camel/content/book-dataformat-appendix.html ============================================================================== --- websites/production/camel/content/book-dataformat-appendix.html (original) +++ websites/production/camel/content/book-dataformat-appendix.html Thu Apr 19 15:20:47 2012 @@ -846,13 +846,13 @@ from(<span class="code-quote">"seda:peop <p>In Camel 1.6 its only the XStream library that is supported and its default.</p> <p>In Camel 2.0 we added support for more libraries:<br clear="none"> -Camel provides integration with two popular JSon libraries:</p> +Camel provides integration with three popular JSON libraries:</p> <ul class="alternate" type="square"><li>The <a shape="rect" class="external-link" href="http://xstream.codehaus.org/" rel="nofollow">XStream library</a> and <a shape="rect" class="external-link" href="http://jettison.codehaus.org/" rel="nofollow">Jettsion </a></li><li>The <a shape="rect" class="external-link" href="http://xircles.codehaus.org/projects/jackson" rel="nofollow">Jackson library</a></li><li><b>Camel 2.10:</b> The <a shape="rect" class="external-link" href="http://code.google.com/p/google-gson/" rel="nofollow">GSon library</a></li></ul> <p>By default Camel uses the XStream library. </p> -<h3><a shape="rect" name="BookDataFormatAppendix-UsingJsondataformatwiththeXStreamlibrary"></a>Using Json data format with the XStream library</h3> +<h3><a shape="rect" name="BookDataFormatAppendix-UsingJSONdataformatwiththeXStreamlibrary"></a>Using JSON data format with the XStream library</h3> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> <span class="code-comment">// lets turn <span class="code-object">Object</span> messages into json then send to MQSeries @@ -862,7 +862,7 @@ Camel provides integration with two popu </pre> </div></div> -<h3><a shape="rect" name="BookDataFormatAppendix-UsingJsondataformatwiththeJacksonlibrary"></a>Using Json data format with the Jackson library</h3> +<h3><a shape="rect" name="BookDataFormatAppendix-UsingJSONdataformatwiththeJacksonlibrary"></a>Using JSON data format with the Jackson library</h3> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> <span class="code-comment">// lets turn <span class="code-object">Object</span> messages into json then send to MQSeries @@ -872,7 +872,7 @@ Camel provides integration with two popu </pre> </div></div> -<h3><a shape="rect" name="BookDataFormatAppendix-UsingJsondataformatwiththeGSONlibrary"></a>Using Json data format with the GSON library</h3> +<h3><a shape="rect" name="BookDataFormatAppendix-UsingJSONdataformatwiththeGSONlibrary"></a>Using JSON data format with the GSON library</h3> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> <span class="code-comment">// lets turn <span class="code-object">Object</span> messages into json then send to MQSeries @@ -883,7 +883,7 @@ Camel provides integration with two popu </div></div> -<h4><a shape="rect" name="BookDataFormatAppendix-UsingJsoninSpringDSL"></a>Using Json in Spring DSL</h4> +<h4><a shape="rect" name="BookDataFormatAppendix-UsingJSONinSpringDSL"></a>Using JSON in Spring DSL</h4> <p>When using <a shape="rect" href="data-format.html" title="Data Format">Data Format</a> in Spring DSL you need to declare the data formats first. This is done in the <b>DataFormats</b> XML tag.</p> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-xml"> 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 Thu Apr 19 15:20:47 2012 @@ -200,9 +200,9 @@ ProducerTemplate template = context.crea <h2><a shape="rect" name="BookInOnePage-Walkthroughanotherexample"></a>Walk through another example</h2> <h3><a shape="rect" name="BookInOnePage-Introduction"></a>Introduction</h3> -<p>We continue the walk from <a shape="rect" href="walk-through-an-example.html" title="Walk through an Example">Walk through an Example</a>. This time we take a closer look at the routing and explains a few pointers so you wont walk into a bear trap, but can enjoy a walk after hours to the local pub for a large beer <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/wink.gif" height="20" width="20" alt="" border="0"></p> +<p>Continuing the walk from our first <a shape="rect" href="walk-through-an-example.html" title="Walk through an Example">example</a>, we take a closer look at the routing and explain a few pointers - so you won't walk into a bear trap, but can enjoy an after-hours walk to the local pub for a large beer <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/wink.gif" height="20" width="20" alt="" border="0"></p> -<p>First we take a moment to look at the <a shape="rect" href="enterprise-integration-patterns.html" title="Enterprise Integration Patterns">Enterprise Integration Patterns</a> that is the base pattern catalog for integrations. In particular we focus on the <a shape="rect" href="pipes-and-filters.html" title="Pipes and Filters">Pipes and Filters</a> EIP pattern, that is a central pattern. This is used for: route through a sequence of processing steps, each performing a specific function - much like the Java Servlet Filters. </p> +<p>First we take a moment to look at the <a shape="rect" href="enterprise-integration-patterns.html" title="Enterprise Integration Patterns">Enterprise Integration Patterns</a> - the base pattern catalog for integration scenarios. In particular we focus on <a shape="rect" href="pipes-and-filters.html" title="Pipes and Filters">Pipes and Filters</a> - a central pattern. This is used to route messages through a sequence of processing steps, each performing a specific function - much like the Java Servlet Filters. </p> <h3><a shape="rect" name="BookInOnePage-Pipesandfilters"></a>Pipes and filters</h3> <p>In this sample we want to process a message in a sequence of steps where each steps can perform their specific function. In our example we have a <a shape="rect" href="jms.html" title="JMS">JMS</a> queue for receiving new orders. When an order is received we need to process it in several steps:</p> @@ -11659,13 +11659,13 @@ from(<span class="code-quote">"seda:peop <p>In Camel 1.6 its only the XStream library that is supported and its default.</p> <p>In Camel 2.0 we added support for more libraries:<br clear="none"> -Camel provides integration with two popular JSon libraries:</p> +Camel provides integration with three popular JSON libraries:</p> <ul class="alternate" type="square"><li>The <a shape="rect" class="external-link" href="http://xstream.codehaus.org/" rel="nofollow">XStream library</a> and <a shape="rect" class="external-link" href="http://jettison.codehaus.org/" rel="nofollow">Jettsion </a></li><li>The <a shape="rect" class="external-link" href="http://xircles.codehaus.org/projects/jackson" rel="nofollow">Jackson library</a></li><li><b>Camel 2.10:</b> The <a shape="rect" class="external-link" href="http://code.google.com/p/google-gson/" rel="nofollow">GSon library</a></li></ul> <p>By default Camel uses the XStream library. </p> -<h3><a shape="rect" name="BookInOnePage-UsingJsondataformatwiththeXStreamlibrary"></a>Using Json data format with the XStream library</h3> +<h3><a shape="rect" name="BookInOnePage-UsingJSONdataformatwiththeXStreamlibrary"></a>Using JSON data format with the XStream library</h3> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> <span class="code-comment">// lets turn <span class="code-object">Object</span> messages into json then send to MQSeries @@ -11675,7 +11675,7 @@ Camel provides integration with two popu </pre> </div></div> -<h3><a shape="rect" name="BookInOnePage-UsingJsondataformatwiththeJacksonlibrary"></a>Using Json data format with the Jackson library</h3> +<h3><a shape="rect" name="BookInOnePage-UsingJSONdataformatwiththeJacksonlibrary"></a>Using JSON data format with the Jackson library</h3> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> <span class="code-comment">// lets turn <span class="code-object">Object</span> messages into json then send to MQSeries @@ -11685,7 +11685,7 @@ Camel provides integration with two popu </pre> </div></div> -<h3><a shape="rect" name="BookInOnePage-UsingJsondataformatwiththeGSONlibrary"></a>Using Json data format with the GSON library</h3> +<h3><a shape="rect" name="BookInOnePage-UsingJSONdataformatwiththeGSONlibrary"></a>Using JSON data format with the GSON library</h3> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> <span class="code-comment">// lets turn <span class="code-object">Object</span> messages into json then send to MQSeries @@ -11696,7 +11696,7 @@ Camel provides integration with two popu </div></div> -<h4><a shape="rect" name="BookInOnePage-UsingJsoninSpringDSL"></a>Using Json in Spring DSL</h4> +<h4><a shape="rect" name="BookInOnePage-UsingJSONinSpringDSL"></a>Using JSON in Spring DSL</h4> <p>When using <a shape="rect" href="data-format.html" title="Data Format">Data Format</a> in Spring DSL you need to declare the data formats first. This is done in the <b>DataFormats</b> XML tag.</p> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-xml"> Modified: websites/production/camel/content/book-quickstart.html ============================================================================== --- websites/production/camel/content/book-quickstart.html (original) +++ websites/production/camel/content/book-quickstart.html Thu Apr 19 15:20:47 2012 @@ -170,9 +170,9 @@ ProducerTemplate template = context.crea <h2><a shape="rect" name="BookQuickstart-Walkthroughanotherexample"></a>Walk through another example</h2> <h3><a shape="rect" name="BookQuickstart-Introduction"></a>Introduction</h3> -<p>We continue the walk from <a shape="rect" href="walk-through-an-example.html" title="Walk through an Example">Walk through an Example</a>. This time we take a closer look at the routing and explains a few pointers so you wont walk into a bear trap, but can enjoy a walk after hours to the local pub for a large beer <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/wink.gif" height="20" width="20" alt="" border="0"></p> +<p>Continuing the walk from our first <a shape="rect" href="walk-through-an-example.html" title="Walk through an Example">example</a>, we take a closer look at the routing and explain a few pointers - so you won't walk into a bear trap, but can enjoy an after-hours walk to the local pub for a large beer <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/wink.gif" height="20" width="20" alt="" border="0"></p> -<p>First we take a moment to look at the <a shape="rect" href="enterprise-integration-patterns.html" title="Enterprise Integration Patterns">Enterprise Integration Patterns</a> that is the base pattern catalog for integrations. In particular we focus on the <a shape="rect" href="pipes-and-filters.html" title="Pipes and Filters">Pipes and Filters</a> EIP pattern, that is a central pattern. This is used for: route through a sequence of processing steps, each performing a specific function - much like the Java Servlet Filters. </p> +<p>First we take a moment to look at the <a shape="rect" href="enterprise-integration-patterns.html" title="Enterprise Integration Patterns">Enterprise Integration Patterns</a> - the base pattern catalog for integration scenarios. In particular we focus on <a shape="rect" href="pipes-and-filters.html" title="Pipes and Filters">Pipes and Filters</a> - a central pattern. This is used to route messages through a sequence of processing steps, each performing a specific function - much like the Java Servlet Filters. </p> <h3><a shape="rect" name="BookQuickstart-Pipesandfilters"></a>Pipes and filters</h3> <p>In this sample we want to process a message in a sequence of steps where each steps can perform their specific function. In our example we have a <a shape="rect" href="jms.html" title="JMS">JMS</a> queue for receiving new orders. When an order is received we need to process it in several steps:</p> 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 Thu Apr 19 15:20:47 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 <errorHandler> with embedded <redeliveryPolicy> to support <a shape="rect" href="using-propertyplaceholder.html" title="Using PropertyPlaceholder">Using PropertyPlaceholder</a></li><li>Fixed issue with using <redeliveryPolicy>, and <redeliveryPolicyProfile> 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 explicit declare to invoke the no-parameter method</li><li>Fixed continued and handled <a shape="rect" href="predicate.html" title="Predicate">Predicate</a> on <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="rect" 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></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 <errorHandler> with embedded <redeliveryPolicy> to support <a shape="rect" href="using-propertyplaceholder.html" title="Using PropertyPlaceholder">Using PropertyPlaceholder</a></li><li>Fixed issue with using <redeliveryPolicy>, and <redeliveryPolicyProfile> 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">Predicate</a> on <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="re ct" 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></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> Modified: websites/production/camel/content/examples.html ============================================================================== --- websites/production/camel/content/examples.html (original) +++ websites/production/camel/content/examples.html Thu Apr 19 15:20:47 2012 @@ -77,17 +77,17 @@ <td valign="top" width="100%"> <div class="wiki-content maincontent"><h2><a shape="rect" name="Examples-Examples"></a>Examples</h2> -<p>Once you have read about <a shape="rect" href="getting-started.html" title="Getting Started">Getting Started</a> and looked at the <a shape="rect" href="enterprise-integration-patterns.html" title="Enterprise Integration Patterns">Enterprise Integration Patterns</a> you might want to try out some examples.</p> +<p>Once you have read about <a shape="rect" href="getting-started.html" title="Getting Started">Getting Started</a> and looked at the <a shape="rect" href="enterprise-integration-patterns.html" title="Enterprise Integration Patterns">Enterprise Integration Patterns</a>, you might want to try out some examples.</p> <p>Before starting to work on example you may want to <a shape="rect" href="what-are-the-dependencies.html" title="What are the dependencies">check the requirements for working with Camel</a>. Then <a shape="rect" href="running-examples.html" title="Running Examples">Running Examples</a> describes how to get the examples to run</p> -<h3><a shape="rect" name="Examples-Walkthroughs"></a>Walk throughs</h3> -<ul><li><a shape="rect" href="walk-through-an-example.html" title="Walk through an Example">Walk through an Example</a> will walk through the code of the first example so you can understand how things fit together using a simple Java main(String[] args) method and using the <a shape="rect" href="dsl.html" title="DSL">DSL</a> to set up some routes.</li><li><a shape="rect" href="walk-through-another-example.html" title="Walk through another example">Walk through another example</a> we continue the walk and look at the Spring DSL (XML based) routing.</li><li>Read the <a shape="rect" href="console-example.html" title="Console Example">Console Example</a> which is a simple beginner example.</li></ul> +<h3><a shape="rect" name="Examples-Walkthroughs"></a>Walk-throughs</h3> +<ul><li>Walk through the code of a <a shape="rect" href="walk-through-an-example.html" title="Walk through an Example">beginner's example</a> so you can understand how things fit together using the Java <a shape="rect" href="dsl.html" title="DSL">DSL</a> to set up some routes in a simple <tt>main(…)</tt> method.</li><li>Walk through the <a shape="rect" href="walk-through-another-example.html" title="Walk through another example">Spring DSL example</a> to look at XML-based routing.</li><li>Walk through the <a shape="rect" href="console-example.html" title="Console Example">Console Example</a> to practice reading input from the console.</li></ul> -<div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Notice</b><br clear="none">These examples listed below, is hosted at Apache. We offer the <a shape="rect" href="articles.html" title="Articles">Articles</a> page where we have a link collection for 3rd party Camel material, such as tutorials, blog posts, published articles, videos, pod casts, presentations, and so forth. +<div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Notice</b><br clear="none">The examples listed below are hosted at Apache. We also offer the <a shape="rect" href="articles.html" title="Articles">Articles</a> page as a collection of 3rd-party Camel material - such as tutorials, blog posts, published articles, videos, podcasts, presentations, and so forth. -<p>If you have written a Camel related article, then we are happy to provide a link to it. You can contact the Camel <a shape="rect" href="team.html" title="Team">Team</a>, for example using the <a shape="rect" href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a>, (or post a tweet with the word Apache Camel).</p></td></tr></table></div> +<p>If you have written a Camel-related article, then we are happy to provide a link to it. You can contact the Camel <a shape="rect" href="team.html" title="Team">Team</a> via our <a shape="rect" href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a>, or simply post a tweet with the words "Apache Camel".</p></td></tr></table></div> <h3><a shape="rect" name="Examples-Examples"></a>Examples</h3> Modified: websites/production/camel/content/json.html ============================================================================== --- websites/production/camel/content/json.html (original) +++ websites/production/camel/content/json.html Thu Apr 19 15:20:47 2012 @@ -81,13 +81,13 @@ <p>In Camel 1.6 its only the XStream library that is supported and its default.</p> <p>In Camel 2.0 we added support for more libraries:<br clear="none"> -Camel provides integration with two popular JSon libraries:</p> +Camel provides integration with three popular JSON libraries:</p> <ul class="alternate" type="square"><li>The <a shape="rect" class="external-link" href="http://xstream.codehaus.org/" rel="nofollow">XStream library</a> and <a shape="rect" class="external-link" href="http://jettison.codehaus.org/" rel="nofollow">Jettsion </a></li><li>The <a shape="rect" class="external-link" href="http://xircles.codehaus.org/projects/jackson" rel="nofollow">Jackson library</a></li><li><b>Camel 2.10:</b> The <a shape="rect" class="external-link" href="http://code.google.com/p/google-gson/" rel="nofollow">GSon library</a></li></ul> <p>By default Camel uses the XStream library. </p> -<h3><a shape="rect" name="JSON-UsingJsondataformatwiththeXStreamlibrary"></a>Using Json data format with the XStream library</h3> +<h3><a shape="rect" name="JSON-UsingJSONdataformatwiththeXStreamlibrary"></a>Using JSON data format with the XStream library</h3> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> <span class="code-comment">// lets turn <span class="code-object">Object</span> messages into json then send to MQSeries @@ -97,7 +97,7 @@ Camel provides integration with two popu </pre> </div></div> -<h3><a shape="rect" name="JSON-UsingJsondataformatwiththeJacksonlibrary"></a>Using Json data format with the Jackson library</h3> +<h3><a shape="rect" name="JSON-UsingJSONdataformatwiththeJacksonlibrary"></a>Using JSON data format with the Jackson library</h3> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> <span class="code-comment">// lets turn <span class="code-object">Object</span> messages into json then send to MQSeries @@ -107,7 +107,7 @@ Camel provides integration with two popu </pre> </div></div> -<h3><a shape="rect" name="JSON-UsingJsondataformatwiththeGSONlibrary"></a>Using Json data format with the GSON library</h3> +<h3><a shape="rect" name="JSON-UsingJSONdataformatwiththeGSONlibrary"></a>Using JSON data format with the GSON library</h3> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java"> <span class="code-comment">// lets turn <span class="code-object">Object</span> messages into json then send to MQSeries @@ -118,7 +118,7 @@ Camel provides integration with two popu </div></div> -<h4><a shape="rect" name="JSON-UsingJsoninSpringDSL"></a>Using Json in Spring DSL</h4> +<h4><a shape="rect" name="JSON-UsingJSONinSpringDSL"></a>Using JSON in Spring DSL</h4> <p>When using <a shape="rect" href="data-format.html" title="Data Format">Data Format</a> in Spring DSL you need to declare the data formats first. This is done in the <b>DataFormats</b> XML tag.</p> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-xml"> Modified: websites/production/camel/content/walk-through-another-example.html ============================================================================== --- websites/production/camel/content/walk-through-another-example.html (original) +++ websites/production/camel/content/walk-through-another-example.html Thu Apr 19 15:20:47 2012 @@ -78,9 +78,9 @@ <div class="wiki-content maincontent"><h2><a shape="rect" name="Walkthroughanotherexample-Walkthroughanotherexample"></a>Walk through another example</h2> <h3><a shape="rect" name="Walkthroughanotherexample-Introduction"></a>Introduction</h3> -<p>We continue the walk from <a shape="rect" href="walk-through-an-example.html" title="Walk through an Example">Walk through an Example</a>. This time we take a closer look at the routing and explains a few pointers so you wont walk into a bear trap, but can enjoy a walk after hours to the local pub for a large beer <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/wink.gif" height="20" width="20" alt="" border="0"></p> +<p>Continuing the walk from our first <a shape="rect" href="walk-through-an-example.html" title="Walk through an Example">example</a>, we take a closer look at the routing and explain a few pointers - so you won't walk into a bear trap, but can enjoy an after-hours walk to the local pub for a large beer <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/wink.gif" height="20" width="20" alt="" border="0"></p> -<p>First we take a moment to look at the <a shape="rect" href="enterprise-integration-patterns.html" title="Enterprise Integration Patterns">Enterprise Integration Patterns</a> that is the base pattern catalog for integrations. In particular we focus on the <a shape="rect" href="pipes-and-filters.html" title="Pipes and Filters">Pipes and Filters</a> EIP pattern, that is a central pattern. This is used for: route through a sequence of processing steps, each performing a specific function - much like the Java Servlet Filters. </p> +<p>First we take a moment to look at the <a shape="rect" href="enterprise-integration-patterns.html" title="Enterprise Integration Patterns">Enterprise Integration Patterns</a> - the base pattern catalog for integration scenarios. In particular we focus on <a shape="rect" href="pipes-and-filters.html" title="Pipes and Filters">Pipes and Filters</a> - a central pattern. This is used to route messages through a sequence of processing steps, each performing a specific function - much like the Java Servlet Filters. </p> <h3><a shape="rect" name="Walkthroughanotherexample-Pipesandfilters"></a>Pipes and filters</h3> <p>In this sample we want to process a message in a sequence of steps where each steps can perform their specific function. In our example we have a <a shape="rect" href="jms.html" title="JMS">JMS</a> queue for receiving new orders. When an order is received we need to process it in several steps:</p>