Author: buildbot
Date: Sun Mar 18 11:21:03 2012
New Revision: 809050

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/beanio.html
    websites/production/camel/content/book-dataformat-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/data-format-list.html
    websites/production/camel/content/data-format.html
    websites/production/camel/content/websocket.html

Modified: websites/production/camel/content/beanio.html
==============================================================================
--- websites/production/camel/content/beanio.html (original)
+++ websites/production/camel/content/beanio.html Sun Mar 18 11:21:03 2012
@@ -80,17 +80,82 @@
 
 <p>The BeanIO <a shape="rect" href="data-format.html" title="Data Format">Data 
Format</a> uses <a shape="rect" class="external-link" href="http://beanio.org/"; 
rel="nofollow">BeanIO</a> to handle flat payloads (such as XML, CSV, delimited, 
or fixed length formats).</p>
 
-<h3><a shape="rect" name="BeanIO-Options"></a>Options</h3>
+<p>BeanIO is configured using a <a shape="rect" class="external-link" 
href="http://beanio.org/2.0/docs/reference/index.html#TheMappingFile"; 
rel="nofollow">mappings XML</a> file where you define the mapping from the flat 
format to Objects (POJOs). This mapping file is mandatory to use.</p>
 
-<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"> Type </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> config </td><td colspan="1" rowspan="1" 
class="confluenceTd"> CSVConfig </td><td colspan="1" rowspan="1" 
class="confluenceTd"> Can be used to set a custom CSVConfig object. 
</td></tr></tbody></table>
+<h3><a shape="rect" name="BeanIO-Options"></a>Options</h3>
+<div class="confluenceTableSmall"><div class="table-wrap">
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"> Option </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Default </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> mapping </td><td colspan="1" rowspan="1" 
class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" 
class="confluenceTd"> The BeanIO mapping file. The option is mandatory. Is by 
default loaded from the classpath. You can prefix with <tt>file:</tt>, 
<tt>http:</tt>, or <tt>classpath:</tt> to denote from where to load the mapping 
file. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
streamName </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td 
colspan="1" rowspan="1" class="confluenceTd"> The name of the stream to use. 
This option is mandatory. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> ignoreUnidentifiedRecords </td><td colspan="1" ro
 wspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> Whether to ignore unidentified records. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
ignoreUnexpectedRecords </td><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether 
to ignore unexpected records. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> ignoreInvalidRecords </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> Whether to ignore invalid records. </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> encoding </td><td colspan="1" 
rowspan="1" class="confluenceTd"> Platform default </td><td colspan="1" 
rowspan="1" class="confluenceTd"> The charset to use. </td></tr></tbody></table>
+</div>
 </div>
-
-<p>TODO:</p>
 
 <h3><a shape="rect" name="BeanIO-Usage"></a>Usage</h3>
-<p>TODO:</p>
 
+<p>An example of a <a shape="rect" class="external-link" 
href="https://svn.apache.org/repos/asf/camel/trunk/components/camel-beanio/src/test/resources/org/apache/camel/dataformat/beanio/mappings.xml";>mapping
 file is here</a>.</p>
+
+<h4><a shape="rect" name="BeanIO-UsingJavaDSL"></a>Using Java DSL</h4>
+<p>To use the <tt>BeanIODataFormat</tt> you need to configure the data format 
with the mapping file, as well the name of the stream.<br clear="none">
+In Java DSL this can be done as shown below. The streamName is 
"employeeFile".</p>
+
+<p>Then we have two routes. The first route is for transforming CSV data into 
a List&lt;Employee&gt; Java objects. Which we then <a shape="rect" 
href="splitter.html" title="Splitter">split</a>, so the mock endpoint<br 
clear="none">
+receives a message for each row.</p>
+
+<p>The 2nd route is for the reverse operation, to transform a 
List&lt;Employee&gt; into a stream of CSV data.</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-java"><span class="code-comment">// setup beanio data format 
using the mapping file, loaded from the classpath
+</span>DataFormat format = <span class="code-keyword">new</span> 
BeanIODataFormat(
+        <span 
class="code-quote">"org/apache/camel/dataformat/beanio/mappings.xml"</span>,
+        <span class="code-quote">"employeeFile"</span>);
+
+<span class="code-comment">// a route which uses the bean io data format to 
format a CSV data
+</span><span class="code-comment">// to java objects
+</span>from(<span class="code-quote">"direct:unmarshal"</span>)
+    .unmarshal(format)
+    <span class="code-comment">// and then split the message body so we get a 
message <span class="code-keyword">for</span> each row
+</span>    .split(body())
+        .to(<span class="code-quote">"mock:beanio-unmarshal"</span>);
+
+<span class="code-comment">// convert list of java objects back to flat format
+</span>from(<span class="code-quote">"direct:marshal"</span>)
+    .marshal(format)
+    .to(<span class="code-quote">"mock:beanio-marshal"</span>);
+</pre>
+</div></div>
+
+<p>The CSV data could for example be as below:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-java"><span class="code-keyword">private</span> <span 
class="code-keyword">static</span> <span class="code-keyword">final</span> 
<span class="code-object">String</span> FIXED_DATA =
+        <span class="code-quote">"Joe,Smith,Developer,75000,10012009"</span> + 
LS
+        + <span class="code-quote">"Jane,Doe,Architect,80000,01152008"</span> 
+ LS
+        + <span 
class="code-quote">"Jon,Anderson,Manager,85000,03182007"</span> + LS;
+</pre>
+</div></div>
+
+<h4><a shape="rect" name="BeanIO-UsingXMLDSL"></a>Using XML DSL</h4>
+<p>To use the BeanIO data format in XML, you need to configure it using the 
&lt;beanio&gt; XML tag as shown below. The routes is similar to the example 
above.</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-xml"><span class="code-tag">&lt;camelContext xmlns=<span 
class="code-quote">"http://camel.apache.org/schema/spring";</span>&gt;</span>
+  <span class="code-tag"><span class="code-comment">&lt;!-- setup beanio data 
format --&gt;</span></span>
+  <span class="code-tag">&lt;dataFormats&gt;</span>
+    <span class="code-tag">&lt;beanio id=<span 
class="code-quote">"myBeanio"</span> mapping=<span 
class="code-quote">"org/apache/camel/dataformat/beanio/mappings.xml"</span> 
streamName=<span class="code-quote">"employeeFile"</span>/&gt;</span>
+  <span class="code-tag">&lt;/dataFormats&gt;</span>
+
+  <span class="code-tag">&lt;route&gt;</span>
+    <span class="code-tag">&lt;from uri=<span 
class="code-quote">"direct:unmarshal"</span>/&gt;</span>
+    <span class="code-tag">&lt;unmarshal ref=<span 
class="code-quote">"myBeanio"</span>/&gt;</span>
+    <span class="code-tag">&lt;split&gt;</span>
+      <span class="code-tag">&lt;simple&gt;</span>body<span 
class="code-tag">&lt;/simple&gt;</span>
+      <span class="code-tag">&lt;to uri=<span 
class="code-quote">"mock:beanio-unmarshal"</span>/&gt;</span>
+    <span class="code-tag">&lt;/split&gt;</span>
+  <span class="code-tag">&lt;/route&gt;</span>
+  
+  <span class="code-tag">&lt;route&gt;</span>
+    <span class="code-tag">&lt;from uri=<span 
class="code-quote">"direct:marshal"</span>/&gt;</span>
+    <span class="code-tag">&lt;marshal ref=<span 
class="code-quote">"myBeanio"</span>/&gt;</span>
+    <span class="code-tag">&lt;to uri=<span 
class="code-quote">"mock:beanio-marshal"</span>/&gt;</span>
+  <span class="code-tag">&lt;/route&gt;</span>
+<span class="code-tag">&lt;/camelContext&gt;</span>
+</pre>
+</div></div>
 
 <h3><a shape="rect" name="BeanIO-Dependencies"></a>Dependencies</h3>
 

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 Sun Mar 18 
11:21:03 2012
@@ -105,7 +105,7 @@
 
 
 <ul><li>Flat data structure marshalling
-       <ul><li><a shape="rect" href="bindy.html" 
title="Bindy">Bindy</a></li><li><a shape="rect" href="csv.html" 
title="CSV">CSV</a></li><li><a shape="rect" href="edi.html" 
title="EDI">EDI</a></li><li><a shape="rect" href="flatpack-dataformat.html" 
title="Flatpack DataFormat">Flatpack DataFormat</a></li></ul>
+       <ul><li><a shape="rect" href="beanio.html" 
title="BeanIO">BeanIO</a></li><li><a shape="rect" href="bindy.html" 
title="Bindy">Bindy</a></li><li><a shape="rect" href="csv.html" 
title="CSV">CSV</a></li><li><a shape="rect" href="edi.html" 
title="EDI">EDI</a></li><li><a shape="rect" href="flatpack-dataformat.html" 
title="Flatpack DataFormat">Flatpack DataFormat</a></li></ul>
        </li></ul>
 
 

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 Mar 18 11:21:03 
2012
@@ -10889,7 +10889,7 @@ from(<span class="code-quote">"direct:st
 
 
 <ul><li>Flat data structure marshalling
-       <ul><li><a shape="rect" href="bindy.html" 
title="Bindy">Bindy</a></li><li><a shape="rect" href="csv.html" 
title="CSV">CSV</a></li><li><a shape="rect" href="edi.html" 
title="EDI">EDI</a></li><li><a shape="rect" href="flatpack-dataformat.html" 
title="Flatpack DataFormat">Flatpack DataFormat</a></li></ul>
+       <ul><li><a shape="rect" href="beanio.html" 
title="BeanIO">BeanIO</a></li><li><a shape="rect" href="bindy.html" 
title="Bindy">Bindy</a></li><li><a shape="rect" href="csv.html" 
title="CSV">CSV</a></li><li><a shape="rect" href="edi.html" 
title="EDI">EDI</a></li><li><a shape="rect" href="flatpack-dataformat.html" 
title="Flatpack DataFormat">Flatpack DataFormat</a></li></ul>
        </li></ul>
 
 

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 Mar 18 
11:21:03 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.</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.</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></ul>
 
 
 <h3><a shape="rect" name="Camel2.10.0Release-Fixedissues"></a>Fixed issues</h3>
@@ -96,7 +96,7 @@
 
 <h3><a shape="rect" name="Camel2.10.0Release-NewComponents"></a>New <a 
shape="rect" href="components.html" title="Components">Components</a></h3>
 
-<ul><li><tt>camel-avro</tt></li><li><tt>camel-aws</tt> - AWS-DDB - Amazon 
DynamoDB</li><li><tt>camel-beanio</tt></li><li><tt>camel-cdi</tt></li><li><tt>camel-fop</tt></li><li><tt>camel-gson</tt>
 - For <a shape="rect" href="json.html" title="JSON">JSON</a> data format using 
the Google GSon 
project</li><li><tt>camel-mina2</tt></li><li><tt>camel-mongodb</tt> - for <a 
shape="rect" href="mongodb.html" title="MongoDB">MongoDB</a> 
integration</li><li><tt>camel-ssh</tt> - For executing commands on a <a 
shape="rect" href="ssh.html" title="SSH">SSH</a> Server</li><li><a shape="rect" 
href="stub.html" title="Stub">Stub</a> - For stubbing endpoints, for 
development and testing purposes</li><li><tt>camel-test-blueprint</tt> - For <a 
shape="rect" href="blueprint-testing.html" title="Blueprint Testing">Blueprint 
Testing</a></li><li><tt>camel-test-spring</tt> - For <a shape="rect" 
href="spring-testing.html" title="Spring Testing">Spring 
Testing</a></li><li><tt>camel-twitter</tt> - For integr
 ating with <a shape="rect" href="twitter.html" 
title="Twitter">Twitter</a></li><li><tt>camel-websocket</tt> - For using <a 
shape="rect" href="websocket.html" title="Websocket">Websocket</a></li></ul>
+<ul><li><tt>camel-avro</tt></li><li><tt>camel-aws</tt> - AWS-DDB - Amazon 
DynamoDB</li><li><tt>camel-beanio</tt> - <a shape="rect" href="beanio.html" 
title="BeanIO">Data Format</a> to map objects to flat structured 
format</li><li><tt>camel-cdi</tt></li><li><tt>camel-fop</tt></li><li><tt>camel-gson</tt>
 - For <a shape="rect" href="json.html" title="JSON">JSON</a> data format using 
the Google GSon 
project</li><li><tt>camel-mina2</tt></li><li><tt>camel-mongodb</tt> - for <a 
shape="rect" href="mongodb.html" title="MongoDB">MongoDB</a> 
integration</li><li><tt>camel-ssh</tt> - For executing commands on a <a 
shape="rect" href="ssh.html" title="SSH">SSH</a> 
Server</li><li><tt>camel-core</tt> - <a shape="rect" href="stub.html" 
title="Stub">Stub</a> for stubbing endpoints, for development and testing 
purposes</li><li><tt>camel-test-blueprint</tt> - For <a shape="rect" 
href="blueprint-testing.html" title="Blueprint Testing">Blueprint 
Testing</a></li><li><tt>camel-test-spring</tt> - For
  <a shape="rect" href="spring-testing.html" title="Spring Testing">Spring 
Testing</a></li><li><tt>camel-twitter</tt> - For integrating with <a 
shape="rect" href="twitter.html" 
title="Twitter">Twitter</a></li><li><tt>camel-websocket</tt> - For using <a 
shape="rect" href="websocket.html" title="Websocket">Websocket</a></li></ul>
 
 
 <h3><a shape="rect" name="Camel2.10.0Release-DSLChanges"></a>DSL Changes</h3>
@@ -105,14 +105,14 @@
 
 <h3><a shape="rect" name="Camel2.10.0Release-NewDataFormatsDataFormat"></a>New 
<a shape="rect" href="data-format.html" title="Data Format">Data 
Formats</a></h3>
 
-<ul><li><tt>camel-avro</tt></li><li><tt>camel-beanio</tt></li><li><tt>camel-gson</tt>
 - For <a shape="rect" href="json.html" title="JSON">JSON</a> data format using 
the Google GSon project</li></ul>
+<ul><li><tt>camel-avro</tt></li><li><tt>camel-beanio</tt> - <a shape="rect" 
href="beanio.html" title="BeanIO">Data Format</a> to map objects to flat 
structured format</li><li><tt>camel-gson</tt> - For <a shape="rect" 
href="json.html" title="JSON">JSON</a> data format using the Google GSon 
project</li></ul>
 
 
 <h3><a shape="rect" name="Camel2.10.0Release-NewLanguages"></a>New <a 
shape="rect" href="languages.html" title="Languages">Languages</a></h3>
 
 <h3><a shape="rect" name="Camel2.10.0Release-NewExamples"></a>New <a 
shape="rect" href="examples.html" title="Examples">Examples</a></h3>
 
-<ul><li><tt>camel-example-ssh</tt></li></ul>
+<ul><li><tt>camel-example-ssh</tt></li><li><tt>camel-example-twitter-websocket</tt></li></ul>
 
 
 <h3><a shape="rect" name="Camel2.10.0Release-NewTutorials"></a>New <a 
shape="rect" href="tutorials.html" title="Tutorials">Tutorials</a></h3>
@@ -134,7 +134,7 @@
 
 <h2><a shape="rect" 
name="Camel2.10.0Release-DependencyUpgrades"></a>Dependency Upgrades</h2>
 
-<ul><li>AHC 1.6.5 to 1.7.1</li><li>AWS 1.2.2 to 1.3.0</li><li>Commons-codec 
1.4 to 1.6</li><li>Commons-net 2.2 to 3.0.1</li><li>CXF 2.5.1 to 
2.5.2</li><li>Freemarker 2.3.18 to 2.3.19</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.1</li><li>Hawtbuf 1.7 to 1.9</li><li>Jackson 1.9.2 to 
1.9.5</li><li>Jackrabbit 2.2.4 to 2.2.11</li><li>Jasypt 1.7 to 
1.9.0</li><li>JClouds 1.3.1 to 1.3.2</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.4</li><li>Lucene 3.0.3 to 3.5.0</li><li>MyBatis 3.0.6 to 
3.1.0</li><li>Netty 3.2.6 to 3.3.1</li><li>OGNL 3.0.2 to 3.0.4</li><li>Resetlet 
2.0.10 to 2.0.11</li><li>SNMP 1.8.1 to 1.10.1</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</li><li>Spring Integration 2.0.
 5 to 2.1.0</li><li>Spring Security 3.0.7 to 3.1.0</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.1</li><li>AWS 1.2.2 to 1.3.0</li><li>Commons-codec 
1.4 to 1.6</li><li>Commons-net 2.2 to 3.0.1</li><li>CXF 2.5.1 to 
2.5.2</li><li>Freemarker 2.3.18 to 2.3.19</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.1</li><li>Hawtbuf 1.7 to 1.9</li><li>Jackson 1.9.2 to 
1.9.5</li><li>Jackrabbit 2.2.4 to 2.2.11</li><li>Jasypt 1.7 to 
1.9.0</li><li>Jetty 1.10 to 1.12</li><li>JClouds 1.3.1 to 
1.3.2</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.4</li><li>Logback 1.0.0 to 
1.0.1</li><li>Lucene 3.0.3 to 3.5.0</li><li>MyBatis 3.0.6 to 
3.1.0</li><li>Netty 3.2.6 to 3.3.1</li><li>OGNL 3.0.2 to 3.0.4</li><li>Resetlet 
2.0.10 to 2.0.11</li><li>SNMP 1.8.1 to 1.10.1</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</li><li>Spring Integration 2.0.5 to 
 >2.1.0</li><li>Spring Security 3.0.7 to 3.1.0</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/data-format-list.html
==============================================================================
--- websites/production/camel/content/data-format-list.html (original)
+++ websites/production/camel/content/data-format-list.html Sun Mar 18 11:21:03 
2012
@@ -96,7 +96,7 @@
 
 
 <ul><li>Flat data structure marshalling
-       <ul><li><a shape="rect" href="bindy.html" 
title="Bindy">Bindy</a></li><li><a shape="rect" href="csv.html" 
title="CSV">CSV</a></li><li><a shape="rect" href="edi.html" 
title="EDI">EDI</a></li><li><a shape="rect" href="flatpack-dataformat.html" 
title="Flatpack DataFormat">Flatpack DataFormat</a></li></ul>
+       <ul><li><a shape="rect" href="beanio.html" 
title="BeanIO">BeanIO</a></li><li><a shape="rect" href="bindy.html" 
title="Bindy">Bindy</a></li><li><a shape="rect" href="csv.html" 
title="CSV">CSV</a></li><li><a shape="rect" href="edi.html" 
title="EDI">EDI</a></li><li><a shape="rect" href="flatpack-dataformat.html" 
title="Flatpack DataFormat">Flatpack DataFormat</a></li></ul>
        </li></ul>
 
 

Modified: websites/production/camel/content/data-format.html
==============================================================================
--- websites/production/camel/content/data-format.html (original)
+++ websites/production/camel/content/data-format.html Sun Mar 18 11:21:03 2012
@@ -102,7 +102,7 @@
 
 
 <ul><li>Flat data structure marshalling
-       <ul><li><a shape="rect" href="bindy.html" 
title="Bindy">Bindy</a></li><li><a shape="rect" href="csv.html" 
title="CSV">CSV</a></li><li><a shape="rect" href="edi.html" 
title="EDI">EDI</a></li><li><a shape="rect" href="flatpack-dataformat.html" 
title="Flatpack DataFormat">Flatpack DataFormat</a></li></ul>
+       <ul><li><a shape="rect" href="beanio.html" 
title="BeanIO">BeanIO</a></li><li><a shape="rect" href="bindy.html" 
title="Bindy">Bindy</a></li><li><a shape="rect" href="csv.html" 
title="CSV">CSV</a></li><li><a shape="rect" href="edi.html" 
title="EDI">EDI</a></li><li><a shape="rect" href="flatpack-dataformat.html" 
title="Flatpack DataFormat">Flatpack DataFormat</a></li></ul>
        </li></ul>
 
 

Modified: websites/production/camel/content/websocket.html
==============================================================================
--- websites/production/camel/content/websocket.html (original)
+++ websites/production/camel/content/websocket.html Sun Mar 18 11:21:03 2012
@@ -107,11 +107,10 @@ websocket:<span class="code-comment">//h
 
 <p>The <tt>WebsocketComponent</tt> must be configured prior to use, to setup 
host, to act as a websocket server. </p>
 
-<div class="confluenceTableSmall"></div>
-<div class="table-wrap">
+<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"> Host </td><td colspan="1" rowspan="1" 
class="confluenceTd"> 0.0.0.0 </td><td colspan="1" rowspan="1" 
class="confluenceTd"> The hostname. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> Port </td><td colspan="1" rowspan="1" 
class="confluenceTd"> 9292 </td><td colspan="1" rowspan="1" 
class="confluenceTd"> The port number. </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"> Path for static resources such as index.html 
files etc. </td></tr></tbody></table>
 </div>
-
+</div>
 
 <h3><a shape="rect" name="Websocket-Usage"></a>Usage</h3>
 


Reply via email to