Modified: websites/production/camel/content/cxf.html
==============================================================================
--- websites/production/camel/content/cxf.html (original)
+++ websites/production/camel/content/cxf.html Sat Sep  8 10:19:54 2012
@@ -122,14 +122,12 @@ cxf:bean:cxfEndpoint?wsdlURL=wsdl/hello_
 
 <h3><a shape="rect" name="CXF-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"> Name </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Required </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>wsdlURL</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> 
The location of the WSDL. It is obtained from endpoint address by default. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: <a shape="rect" 
class="external-link" href="file://local/wsdl/hello.wsdl" 
rel="nofollow">file://local/wsdl/hello.wsdl</a> or <tt>wsdl/hello.wsdl</tt> 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>serviceClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
Yes </td><td colspan="1" rowspan="1" class="confluenceTd"> The name of the SEI 
(Service Endpo
 int Interface) class. This class can have, but does not require, JSR181 
annotations. <br clear="none" class="atl-forced-newline"> This option is only 
required by POJO mode. If the wsdlURL option is provided, serviceClass is not 
required for PAYLOAD and MESSAGE mode. When wsdlURL option is used without 
serviceClass, the serviceName and portName (endpointName for Spring 
configuration) options <b>MUST</b> be provided. It is possible to use 
<tt>#</tt> notation to reference a <tt>serviceClass</tt> object instance from 
the registry. E.g. <tt>serviceClass=#beanName</tt>.<br clear="none" 
class="atl-forced-newline"> <b>Since 2.8,</b> it is possible to omit both 
wsdlURL and serviceClass options for PAYLOAD and MESSAGE mode. When they are 
omitted, arbitrary XML elements can be put in CxfPayload's body in PAYLOAD mode 
to facilitate CXF Dispatch Mode. <br clear="none" class="atl-forced-newline"> 
<br clear="none" class="atl-forced-newline"> Please be advised that the 
<b>referenced object 
 cannot be a Proxy</b> (Spring AOP Proxy is OK) as it relies on 
<tt>Object.getClass().getName()</tt> method for non Spring AOP Proxy. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: <tt>org.apache.camel.Hello</tt> 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>serviceName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No 
</td><td colspan="1" rowspan="1" class="confluenceTd"> The service name this 
service is implementing, it maps to the <tt>wsdl:service@name</tt>. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <b>Required</b> for camel-cxf consumer since 
camel-2.2.0 or if more than one <tt>serviceName</tt> is present in WSDL. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: 
{http:&#173;//org.apache.camel}ServiceName </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>p
 ortName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No 
</td><td colspan="1" rowspan="1" class="confluenceTd"> The port name this 
service is implementing, it maps to the <tt>wsdl:port@name</tt>. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <b>Required</b> for camel-cxf consumer since 
camel-2.2.0 or if more than one <tt>portName</tt> is present under 
<tt>serviceName</tt>. <br clear="none" class="atl-forced-newline"> <br 
clear="none" class="atl-forced-newline"> <em>Example</em>: 
{http:&#173;//org.apache.camel}PortName </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>dataFormat</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" 
class="confluenceTd"> The data type messages supported by the CXF endpoint. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Default</em>: <tt>POJO</tt> <br clear="none" 
class="atl-forced
 -newline"> <em>Example</em>: <tt>POJO</tt>, <tt>PAYLOAD</tt>, <tt>MESSAGE</tt> 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>relayHeaders</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No 
</td><td colspan="1" rowspan="1" class="confluenceTd"> Please see the 
<b>Description of</b> <tt><b>relayHeaders</b></tt> <b>option</b> section for 
this option.  Should a CXF endpoint relay headers along the route. Currently 
only available when <tt>dataFormat=POJO</tt> <br clear="none" 
class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> 
<em>Default</em>: <tt>true</tt> <br clear="none" class="atl-forced-newline"> 
<em>Example</em>: <tt>true</tt>, <tt>false</tt> </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>wrapped</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" 
class="confluenceTd"> Which kind of operation that CXF  endpoint producer will 
invoke <br clear="none" class="
 atl-forced-newline"> <br clear="none" class="atl-forced-newline"> 
<em>Default</em>: <tt>false</tt> <br clear="none" class="atl-forced-newline"> 
<em>Example</em>: <tt>true</tt>, <tt>false</tt> </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>wrappedStyle</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <b>New in 2.5.0</b> The WSDL style that describes how 
parameters are represented in the SOAP body. If the value is false, CXF will 
chose the document-literal unwrapped style, If the value is true, CXF will 
chose the document-literal wrapped style <br clear="none" 
class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> 
<em>Default</em>: <tt>Null</tt> <br clear="none" class="atl-forced-newline"> 
<em>Example</em>: <tt>true</tt>, <tt>false</tt> </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>setDefaultBus</tt> </td><td colspan="1" 
rowspan="1" class="confluenc
 eTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> Will set the 
default bus when CXF endpoint create a bus by itself <br clear="none" 
class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> 
<em>Default</em>: <tt>false</tt> <br clear="none" class="atl-forced-newline"> 
<em>Example</em>: <tt>true</tt>, <tt>false</tt> </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>bus</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> 
A default bus created by CXF Bus Factory. Use <tt>#</tt> notation to reference 
a bus object from the registry. The referenced object must be an instance of 
<tt>org.apache.cxf.Bus</tt>. <br clear="none" class="atl-forced-newline"> <br 
clear="none" class="atl-forced-newline"> <em>Example</em>: 
<tt>bus=#busName</tt> </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>cxfBinding</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd">
  No </td><td colspan="1" rowspan="1" class="confluenceTd"> Use <tt>#</tt> 
notation to reference a CXF binding object from the registry. The referenced 
object must be an instance of 
<tt>org.apache.camel.component.cxf.CxfBinding</tt> (use an instance of 
<tt>org.apache.camel.component.cxf.DefaultCxfBinding</tt>). <br clear="none" 
class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> 
<em>Example</em>: <tt>cxfBinding=#bindingName</tt> <br clear="none" 
class="atl-forced-newline"> </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>headerFilterStrategy</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" 
class="confluenceTd"> Use <tt>#</tt> notation to reference a header filter 
strategy object from the registry. The referenced object must be an instance of 
<tt>org.apache.camel.spi.HeaderFilterStrategy</tt> (use an instance of 
<tt>org.apache.camel.component.cxf.CxfHeaderFilterStrategy</tt>). <br clear="non
 e" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> 
<em>Example</em>: <tt>headerFilterStrategy=#strategyName</tt> </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <tt>loggingFeatureEnabled</tt> 
</td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" 
rowspan="1" class="confluenceTd"> New in 2.3. This option enables CXF Logging 
Feature which writes inbound and outbound SOAP messages to log. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Default</em>: <tt>false</tt> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: 
<tt>loggingFeatureEnabled</tt><tt>=true</tt> </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>defaultOperationName</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" 
rowspan="1" class="confluenceTd"> New in 2.4, this option will set the default 
operationName that will be used by the CxfProducer w
 hich invokes the remote service. <br clear="none" class="atl-forced-newline"> 
<br clear="none" class="atl-forced-newline"> <em>Default</em>: <tt>null</tt> 
<br clear="none" class="atl-forced-newline"> <em>Example</em>: 
<tt>defaultOperationName</tt><tt>=greetMe</tt> </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>defaultOperationNamespace</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" 
rowspan="1" class="confluenceTd"> New in 2.4. This option will set the default 
operationNamespace that will be used by the CxfProducer which invokes the 
remote service. <br clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Default</em>: <tt>null</tt> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: 
<tt>defaultOperationNamespace</tt><tt>=</tt><tt><a shape="rect" 
class="external-link" 
href="http://apache.org/hello_world_soap_http";>http://apache.org/hello_world_soap_http</a></tt>
 </td></tr>
 <tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>synchronous</tt> 
</td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" 
rowspan="1" class="confluenceTd"> New in 2.5. This option will let cxf endpoint 
decide to use sync or async API to do the underlying work. The default value is 
false which means camel-cxf endpoint will try to use async API by default. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Default</em>: <tt>false</tt> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: synchronous=true 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>publishedEndpointUrl</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> 
New in 2.5. This option can override the endpointUrl that published from the 
WSDL which can be accessed with service address url plus ?wsdl. <br 
clear="none" class="atl-forced-newline"> <br 
 clear="none" class="atl-forced-newline"> <em>Default</em>: <tt>null</tt> <br 
clear="none" class="atl-forced-newline"> <em>Example</em>: 
publshedEndpointUrl=<a shape="rect" class="external-link" 
href="http://example.com/service"; rel="nofollow">http://example.com/service</a> 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>properties.XXX</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
No </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> 
Allows to set custom properties to CXF in the endpoint uri. For example setting 
<tt>properties.mtom-enabled=true</tt> to enable MTOM. </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <tt>allowStreaming</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" 
rowspan="1" class="confluenceTd"> New in 2.8.2.   This option controls whether 
the CXF component, when running in PAYLOAD mode (see below), will DOM parse the 
incoming messages into DOM Elements 
 or keep the payload as a javax.xml.transform.Source object that would allow 
streaming in some cases. </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>skipFaultLogging</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" 
class="confluenceTd"> New in 2.11. This option controls whether the 
PhaseInterceptorChain skips logging the Fault that it catches. 
</td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"> Name </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Required </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>wsdlURL</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> 
The location of the WSDL. It is obtained from endpoint address by default. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: <a shape="rect" 
class="external-link" href="file://local/wsdl/hello.wsdl" 
rel="nofollow">file://local/wsdl/hello.wsdl</a> or <tt>wsdl/hello.wsdl</tt> 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>serviceClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
Yes </td><td colspan="1" rowspan="1" class="confluenceTd"> The name of the SEI 
(Service Endpo
 int Interface) class. This class can have, but does not require, JSR181 
annotations. <br clear="none" class="atl-forced-newline"> This option is only 
required by POJO mode. If the wsdlURL option is provided, serviceClass is not 
required for PAYLOAD and MESSAGE mode. When wsdlURL option is used without 
serviceClass, the serviceName and portName (endpointName for Spring 
configuration) options <b>MUST</b> be provided. It is possible to use 
<tt>#</tt> notation to reference a <tt>serviceClass</tt> object instance from 
the registry. E.g. <tt>serviceClass=#beanName</tt>. The <tt>serviceClass</tt> 
for a CXF producer (that is, the <tt>to</tt> endpoint) should be a Java 
interface.<br clear="none" class="atl-forced-newline"> <b>Since 2.8,</b> it is 
possible to omit both wsdlURL and serviceClass options for PAYLOAD and MESSAGE 
mode. When they are omitted, arbitrary XML elements can be put in CxfPayload's 
body in PAYLOAD mode to facilitate CXF Dispatch Mode. <br clear="none" 
class="atl-f
 orced-newline"> <br clear="none" class="atl-forced-newline"> Please be advised 
that the <b>referenced object cannot be a Proxy</b> (Spring AOP Proxy is OK) as 
it relies on <tt>Object.getClass().getName()</tt> method for non Spring AOP 
Proxy. <br clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: <tt>org.apache.camel.Hello</tt> 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>serviceName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No 
</td><td colspan="1" rowspan="1" class="confluenceTd"> The service name this 
service is implementing, it maps to the <tt>wsdl:service@name</tt>. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <b>Required</b> for camel-cxf consumer since 
camel-2.2.0 or if more than one <tt>serviceName</tt> is present in WSDL. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: {ht
 tp:&#173;//org.apache.camel}ServiceName </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>portName</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" 
class="confluenceTd"> The port name this service is implementing, it maps to 
the <tt>wsdl:port@name</tt>. <br clear="none" class="atl-forced-newline"> <br 
clear="none" class="atl-forced-newline"> <b>Required</b> for camel-cxf consumer 
since camel-2.2.0 or if more than one <tt>portName</tt> is present under 
<tt>serviceName</tt>. <br clear="none" class="atl-forced-newline"> <br 
clear="none" class="atl-forced-newline"> <em>Example</em>: 
{http:&#173;//org.apache.camel}PortName </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>dataFormat</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" 
class="confluenceTd"> The data type messages supported by the CXF endpoint. <br 
clear="none" class="atl-forced-newline"> <b
 r clear="none" class="atl-forced-newline"> <em>Default</em>: <tt>POJO</tt> <br 
clear="none" class="atl-forced-newline"> <em>Example</em>: <tt>POJO</tt>, 
<tt>PAYLOAD</tt>, <tt>MESSAGE</tt> </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>relayHeaders</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> 
Please see the <b>Description of</b> <tt><b>relayHeaders</b></tt> <b>option</b> 
section for this option.  Should a CXF endpoint relay headers along the route. 
Currently only available when <tt>dataFormat=POJO</tt> <br clear="none" 
class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> 
<em>Default</em>: <tt>true</tt> <br clear="none" class="atl-forced-newline"> 
<em>Example</em>: <tt>true</tt>, <tt>false</tt> </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>wrapped</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" c
 lass="confluenceTd"> Which kind of operation that CXF  endpoint producer will 
invoke <br clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Default</em>: <tt>false</tt> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: <tt>true</tt>, <tt>false</tt> 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>wrappedStyle</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No 
</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>New in 2.5.0</b> The 
WSDL style that describes how parameters are represented in the SOAP body. If 
the value is false, CXF will chose the document-literal unwrapped style, If the 
value is true, CXF will chose the document-literal wrapped style <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Default</em>: <tt>Null</tt> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: <tt>true</tt>, <tt>false</tt> 
</td></tr><tr><td colspan="
 1" rowspan="1" class="confluenceTd"> <tt>setDefaultBus</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" 
rowspan="1" class="confluenceTd"> Will set the default bus when CXF endpoint 
create a bus by itself <br clear="none" class="atl-forced-newline"> <br 
clear="none" class="atl-forced-newline"> <em>Default</em>: <tt>false</tt> <br 
clear="none" class="atl-forced-newline"> <em>Example</em>: <tt>true</tt>, 
<tt>false</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>bus</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td 
colspan="1" rowspan="1" class="confluenceTd"> A default bus created by CXF Bus 
Factory. Use <tt>#</tt> notation to reference a bus object from the registry. 
The referenced object must be an instance of <tt>org.apache.cxf.Bus</tt>. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: <tt>bus=#busName</tt> 
</td></tr><tr><td colspan="1"
  rowspan="1" class="confluenceTd"> <tt>cxfBinding</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" 
class="confluenceTd"> Use <tt>#</tt> notation to reference a CXF binding object 
from the registry. The referenced object must be an instance of 
<tt>org.apache.camel.component.cxf.CxfBinding</tt> (use an instance of 
<tt>org.apache.camel.component.cxf.DefaultCxfBinding</tt>). <br clear="none" 
class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> 
<em>Example</em>: <tt>cxfBinding=#bindingName</tt> <br clear="none" 
class="atl-forced-newline"> </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>headerFilterStrategy</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" 
class="confluenceTd"> Use <tt>#</tt> notation to reference a header filter 
strategy object from the registry. The referenced object must be an instance of 
<tt>org.apache.camel.spi.HeaderFilterStrat
 egy</tt> (use an instance of 
<tt>org.apache.camel.component.cxf.CxfHeaderFilterStrategy</tt>). <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: 
<tt>headerFilterStrategy=#strategyName</tt> </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>loggingFeatureEnabled</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" 
rowspan="1" class="confluenceTd"> New in 2.3. This option enables CXF Logging 
Feature which writes inbound and outbound SOAP messages to log. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Default</em>: <tt>false</tt> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: 
<tt>loggingFeatureEnabled</tt><tt>=true</tt> </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>defaultOperationName</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" 
rowspan="1" class="con
 fluenceTd"> New in 2.4, this option will set the default operationName that 
will be used by the CxfProducer which invokes the remote service. <br 
clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Default</em>: <tt>null</tt> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: 
<tt>defaultOperationName</tt><tt>=greetMe</tt> </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>defaultOperationNamespace</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" 
rowspan="1" class="confluenceTd"> New in 2.4. This option will set the default 
operationNamespace that will be used by the CxfProducer which invokes the 
remote service. <br clear="none" class="atl-forced-newline"> <br clear="none" 
class="atl-forced-newline"> <em>Default</em>: <tt>null</tt> <br clear="none" 
class="atl-forced-newline"> <em>Example</em>: 
<tt>defaultOperationNamespace</tt><tt>=</tt><tt><a shape="rect" 
class="external-lin
 k" 
href="http://apache.org/hello_world_soap_http";>http://apache.org/hello_world_soap_http</a></tt>
 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>synchronous</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No 
</td><td colspan="1" rowspan="1" class="confluenceTd"> New in 2.5. This option 
will let cxf endpoint decide to use sync or async API to do the underlying 
work. The default value is false which means camel-cxf endpoint will try to use 
async API by default. <br clear="none" class="atl-forced-newline"> <br 
clear="none" class="atl-forced-newline"> <em>Default</em>: <tt>false</tt> <br 
clear="none" class="atl-forced-newline"> <em>Example</em>: synchronous=true 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>publishedEndpointUrl</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> 
New in 2.5. This option can override the endpointUrl that published from the 
WSDL
  which can be accessed with service address url plus ?wsdl. <br clear="none" 
class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> 
<em>Default</em>: <tt>null</tt> <br clear="none" class="atl-forced-newline"> 
<em>Example</em>: publshedEndpointUrl=<a shape="rect" class="external-link" 
href="http://example.com/service"; rel="nofollow">http://example.com/service</a> 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>properties.XXX</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 
No </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> 
Allows to set custom properties to CXF in the endpoint uri. For example setting 
<tt>properties.mtom-enabled=true</tt> to enable MTOM. </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <tt>allowStreaming</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" 
rowspan="1" class="confluenceTd"> New in 2.8.2.   This option controls whether 
the CXF
  component, when running in PAYLOAD mode (see below), will DOM parse the 
incoming messages into DOM Elements or keep the payload as a 
javax.xml.transform.Source object that would allow streaming in some cases. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>skipFaultLogging</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> 
New in 2.11. This option controls whether the PhaseInterceptorChain skips 
logging the Fault that it catches. </td></tr></tbody></table>
 </div>
 
 
 <p>The <tt>serviceName</tt> and <tt>portName</tt> are <a shape="rect" 
class="external-link" href="http://en.wikipedia.org/wiki/QName"; 
rel="nofollow">QNames</a>, so if you provide them be sure to prefix them with 
their {namespace} as shown in the examples above.</p>
 
-<p><b>NOTE</b> From CAMEL 1.5.1 , the <tt>serviceClass</tt> for a CXF producer 
(that is, the <tt>to</tt> endpoint) should be a Java interface.</p>
-
 <h4><a shape="rect" name="CXF-Thedescriptionsofthedataformats"></a>The 
descriptions of the dataformats</h4>
 
 <div class="confluenceTableSmall"></div>
@@ -673,7 +671,6 @@ detail.appendChild(tn);
 });
 </pre>
 </div></div>
-<p><b>NOTE</b> the response code setting only works in Camel's version &gt;= 
1.5.1</p>
 
 <p>Same for using POJO data format. You can set the SOAPFault on the out body 
and also indicate it's a fault by calling Message.setFault(true):</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">

Modified: websites/production/camel/content/flatpack.html
==============================================================================
--- websites/production/camel/content/flatpack.html (original)
+++ websites/production/camel/content/flatpack.html Sat Sep  8 10:19:54 2012
@@ -151,7 +151,7 @@ Each <tt>Map</tt> contains the key for t
 </div></div>
 
 <h3><a shape="rect" name="Flatpack-HeaderandTrailerrecords"></a>Header and 
Trailer records</h3>
-<p>In Camel 1.5 onwards the header and trailer notions in Flatpack are 
supported. However, you <b>must</b> use fixed record IDs:</p>
+<p>The header and trailer notions in Flatpack are supported. However, you 
<b>must</b> use fixed record IDs:</p>
 <ul><li><tt>header</tt> for the header record (must be 
lowercase)</li><li><tt>trailer</tt> for the trailer record (must be 
lowercase)</li></ul>
 
 

Modified: websites/production/camel/content/guice.html
==============================================================================
--- websites/production/camel/content/guice.html (original)
+++ websites/production/camel/content/guice.html Sat Sep  8 10:19:54 2012
@@ -77,7 +77,7 @@
         <td valign="top" width="100%">
 <div class="wiki-content maincontent"><h2><a shape="rect" 
name="Guice-CamelGuice"></a>Camel Guice</h2>
 
-<p>As of 1.5 we now have support for <a shape="rect" class="external-link" 
href="http://code.google.com/p/google-guice/"; rel="nofollow">Google Guice</a> 
as a dependency injection framework. To use it just be dependent on 
<b>camel-guice.jar</b> which also depends on <a shape="rect" 
class="external-link" 
href="http://activemq.apache.org/camel/maven/camel-guice/dependencies.html";>the 
following jars</a>.</p>
+<p>We have support for <a shape="rect" class="external-link" 
href="http://code.google.com/p/google-guice/"; rel="nofollow">Google Guice</a> 
as a dependency injection framework. To use it just be dependent on 
<b>camel-guice.jar</b> which also depends on <a shape="rect" 
class="external-link" 
href="http://activemq.apache.org/camel/maven/camel-guice/dependencies.html";>the 
following jars</a>.</p>
 
 <h3><a shape="rect" 
name="Guice-DependencyInjectingCamelwithGuice"></a>Dependency Injecting Camel 
with Guice</h3>
 

Modified: websites/production/camel/content/jdbc.html
==============================================================================
--- websites/production/camel/content/jdbc.html (original)
+++ websites/production/camel/content/jdbc.html Sat Sep  8 10:19:54 2012
@@ -110,7 +110,7 @@ jdbc:dataSourceName[?options]
 <h3><a shape="rect" name="JDBC-Options"></a>Options</h3>
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"> Name </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>readSize</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>0</tt> / <tt>2000</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> The default maximum number of rows that can 
be read by a polling query. The default value is 2000 for Camel 1.5.0 or older. 
In newer releases the default value is 0. </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>statement.&lt;xxx&gt;</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.1:</b> Sets additional 
options on the <tt>java.sql.Statement</tt> that is used behind the scenes to 
execute the queries. For instance, <tt>st
 atement.maxRows=10</tt>. For detailed documentation, see the <a shape="rect" 
class="external-link" 
href="http://java.sun.com/j2se/1.5.0/docs/api/java/sql/Statement.html"; 
rel="nofollow"><tt>java.sql.Statement</tt> javadoc</a> documentation. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>useJDBC4ColumnNameAndLabelSemantics</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <b>Camel 2.2:</b> Sets whether to use JDBC 4/3 column 
label/name semantics. You can use this option to turn it <tt>false</tt> in case 
you have issues with your JDBC driver to select data. This only applies when 
using <tt>SQL SELECT</tt> using aliases (e.g. <tt>SQL SELECT id as identifier, 
name as given_name from persons</tt>). </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>resetAutoCommit</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan=
 "1" class="confluenceTd"> <b>Camel 2.9:</b> Camel will set the autoCommit on 
the JDBC connection to be false, commit the change after executed the statement 
and reset the autoCommit flag of the connection at the end, if the 
resetAutoCommit is true. If the JDBC connection doesn't support to reset the 
autoCommit flag, you can set the resetAutoCommit flag to be false, and Camel 
will not try to reset the autoCommit flag.</td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"> Name </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>readSize</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>0</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> The default maximum number of rows that can be read by a 
polling query. The default value is 0. </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>statement.&lt;xxx&gt;</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.1:</b> Sets additional 
options on the <tt>java.sql.Statement</tt> that is used behind the scenes to 
execute the queries. For instance, <tt>statement.maxRows=10</tt>. For detailed 
documentation, see the <a shape="rect" class="ex
 ternal-link" 
href="http://java.sun.com/j2se/1.5.0/docs/api/java/sql/Statement.html"; 
rel="nofollow"><tt>java.sql.Statement</tt> javadoc</a> documentation. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>useJDBC4ColumnNameAndLabelSemantics</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <b>Camel 2.2:</b> Sets whether to use JDBC 4/3 column 
label/name semantics. You can use this option to turn it <tt>false</tt> in case 
you have issues with your JDBC driver to select data. This only applies when 
using <tt>SQL SELECT</tt> using aliases (e.g. <tt>SQL SELECT id as identifier, 
name as given_name from persons</tt>). </td></tr><tr><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>resetAutoCommit</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> <b>Camel 2.9:</b> Camel will set the 
autoCommit on the JDBC 
 connection to be false, commit the change after executed the statement and 
reset the autoCommit flag of the connection at the end, if the resetAutoCommit 
is true. If the JDBC connection doesn't support to reset the autoCommit flag, 
you can set the resetAutoCommit flag to be false, and Camel will not try to 
reset the autoCommit flag.</td></tr></tbody></table>
 </div>
 
 

Modified: websites/production/camel/content/nmr.html
==============================================================================
--- websites/production/camel/content/nmr.html (original)
+++ websites/production/camel/content/nmr.html Sat Sep  8 10:19:54 2012
@@ -171,8 +171,8 @@ from(<span class="code-quote">"nmr:MyEnd
 </pre>
 </div></div>
 
-<p>From <b>Camel 1.5</b> onwards, the stream caching is default enabled, so it 
is not necessary to set the <tt>streamCaching()</tt> option.<br clear="none">
-In <b>Camel 2.0</b> we store big input streams (by default, over 64K) in a 
<tt>temp</tt> file using <tt>CachedOutputStream</tt>. When you close the input 
stream, the temp file will be deleted.</p>
+<p>The stream caching is default enabled, so it is not necessary to set the 
<tt>streamCaching()</tt> option.<br clear="none">
+We store big input streams (by default, over 64K) in a <tt>temp</tt> file 
using <tt>CachedOutputStream</tt>. When you close the input stream, the temp 
file will be deleted.</p>
 
 <h4><a shape="rect" name="NMR-Testing"></a>Testing</h4>
 <p>NMR camel routes can be tested using the camel unit test approach even if 
they will be deployed next in different bundles on an OSGI runtime. With this 
aim in view, you will extend the ServiceMixNMR Mock class 
<tt>org.apache.servicemix.camel.nmr.AbstractComponentTest</tt> which will 
create a NMR bus, register the Camel NMR Component and the endpoints defined 
into the Camel routes.</p>

Modified: websites/production/camel/content/parameter-binding-annotations.html
==============================================================================
--- websites/production/camel/content/parameter-binding-annotations.html 
(original)
+++ websites/production/camel/content/parameter-binding-annotations.html Sat 
Sep  8 10:19:54 2012
@@ -86,13 +86,12 @@
 <p>The core annotations are as follows</p>
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"> Annotation </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Meaning </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Parameter </th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Body.html";>@Body</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to an inbound 
message body </td><td colspan="1" rowspan="1" 
class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/ExchangeException.html";>@ExchangeException</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to an Exception 
set on the exchange (<b>Camel 2.0</b>) </td><td colspan="1" rowspan="1" 
class="confluenceTd">&#16
 0;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a 
shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Header.html";>@Header</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to an inbound 
message header </td><td colspan="1" rowspan="1" class="confluenceTd"> String 
name of the header </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Headers.html";>@Headers</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to the Map of 
the inbound message headers </td><td colspan="1" rowspan="1" 
class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/OutHeaders.html";>@OutHeaders</a>
 </td><td colspan="
 1" rowspan="1" class="confluenceTd"> To bind to the Map of the outbound 
message headers </td><td colspan="1" rowspan="1" 
class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Property.html";>@Property</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to a named 
property on the exchange </td><td colspan="1" rowspan="1" class="confluenceTd"> 
String name of the property </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Properties.html";>@Properties</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to the property 
map on the exchange </td><td colspan="1" rowspan="1" 
class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="
 rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Handler.html";>@Handler</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.0:</b> Not 
part as a type parameter but stated in this table anyway to spread the good 
word that we have this annotation in Camel now. See more at <a shape="rect" 
href="bean-binding.html" title="Bean Binding">Bean Binding</a>. </td><td 
colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"> Annotation </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Meaning </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Parameter </th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Body.html";>@Body</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to an inbound 
message body </td><td colspan="1" rowspan="1" 
class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/ExchangeException.html";>@ExchangeException</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to an Exception 
set on the exchange </td><td colspan="1" rowspan="1" 
class="confluenceTd">&#160;</td></tr><tr><td
  colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" 
class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Header.html";>@Header</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to an inbound 
message header </td><td colspan="1" rowspan="1" class="confluenceTd"> String 
name of the header </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Headers.html";>@Headers</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to the Map of 
the inbound message headers </td><td colspan="1" rowspan="1" 
class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/OutHeaders.html";>@OutHeaders</a>
 </td><td colspan="1" rowspan="1" clas
 s="confluenceTd"> To bind to the Map of the outbound message headers </td><td 
colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" 
class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Property.html";>@Property</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to a named 
property on the exchange </td><td colspan="1" rowspan="1" class="confluenceTd"> 
String name of the property </td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="external-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Properties.html";>@Properties</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> To bind to the property 
map on the exchange </td><td colspan="1" rowspan="1" 
class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <a shape="rect" class="extern
 al-link" 
href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Handler.html";>@Handler</a>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> Not part as a type 
parameter but stated in this table anyway to spread the good word that we have 
this annotation in Camel now. See more at <a shape="rect" 
href="bean-binding.html" title="Bean Binding">Bean Binding</a>. </td><td 
colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr></tbody></table>
 </div>
 
 
-<p>The follow annotations <tt>@Headers</tt>, <tt>@OutHeaders</tt> and 
<tt>@Properties</tt> binds to the backing <tt>java.util.Map</tt> so you can 
alter the content of these maps directly, for instance using the <tt>put</tt> 
method to add a new entry. See the OrderService class at <a shape="rect" 
href="exception-clause.html" title="Exception Clause">Exception Clause</a> for 
such an example.</p>
+<p>The follow annotations <tt>@Headers</tt>, <tt>@OutHeaders</tt> and 
<tt>@Properties</tt> binds to the backing <tt>java.util.Map</tt> so you can 
alter the content of these maps directly, for instance using the <tt>put</tt> 
method to add a new entry. See the OrderService class at <a shape="rect" 
href="exception-clause.html" title="Exception Clause">Exception Clause</a> for 
such an example. You can use <tt>@Header("myHeader")</tt> and 
<tt>@Property("myProperty")</tt> to access the backing 
<tt>java.util.Map</tt>.</p>
 
-<p>Since <b>Camel 2.0</b>, you can use <tt>@Header("myHeader")</tt> and 
<tt>@Property("myProperty")</tt> instead of <tt>@Header(name="myHeader")</tt> 
and <tt>@Property(name="myProperty")</tt> as <b>Camel 1.x</b> does. </p>
 <h3><a shape="rect" name="ParameterBindingAnnotations-Example"></a>Example</h3>
 <p>In this example below we have a @Consume consumer (like message driven) 
that consumes JMS messages from the activemq queue. We use the @Header and 
@Body parameter binding annotations to bind from the JMSMessage to the method 
parameters.</p>
 

Modified: websites/production/camel/content/recipientlist-annotation.html
==============================================================================
--- websites/production/camel/content/recipientlist-annotation.html (original)
+++ websites/production/camel/content/recipientlist-annotation.html Sat Sep  8 
10:19:54 2012
@@ -77,7 +77,7 @@
         <td valign="top" width="100%">
 <div class="wiki-content maincontent"><h2><a shape="rect" 
name="RecipientListAnnotation-@RecipientListAnnotation"></a>@RecipientList 
Annotation</h2>
 
-<p>As of 1.5.0 we now support the use of @RecipientList on a bean method to 
easily create a dynamic <a shape="rect" href="recipient-list.html" 
title="Recipient List">Recipient List</a> using a Java method.</p>
+<p>We support the use of @RecipientList on a bean method to easily create a 
dynamic <a shape="rect" href="recipient-list.html" title="Recipient 
List">Recipient List</a> using a Java method.</p>
 
 <h3><a shape="rect" 
name="RecipientListAnnotation-SimpleExampleusing@Consumeand@RecipientList"></a>Simple
 Example using @Consume and @RecipientList</h3>
 
@@ -104,8 +104,8 @@
 &lt;beans xmlns=<span 
class="code-quote">"http://www.springframework.org/schema/beans";</span>
        <span class="code-keyword">xmlns:xsi</span>=<span 
class="code-quote">"http://www.w3.org/2001/XMLSchema-instance";</span>
        xsi:schemaLocation="
-       http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://activemq.apache.org/camel/schema/spring 
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+       http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     "&gt;
 
   <span class="code-tag">&lt;camelContext xmlns=<span 
class="code-quote">"http://activemq.apache.org/camel/schema/spring";</span>/&gt;</span>

Modified: websites/production/camel/content/sql-component.html
==============================================================================
--- websites/production/camel/content/sql-component.html (original)
+++ websites/production/camel/content/sql-component.html Sat Sep  8 10:19:54 
2012
@@ -139,7 +139,7 @@ sql:select * from table where id=# order
 <p>When performing <tt>update</tt> operations, the SQL Component stores the 
update count in the following message headers:</p>
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"> Header </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>SqlProducer.UPDATE_COUNT</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> <b>Camel 1.x</b>: The number of rows updated 
for <tt>update</tt> operations, returned as an <tt>Integer</tt> object. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>CamelSqlUpdateCount</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> The number of rows updated for <tt>update</tt> 
operations, returned as an <tt>Integer</tt> object. </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelSqlRowCount</tt> 
</td><td colspan="1" rowspan="1" class="confluenceTd"> The number of rows 
returned for <tt>select</tt> operations, returned as an <tt>Integer</tt> 
object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd
 "> <tt>CamelSqlQuery</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> <b>Camel 2.8:</b> Query to execute. This query takes 
precedence over the query specified in the endpoint URI. Note that query 
parameters in the header <em>are</em> represented by a <tt>?</tt> instead of a 
<tt>#</tt> symbol </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"> Header </th><th colspan="1" rowspan="1" 
class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"> <tt>CamelSqlUpdateCount</tt> </td><td colspan="1" 
rowspan="1" class="confluenceTd"> The number of rows updated for 
<tt>update</tt> operations, returned as an <tt>Integer</tt> object. 
</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> 
<tt>CamelSqlRowCount</tt> </td><td colspan="1" rowspan="1" 
class="confluenceTd"> The number of rows returned for <tt>select</tt> 
operations, returned as an <tt>Integer</tt> object. </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelSqlQuery</tt> </td><td 
colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Query to 
execute. This query takes precedence over the query specified in the endpoint 
URI. Note that query parameters in the header <em>are</em> represented by a 
<tt>?</t
 t> instead of a <tt>#</tt> symbol </td></tr></tbody></table>
 </div>
 
 

Modified: websites/production/camel/content/vm.html
==============================================================================
--- websites/production/camel/content/vm.html (original)
+++ websites/production/camel/content/vm.html Sat Sep  8 10:19:54 2012
@@ -95,7 +95,7 @@ vm:queueName[?options]
 
 <p>You can append query options to the URI in the following format: 
<tt>?option=value&amp;option=value&amp;...</tt></p>
 
-<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>Camel 1.x to 2.3 - Same URI must be used for both producer and 
consumer</b><br clear="none">An exactly identical <a shape="rect" 
href="vm.html" title="VM">VM</a> endpoint URI <b>must</b> be used for both the 
producer and the consumer endpoint. Otherwise, Camel will create a second <a 
shape="rect" href="vm.html" title="VM">VM</a> endpoint despite that the 
<tt>queueName</tt> portion of the URI is identical. For example:
+<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>Before Camel 2.3 - Same URI must be used for both producer and 
consumer</b><br clear="none">An exactly identical <a shape="rect" 
href="vm.html" title="VM">VM</a> endpoint URI <b>must</b> be used for both the 
producer and the consumer endpoint. Otherwise, Camel will create a second <a 
shape="rect" href="vm.html" title="VM">VM</a> endpoint despite that the 
<tt>queueName</tt> portion of the URI is identical. For example:
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-java">
 from(<span class="code-quote">"direct:foo"</span>).to(<span 
class="code-quote">"vm:bar?concurrentConsumers=5"</span>);

Modified: websites/production/camel/content/walk-through-an-example.html
==============================================================================
--- websites/production/camel/content/walk-through-an-example.html (original)
+++ websites/production/camel/content/walk-through-an-example.html Sat Sep  8 
10:19:54 2012
@@ -155,14 +155,7 @@ camelContext.start();
 
 <p><b>That's it!</b></p>
 
-<p>If you have the time then use 5 more minutes to <a shape="rect" 
href="walk-through-another-example.html" title="Walk through another 
example">Walk through another example</a> that demonstrates the Spring DSL (XML 
based) routing.</p>
-
-<div class="panelMacro"><table class="noteMacro"><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/warning.gif"; 
width="16" height="16" alt="" border="0"></td><td colspan="1" 
rowspan="1"><b>Camel 1.4.0 change</b><br clear="none">In Camel 1.4.0, 
CamelTemplate has been marked as @deprecated. ProducerTemplate should be used 
instead and its created from the CamelContext itself.
-<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
-<pre class="code-java">
-ProducerTemplate template = context.createProducerTemplate();
-</pre>
-</div></div></td></tr></table></div></div>
+<p>If you have the time then use 5 more minutes to <a shape="rect" 
href="walk-through-another-example.html" title="Walk through another 
example">Walk through another example</a> that demonstrates the Spring DSL (XML 
based) routing.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">


Reply via email to