You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bu...@apache.org on 2012/04/16 21:20:55 UTC

svn commit: r813278 - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache spring-web-services.html

Author: buildbot
Date: Mon Apr 16 19:20:55 2012
New Revision: 813278

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/book-component-appendix.html
    websites/production/camel/content/book-in-one-page.html
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/spring-web-services.html

Modified: websites/production/camel/content/book-component-appendix.html
==============================================================================
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Mon Apr 16 19:20:55 2012
@@ -15084,6 +15084,7 @@ spring-integration:defaultChannelName[?o
 <ul><li><a shape="rect" href="configuring-camel.html" title="Configuring Camel">Configuring Camel</a></li><li><a shape="rect" href="component.html" title="Component">Component</a></li><li><a shape="rect" href="endpoint.html" title="Endpoint">Endpoint</a></li><li><a shape="rect" href="getting-started.html" title="Getting Started">Getting Started</a></li></ul>
 
 <h2><a shape="rect" name="BookComponentAppendix-SpringWebServicesComponent"></a>Spring Web Services Component</h2>
+
 <p><b>Available as of Camel 2.6</b></p>
 
 <p>The <b>spring-ws:</b> component allows you to integrate with <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/" rel="nofollow">Spring Web Services</a>. It offers both <em>client</em>-side support, for accessing web services, and <em>server</em>-side support for creating your own contract-first web services.</p>
@@ -15091,8 +15092,7 @@ spring-integration:defaultChannelName[?o
 <p>Maven users will need to add the following dependency to their <tt>pom.xml</tt> for this component:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;dependency&gt;</span>
+<pre class="code-xml"><span class="code-tag">&lt;dependency&gt;</span>
 	<span class="code-tag">&lt;groupId&gt;</span>org.apache.camel<span class="code-tag">&lt;/groupId&gt;</span>
 	<span class="code-tag">&lt;artifactId&gt;</span>camel-spring-ws<span class="code-tag">&lt;/artifactId&gt;</span>
 	<span class="code-tag">&lt;version&gt;</span>x.x.x<span class="code-tag">&lt;/version&gt;</span>
@@ -15101,7 +15101,7 @@ spring-integration:defaultChannelName[?o
 </pre>
 </div></div>
 
-<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>Dependencies</b><br clear="none">As of Camel 2.8 this component ships with Spring-WS 2.0.x which (like the rest of Camel) requires Spring 3.0.x. 
+<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>Dependencies</b><br clear="none">As of Camel 2.8 this component ships with Spring-WS 2.0.x which (like the rest of Camel) requires Spring 3.0.x.
 
 <p>Earlier Camel versions shipped Spring-WS 1.5.9 which is compatible with Spring 2.5.x and 3.0.x. In order to run earlier versions of <tt>camel-spring-ws</tt> on Spring 2.5.x you need to add the <tt>spring-webmvc</tt> module from Spring 2.5.x. In order to run Spring-WS 1.5.9 on Spring 3.0.x you need to exclude the OXM module from Spring 3.0.x as this module is also included in Spring-WS 1.5.9 (see <a shape="rect" class="external-link" href="http://stackoverflow.com/questions/3313314/can-spring-ws-1-5-be-used-with-spring-3" rel="nofollow">this post</a>)</p></td></tr></table></div>
 
@@ -15110,8 +15110,7 @@ spring-integration:defaultChannelName[?o
 <p>The URI scheme for this component is as follows</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-spring-ws:[mapping-type:]address[?options]
+<pre class="code-java">spring-ws:[mapping-type:]address[?options]
 </pre>
 </div></div>
 
@@ -15129,7 +15128,7 @@ spring-ws:[mapping-type:]address[?option
 <h3><a shape="rect" name="BookComponentAppendix-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>soapAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> SOAP action to include inside a SOAP request when accessing remote web services </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>wsAddressingAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> WS-Addressing 1.0 action header to include when accessing web services. The <tt>To</tt> header is set to the <em>address</em> of the web service as specified in the endpoint URI (default Spring-WS behavior). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>ex
 pression</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Only when <em>mapping-type</em> is <tt>xpathresult</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> XPath expression to use in the process of mapping web service requests, should match the result specified by <tt>xpathresult</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeout</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> Sets the socket read timeout (in milliseconds) while invoking a webservice using the producer, see <a shape="rect" class="external-link" href="http://docs.oracle.com/javase/6/docs/api/java/net/URLConnection.html#setReadTimeout(int)" rel="nofollow">URLConnection.setReadTimeout()</a> and <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/site/apidocs/org/springframework/ws/transport/http/CommonsHttpMessageSender.html#setReadTimeou
 t(int)" rel="nofollow">CommonsHttpMessageSender.setReadTimeout()</a> </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>soapAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> SOAP action to include inside a SOAP request when accessing remote web services </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>wsAddressingAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> WS-Addressing 1.0 action header to include when accessing web services. The <tt>To</tt> header is set to the <em>address</em> of the web service as specified in the endpoint URI (default Spring-WS behavior). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>ex
 pression</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Only when <em>mapping-type</em> is <tt>xpathresult</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> XPath expression to use in the process of mapping web service requests, should match the result specified by <tt>xpathresult</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeout</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> Sets the socket read timeout (in milliseconds) while invoking a webservice using the producer, see <a shape="rect" class="external-link" href="http://docs.oracle.com/javase/6/docs/api/java/net/URLConnection.html#setReadTimeout(int)" rel="nofollow">URLConnection.setReadTimeout()</a> and <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/site/apidocs/org/springframework/ws/transport/http/CommonsHttpMessageSender.html#setReadTimeou
 t(int)" rel="nofollow">CommonsHttpMessageSender.setReadTimeout()</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>sslContextParameters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b>&#160;Reference to a&#160;<tt>org.apache.camel.util.jsse.SSLContextParameters</tt>&#160;in the&#160;<a shape="rect" class="external-link" href="http://camel.apache.org/registry.html">Registry</a>. &#160;See&#160;<a shape="rect" class="external-link" href="http://camel.apache.org/http4.html#HTTP4-UsingtheJSSEConfigurationUtility">Using the JSSE Configuration Utility</a>. &#160;This option works when using the built-in message sender implementations:&#160;<em>CommonsHttpMessageSender</em>&#160;and&#160;<em>HttpUrlConnectionMessageSender</em>. &#160;One of these implementations will be used by default for HTTP based services unless you customize the Spring WS configuration options supplied
  to the component. &#160;If you are using a non-standard sender, it is assumed that you will handle your own TLS configuration. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -15153,15 +15152,13 @@ spring-ws:[mapping-type:]address[?option
 
 <p>To call a web service at <tt><a shape="rect" class="external-link" href="http://foo.com/bar" rel="nofollow">http://foo.com/bar</a></tt> simply define a route:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"direct:example"</span>).to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar"</span>)</span>
+<pre class="code-java">from(<span class="code-quote">"direct:example"</span>).to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar"</span>)</span>
 </pre>
 </div></div>
 
 <p>And sent a message:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-template.requestBody(<span class="code-quote">"direct:example"</span>, <span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>);</span>
+<pre class="code-java">template.requestBody(<span class="code-quote">"direct:example"</span>, <span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>);</span>
 </pre>
 </div></div>
 <p>Remember if it's a SOAP service you're calling you don't have to include SOAP tags. Spring-WS will perform the XML-to-SOAP marshaling.</p>
@@ -15170,17 +15167,15 @@ template.requestBody(<span class="code-q
 
 <p>When a remote web service requires a SOAP action or use of the WS-Addressing standard you define your route as:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"direct:example"</span>)
+<pre class="code-java">from(<span class="code-quote">"direct:example"</span>)
 .to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar?soapAction=http://foo.com&amp;wsAddressingAction=http://bar.com"</span>)</span>
 </pre>
 </div></div>
 
 <p>Optionally you can override the endpoint options with header values:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-template.requestBodyAndHeader(<span class="code-quote">"direct:example"</span>, 
-<span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>, 
+<pre class="code-java">template.requestBodyAndHeader(<span class="code-quote">"direct:example"</span>,
+<span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>,
 </span>SpringWebserviceConstants.SPRING_WS_SOAP_ACTION, <span class="code-quote">"http:<span class="code-comment">//baz.com"</span>);</span>
 </pre>
 </div></div>
@@ -15189,8 +15184,7 @@ template.requestBodyAndHeader(<span clas
 
 <p>A custom message sender or factory in the registry can be referenced like this:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"direct:example"</span>)
+<pre class="code-java">from(<span class="code-quote">"direct:example"</span>)
 .to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar?messageFactory=#messageFactory&amp;messageSender=#messageSender"</span>)</span>
 </pre>
 </div></div>
@@ -15218,9 +15212,9 @@ from(<span class="code-quote">"direct:ex
 
 <h2><a shape="rect" name="BookComponentAppendix-Exposingwebservices"></a>Exposing web services</h2>
 
-<p>In order to expose a web service using this component you first need to set-up a <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html" rel="nofollow">MessageDispatcher</a> to look for endpoint mappings in a Spring XML file. If you plan on running inside a servlet container you probably want to use a <tt>MessageDispatcherServlet</tt> configured in <tt>web.xml</tt>. </p>
+<p>In order to expose a web service using this component you first need to set-up a <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html" rel="nofollow">MessageDispatcher</a> to look for endpoint mappings in a Spring XML file. If you plan on running inside a servlet container you probably want to use a <tt>MessageDispatcherServlet</tt> configured in <tt>web.xml</tt>.</p>
 
-<p>By default the <tt>MessageDispatcherServlet</tt> will look for a Spring XML named <tt>/WEB-INF/spring-ws-servlet.xml</tt>. To use Camel with Spring-WS the only mandatory bean in that XML file is <tt>CamelEndpointMapping</tt>. This bean allows the <tt>MessageDispatcher</tt> to dispatch web service requests to your routes. </p>
+<p>By default the <tt>MessageDispatcherServlet</tt> will look for a Spring XML named <tt>/WEB-INF/spring-ws-servlet.xml</tt>. To use Camel with Spring-WS the only mandatory bean in that XML file is <tt>CamelEndpointMapping</tt>. This bean allows the <tt>MessageDispatcher</tt> to dispatch web service requests to your routes.</p>
 
 <p><em>web.xml</em></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -15243,14 +15237,14 @@ from(<span class="code-quote">"direct:ex
 <pre class="code-xml"><span class="code-tag">&lt;bean id=<span class="code-quote">"endpointMapping"</span> class=<span class="code-quote">"org.apache.camel.component.spring.ws.bean.CamelEndpointMapping"</span> /&gt;</span>
 
 <span class="code-tag">&lt;bean id=<span class="code-quote">"wsdl"</span> class=<span class="code-quote">"org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition"</span>&gt;</span>
-	<span class="code-tag">&lt;property name=<span class="code-quote">"schema"</span>&gt;</span> 
-		<span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.xml.xsd.SimpleXsdSchema"</span>&gt;</span>                   
+	<span class="code-tag">&lt;property name=<span class="code-quote">"schema"</span>&gt;</span>
+		<span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.xml.xsd.SimpleXsdSchema"</span>&gt;</span>
 			<span class="code-tag">&lt;property name=<span class="code-quote">"xsd"</span> value=<span class="code-quote">"/WEB-INF/foobar.xsd"</span>/&gt;</span>
-		<span class="code-tag">&lt;/bean&gt;</span>    
-	<span class="code-tag">&lt;/property&gt;</span>                                        
-	<span class="code-tag">&lt;property name=<span class="code-quote">"portTypeName"</span> value=<span class="code-quote">"FooBar"</span>/&gt;</span>                                
-	<span class="code-tag">&lt;property name=<span class="code-quote">"locationUri"</span> value=<span class="code-quote">"/"</span>/&gt;</span>                              
-	<span class="code-tag">&lt;property name=<span class="code-quote">"targetNamespace"</span> value=<span class="code-quote">"http://example.com/"</span>/&gt;</span>       
+		<span class="code-tag">&lt;/bean&gt;</span>
+	<span class="code-tag">&lt;/property&gt;</span>
+	<span class="code-tag">&lt;property name=<span class="code-quote">"portTypeName"</span> value=<span class="code-quote">"FooBar"</span>/&gt;</span>
+	<span class="code-tag">&lt;property name=<span class="code-quote">"locationUri"</span> value=<span class="code-quote">"/"</span>/&gt;</span>
+	<span class="code-tag">&lt;property name=<span class="code-quote">"targetNamespace"</span> value=<span class="code-quote">"http://example.com/"</span>/&gt;</span>
 <span class="code-tag">&lt;/bean&gt;</span>
 </pre>
 </div></div>
@@ -15263,46 +15257,41 @@ from(<span class="code-quote">"direct:ex
 
 <p>The following route will receive all web service requests that have a root element named "GetFoo" within the <tt><a shape="rect" class="external-link" href="http://example.com/" rel="nofollow">http://example.com/</a></tt> namespace.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <p>The following route will receive web service requests containing the <tt><a shape="rect" class="external-link" href="http://example.com/GetFoo" rel="nofollow">http://example.com/GetFoo</a></tt> SOAP action.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:soapaction:http:<span class="code-comment">//example.com/GetFoo?endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:soapaction:http:<span class="code-comment">//example.com/GetFoo?endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <p>The following route will receive all requests sent to <tt><a shape="rect" class="external-link" href="http://example.com/foobar" rel="nofollow">http://example.com/foobar</a></tt>.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:uri:http:<span class="code-comment">//example.com/foobar?endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:uri:http:<span class="code-comment">//example.com/foobar?endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <p>The route below will receive requests that contain the element <tt>&lt;foobar&gt;abc&lt;/foobar&gt;</tt> anywhere inside the message (and the default namespace).</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:xpathresult:abc?expression=<span class="code-comment">//foobar&amp;endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:xpathresult:abc?expression=<span class="code-comment">//foobar&amp;endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <h3><a shape="rect" name="BookComponentAppendix-Alternativeconfiguration%2Cusingexistingendpointmappings"></a>Alternative configuration, using existing endpoint mappings</h3>
 
-<p>For every endpoint with mapping-type <tt>beanname</tt> one bean of type <tt>CamelEndpointDispatcher</tt> with a corresponding name is required in the Registry/ApplicationContext. This bean acts as a bridge between the Camel endpoint and an existing <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html#server-endpoint-mapping" rel="nofollow">endpoint mapping</a> like <tt>PayloadRootQNameEndpointMapping</tt>. </p>
+<p>For every endpoint with mapping-type <tt>beanname</tt> one bean of type <tt>CamelEndpointDispatcher</tt> with a corresponding name is required in the Registry/ApplicationContext. This bean acts as a bridge between the Camel endpoint and an existing <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html#server-endpoint-mapping" rel="nofollow">endpoint mapping</a> like <tt>PayloadRootQNameEndpointMapping</tt>.</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">The use of the <tt>beanname</tt> mapping-type is primarily meant for (legacy) situations where you're already using Spring-WS and have endpoint mappings defined in a Spring XML file. The <tt>beanname</tt> mapping-type allows you to wire your Camel route into an existing endpoint mapping. When you're starting from scratch it's recommended to define your endpoint mappings as Camel URI's (as illustrated above with <tt>endpointMapping</tt>) since it requires less configuration and is more expressive. Alternatively you could use vanilla Spring-WS with the help of annotations.</td></tr></table></div>
 
 <p>An example of a route using <tt>beanname</tt>:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;camelContext xmlns=<span class="code-quote">"http:<span class="code-comment">//camel.apache.org/schema/spring"</span>&gt;
+<pre class="code-java">&lt;camelContext xmlns=<span class="code-quote">"http:<span class="code-comment">//camel.apache.org/schema/spring"</span>&gt;
 </span>	&lt;route&gt;
 		&lt;from uri=<span class="code-quote">"spring-ws:beanname:QuoteEndpointDispatcher"</span> /&gt;
 		&lt;to uri=<span class="code-quote">"mock:example"</span> /&gt;
@@ -15325,12 +15314,11 @@ from(<span class="code-quote">"spring-ws
 
 <h2><a shape="rect" name="BookComponentAppendix-POJO%28un%29marshalling"></a>POJO (un)marshalling</h2>
 
-<p>Camel's <a shape="rect" href="data-format.html" title="Data Format">pluggable data formats</a> offer support for pojo/xml marshalling using libraries such as JAXB, XStream, JibX, Castor and XMLBeans. You can use these data formats in your route to sent and receive pojo's, to and from web services. </p>
+<p>Camel's <a shape="rect" href="data-format.html" title="Data Format">pluggable data formats</a> offer support for pojo/xml marshalling using libraries such as JAXB, XStream, JibX, Castor and XMLBeans. You can use these data formats in your route to sent and receive pojo's, to and from web services.</p>
 
 <p>When <em>accessing</em> web services you can marshal the request and unmarshal the response message:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-JaxbDataFormat jaxb = <span class="code-keyword">new</span> JaxbDataFormat(<span class="code-keyword">false</span>);
+<pre class="code-java">JaxbDataFormat jaxb = <span class="code-keyword">new</span> JaxbDataFormat(<span class="code-keyword">false</span>);
 jaxb.setContextPath(<span class="code-quote">"com.example.model"</span>);
 
 from(<span class="code-quote">"direct:example"</span>).marshal(jaxb).to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar"</span>).unmarshal(jaxb);</span>
@@ -15339,8 +15327,7 @@ from(<span class="code-quote">"direct:ex
 
 <p>Similarly when <em>providing</em> web services, you can unmarshal XML requests to POJO's and marshal the response message back to XML:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>).unmarshal(jaxb)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>).unmarshal(jaxb)
 </span>.to(<span class="code-quote">"mock:example"</span>).marshal(jaxb);
 </pre>
 </div></div>

Modified: websites/production/camel/content/book-in-one-page.html
==============================================================================
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Mon Apr 16 19:20:55 2012
@@ -35255,6 +35255,7 @@ spring-integration:defaultChannelName[?o
 <ul><li><a shape="rect" href="configuring-camel.html" title="Configuring Camel">Configuring Camel</a></li><li><a shape="rect" href="component.html" title="Component">Component</a></li><li><a shape="rect" href="endpoint.html" title="Endpoint">Endpoint</a></li><li><a shape="rect" href="getting-started.html" title="Getting Started">Getting Started</a></li></ul>
 
 <h2><a shape="rect" name="BookInOnePage-SpringWebServicesComponent"></a>Spring Web Services Component</h2>
+
 <p><b>Available as of Camel 2.6</b></p>
 
 <p>The <b>spring-ws:</b> component allows you to integrate with <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/" rel="nofollow">Spring Web Services</a>. It offers both <em>client</em>-side support, for accessing web services, and <em>server</em>-side support for creating your own contract-first web services.</p>
@@ -35262,8 +35263,7 @@ spring-integration:defaultChannelName[?o
 <p>Maven users will need to add the following dependency to their <tt>pom.xml</tt> for this component:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;dependency&gt;</span>
+<pre class="code-xml"><span class="code-tag">&lt;dependency&gt;</span>
 	<span class="code-tag">&lt;groupId&gt;</span>org.apache.camel<span class="code-tag">&lt;/groupId&gt;</span>
 	<span class="code-tag">&lt;artifactId&gt;</span>camel-spring-ws<span class="code-tag">&lt;/artifactId&gt;</span>
 	<span class="code-tag">&lt;version&gt;</span>x.x.x<span class="code-tag">&lt;/version&gt;</span>
@@ -35272,7 +35272,7 @@ spring-integration:defaultChannelName[?o
 </pre>
 </div></div>
 
-<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>Dependencies</b><br clear="none">As of Camel 2.8 this component ships with Spring-WS 2.0.x which (like the rest of Camel) requires Spring 3.0.x. 
+<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>Dependencies</b><br clear="none">As of Camel 2.8 this component ships with Spring-WS 2.0.x which (like the rest of Camel) requires Spring 3.0.x.
 
 <p>Earlier Camel versions shipped Spring-WS 1.5.9 which is compatible with Spring 2.5.x and 3.0.x. In order to run earlier versions of <tt>camel-spring-ws</tt> on Spring 2.5.x you need to add the <tt>spring-webmvc</tt> module from Spring 2.5.x. In order to run Spring-WS 1.5.9 on Spring 3.0.x you need to exclude the OXM module from Spring 3.0.x as this module is also included in Spring-WS 1.5.9 (see <a shape="rect" class="external-link" href="http://stackoverflow.com/questions/3313314/can-spring-ws-1-5-be-used-with-spring-3" rel="nofollow">this post</a>)</p></td></tr></table></div>
 
@@ -35281,8 +35281,7 @@ spring-integration:defaultChannelName[?o
 <p>The URI scheme for this component is as follows</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-spring-ws:[mapping-type:]address[?options]
+<pre class="code-java">spring-ws:[mapping-type:]address[?options]
 </pre>
 </div></div>
 
@@ -35300,7 +35299,7 @@ spring-ws:[mapping-type:]address[?option
 <h3><a shape="rect" name="BookInOnePage-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>soapAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> SOAP action to include inside a SOAP request when accessing remote web services </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>wsAddressingAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> WS-Addressing 1.0 action header to include when accessing web services. The <tt>To</tt> header is set to the <em>address</em> of the web service as specified in the endpoint URI (default Spring-WS behavior). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>ex
 pression</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Only when <em>mapping-type</em> is <tt>xpathresult</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> XPath expression to use in the process of mapping web service requests, should match the result specified by <tt>xpathresult</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeout</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> Sets the socket read timeout (in milliseconds) while invoking a webservice using the producer, see <a shape="rect" class="external-link" href="http://docs.oracle.com/javase/6/docs/api/java/net/URLConnection.html#setReadTimeout(int)" rel="nofollow">URLConnection.setReadTimeout()</a> and <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/site/apidocs/org/springframework/ws/transport/http/CommonsHttpMessageSender.html#setReadTimeou
 t(int)" rel="nofollow">CommonsHttpMessageSender.setReadTimeout()</a> </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>soapAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> SOAP action to include inside a SOAP request when accessing remote web services </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>wsAddressingAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> WS-Addressing 1.0 action header to include when accessing web services. The <tt>To</tt> header is set to the <em>address</em> of the web service as specified in the endpoint URI (default Spring-WS behavior). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>ex
 pression</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Only when <em>mapping-type</em> is <tt>xpathresult</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> XPath expression to use in the process of mapping web service requests, should match the result specified by <tt>xpathresult</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeout</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> Sets the socket read timeout (in milliseconds) while invoking a webservice using the producer, see <a shape="rect" class="external-link" href="http://docs.oracle.com/javase/6/docs/api/java/net/URLConnection.html#setReadTimeout(int)" rel="nofollow">URLConnection.setReadTimeout()</a> and <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/site/apidocs/org/springframework/ws/transport/http/CommonsHttpMessageSender.html#setReadTimeou
 t(int)" rel="nofollow">CommonsHttpMessageSender.setReadTimeout()</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>sslContextParameters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b>&#160;Reference to a&#160;<tt>org.apache.camel.util.jsse.SSLContextParameters</tt>&#160;in the&#160;<a shape="rect" class="external-link" href="http://camel.apache.org/registry.html">Registry</a>. &#160;See&#160;<a shape="rect" class="external-link" href="http://camel.apache.org/http4.html#HTTP4-UsingtheJSSEConfigurationUtility">Using the JSSE Configuration Utility</a>. &#160;This option works when using the built-in message sender implementations:&#160;<em>CommonsHttpMessageSender</em>&#160;and&#160;<em>HttpUrlConnectionMessageSender</em>. &#160;One of these implementations will be used by default for HTTP based services unless you customize the Spring WS configuration options supplied
  to the component. &#160;If you are using a non-standard sender, it is assumed that you will handle your own TLS configuration. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -35324,15 +35323,13 @@ spring-ws:[mapping-type:]address[?option
 
 <p>To call a web service at <tt><a shape="rect" class="external-link" href="http://foo.com/bar" rel="nofollow">http://foo.com/bar</a></tt> simply define a route:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"direct:example"</span>).to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar"</span>)</span>
+<pre class="code-java">from(<span class="code-quote">"direct:example"</span>).to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar"</span>)</span>
 </pre>
 </div></div>
 
 <p>And sent a message:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-template.requestBody(<span class="code-quote">"direct:example"</span>, <span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>);</span>
+<pre class="code-java">template.requestBody(<span class="code-quote">"direct:example"</span>, <span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>);</span>
 </pre>
 </div></div>
 <p>Remember if it's a SOAP service you're calling you don't have to include SOAP tags. Spring-WS will perform the XML-to-SOAP marshaling.</p>
@@ -35341,17 +35338,15 @@ template.requestBody(<span class="code-q
 
 <p>When a remote web service requires a SOAP action or use of the WS-Addressing standard you define your route as:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"direct:example"</span>)
+<pre class="code-java">from(<span class="code-quote">"direct:example"</span>)
 .to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar?soapAction=http://foo.com&amp;wsAddressingAction=http://bar.com"</span>)</span>
 </pre>
 </div></div>
 
 <p>Optionally you can override the endpoint options with header values:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-template.requestBodyAndHeader(<span class="code-quote">"direct:example"</span>, 
-<span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>, 
+<pre class="code-java">template.requestBodyAndHeader(<span class="code-quote">"direct:example"</span>,
+<span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>,
 </span>SpringWebserviceConstants.SPRING_WS_SOAP_ACTION, <span class="code-quote">"http:<span class="code-comment">//baz.com"</span>);</span>
 </pre>
 </div></div>
@@ -35360,8 +35355,7 @@ template.requestBodyAndHeader(<span clas
 
 <p>A custom message sender or factory in the registry can be referenced like this:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"direct:example"</span>)
+<pre class="code-java">from(<span class="code-quote">"direct:example"</span>)
 .to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar?messageFactory=#messageFactory&amp;messageSender=#messageSender"</span>)</span>
 </pre>
 </div></div>
@@ -35389,9 +35383,9 @@ from(<span class="code-quote">"direct:ex
 
 <h2><a shape="rect" name="BookInOnePage-Exposingwebservices"></a>Exposing web services</h2>
 
-<p>In order to expose a web service using this component you first need to set-up a <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html" rel="nofollow">MessageDispatcher</a> to look for endpoint mappings in a Spring XML file. If you plan on running inside a servlet container you probably want to use a <tt>MessageDispatcherServlet</tt> configured in <tt>web.xml</tt>. </p>
+<p>In order to expose a web service using this component you first need to set-up a <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html" rel="nofollow">MessageDispatcher</a> to look for endpoint mappings in a Spring XML file. If you plan on running inside a servlet container you probably want to use a <tt>MessageDispatcherServlet</tt> configured in <tt>web.xml</tt>.</p>
 
-<p>By default the <tt>MessageDispatcherServlet</tt> will look for a Spring XML named <tt>/WEB-INF/spring-ws-servlet.xml</tt>. To use Camel with Spring-WS the only mandatory bean in that XML file is <tt>CamelEndpointMapping</tt>. This bean allows the <tt>MessageDispatcher</tt> to dispatch web service requests to your routes. </p>
+<p>By default the <tt>MessageDispatcherServlet</tt> will look for a Spring XML named <tt>/WEB-INF/spring-ws-servlet.xml</tt>. To use Camel with Spring-WS the only mandatory bean in that XML file is <tt>CamelEndpointMapping</tt>. This bean allows the <tt>MessageDispatcher</tt> to dispatch web service requests to your routes.</p>
 
 <p><em>web.xml</em></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -35414,14 +35408,14 @@ from(<span class="code-quote">"direct:ex
 <pre class="code-xml"><span class="code-tag">&lt;bean id=<span class="code-quote">"endpointMapping"</span> class=<span class="code-quote">"org.apache.camel.component.spring.ws.bean.CamelEndpointMapping"</span> /&gt;</span>
 
 <span class="code-tag">&lt;bean id=<span class="code-quote">"wsdl"</span> class=<span class="code-quote">"org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition"</span>&gt;</span>
-	<span class="code-tag">&lt;property name=<span class="code-quote">"schema"</span>&gt;</span> 
-		<span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.xml.xsd.SimpleXsdSchema"</span>&gt;</span>                   
+	<span class="code-tag">&lt;property name=<span class="code-quote">"schema"</span>&gt;</span>
+		<span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.xml.xsd.SimpleXsdSchema"</span>&gt;</span>
 			<span class="code-tag">&lt;property name=<span class="code-quote">"xsd"</span> value=<span class="code-quote">"/WEB-INF/foobar.xsd"</span>/&gt;</span>
-		<span class="code-tag">&lt;/bean&gt;</span>    
-	<span class="code-tag">&lt;/property&gt;</span>                                        
-	<span class="code-tag">&lt;property name=<span class="code-quote">"portTypeName"</span> value=<span class="code-quote">"FooBar"</span>/&gt;</span>                                
-	<span class="code-tag">&lt;property name=<span class="code-quote">"locationUri"</span> value=<span class="code-quote">"/"</span>/&gt;</span>                              
-	<span class="code-tag">&lt;property name=<span class="code-quote">"targetNamespace"</span> value=<span class="code-quote">"http://example.com/"</span>/&gt;</span>       
+		<span class="code-tag">&lt;/bean&gt;</span>
+	<span class="code-tag">&lt;/property&gt;</span>
+	<span class="code-tag">&lt;property name=<span class="code-quote">"portTypeName"</span> value=<span class="code-quote">"FooBar"</span>/&gt;</span>
+	<span class="code-tag">&lt;property name=<span class="code-quote">"locationUri"</span> value=<span class="code-quote">"/"</span>/&gt;</span>
+	<span class="code-tag">&lt;property name=<span class="code-quote">"targetNamespace"</span> value=<span class="code-quote">"http://example.com/"</span>/&gt;</span>
 <span class="code-tag">&lt;/bean&gt;</span>
 </pre>
 </div></div>
@@ -35434,46 +35428,41 @@ from(<span class="code-quote">"direct:ex
 
 <p>The following route will receive all web service requests that have a root element named "GetFoo" within the <tt><a shape="rect" class="external-link" href="http://example.com/" rel="nofollow">http://example.com/</a></tt> namespace.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <p>The following route will receive web service requests containing the <tt><a shape="rect" class="external-link" href="http://example.com/GetFoo" rel="nofollow">http://example.com/GetFoo</a></tt> SOAP action.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:soapaction:http:<span class="code-comment">//example.com/GetFoo?endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:soapaction:http:<span class="code-comment">//example.com/GetFoo?endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <p>The following route will receive all requests sent to <tt><a shape="rect" class="external-link" href="http://example.com/foobar" rel="nofollow">http://example.com/foobar</a></tt>.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:uri:http:<span class="code-comment">//example.com/foobar?endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:uri:http:<span class="code-comment">//example.com/foobar?endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <p>The route below will receive requests that contain the element <tt>&lt;foobar&gt;abc&lt;/foobar&gt;</tt> anywhere inside the message (and the default namespace).</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:xpathresult:abc?expression=<span class="code-comment">//foobar&amp;endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:xpathresult:abc?expression=<span class="code-comment">//foobar&amp;endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <h3><a shape="rect" name="BookInOnePage-Alternativeconfiguration%2Cusingexistingendpointmappings"></a>Alternative configuration, using existing endpoint mappings</h3>
 
-<p>For every endpoint with mapping-type <tt>beanname</tt> one bean of type <tt>CamelEndpointDispatcher</tt> with a corresponding name is required in the Registry/ApplicationContext. This bean acts as a bridge between the Camel endpoint and an existing <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html#server-endpoint-mapping" rel="nofollow">endpoint mapping</a> like <tt>PayloadRootQNameEndpointMapping</tt>. </p>
+<p>For every endpoint with mapping-type <tt>beanname</tt> one bean of type <tt>CamelEndpointDispatcher</tt> with a corresponding name is required in the Registry/ApplicationContext. This bean acts as a bridge between the Camel endpoint and an existing <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html#server-endpoint-mapping" rel="nofollow">endpoint mapping</a> like <tt>PayloadRootQNameEndpointMapping</tt>.</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">The use of the <tt>beanname</tt> mapping-type is primarily meant for (legacy) situations where you're already using Spring-WS and have endpoint mappings defined in a Spring XML file. The <tt>beanname</tt> mapping-type allows you to wire your Camel route into an existing endpoint mapping. When you're starting from scratch it's recommended to define your endpoint mappings as Camel URI's (as illustrated above with <tt>endpointMapping</tt>) since it requires less configuration and is more expressive. Alternatively you could use vanilla Spring-WS with the help of annotations.</td></tr></table></div>
 
 <p>An example of a route using <tt>beanname</tt>:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;camelContext xmlns=<span class="code-quote">"http:<span class="code-comment">//camel.apache.org/schema/spring"</span>&gt;
+<pre class="code-java">&lt;camelContext xmlns=<span class="code-quote">"http:<span class="code-comment">//camel.apache.org/schema/spring"</span>&gt;
 </span>	&lt;route&gt;
 		&lt;from uri=<span class="code-quote">"spring-ws:beanname:QuoteEndpointDispatcher"</span> /&gt;
 		&lt;to uri=<span class="code-quote">"mock:example"</span> /&gt;
@@ -35496,12 +35485,11 @@ from(<span class="code-quote">"spring-ws
 
 <h2><a shape="rect" name="BookInOnePage-POJO%28un%29marshalling"></a>POJO (un)marshalling</h2>
 
-<p>Camel's <a shape="rect" href="data-format.html" title="Data Format">pluggable data formats</a> offer support for pojo/xml marshalling using libraries such as JAXB, XStream, JibX, Castor and XMLBeans. You can use these data formats in your route to sent and receive pojo's, to and from web services. </p>
+<p>Camel's <a shape="rect" href="data-format.html" title="Data Format">pluggable data formats</a> offer support for pojo/xml marshalling using libraries such as JAXB, XStream, JibX, Castor and XMLBeans. You can use these data formats in your route to sent and receive pojo's, to and from web services.</p>
 
 <p>When <em>accessing</em> web services you can marshal the request and unmarshal the response message:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-JaxbDataFormat jaxb = <span class="code-keyword">new</span> JaxbDataFormat(<span class="code-keyword">false</span>);
+<pre class="code-java">JaxbDataFormat jaxb = <span class="code-keyword">new</span> JaxbDataFormat(<span class="code-keyword">false</span>);
 jaxb.setContextPath(<span class="code-quote">"com.example.model"</span>);
 
 from(<span class="code-quote">"direct:example"</span>).marshal(jaxb).to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar"</span>).unmarshal(jaxb);</span>
@@ -35510,8 +35498,7 @@ from(<span class="code-quote">"direct:ex
 
 <p>Similarly when <em>providing</em> web services, you can unmarshal XML requests to POJO's and marshal the response message back to XML:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>).unmarshal(jaxb)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>).unmarshal(jaxb)
 </span>.to(<span class="code-quote">"mock:example"</span>).marshal(jaxb);
 </pre>
 </div></div>

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

Modified: websites/production/camel/content/spring-web-services.html
==============================================================================
--- websites/production/camel/content/spring-web-services.html (original)
+++ websites/production/camel/content/spring-web-services.html Mon Apr 16 19:20:55 2012
@@ -76,6 +76,7 @@
         <tr>
         <td valign="top" width="100%">
 <div class="wiki-content maincontent"><h2><a shape="rect" name="SpringWebServices-SpringWebServicesComponent"></a>Spring Web Services Component</h2>
+
 <p><b>Available as of Camel 2.6</b></p>
 
 <p>The <b>spring-ws:</b> component allows you to integrate with <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/" rel="nofollow">Spring Web Services</a>. It offers both <em>client</em>-side support, for accessing web services, and <em>server</em>-side support for creating your own contract-first web services.</p>
@@ -83,8 +84,7 @@
 <p>Maven users will need to add the following dependency to their <tt>pom.xml</tt> for this component:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;dependency&gt;</span>
+<pre class="code-xml"><span class="code-tag">&lt;dependency&gt;</span>
 	<span class="code-tag">&lt;groupId&gt;</span>org.apache.camel<span class="code-tag">&lt;/groupId&gt;</span>
 	<span class="code-tag">&lt;artifactId&gt;</span>camel-spring-ws<span class="code-tag">&lt;/artifactId&gt;</span>
 	<span class="code-tag">&lt;version&gt;</span>x.x.x<span class="code-tag">&lt;/version&gt;</span>
@@ -93,7 +93,7 @@
 </pre>
 </div></div>
 
-<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>Dependencies</b><br clear="none">As of Camel 2.8 this component ships with Spring-WS 2.0.x which (like the rest of Camel) requires Spring 3.0.x. 
+<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>Dependencies</b><br clear="none">As of Camel 2.8 this component ships with Spring-WS 2.0.x which (like the rest of Camel) requires Spring 3.0.x.
 
 <p>Earlier Camel versions shipped Spring-WS 1.5.9 which is compatible with Spring 2.5.x and 3.0.x. In order to run earlier versions of <tt>camel-spring-ws</tt> on Spring 2.5.x you need to add the <tt>spring-webmvc</tt> module from Spring 2.5.x. In order to run Spring-WS 1.5.9 on Spring 3.0.x you need to exclude the OXM module from Spring 3.0.x as this module is also included in Spring-WS 1.5.9 (see <a shape="rect" class="external-link" href="http://stackoverflow.com/questions/3313314/can-spring-ws-1-5-be-used-with-spring-3" rel="nofollow">this post</a>)</p></td></tr></table></div>
 
@@ -102,8 +102,7 @@
 <p>The URI scheme for this component is as follows</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-spring-ws:[mapping-type:]address[?options]
+<pre class="code-java">spring-ws:[mapping-type:]address[?options]
 </pre>
 </div></div>
 
@@ -121,7 +120,7 @@ spring-ws:[mapping-type:]address[?option
 <h3><a shape="rect" name="SpringWebServices-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>soapAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> SOAP action to include inside a SOAP request when accessing remote web services </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>wsAddressingAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> WS-Addressing 1.0 action header to include when accessing web services. The <tt>To</tt> header is set to the <em>address</em> of the web service as specified in the endpoint URI (default Spring-WS behavior). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>ex
 pression</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Only when <em>mapping-type</em> is <tt>xpathresult</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> XPath expression to use in the process of mapping web service requests, should match the result specified by <tt>xpathresult</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeout</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> Sets the socket read timeout (in milliseconds) while invoking a webservice using the producer, see <a shape="rect" class="external-link" href="http://docs.oracle.com/javase/6/docs/api/java/net/URLConnection.html#setReadTimeout(int)" rel="nofollow">URLConnection.setReadTimeout()</a> and <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/site/apidocs/org/springframework/ws/transport/http/CommonsHttpMessageSender.html#setReadTimeou
 t(int)" rel="nofollow">CommonsHttpMessageSender.setReadTimeout()</a> </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>soapAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> SOAP action to include inside a SOAP request when accessing remote web services </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>wsAddressingAction</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> WS-Addressing 1.0 action header to include when accessing web services. The <tt>To</tt> header is set to the <em>address</em> of the web service as specified in the endpoint URI (default Spring-WS behavior). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>ex
 pression</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Only when <em>mapping-type</em> is <tt>xpathresult</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> XPath expression to use in the process of mapping web service requests, should match the result specified by <tt>xpathresult</tt> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeout</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> Sets the socket read timeout (in milliseconds) while invoking a webservice using the producer, see <a shape="rect" class="external-link" href="http://docs.oracle.com/javase/6/docs/api/java/net/URLConnection.html#setReadTimeout(int)" rel="nofollow">URLConnection.setReadTimeout()</a> and <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/site/apidocs/org/springframework/ws/transport/http/CommonsHttpMessageSender.html#setReadTimeou
 t(int)" rel="nofollow">CommonsHttpMessageSender.setReadTimeout()</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>sslContextParameters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> No </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b>&#160;Reference to a&#160;<tt>org.apache.camel.util.jsse.SSLContextParameters</tt>&#160;in the&#160;<a shape="rect" class="external-link" href="http://camel.apache.org/registry.html">Registry</a>. &#160;See&#160;<a shape="rect" class="external-link" href="http://camel.apache.org/http4.html#HTTP4-UsingtheJSSEConfigurationUtility">Using the JSSE Configuration Utility</a>. &#160;This option works when using the built-in message sender implementations:&#160;<em>CommonsHttpMessageSender</em>&#160;and&#160;<em>HttpUrlConnectionMessageSender</em>. &#160;One of these implementations will be used by default for HTTP based services unless you customize the Spring WS configuration options supplied
  to the component. &#160;If you are using a non-standard sender, it is assumed that you will handle your own TLS configuration. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -145,15 +144,13 @@ spring-ws:[mapping-type:]address[?option
 
 <p>To call a web service at <tt><a shape="rect" class="external-link" href="http://foo.com/bar" rel="nofollow">http://foo.com/bar</a></tt> simply define a route:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"direct:example"</span>).to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar"</span>)</span>
+<pre class="code-java">from(<span class="code-quote">"direct:example"</span>).to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar"</span>)</span>
 </pre>
 </div></div>
 
 <p>And sent a message:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-template.requestBody(<span class="code-quote">"direct:example"</span>, <span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>);</span>
+<pre class="code-java">template.requestBody(<span class="code-quote">"direct:example"</span>, <span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>);</span>
 </pre>
 </div></div>
 <p>Remember if it's a SOAP service you're calling you don't have to include SOAP tags. Spring-WS will perform the XML-to-SOAP marshaling.</p>
@@ -162,17 +159,15 @@ template.requestBody(<span class="code-q
 
 <p>When a remote web service requires a SOAP action or use of the WS-Addressing standard you define your route as:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"direct:example"</span>)
+<pre class="code-java">from(<span class="code-quote">"direct:example"</span>)
 .to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar?soapAction=http://foo.com&amp;wsAddressingAction=http://bar.com"</span>)</span>
 </pre>
 </div></div>
 
 <p>Optionally you can override the endpoint options with header values:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-template.requestBodyAndHeader(<span class="code-quote">"direct:example"</span>, 
-<span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>, 
+<pre class="code-java">template.requestBodyAndHeader(<span class="code-quote">"direct:example"</span>,
+<span class="code-quote">"&lt;foobar xmlns=\"</span>http:<span class="code-comment">//foo.com\<span class="code-quote">"&gt;&lt;msg&gt;test message&lt;/msg&gt;&lt;/foobar&gt;"</span>,
 </span>SpringWebserviceConstants.SPRING_WS_SOAP_ACTION, <span class="code-quote">"http:<span class="code-comment">//baz.com"</span>);</span>
 </pre>
 </div></div>
@@ -181,8 +176,7 @@ template.requestBodyAndHeader(<span clas
 
 <p>A custom message sender or factory in the registry can be referenced like this:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"direct:example"</span>)
+<pre class="code-java">from(<span class="code-quote">"direct:example"</span>)
 .to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar?messageFactory=#messageFactory&amp;messageSender=#messageSender"</span>)</span>
 </pre>
 </div></div>
@@ -210,9 +204,9 @@ from(<span class="code-quote">"direct:ex
 
 <h2><a shape="rect" name="SpringWebServices-Exposingwebservices"></a>Exposing web services</h2>
 
-<p>In order to expose a web service using this component you first need to set-up a <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html" rel="nofollow">MessageDispatcher</a> to look for endpoint mappings in a Spring XML file. If you plan on running inside a servlet container you probably want to use a <tt>MessageDispatcherServlet</tt> configured in <tt>web.xml</tt>. </p>
+<p>In order to expose a web service using this component you first need to set-up a <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html" rel="nofollow">MessageDispatcher</a> to look for endpoint mappings in a Spring XML file. If you plan on running inside a servlet container you probably want to use a <tt>MessageDispatcherServlet</tt> configured in <tt>web.xml</tt>.</p>
 
-<p>By default the <tt>MessageDispatcherServlet</tt> will look for a Spring XML named <tt>/WEB-INF/spring-ws-servlet.xml</tt>. To use Camel with Spring-WS the only mandatory bean in that XML file is <tt>CamelEndpointMapping</tt>. This bean allows the <tt>MessageDispatcher</tt> to dispatch web service requests to your routes. </p>
+<p>By default the <tt>MessageDispatcherServlet</tt> will look for a Spring XML named <tt>/WEB-INF/spring-ws-servlet.xml</tt>. To use Camel with Spring-WS the only mandatory bean in that XML file is <tt>CamelEndpointMapping</tt>. This bean allows the <tt>MessageDispatcher</tt> to dispatch web service requests to your routes.</p>
 
 <p><em>web.xml</em></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -235,14 +229,14 @@ from(<span class="code-quote">"direct:ex
 <pre class="code-xml"><span class="code-tag">&lt;bean id=<span class="code-quote">"endpointMapping"</span> class=<span class="code-quote">"org.apache.camel.component.spring.ws.bean.CamelEndpointMapping"</span> /&gt;</span>
 
 <span class="code-tag">&lt;bean id=<span class="code-quote">"wsdl"</span> class=<span class="code-quote">"org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition"</span>&gt;</span>
-	<span class="code-tag">&lt;property name=<span class="code-quote">"schema"</span>&gt;</span> 
-		<span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.xml.xsd.SimpleXsdSchema"</span>&gt;</span>                   
+	<span class="code-tag">&lt;property name=<span class="code-quote">"schema"</span>&gt;</span>
+		<span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.xml.xsd.SimpleXsdSchema"</span>&gt;</span>
 			<span class="code-tag">&lt;property name=<span class="code-quote">"xsd"</span> value=<span class="code-quote">"/WEB-INF/foobar.xsd"</span>/&gt;</span>
-		<span class="code-tag">&lt;/bean&gt;</span>    
-	<span class="code-tag">&lt;/property&gt;</span>                                        
-	<span class="code-tag">&lt;property name=<span class="code-quote">"portTypeName"</span> value=<span class="code-quote">"FooBar"</span>/&gt;</span>                                
-	<span class="code-tag">&lt;property name=<span class="code-quote">"locationUri"</span> value=<span class="code-quote">"/"</span>/&gt;</span>                              
-	<span class="code-tag">&lt;property name=<span class="code-quote">"targetNamespace"</span> value=<span class="code-quote">"http://example.com/"</span>/&gt;</span>       
+		<span class="code-tag">&lt;/bean&gt;</span>
+	<span class="code-tag">&lt;/property&gt;</span>
+	<span class="code-tag">&lt;property name=<span class="code-quote">"portTypeName"</span> value=<span class="code-quote">"FooBar"</span>/&gt;</span>
+	<span class="code-tag">&lt;property name=<span class="code-quote">"locationUri"</span> value=<span class="code-quote">"/"</span>/&gt;</span>
+	<span class="code-tag">&lt;property name=<span class="code-quote">"targetNamespace"</span> value=<span class="code-quote">"http://example.com/"</span>/&gt;</span>
 <span class="code-tag">&lt;/bean&gt;</span>
 </pre>
 </div></div>
@@ -255,46 +249,41 @@ from(<span class="code-quote">"direct:ex
 
 <p>The following route will receive all web service requests that have a root element named "GetFoo" within the <tt><a shape="rect" class="external-link" href="http://example.com/" rel="nofollow">http://example.com/</a></tt> namespace.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <p>The following route will receive web service requests containing the <tt><a shape="rect" class="external-link" href="http://example.com/GetFoo" rel="nofollow">http://example.com/GetFoo</a></tt> SOAP action.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:soapaction:http:<span class="code-comment">//example.com/GetFoo?endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:soapaction:http:<span class="code-comment">//example.com/GetFoo?endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <p>The following route will receive all requests sent to <tt><a shape="rect" class="external-link" href="http://example.com/foobar" rel="nofollow">http://example.com/foobar</a></tt>.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:uri:http:<span class="code-comment">//example.com/foobar?endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:uri:http:<span class="code-comment">//example.com/foobar?endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <p>The route below will receive requests that contain the element <tt>&lt;foobar&gt;abc&lt;/foobar&gt;</tt> anywhere inside the message (and the default namespace).</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:xpathresult:abc?expression=<span class="code-comment">//foobar&amp;endpointMapping=#endpointMapping"</span>)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:xpathresult:abc?expression=<span class="code-comment">//foobar&amp;endpointMapping=#endpointMapping"</span>)
 </span>.convertBodyTo(<span class="code-object">String</span>.class).to(mock:example)
 </pre>
 </div></div>
 
 <h3><a shape="rect" name="SpringWebServices-Alternativeconfiguration%2Cusingexistingendpointmappings"></a>Alternative configuration, using existing endpoint mappings</h3>
 
-<p>For every endpoint with mapping-type <tt>beanname</tt> one bean of type <tt>CamelEndpointDispatcher</tt> with a corresponding name is required in the Registry/ApplicationContext. This bean acts as a bridge between the Camel endpoint and an existing <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html#server-endpoint-mapping" rel="nofollow">endpoint mapping</a> like <tt>PayloadRootQNameEndpointMapping</tt>. </p>
+<p>For every endpoint with mapping-type <tt>beanname</tt> one bean of type <tt>CamelEndpointDispatcher</tt> with a corresponding name is required in the Registry/ApplicationContext. This bean acts as a bridge between the Camel endpoint and an existing <a shape="rect" class="external-link" href="http://static.springsource.org/spring-ws/sites/1.5/reference/html/server.html#server-endpoint-mapping" rel="nofollow">endpoint mapping</a> like <tt>PayloadRootQNameEndpointMapping</tt>.</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">The use of the <tt>beanname</tt> mapping-type is primarily meant for (legacy) situations where you're already using Spring-WS and have endpoint mappings defined in a Spring XML file. The <tt>beanname</tt> mapping-type allows you to wire your Camel route into an existing endpoint mapping. When you're starting from scratch it's recommended to define your endpoint mappings as Camel URI's (as illustrated above with <tt>endpointMapping</tt>) since it requires less configuration and is more expressive. Alternatively you could use vanilla Spring-WS with the help of annotations.</td></tr></table></div>
 
 <p>An example of a route using <tt>beanname</tt>:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;camelContext xmlns=<span class="code-quote">"http:<span class="code-comment">//camel.apache.org/schema/spring"</span>&gt;
+<pre class="code-java">&lt;camelContext xmlns=<span class="code-quote">"http:<span class="code-comment">//camel.apache.org/schema/spring"</span>&gt;
 </span>	&lt;route&gt;
 		&lt;from uri=<span class="code-quote">"spring-ws:beanname:QuoteEndpointDispatcher"</span> /&gt;
 		&lt;to uri=<span class="code-quote">"mock:example"</span> /&gt;
@@ -317,12 +306,11 @@ from(<span class="code-quote">"spring-ws
 
 <h2><a shape="rect" name="SpringWebServices-POJO%28un%29marshalling"></a>POJO (un)marshalling</h2>
 
-<p>Camel's <a shape="rect" href="data-format.html" title="Data Format">pluggable data formats</a> offer support for pojo/xml marshalling using libraries such as JAXB, XStream, JibX, Castor and XMLBeans. You can use these data formats in your route to sent and receive pojo's, to and from web services. </p>
+<p>Camel's <a shape="rect" href="data-format.html" title="Data Format">pluggable data formats</a> offer support for pojo/xml marshalling using libraries such as JAXB, XStream, JibX, Castor and XMLBeans. You can use these data formats in your route to sent and receive pojo's, to and from web services.</p>
 
 <p>When <em>accessing</em> web services you can marshal the request and unmarshal the response message:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-JaxbDataFormat jaxb = <span class="code-keyword">new</span> JaxbDataFormat(<span class="code-keyword">false</span>);
+<pre class="code-java">JaxbDataFormat jaxb = <span class="code-keyword">new</span> JaxbDataFormat(<span class="code-keyword">false</span>);
 jaxb.setContextPath(<span class="code-quote">"com.example.model"</span>);
 
 from(<span class="code-quote">"direct:example"</span>).marshal(jaxb).to(<span class="code-quote">"spring-ws:http:<span class="code-comment">//foo.com/bar"</span>).unmarshal(jaxb);</span>
@@ -331,8 +319,7 @@ from(<span class="code-quote">"direct:ex
 
 <p>Similarly when <em>providing</em> web services, you can unmarshal XML requests to POJO's and marshal the response message back to XML:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>).unmarshal(jaxb)
+<pre class="code-java">from(<span class="code-quote">"spring-ws:rootqname:{http:<span class="code-comment">//example.com/}GetFoo?endpointMapping=#endpointMapping"</span>).unmarshal(jaxb)
 </span>.to(<span class="code-quote">"mock:example"</span>).marshal(jaxb);
 </pre>
 </div></div>