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/09/08 00:36:15 UTC

svn commit: r831334 [14/14] - in /websites/production/camel/content: ./ cache/

Modified: websites/production/camel/content/xmpp.html
==============================================================================
--- websites/production/camel/content/xmpp.html (original)
+++ websites/production/camel/content/xmpp.html Fri Sep  7 22:36:12 2012
@@ -99,20 +99,20 @@ xmpp:<span class="code-comment">//[login
 </pre>
 </div></div>
 <p>The component supports both room based and private person-person conversations.<br clear="none">
-The component supports both producer and consumer (you can get messages from XMPP or send messages to XMPP). Consumer mode supports rooms starting from camel-1.5.0.</p>
+The component supports both producer and consumer (you can get messages from XMPP or send messages to XMPP). Consumer mode supports rooms starting.</p>
 
 <p>You can append query options to the URI in the following format, <tt>?option=value&amp;option=value&amp;...</tt></p>
 
 <h3><a shape="rect" name="XMPP-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"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>room</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If this option is specified, the component will connect to MUC (Multi User Chat). Usually, the domain name for MUC is different from the login domain. For example, if you are <tt>superman@jabber.org</tt> and want to join the <tt>krypton</tt> room, then the room URL is <tt>krypton@conference.jabber.org</tt>. Note the <tt>conference</tt> part.<br clear="none">
-Starting from camel-1.5.0, it is not a requirement to provide the full room JID. If the <tt>room</tt> parameter does not contain the <tt>@</tt> symbol, the domain part will be discovered and added by Camel</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>user</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> User name (without server name). If not specified, anonymous login will be attempted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Password. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>resource</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> XMPP resource. The default is <tt>Camel</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>createAccount</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If <tt>true</tt>, an attempt to create an account will be made. Default is <tt>false</tt>. </
 td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>participant</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> JID (Jabber ID) of person to receive messages. <tt>room</tt> parameter has precedence over <tt>participant</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>nickname</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Use nickname when joining room. If room is specified and nickname is not, <tt>user</tt> will be used for the nickname. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>serviceName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 1.6/2.0</b> The name of the service you are connecting to. For Google Talk, this would be <tt>gmail.com</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>testConnectionOnStartup</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> Specifies whether to test the connection on startup. 
 This is used to ensure that the XMPP client has a valid connection to the XMPP server when the route starts. Camel throws an exception on startup if a connection cannot be established. When this option is set to false, Camel will attempt to establish a "lazy" connection when needed by a producer, and will poll for a consumer connection until the connection is established.   Default is <tt>true</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>connectionPollDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> The amount of time in seconds between polls to verify the health of the XMPP connection, or between attempts to establish an initial consumer connection. Camel will try to re-establish a connection if it has become inactive. Default is <tt>10 seconds</tt>.</td></tr></tbody></table>
+It is not a requirement to provide the full room JID. If the <tt>room</tt> parameter does not contain the <tt>@</tt> symbol, the domain part will be discovered and added by Camel</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>user</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> User name (without server name). If not specified, anonymous login will be attempted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Password. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>resource</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> XMPP resource. The default is <tt>Camel</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>createAccount</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> If <tt>true</tt>, an attempt to create an account will be made. Default is <tt>false</tt>. </td></tr><tr><td colspan="1"
  rowspan="1" class="confluenceTd"> <tt>participant</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> JID (Jabber ID) of person to receive messages. <tt>room</tt> parameter has precedence over <tt>participant</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>nickname</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Use nickname when joining room. If room is specified and nickname is not, <tt>user</tt> will be used for the nickname. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>serviceName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The name of the service you are connecting to. For Google Talk, this would be <tt>gmail.com</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>testConnectionOnStartup</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> Specifies whether to test the connection on startup. This is used to ensure that the XMPP client has 
 a valid connection to the XMPP server when the route starts. Camel throws an exception on startup if a connection cannot be established. When this option is set to false, Camel will attempt to establish a "lazy" connection when needed by a producer, and will poll for a consumer connection until the connection is established.   Default is <tt>true</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>connectionPollDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> The amount of time in seconds between polls to verify the health of the XMPP connection, or between attempts to establish an initial consumer connection. Camel will try to re-establish a connection if it has become inactive. Default is <tt>10 seconds</tt>.</td></tr></tbody></table>
 </div>
 </div>
 
 <h3><a shape="rect" name="XMPP-HeadersandsettingSubjectorLanguage"></a>Headers and setting Subject or Language</h3>
 <p>Camel sets the message IN headers as properties on the XMPP message. You can configure a <tt>HeaderFilterStategy</tt> if you need custom filtering of headers.<br clear="none">
-In <b>Camel 1.6.2/2.0</b> the <b>Subject</b> and <b>Language</b> of the XMPP message are also set if they are provided as IN headers.</p>
+The <b>Subject</b> and <b>Language</b> of the XMPP message are also set if they are provided as IN headers.</p>
 
 <h3><a shape="rect" name="XMPP-Examples"></a>Examples</h3>
 
@@ -147,7 +147,7 @@ from(<span class="code-quote">"xmpp:<spa
 </pre>
 </div></div>
 
-<p>Consumer configuration, which listens to room messages (supported from camel-1.5.0):</p>
+<p>Consumer configuration, which listens to room messages:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
 from(<span class="code-quote">"xmpp:<span class="code-comment">//superman@jabber.org/?password=secret&amp;room=krypton@conference.jabber.org"</span>).
@@ -155,7 +155,7 @@ from(<span class="code-quote">"xmpp:<spa
 </pre>
 </div></div>
 
-<p>Room in short notation (no domain part; for camel-1.5.0+):</p>
+<p>Room in short notation (no domain part):</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
 from(<span class="code-quote">"xmpp:<span class="code-comment">//superman@jabber.org/?password=secret&amp;room=krypton"</span>).
@@ -163,7 +163,7 @@ from(<span class="code-quote">"xmpp:<spa
 </pre>
 </div></div>
 
-<p>When connecting to the Google Chat service, you'll need to specify the <tt>serviceName</tt> as well as your credentials (as of <b>Camel 1.6/2.0</b>):</p>
+<p>When connecting to the Google Chat service, you'll need to specify the <tt>serviceName</tt> as well as your credentials:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java"><span class="code-comment">// send a message from fromuser@gmail.com to touser@gmail.com
 </span>from(<span class="code-quote">"direct:start"</span>).

Modified: websites/production/camel/content/xpath.html
==============================================================================
--- websites/production/camel/content/xpath.html (original)
+++ websites/production/camel/content/xpath.html Fri Sep  7 22:36:12 2012
@@ -97,7 +97,7 @@ from(<span class="code-quote">"queue:foo
 
 <h3><a shape="rect" name="XPath-Namespaces"></a>Namespaces</h3>
 
-<p>In 1.3 onwards you can easily use namespaces with XPath expressions using the Namespaces helper class.</p>
+<p>You can easily use namespaces with XPath expressions using the Namespaces helper class.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">Namespaces ns = <span class="code-keyword">new</span> Namespaces(<span class="code-quote">"c"</span>, <span class="code-quote">"http:<span class="code-comment">//acme.com/cheese"</span>);
@@ -186,7 +186,7 @@ from(<span class="code-quote">"direct:in
 &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.0.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 id=<span class="code-quote">"camel"</span> xmlns=<span class="code-quote">"http://activemq.apache.org/camel/schema/spring"</span> <span class="code-keyword">xmlns:foo</span>=<span class="code-quote">"http://example.com/person"</span>&gt;</span>
@@ -334,8 +334,6 @@ If neither is true the message is routed
 
 <p>i.e. cut and paste upper code to your own project in a different package and/or annotation name then add whatever namespace prefix/uris you want in scope when you use your annotation on a method parameter. Then when you use your annotation on a method parameter all the namespaces you want will be available for use in your XPath expression.</p>
 
-<p><b>NOTE</b> this feature is supported from Camel 1.6.1.</p>
-
 <p>For example</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">

Modified: websites/production/camel/content/xquery.html
==============================================================================
--- websites/production/camel/content/xquery.html (original)
+++ websites/production/camel/content/xquery.html Fri Sep  7 22:36:12 2012
@@ -109,7 +109,7 @@ from(<span class="code-quote">"direct:st
 <p>The IN message body will be set as the <tt>contextItem</tt>. Besides this these Variables is also added as parameters:</p>
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Variable </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th><th colspan="1" rowspan="1" class="confluenceTh"> Support version </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exchange </td><td colspan="1" rowspan="1" class="confluenceTd"> Exchange </td><td colspan="1" rowspan="1" class="confluenceTd"> The current Exchange </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.body </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> The In message's body  </td><td colspan="1" rowspan="1" class="confluenceTd">  &gt;= 1.6.1 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.body </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </
 td><td colspan="1" rowspan="1" class="confluenceTd"> The OUT message's body (if any)</td><td colspan="1" rowspan="1" class="confluenceTd"> &gt;= 1.6.1 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.headers.*</td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> You can access the value of exchange.in.headers with key <b>foo</b> by using the variable which name is in.headers.foo</td><td colspan="1" rowspan="1" class="confluenceTd"> &gt;=1.6.1 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.headers.* </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> You can access the value of exchange.out.headers with key <b>foo</b> by using the variable which name is out.headers.foo variable</td><td colspan="1" rowspan="1" class="confluenceTd"> &gt;=1.6.1 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <b>key 
 name</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> Any exchange.properties and exchange.in.headers (exchange.in.headers support was removed since camel 1.6.1) and any additional parameters set using <tt>setParameters(Map)</tt>. These parameters is added with they own key name, for instance if there is an IN header with the key name <b>foo</b> then its added as <b>foo</b>. </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"> Variable </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> exchange </td><td colspan="1" rowspan="1" class="confluenceTd"> Exchange </td><td colspan="1" rowspan="1" class="confluenceTd"> The current Exchange </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.body </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> The In message's body  </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.body </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> The OUT message's body (if any)</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> in.headers.*</td><td colspan="1" rowspan="1" class=
 "confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> You can access the value of exchange.in.headers with key <b>foo</b> by using the variable which name is in.headers.foo</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> out.headers.* </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> You can access the value of exchange.out.headers with key <b>foo</b> by using the variable which name is out.headers.foo variable</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <b>key name</b> </td><td colspan="1" rowspan="1" class="confluenceTd"> Object </td><td colspan="1" rowspan="1" class="confluenceTd"> Any exchange.properties and exchange.in.headers and any additional parameters set using <tt>setParameters(Map)</tt>. These parameters is added with they own key name, for instance if there is an IN header with the key name <b>foo</b> then its added as <b>foo</b>. </td></t
 r></tbody></table>
 </div>
 
 
@@ -123,7 +123,7 @@ from(<span class="code-quote">"direct:st
        <span class="code-keyword">xmlns:xsi</span>=<span class="code-quote">"http://www.w3.org/2001/XMLSchema-instance"</span>
        <span class="code-keyword">xmlns:foo</span>=<span class="code-quote">"http://example.com/person"</span>
        xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.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 id=<span class="code-quote">"camel"</span> xmlns=<span class="code-quote">"http://activemq.apache.org/camel/schema/spring"</span>&gt;</span>
@@ -207,7 +207,7 @@ from(<span class="code-quote">"direct:st
 &lt;dependency&gt;
   &lt;groupId&gt;org.apache.camel&lt;/groupId&gt;
   &lt;artifactId&gt;camel-saxon&lt;/artifactId&gt;
-  &lt;version&gt;1.4.0&lt;/version&gt;
+  &lt;version&gt;x.x.x&lt;/version&gt;
 &lt;/dependency&gt;
 </pre>
 </div></div></div>

Modified: websites/production/camel/content/xslt.html
==============================================================================
--- websites/production/camel/content/xslt.html (original)
+++ websites/production/camel/content/xslt.html Fri Sep  7 22:36:12 2012
@@ -118,7 +118,7 @@ xslt:templateName[?options]
 
 <h3><a shape="rect" name="XSLT-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"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>converter</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Option to override default <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/converter/jaxp/XmlConverter.html">XmlConverter</a>. Will lookup for the converter in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. The provided converted must be of type org.apache.camel.converter.jaxp.XmlConverter. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transformerFactory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> <
 /td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 1.6</b> Option to override default <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/transform/TransformerFactory.html" rel="nofollow">TransformerFactory</a>. Will lookup for the transformerFactory in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. The provided transformer factory must be of type javax.xml.transform.TransformerFactory. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transformerFactoryClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 1.6</b> Option to override default <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/transform/TransformerFactory.html" rel="nofollow">TransformerFactory</a>. Will create a TransformerFactoryClass instance and set it to the converter. </td></tr><
 tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>uriResolver</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3</b>: Allows you to use a custom <tt>javax.xml.transformation.URIResolver</tt>. Camel will by default use its own implementation <tt>org.apache.camel.builder.xml.XsltUriResolver</tt> which is capable of loading from classpath. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>resultHandlerFactory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Allows you to use a custom <tt>org.apache.camel.builder.xml.ResultHandlerFactory</tt> which is capable of using custom <tt>org.apache.camel.builder.xml.ResultHandler</tt> types. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>failOnNullBody</tt> </td><td colspan="1" rowspan="1" class="confluence
 Td"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Whether or not to throw an exception if the input body is null. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>deleteOutputFile</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6:</b> If you have <tt>output=file</tt> then this option dictates whether or not the output file should be deleted when the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> is done processing. For example suppose the output file is a temporary file, then it can be a good idea to delete it after use. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>output</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>string</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Option to specify which output type to use. Possible values are:
  <tt>string, bytes, DOM, file</tt>. The first three options are all in memory based, where as <tt>file</tt> is streamed directly to a <tt>java.io.File</tt>. For <tt>file</tt> you <b>must</b> specify the filename in the IN header with the key <tt>Exchange.XSLT_FILE_NAME</tt> which is also <tt>CamelXsltFileName</tt>. Also any paths leading to the filename must be created beforehand, otherwise an exception is thrown at runtime. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>contentCache</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6:</b> Cache for the resource content (the stylesheet file) when it is loaded. If set to <tt>false</tt> Camel will reload the stylesheet file on each message processing. This is good for development. <br clear="none">
+<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>converter</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Option to override default <a shape="rect" class="external-link" href="http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/converter/jaxp/XmlConverter.html">XmlConverter</a>. Will lookup for the converter in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. The provided converted must be of type org.apache.camel.converter.jaxp.XmlConverter. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transformerFactory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> <
 /td><td colspan="1" rowspan="1" class="confluenceTd"> Option to override default <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/transform/TransformerFactory.html" rel="nofollow">TransformerFactory</a>. Will lookup for the transformerFactory in the <a shape="rect" href="registry.html" title="Registry">Registry</a>. The provided transformer factory must be of type javax.xml.transform.TransformerFactory. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transformerFactoryClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Option to override default <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/transform/TransformerFactory.html" rel="nofollow">TransformerFactory</a>. Will create a TransformerFactoryClass instance and set it to the converter. </td></tr><tr><td colspan="1" rowspan="1" cla
 ss="confluenceTd"> <tt>uriResolver</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3</b>: Allows you to use a custom <tt>javax.xml.transformation.URIResolver</tt>. Camel will by default use its own implementation <tt>org.apache.camel.builder.xml.XsltUriResolver</tt> which is capable of loading from classpath. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>resultHandlerFactory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Allows you to use a custom <tt>org.apache.camel.builder.xml.ResultHandlerFactory</tt> which is capable of using custom <tt>org.apache.camel.builder.xml.ResultHandler</tt> types. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>failOnNullBody</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspa
 n="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Whether or not to throw an exception if the input body is null. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>deleteOutputFile</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6:</b> If you have <tt>output=file</tt> then this option dictates whether or not the output file should be deleted when the <a shape="rect" href="exchange.html" title="Exchange">Exchange</a> is done processing. For example suppose the output file is a temporary file, then it can be a good idea to delete it after use. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>output</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>string</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.3:</b> Option to specify which output type to use. Possible values are: <tt>string, bytes, DOM, file</tt>
 . The first three options are all in memory based, where as <tt>file</tt> is streamed directly to a <tt>java.io.File</tt>. For <tt>file</tt> you <b>must</b> specify the filename in the IN header with the key <tt>Exchange.XSLT_FILE_NAME</tt> which is also <tt>CamelXsltFileName</tt>. Also any paths leading to the filename must be created beforehand, otherwise an exception is thrown at runtime. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>contentCache</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.6:</b> Cache for the resource content (the stylesheet file) when it is loaded. If set to <tt>false</tt> Camel will reload the stylesheet file on each message processing. This is good for development. <br clear="none">
 Note: from <b>Camel 2.9</b> a cached stylesheet can be forced to reload at runtime via JMX using the <tt>clearCachedStylesheet</tt> operation. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>allowStAX</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8.3/2.9:</b> Whether to allow using StAX as the <tt>javax.xml.transform.Source</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transformerCacheSize</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.3/2.10.1:</b>  The number of <tt>javax.xml.transform.Transformer</tt> object that are cached for reuse to avoid calls to <tt>Template.newTransformer()</tt>. </td></tr></tbody></table>
 </div>
 </div>
@@ -189,7 +189,7 @@ To do this you will need to declare the 
 <p>There is a <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/XsltTest.java">test case</a> along with <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/XsltTest-context.xml">its Spring XML</a> if you want a concrete example.</p>
 
 <h3><a shape="rect" name="XSLT-Usingxsl%3Ainclude"></a>Using xsl:include</h3>
-<p><b>Camel 1.6.2/2.2 or older</b><br clear="none">
+<p><b>Camel 2.2 or older</b><br clear="none">
 If you use xsl:include in your XSL files then in Camel 2.2 or older it uses the default <tt>javax.xml.transform.URIResolver</tt> which means it can only lookup files from file system, and its does that relative from the JVM starting folder.</p>
 
 <p>For example this include:</p>
@@ -201,7 +201,7 @@ If you use xsl:include in your XSL files
 
 <p>Will lookup the <tt>staff_tempkalte.xsl</tt> file from the starting folder where the application was started.</p>
 
-<p><b>Camel 1.6.3/2.3 or newer</b> <br clear="none">
+<p><b>Camel 2.3 or newer</b> <br clear="none">
 Now Camel provides its own implementation of <tt>URIResolver</tt> which allows Camel to load included files from the classpath and more intelligent than before.</p>
 
 <p>For example this include:</p>

Modified: websites/production/camel/content/xstream.html
==============================================================================
--- websites/production/camel/content/xstream.html (original)
+++ websites/production/camel/content/xstream.html Fri Sep  7 22:36:12 2012
@@ -98,7 +98,7 @@
 4. Use the platform default XMLInputFactory,XMLOutputFactory instance.</p>
 
 <h3><a shape="rect" name="XStream-HowtosettheXMLencodinginXstreamDataFormat%3F"></a>How to set the XML encoding in Xstream DataFormat?</h3>
-<p>From Camel 1.6.3 or Camel 2.2.0, you can set the encoding of XML in Xstream DataFormat by setting the Exchange's property with the key <tt>Exchange.CHARSET_NAME</tt>, or setting the encoding property on Xstream from DSL or Spring config.</p>
+<p>From Camel 2.2.0, you can set the encoding of XML in Xstream DataFormat by setting the Exchange's property with the key <tt>Exchange.CHARSET_NAME</tt>, or setting the encoding property on Xstream from DSL or Spring config.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
 from(<span class="code-quote">"activemq:My.Queue"</span>).
@@ -143,7 +143,7 @@ from(<span class="code-quote">"activemq:
 &lt;dependency&gt;
   &lt;groupId&gt;org.apache.camel&lt;/groupId&gt;
   &lt;artifactId&gt;camel-xstream&lt;/artifactId&gt;
-  &lt;version&gt;1.5.0&lt;/version&gt;
+  &lt;version&gt;x.x.x&lt;/version&gt;
 &lt;/dependency&gt;
 </pre>
 </div></div>