Modified: websites/production/camel/content/book-cookbook.html
==============================================================================
--- websites/production/camel/content/book-cookbook.html (original)
+++ websites/production/camel/content/book-cookbook.html Thu Sep 14 19:25:46
2017
@@ -199,7 +199,7 @@ public class MySimpleIdGenerator {
<p>And finally we just need to remember to have our bean registered in the
Spring <a shape="rect" href="registry.html">Registry</a>:</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<bean id="myCorrelationIdGenerator"
class="com.mycompany.MySimpleIdGenerator"/>
]]></script>
</div></div>
@@ -271,7 +271,7 @@ public class MySimpleIdGenerator {
<p>For example to inject a bean named foo, you can enlist the bean in the <a
shape="rect" href="registry.html">Registry</a> such as in a Spring XML file:</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<bean id="foo" class="com.foo.MyFooBean"/>
]]></script>
</div></div>
@@ -451,7 +451,7 @@ public class MySimpleIdGenerator {
<p>And finally we just need to remember to have our bean registered in the
Spring <a shape="rect" href="registry.html">Registry</a>:</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<bean id="myCorrelationIdGenerator"
class="com.mycompany.MySimpleIdGenerator"/>
]]></script>
</div></div>
@@ -512,7 +512,7 @@ from(uri).bean(theBean, "methodName
<p>The consumer above will only be created for the <a shape="rect"
href="camelcontext.html">CamelContext</a> that have the context id =
<code>camel-1</code>. You set this id in the XML tag:</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<camelContext id="camel-1" ...>
]]></script>
</div></div>
@@ -577,7 +577,7 @@ public class MyService {
<p>If you define the bean in Spring XML or Blueprint, then you can configure
the property as follows:</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<bean id="myService" class="com.foo.MyService">
<property name="serviceEndpoint"
value="activemq:queue:foo"/>
</bean>
@@ -674,7 +674,7 @@ public class RouterBean {
<p>For example if the above bean is configured in <a shape="rect"
href="spring.html">Spring</a> when using a
<strong><camelContext></strong> element as follows</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -1110,7 +1110,7 @@ public class MyCamelTest extends Abstrac
<p>Maven users will need to add the following dependency to their
<code>pom.xml</code> for this component:</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-guice</artifactId>
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 Thu Sep 14
19:25:46 2017
@@ -259,7 +259,7 @@ from("activemq:My.Queue").
<p>If you use maven you could just add the following to your pom.xml,
substituting the version number for the latest & greatest release (see <a
shape="rect" href="download.html">the download page for the latest
versions</a>).</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xmlbeans</artifactId>
@@ -367,7 +367,7 @@ from("direct:start")
.marshal(new CsvDataFormat().setDelimiter('|'))
.to("mock:result")]]></script>
</div></div></td></tr><tr><td colspan="1" rowspan="1"
class="confluenceTd"><span>or this XML route definition</span></td><td
colspan="1" rowspan="1" class="confluenceTd"><div class="code panel pdl"
style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<route>
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<route>
<from uri="direct:start" />
<marshal>
<csv delimiter="|" />
@@ -377,7 +377,7 @@ from("direct:start")
</div></div></td></tr><tr><td colspan="1" rowspan="1"
class="confluenceTd"><span>then it will produce</span></td><td colspan="1"
rowspan="1" class="confluenceTd"><div class="code panel pdl"
style="border-width: 1px;"><div class="codeContent panelContent pdl">
<script class="brush: text; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[abc|123]]></script>
</div></div></td></tr></tbody></table></div><h3
id="BookDataFormatAppendix-UsingautogenColumns,configRefandstrategyRefattributesinsideXMLDSL">Using
autogenColumns, configRef and strategyRef attributes inside XML
DSL</h3><p><strong>Available as of Camel 2.9.2 / 2.10 and deleted for Camel
2.15</strong></p><p>You can customize the CSV <a shape="rect"
href="data-format.html">Data Format</a> to make use of your own
<code>CSVConfig</code> and/or <code>CSVStrategy</code>. Also note that the
default value of the <code>autogenColumns</code> option is true. The following
example should illustrate this customization.</p><div class="code panel pdl"
style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<route>
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<route>
<from uri="direct:start" />
<marshal>
<!-- make use of a strategy other than the default one which is
'org.apache.commons.csv.CSVStrategy.DEFAULT_STRATEGY' -->
@@ -405,7 +405,7 @@ from("direct:start")
</bean>
]]></script>
</div></div><h3
id="BookDataFormatAppendix-UsingskipFirstLineoptionwhileunmarshaling">Using
skipFirstLine option while unmarshaling</h3><p><strong>Available as of Camel
2.10 and deleted for Camel 2.15</strong></p><p>You can instruct the CSV <a
shape="rect" href="data-format.html">Data Format</a> to skip the first line
which contains the CSV headers. Using the Spring/XML DSL:</p><div class="code
panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<route>
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<route>
<from uri="direct:start" />
<unmarshal>
<csv skipFirstLine="true" />
@@ -422,7 +422,7 @@ from("direct:start")
.to("bean:myCsvHandler?method=doHandleCsv");
]]></script>
</div></div><h3
id="BookDataFormatAppendix-Unmarshalingwithapipeasdelimiter">Unmarshaling with
a pipe as delimiter</h3><p>Using the Spring/XML DSL:</p><div class="code panel
pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<route>
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<route>
<from uri="direct:start" />
<unmarshal>
<csv delimiter="|" />
@@ -1643,7 +1643,7 @@ context.addRoutes(new RouteBuilder() {
}
]]></script>
</div></div><h5 id="BookDataFormatAppendix-SpringXML">Spring XML</h5><p>A
namespace prefix that is defined as part of the <code>camelContext</code>
definition can be re-used in context within the data format
<code>secureTag</code> attribute of the <code>secureXML</code> element.</p><div
class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<camelContext
id="springXmlSecurityDataFormatTestCamelContext"
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<camelContext
id="springXmlSecurityDataFormatTestCamelContext"
xmlns="http://camel.apache.org/schema/spring"
xmlns:cheese="http://cheese.xmlsecurity.camel.apache.org/">
<route>
@@ -1655,7 +1655,7 @@ context.addRoutes(new RouteBuilder() {
...
]]></script>
</div></div><h4 id="BookDataFormatAppendix-AsymmetricKeyEncryption">Asymmetric
Key Encryption</h4><h5 id="BookDataFormatAppendix-SpringXMLSender">Spring XML
Sender</h5><div class="code panel pdl" style="border-width: 1px;"><div
class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<!-- trust store configuration -->
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<!-- trust store configuration -->
<camel:keyStoreParameters id="trustStoreParams"
resource="./sender.ts" password="password"/>
<camelContext id="springXmlSecurityDataFormatTestCamelContext"
@@ -1674,7 +1674,7 @@ context.addRoutes(new RouteBuilder() {
...
]]></script>
</div></div><h5 id="BookDataFormatAppendix-SpringXMLRecipient">Spring XML
Recipient</h5><div class="code panel pdl" style="border-width: 1px;"><div
class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<!-- key store configuration -->
<camel:keyStoreParameters id="keyStoreParams"
resource="./recipient.ks" password="password" />
@@ -2019,7 +2019,7 @@ from("direct:start")
<p>When using XML DSL there is a version attribute you can set on the
<soapjaxb> element.</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<!-- Defining a ServiceInterfaceStrategy for retrieving the element
name when marshalling -->
<bean id="myNameStrategy"
class="org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy">
<constructor-arg
value="com.example.customerservice.CustomerService"/>
@@ -2030,7 +2030,7 @@ from("direct:start")
<p>And in the Camel route</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<route>
<from uri="direct:start"/>
<marshal>
@@ -2157,7 +2157,7 @@ from("jms://queue:customerServiceQu
<p>To use the SOAP dataformat in your camel routes you need to add the
following dependency to your pom.</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-soap</artifactId>
@@ -2232,7 +2232,7 @@ from("direct:start")
</dependency>
</plain-text-body><h3 id="BookDataFormatAppendix-SeeAlso">See
Also</h3><ul><li><a shape="rect" href="data-format.html">Data
Format</a></li><li><a shape="rect" href="crypto-digital-signatures.html">Crypto
(Digital Signatures)</a></li><li><a shape="rect" class="external-link"
href="http://www.bouncycastle.org/java.html";
rel="nofollow">http://www.bouncycastle.org/java.html</a></li></ul>
<h2 id="BookDataFormatAppendix-SyslogDataFormat">Syslog
DataFormat</h2><p><strong>Available as of Camel 2.6</strong></p><p>The
<strong>syslog</strong> dataformat is used for working with <a shape="rect"
class="external-link" href="http://www.ietf.org/rfc/rfc3164.txt";
rel="nofollow">RFC3164</a> and RFC5424 messages.</p><p>This component
supports the following:</p><ul class="alternate"><li>UDP consumption of syslog
messages</li><li>Agnostic data format using either plain String objects or
SyslogMessage model objects.</li><li><a shape="rect"
href="type-converter.html">Type Converter</a> from/to SyslogMessage and
String</li><li>Integration with the <a shape="rect"
href="mina.html">camel-mina</a> component.</li><li>Integration with the <a
shape="rect" href="netty.html">camel-netty</a> component.</li><li><strong>Camel
2.14:</strong> Encoder and decoder for the <a shape="rect"
href="netty.html">camel-netty</a> component.</li><li><strong>Camel
2.14:</strong> Support for
RFC5424 also.</li></ul><p>Maven users will need to add the following
dependency to their <code>pom.xml</code> for this component:</p><div
class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<dependency>
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-syslog</artifactId>
<version>x.x.x</version>
@@ -2240,7 +2240,7 @@ from("direct:start")
</dependency>
]]></script>
</div></div><h3 id="BookDataFormatAppendix-RFC3164Syslogprotocol">RFC3164
Syslog protocol</h3><p>Syslog uses the user datagram protocol (UDP) <a
shape="rect" class="unresolved" href="#">1</a> as its underlying transport
layer mechanism. <br clear="none"> The UDP port that has been assigned to
syslog is 514.</p><p>To expose a Syslog listener service we reuse the existing
<a shape="rect" href="mina.html">camel-mina</a> component or <a shape="rect"
href="netty.html">camel-netty</a> where we just use the
<code>Rfc3164SyslogDataFormat</code> to marshal and unmarshal messages. Notice
that from <strong>Camel 2.14</strong> onwards the syslog dataformat is
renamed to <code>SyslogDataFormat</code>.</p><h3
id="BookDataFormatAppendix-RFC5424Syslogprotocol">RFC5424 Syslog
protocol</h3><p><strong>Available as of Camel 2.14</strong></p><p>To expose a
Syslog listener service we reuse the existing <a shape="rect"
href="mina.html">camel-mina</a> component or <a shape="rect" href="
netty.html">camel-netty</a> where we just use
the <code>SyslogDataFormat</code> to marshal and unmarshal
messages</p><h4 id="BookDataFormatAppendix-ExposingaSysloglistener">Exposing a
Syslog listener</h4><p>In our Spring XML file, we configure an endpoint to
listen for udp messages on port 10514, note that in netty we disable the
defaultCodec, this <br clear="none"> will allow a fallback to a
NettyTypeConverter and delivers the message as an InputStream:</p><div
class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<camelContext id="myCamel"
xmlns="http://camel.apache.org/schema/spring">
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<camelContext id="myCamel"
xmlns="http://camel.apache.org/schema/spring">
<dataFormats>
<syslog id="mySyslog"/>
@@ -2255,7 +2255,7 @@ from("direct:start")
</camelContext>
]]></script>
</div></div><p>The same route using <a shape="rect"
href="mina.html">camel-mina</a></p><div class="code panel pdl"
style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<camelContext id="myCamel"
xmlns="http://camel.apache.org/schema/spring">
+<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[<camelContext id="myCamel"
xmlns="http://camel.apache.org/schema/spring">
<dataFormats>
<syslog id="mySyslog"/>
@@ -2270,7 +2270,7 @@ from("direct:start")
</camelContext>
]]></script>
</div></div><h4
id="BookDataFormatAppendix-Sendingsyslogmessagestoaremotedestination">Sending
syslog messages to a remote destination</h4><div class="code panel pdl"
style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default"
type="syntaxhighlighter"><