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 2013/04/17 19:21:02 UTC

svn commit: r858847 - in /websites/production/camel/content: bindy.html book-dataformat-appendix.html book-in-one-page.html cache/main.pageCache

Author: buildbot
Date: Wed Apr 17 17:21:01 2013
New Revision: 858847

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/bindy.html
    websites/production/camel/content/book-dataformat-appendix.html
    websites/production/camel/content/book-in-one-page.html
    websites/production/camel/content/cache/main.pageCache

Modified: websites/production/camel/content/bindy.html
==============================================================================
--- websites/production/camel/content/bindy.html (original)
+++ websites/production/camel/content/bindy.html Wed Apr 17 17:21:01 2013
@@ -114,7 +114,7 @@ to/from Java Beans that have binding map
 
 <div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> separator </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be ',' or ';' or 'anything'. This value is interpreted as a regular expression. If you want to use a sign which has a special meaning in regular expressions, e.g. the '|' sign, than you have to mask it, like ' <br clear="none" class="atl-forced-newline">
-|' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFirstLine </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to skip the first line of the CSV file </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC; default value = WINDOWS - allow to define the carriage return character to use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> generateHeaderColumns </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - uses to generate the header columns of the CSV generates </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan
 ="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> quote </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8.3/2.9:</b> option - allow to specify a quote character of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
+|' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFirstLine </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to skip the first line of the CSV file </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC, or custom; default value = WINDOWS - allow to define the carriage return character to use. If you specify a value other than the three listed before, the value you enter (custom) will be used as the CRLF character(s) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> generateHeaderColumns </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - uses to generate the 
 header columns of the CSV generates </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> quote </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8.3/2.9:</b> option - allow to specify a quote character of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
 </div>
 
 
@@ -255,6 +255,17 @@ Remark : In this case, the first and las
 </pre>
 </div></div>
 
+<p>Additionally, if for some reason you need to add a different line ending character, you can opt to specify it using the crlf parameter. In the following example, we can end the line with a comma followed by the newline character:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+@CsvRecord(separator = <span class="code-quote">","</span>, crlf=<span class="code-quote">",\n"</span>)
+<span class="code-keyword">public</span> <span class="code-object">Class</span> Order {
+...
+}
+</pre>
+</div></div>
+
 <p><b>case 8 : isOrdered</b></p>
 
 <p>Sometimes, the order to follow during the creation of the CSV record from the model is different from the order used during the parsing. Then, in this case, we can use the attribute isOrdered = true to indicate this in combination with attribute 'position' of the DataField annotation.</p>
@@ -572,7 +583,7 @@ When the size of the data does not fill 
 
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = WINDOWS - allow to define the carriage return character to use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> paddingChar </td><td colspan="1" rowspan="1" class="confluenceTd"> char </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - default value = '  ' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> length </td><td colspan="1" rowspan="1" class="confluenceTd"> int </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory = size of the fixed length record </td></tr><tr><td colspan="1" row
 span="1" class="confluenceTd"> hasHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Indicates that the record(s) of this type may be preceded by a single header record at the beginning of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> hasFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional -  Indicates that the record(s) of this type may be followed by a single footer record at the end of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the header record.  Configure this parameter on
  the primary record (e.g., not the header or footer). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the footer record Configure this parameter on the primary record (e.g., not the header or footer).. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecord as a header record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecords as a footer r
 ecord </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC, or custom; default value = WINDOWS - allow to define the carriage return character to use. If you specify a value other than the three listed before, the value you enter (custom) will be used as the CRLF character(s)</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> paddingChar </td><td colspan="1" rowspan="1" class="confluenceTd"> char </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - default value = '  ' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> length </td><td colspan="
 1" rowspan="1" class="confluenceTd"> int </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory = size of the fixed length record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> hasHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Indicates that the record(s) of this type may be preceded by a single header record at the beginning of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> hasFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional -  Indicates that the record(s) of this type may be followed by a single footer record at the end of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowsp
 an="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the header record.  Configure this parameter on the primary record (e.g., not the header or footer). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the footer record Configure this parameter on the primary record (e.g., not the header or footer).. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecord as a header record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isFooter </td><td colspan="1" row
 span="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecords as a footer record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
 </div>
 
 
@@ -907,7 +918,7 @@ When the size of the data does not fill 
 
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> pairSeparator </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '=' or ';' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyValuePairSeparair </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '\u0001', '\u0009', '#' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = WINDOWS - allow to define the carriage return chara
 cter to use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> type </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - define the type of message (e.g. FIX, EMX, ...) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> version </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - version of the message (e.g. 4.1) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when FIX message is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation i
 s associated to the message class of the model and must be declared one time. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> pairSeparator </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '=' or ';' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyValuePairSeparair </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '\u0001', '\u0009', '#' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC, or custom; default value = WIND
 OWS - allow to define the carriage return character to use. If you specify a value other than the three listed before, the value you enter (custom) will be used as the CRLF character(s) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> type </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - define the type of message (e.g. FIX, EMX, ...) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> version </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - version of the message (e.g. 4.1) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when FIX message is generated </td></tr><tr><td colspan="
 1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the message class of the model and must be declared one time. </td></tr></tbody></table>
 </div>
 
 

Modified: websites/production/camel/content/book-dataformat-appendix.html
==============================================================================
--- websites/production/camel/content/book-dataformat-appendix.html (original)
+++ websites/production/camel/content/book-dataformat-appendix.html Wed Apr 17 17:21:01 2013
@@ -1352,7 +1352,7 @@ to/from Java Beans that have binding map
 
 <div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> separator </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be ',' or ';' or 'anything'. This value is interpreted as a regular expression. If you want to use a sign which has a special meaning in regular expressions, e.g. the '|' sign, than you have to mask it, like ' <br clear="none" class="atl-forced-newline">
-|' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFirstLine </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to skip the first line of the CSV file </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC; default value = WINDOWS - allow to define the carriage return character to use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> generateHeaderColumns </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - uses to generate the header columns of the CSV generates </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan
 ="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> quote </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8.3/2.9:</b> option - allow to specify a quote character of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
+|' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFirstLine </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to skip the first line of the CSV file </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC, or custom; default value = WINDOWS - allow to define the carriage return character to use. If you specify a value other than the three listed before, the value you enter (custom) will be used as the CRLF character(s) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> generateHeaderColumns </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - uses to generate the 
 header columns of the CSV generates </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> quote </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8.3/2.9:</b> option - allow to specify a quote character of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
 </div>
 
 
@@ -1493,6 +1493,17 @@ Remark : In this case, the first and las
 </pre>
 </div></div>
 
+<p>Additionally, if for some reason you need to add a different line ending character, you can opt to specify it using the crlf parameter. In the following example, we can end the line with a comma followed by the newline character:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+@CsvRecord(separator = <span class="code-quote">","</span>, crlf=<span class="code-quote">",\n"</span>)
+<span class="code-keyword">public</span> <span class="code-object">Class</span> Order {
+...
+}
+</pre>
+</div></div>
+
 <p><b>case 8 : isOrdered</b></p>
 
 <p>Sometimes, the order to follow during the creation of the CSV record from the model is different from the order used during the parsing. Then, in this case, we can use the attribute isOrdered = true to indicate this in combination with attribute 'position' of the DataField annotation.</p>
@@ -1810,7 +1821,7 @@ When the size of the data does not fill 
 
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = WINDOWS - allow to define the carriage return character to use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> paddingChar </td><td colspan="1" rowspan="1" class="confluenceTd"> char </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - default value = '  ' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> length </td><td colspan="1" rowspan="1" class="confluenceTd"> int </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory = size of the fixed length record </td></tr><tr><td colspan="1" row
 span="1" class="confluenceTd"> hasHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Indicates that the record(s) of this type may be preceded by a single header record at the beginning of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> hasFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional -  Indicates that the record(s) of this type may be followed by a single footer record at the end of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the header record.  Configure this parameter on
  the primary record (e.g., not the header or footer). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the footer record Configure this parameter on the primary record (e.g., not the header or footer).. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecord as a header record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecords as a footer r
 ecord </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC, or custom; default value = WINDOWS - allow to define the carriage return character to use. If you specify a value other than the three listed before, the value you enter (custom) will be used as the CRLF character(s)</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> paddingChar </td><td colspan="1" rowspan="1" class="confluenceTd"> char </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - default value = '  ' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> length </td><td colspan="
 1" rowspan="1" class="confluenceTd"> int </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory = size of the fixed length record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> hasHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Indicates that the record(s) of this type may be preceded by a single header record at the beginning of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> hasFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional -  Indicates that the record(s) of this type may be followed by a single footer record at the end of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowsp
 an="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the header record.  Configure this parameter on the primary record (e.g., not the header or footer). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the footer record Configure this parameter on the primary record (e.g., not the header or footer).. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecord as a header record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isFooter </td><td colspan="1" row
 span="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecords as a footer record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
 </div>
 
 
@@ -2145,7 +2156,7 @@ When the size of the data does not fill 
 
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> pairSeparator </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '=' or ';' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyValuePairSeparair </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '\u0001', '\u0009', '#' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = WINDOWS - allow to define the carriage return chara
 cter to use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> type </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - define the type of message (e.g. FIX, EMX, ...) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> version </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - version of the message (e.g. 4.1) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when FIX message is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation i
 s associated to the message class of the model and must be declared one time. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> pairSeparator </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '=' or ';' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyValuePairSeparair </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '\u0001', '\u0009', '#' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC, or custom; default value = WIND
 OWS - allow to define the carriage return character to use. If you specify a value other than the three listed before, the value you enter (custom) will be used as the CRLF character(s) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> type </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - define the type of message (e.g. FIX, EMX, ...) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> version </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - version of the message (e.g. 4.1) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when FIX message is generated </td></tr><tr><td colspan="
 1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the message class of the model and must be declared one time. </td></tr></tbody></table>
 </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 Wed Apr 17 17:21:01 2013
@@ -4604,7 +4604,7 @@ First we need to do the standard scheme 
          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
          http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
          http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-         http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd"&gt;
+         http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"&gt;
 </pre>
 </div></div>
 <p>We use Spring annotations for doing IoC dependencies and its component-scan features comes to the rescue as it scans for spring annotations in the given package name:</p>
@@ -4628,7 +4628,7 @@ Notice that we also have enabled the <a 
 </div></div>
 <p>The ActiveMQ JMS broker is also configured in this xml file. We set it up to listen on TCP port 61610.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag"><span class="code-comment">&lt;!-- lets configure the ActiveMQ JMS broker server to listen on TCP 61610 --&gt;</span></span>
+<pre class="code-xml"><span class="code-tag"><span class="code-comment">&lt;!-- lets configure the ActiveMQ JMS broker server --&gt;</span></span>
 <span class="code-tag">&lt;broker:broker useJmx=<span class="code-quote">"true"</span> persistent=<span class="code-quote">"false"</span> brokerName=<span class="code-quote">"myBroker"</span>&gt;</span>
   <span class="code-tag">&lt;broker:transportConnectors&gt;</span>
     <span class="code-tag"><span class="code-comment">&lt;!-- expose a VM transport for in-JVM transport between AMQ and Camel on the server side --&gt;</span></span>
@@ -4677,8 +4677,10 @@ The server is started with:<br clear="no
 <pre class="code-xml">&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>
        <span class="code-keyword">xmlns:camel</span>=<span class="code-quote">"http://camel.apache.org/schema/spring"</span>
+       <span class="code-keyword">xmlns:context</span>=<span class="code-quote">"http://www.springframework.org/schema/context"</span>
        xsi:schemaLocation="
          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
          http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"&gt;
 </pre>
 </div></div>
@@ -4691,7 +4693,7 @@ The server is started with:<br clear="no
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-xml"><span class="code-tag"><span class="code-comment">&lt;!-- Camel JMSProducer to be able to send messages to a remote Active MQ server --&gt;</span></span>
 <span class="code-tag">&lt;bean id=<span class="code-quote">"jms"</span> class=<span class="code-quote">"org.apache.activemq.camel.component.ActiveMQComponent"</span>&gt;</span>
-  <span class="code-tag">&lt;property name=<span class="code-quote">"brokerURL"</span> value=<span class="code-quote">"tcp://localhost:61610"</span>/&gt;</span>
+  <span class="code-tag">&lt;property name=<span class="code-quote">"brokerURL"</span> value=<span class="code-quote">"tcp://localhost:${tcp.port}"</span>/&gt;</span>
 <span class="code-tag">&lt;/bean&gt;</span>
 </pre>
 </div></div>
@@ -4780,7 +4782,7 @@ The server is started with:<br clear="no
 </span>    <span class="code-comment">// we use the in out pattern <span class="code-keyword">for</span> a <span class="code-keyword">synchronized</span> exchange where we expect a response
 </span>    Exchange exchange = endpoint.createExchange(ExchangePattern.InOut);
     <span class="code-comment">// set the input on the in body
-</span>    <span class="code-comment">// must you correct type to match the expected type of an <span class="code-object">Integer</span> object
+</span>    <span class="code-comment">// must be correct type to match the expected type of an <span class="code-object">Integer</span> object
 </span>    exchange.getIn().setBody(11);
 
     <span class="code-comment">// to send the exchange we need an producer to <span class="code-keyword">do</span> it <span class="code-keyword">for</span> us
@@ -12542,7 +12544,7 @@ to/from Java Beans that have binding map
 
 <div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> separator </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be ',' or ';' or 'anything'. This value is interpreted as a regular expression. If you want to use a sign which has a special meaning in regular expressions, e.g. the '|' sign, than you have to mask it, like ' <br clear="none" class="atl-forced-newline">
-|' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFirstLine </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to skip the first line of the CSV file </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC; default value = WINDOWS - allow to define the carriage return character to use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> generateHeaderColumns </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - uses to generate the header columns of the CSV generates </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan
 ="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> quote </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8.3/2.9:</b> option - allow to specify a quote character of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
+|' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFirstLine </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to skip the first line of the CSV file </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC, or custom; default value = WINDOWS - allow to define the carriage return character to use. If you specify a value other than the three listed before, the value you enter (custom) will be used as the CRLF character(s) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> generateHeaderColumns </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - uses to generate the 
 header columns of the CSV generates </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> quote </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8.3/2.9:</b> option - allow to specify a quote character of the fields when CSV is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
 </div>
 
 
@@ -12683,6 +12685,17 @@ Remark : In this case, the first and las
 </pre>
 </div></div>
 
+<p>Additionally, if for some reason you need to add a different line ending character, you can opt to specify it using the crlf parameter. In the following example, we can end the line with a comma followed by the newline character:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+@CsvRecord(separator = <span class="code-quote">","</span>, crlf=<span class="code-quote">",\n"</span>)
+<span class="code-keyword">public</span> <span class="code-object">Class</span> Order {
+...
+}
+</pre>
+</div></div>
+
 <p><b>case 8 : isOrdered</b></p>
 
 <p>Sometimes, the order to follow during the creation of the CSV record from the model is different from the order used during the parsing. Then, in this case, we can use the attribute isOrdered = true to indicate this in combination with attribute 'position' of the DataField annotation.</p>
@@ -13000,7 +13013,7 @@ When the size of the data does not fill 
 
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = WINDOWS - allow to define the carriage return character to use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> paddingChar </td><td colspan="1" rowspan="1" class="confluenceTd"> char </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - default value = '  ' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> length </td><td colspan="1" rowspan="1" class="confluenceTd"> int </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory = size of the fixed length record </td></tr><tr><td colspan="1" row
 span="1" class="confluenceTd"> hasHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Indicates that the record(s) of this type may be preceded by a single header record at the beginning of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> hasFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional -  Indicates that the record(s) of this type may be followed by a single footer record at the end of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the header record.  Configure this parameter on
  the primary record (e.g., not the header or footer). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the footer record Configure this parameter on the primary record (e.g., not the header or footer).. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecord as a header record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecords as a footer r
 ecord </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC, or custom; default value = WINDOWS - allow to define the carriage return character to use. If you specify a value other than the three listed before, the value you enter (custom) will be used as the CRLF character(s)</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> paddingChar </td><td colspan="1" rowspan="1" class="confluenceTd"> char </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - default value = '  ' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> length </td><td colspan="
 1" rowspan="1" class="confluenceTd"> int </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory = size of the fixed length record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> hasHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Indicates that the record(s) of this type may be preceded by a single header record at the beginning of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> hasFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional -  Indicates that the record(s) of this type may be followed by a single footer record at the end of the file / stream </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowsp
 an="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the header record.  Configure this parameter on the primary record (e.g., not the header or footer). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> skipFooter </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Configures the data format to skip marshalling / unmarshalling of the footer record Configure this parameter on the primary record (e.g., not the header or footer).. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isHeader </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecord as a header record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isFooter </td><td colspan="1" row
 span="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11</b> - optional - Identifies this FixedLengthRecords as a footer record </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the root class of the model and must be declared one time. </td></tr></tbody></table>
 </div>
 
 
@@ -13335,7 +13348,7 @@ When the size of the data does not fill 
 
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> pairSeparator </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '=' or ';' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyValuePairSeparair </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '\u0001', '\u0009', '#' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = WINDOWS - allow to define the carriage return chara
 cter to use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> type </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - define the type of message (e.g. FIX, EMX, ...) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> version </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - version of the message (e.g. 4.1) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when FIX message is generated </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation i
 s associated to the message class of the model and must be declared one time. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter name </th><th colspan="1" rowspan="1" class="confluenceTh"> type </th><th colspan="1" rowspan="1" class="confluenceTh"> Info </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> pairSeparator </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '=' or ';' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyValuePairSeparair </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> mandatory - can be '\u0001', '\u0009', '#' or 'anything' </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> crlf </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - possible values = WINDOWS,UNIX,MAC, or custom; default value = WIND
 OWS - allow to define the carriage return character to use. If you specify a value other than the three listed before, the value you enter (custom) will be used as the CRLF character(s) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> type </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - define the type of message (e.g. FIX, EMX, ...) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> version </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - version of the message (e.g. 4.1) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> isOrdered </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> optional - default value = false - allow to change the order of the fields when FIX message is generated </td></tr><tr><td colspan="
 1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> This annotation is associated to the message class of the model and must be declared one time. </td></tr></tbody></table>
 </div>
 
 
@@ -36008,7 +36021,9 @@ Use the <tt>Web.xml</tt> file to publish
 <pre class="code-java">from(<span class="code-quote">"servlet:<span class="code-comment">///hello?matchOnUriPrefix=<span class="code-keyword">true</span>"</span>).process(<span class="code-keyword">new</span> Processor() {
 </span>    <span class="code-keyword">public</span> void process(Exchange exchange) <span class="code-keyword">throws</span> Exception {
         <span class="code-object">String</span> contentType = exchange.getIn().getHeader(Exchange.CONTENT_TYPE, <span class="code-object">String</span>.class);
-        <span class="code-object">String</span> path = exchange.getIn().getHeader(Exchange.HTTP_PATH, <span class="code-object">String</span>.class);
+        <span class="code-object">String</span> path = exchange.getIn().getHeader(Exchange.HTTP_URI, <span class="code-object">String</span>.class);
+        path = path.substring(path.lastIndexOf(<span class="code-quote">"/"</span>));
+
         assertEquals(<span class="code-quote">"Get a wrong content type"</span>, CONTENT_TYPE, contentType);
         <span class="code-comment">// <span class="code-keyword">assert</span> camel http header
 </span>        <span class="code-object">String</span> charsetEncoding = exchange.getIn().getHeader(Exchange.HTTP_CHARACTER_ENCODING, <span class="code-object">String</span>.class);

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