You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2013/12/16 21:05:18 UTC
svn commit: r890614 [1/4] - in /websites/production/camel/content: ./ cache/
Author: dkulp
Date: Mon Dec 16 20:05:17 2013
New Revision: 890614
Log:
UPdate some pages
Modified:
websites/production/camel/content/avro.html
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-cookbook.html
websites/production/camel/content/book-dataformat-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/book-pattern-appendix.html
websites/production/camel/content/book-tutorials.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2112-release.html
websites/production/camel/content/camel-2122-release.html
websites/production/camel/content/camel-30-ideas.html
websites/production/camel/content/camel-jmx.html
websites/production/camel/content/cxf.html
websites/production/camel/content/disruptor.html
websites/production/camel/content/download.html
websites/production/camel/content/http.html
websites/production/camel/content/json.html
websites/production/camel/content/jt400.html
websites/production/camel/content/recipient-list.html
websites/production/camel/content/scala-dsl-eip.html
websites/production/camel/content/siteindex.html
websites/production/camel/content/spring-testing.html
websites/production/camel/content/tutorial-axis-camel.html
websites/production/camel/content/tutorial-jmsremoting.html
websites/production/camel/content/tutorial-osgi-camel-part2c.html
websites/production/camel/content/user-guide.html
websites/production/camel/content/zip-dataformat.html
websites/production/camel/content/zip-file-dataformat.html
Modified: websites/production/camel/content/avro.html
==============================================================================
--- websites/production/camel/content/avro.html (original)
+++ websites/production/camel/content/avro.html Mon Dec 16 20:05:17 2013
@@ -253,11 +253,11 @@ avro:[transport]:[host]:[port][/messageN
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-Â Â Â Â <route>
-Â Â Â Â Â Â <from uri="direct:start"/>
-Â Â Â Â Â Â <to uri="avro:http:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
-Â Â Â Â Â Â <to uri="log:avro"/>
-Â Â Â Â </route>
+Ê Ê Ê Ê <route>
+Ê Ê Ê Ê Ê Ê <from uri="direct:start"/>
+Ê Ê Ê Ê Ê Ê <to uri="avro:http:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
+Ê Ê Ê Ê Ê Ê <to uri="log:avro"/>
+Ê Ê Ê Ê </route>
]]></script>
</div></div>
<p>An example of consuming messages using camel avro consumers via netty:</p>
Modified: websites/production/camel/content/book-component-appendix.html
==============================================================================
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Mon Dec 16 20:05:17 2013
@@ -1930,11 +1930,11 @@ template.send("direct:alias-verify&
<p>The <strong>cxf:</strong> component provides integration with <a shape="rect" href="http://cxf.apache.org">Apache CXF</a> for connecting to JAX-WS services hosted in CXF.</p>
<style type="text/css">/*<![CDATA[*/
-div.rbtoc1387214478844 {padding: 0px;}
-div.rbtoc1387214478844 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1387214478844 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1387223939589 {padding: 0px;}
+div.rbtoc1387223939589 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1387223939589 li {margin-left: 0px;padding-left: 0px;}
-/*]]>*/</style><div class="toc-macro rbtoc1387214478844">
+/*]]>*/</style><div class="toc-macro rbtoc1387223939589">
<ul class="toc-indentation"><li><a shape="rect" href="#CXF-CXFComponent">CXF Component</a>
<ul class="toc-indentation"><li><a shape="rect" href="#CXF-URIformat">URI format</a></li><li><a shape="rect" href="#CXF-Options">Options</a>
<ul class="toc-indentation"><li><a shape="rect" href="#CXF-Thedescriptionsofthedataformats">The descriptions of the dataformats</a>
@@ -7812,9 +7812,9 @@ ProtocolSocketFactory factory =
Protocol.registerProtocol("https",
new Protocol(
-Â Â Â Â Â Â Â "https",
-Â Â Â Â Â Â Â factory,
-Â Â Â Â Â Â Â 443));
+ÊÊÊÊÊÊÊ "https",
+ÊÊÊÊÊÊÊ factory,
+ÊÊÊÊÊÊÊ 443));
from("direct:start")
.to("https://mail.google.com/mail/").to("mock:results");
@@ -10695,7 +10695,7 @@ public class Jt400RouteBuilder extends R
public class Jt400RouteBuilder extends RouteBuilder {
@Override
public void configure() throws Exception {
- from("direct:work").to("jt400://GRUPO:ATWORK@server/QSYS.LIB/assets.LIB/compute.PGM?fieldsLength=10,10,512&ouputFieldsIdx=2,3").to(âdirect:playâ);
+ from("direct:work").to("jt400://GRUPO:ATWORK@server/QSYS.LIB/assets.LIB/compute.PGM?fieldsLength=10,10,512&ouputFieldsIdx=2,3").to(Òdirect:playÓ);
}
}
]]></script>
Modified: websites/production/camel/content/book-cookbook.html
==============================================================================
--- websites/production/camel/content/book-cookbook.html (original)
+++ websites/production/camel/content/book-cookbook.html Mon Dec 16 20:05:17 2013
@@ -2603,22 +2603,22 @@ public class FilterTest extends Abstract
@ContextConfiguration
public class MyCamelTest {
-Â Â @Autowired
-Â Â protected CamelContext camelContext;
+Ê Ê @Autowired
+Ê Ê protected CamelContext camelContext;
-Â Â @EndpointInject(uri = "mock:foo")
-Â Â protected MockEndpoint foo;
+Ê Ê @EndpointInject(uri = "mock:foo")
+Ê Ê protected MockEndpoint foo;
@Test
@DirtiesContext
-Â Â public void testMocksAreValid() throws Exception {
- ...   Â
+Ê Ê public void testMocksAreValid() throws Exception {
+ ...Ê Ê Ê Ê
-Â Â Â Â foo.message(0).header("bar").isEqualTo("ABC");
+Ê Ê Ê Ê foo.message(0).header("bar").isEqualTo("ABC");
-Â Â Â Â MockEndpoint.assertIsSatisfied(camelContext);
-Â Â }
+Ê Ê Ê Ê MockEndpoint.assertIsSatisfied(camelContext);
+Ê Ê }
}
]]></script>
</div></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 Mon Dec 16 20:05:17 2013
@@ -40,6 +40,7 @@
<link href='http://camel.apache.org/styles/highlighter/styles/shThemeCamel.css' rel='stylesheet' type='text/css' />
<script src='http://camel.apache.org/styles/highlighter/scripts/shCore.js' type='text/javascript'></script>
<script src='http://camel.apache.org/styles/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+ <script src='http://camel.apache.org/styles/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
<script src='http://camel.apache.org/styles/highlighter/scripts/shBrushPlain.js' type='text/javascript'></script>
<script type="text/javascript">
@@ -1031,83 +1032,46 @@ from("seda:people").marshal(df
</dependency>
]]></script>
</div></div>
-<h2 id="BookDataFormatAppendix-JSON">JSON</h2>
-<p>JSON is a <a shape="rect" href="data-format.html">Data Format</a> to marshal and unmarshal Java objects to and from <a shape="rect" class="external-link" href="http://www.json.org/" rel="nofollow">JSON</a>. </p>
-
-<p>For JSON to object marshalling, Camel provides integration with three popular JSON libraries:</p>
-<ul class="alternate"><li>The <a shape="rect" class="external-link" href="http://xstream.codehaus.org/" rel="nofollow">XStream library</a> and <a shape="rect" class="external-link" href="http://jettison.codehaus.org/" rel="nofollow">Jettsion </a></li><li>The <a shape="rect" class="external-link" href="http://xircles.codehaus.org/projects/jackson" rel="nofollow">Jackson library</a></li><li><strong>Camel 2.10:</strong> The <a shape="rect" class="external-link" href="http://code.google.com/p/google-gson/" rel="nofollow">GSon library</a></li></ul>
-
-
-<p>By default Camel uses the XStream library. </p>
-
- <div class="aui-message success shadowed information-macro">
+<h2 id="BookDataFormatAppendix-JSON">JSON</h2><p>JSON is a <a shape="rect" href="data-format.html">Data Format</a> to marshal and unmarshal Java objects to and from <a shape="rect" class="external-link" href="http://www.json.org/" rel="nofollow">JSON</a>.</p><p>For JSON to object marshalling, Camel provides integration with three popular JSON libraries:</p><ul class="alternate"><li>The <a shape="rect" class="external-link" href="http://xstream.codehaus.org/" rel="nofollow">XStream library</a> and <a shape="rect" class="external-link" href="http://jettison.codehaus.org/" rel="nofollow">Jettsion </a></li><li>The <a shape="rect" class="external-link" href="http://xircles.codehaus.org/projects/jackson" rel="nofollow">Jackson library</a></li><li><strong>Camel 2.10:</strong> The <a shape="rect" class="external-link" href="http://code.google.com/p/google-gson/" rel="nofollow">GSon library</a></li></ul><p>By default Camel uses the XStream library.</p> <div class="aui-message success shad
owed information-macro">
<p class="title">Direct, bi-directional JSON <=> XML conversions</p>
<span class="aui-icon icon-success">Icon</span>
<div class="message-content">
-
-<p>As of Camel 2.10, Camel supports direct, bi-directional JSON <=> XML conversions via the <a shape="rect" href="xmljson.html">camel-xmljson</a> data format, which is documented separately.</p>
+ <p>As of Camel 2.10, Camel supports direct, bi-directional JSON <=> XML conversions via the <a shape="rect" href="xmljson.html">camel-xmljson</a> data format, which is documented separately.</p>
</div>
</div>
-
-
-<h3 id="BookDataFormatAppendix-UsingJSONdataformatwiththeXStreamlibrary">Using JSON data format with the XStream library</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-// lets turn Object messages into json then send to MQSeries
+<h3 id="BookDataFormatAppendix-UsingJSONdataformatwiththeXStreamlibrary">Using JSON data format with the XStream library</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[// lets turn Object messages into json then send to MQSeries
from("activemq:My.Queue").
marshal().json().
to("mqseries:Another.Queue");
]]></script>
-</div></div>
-
-<h3 id="BookDataFormatAppendix-UsingJSONdataformatwiththeJacksonlibrary">Using JSON data format with the Jackson library</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-// lets turn Object messages into json then send to MQSeries
+</div></div><h3 id="BookDataFormatAppendix-UsingJSONdataformatwiththeJacksonlibrary">Using JSON data format with the Jackson library</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[// lets turn Object messages into json then send to MQSeries
from("activemq:My.Queue").
marshal().json(JsonLibrary.Jackson).
to("mqseries:Another.Queue");
]]></script>
-</div></div>
-
-<h3 id="BookDataFormatAppendix-UsingJSONdataformatwiththeGSONlibrary">Using JSON data format with the GSON library</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-// lets turn Object messages into json then send to MQSeries
+</div></div><h3 id="BookDataFormatAppendix-UsingJSONdataformatwiththeGSONlibrary">Using JSON data format with the GSON library</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[// lets turn Object messages into json then send to MQSeries
from("activemq:My.Queue").
marshal().json(JsonLibrary.Gson).
to("mqseries:Another.Queue");
]]></script>
-</div></div>
-
-
-<h4 id="BookDataFormatAppendix-UsingJSONinSpringDSL">Using JSON in Spring DSL</h4>
-<p>When using <a shape="rect" href="data-format.html">Data Format</a> in Spring DSL you need to declare the data formats first. This is done in the <strong>DataFormats</strong> XML tag.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
- <dataFormats>
+</div></div><h4 id="BookDataFormatAppendix-UsingJSONinSpringDSL">Using JSON in Spring DSL</h4><p>When using <a shape="rect" href="data-format.html">Data Format</a> in Spring DSL you need to declare the data formats first. This is done in the <strong>DataFormats</strong> XML tag.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ <dataFormats>
<!-- here we define a Json data format with the id jack and that it should use the TestPojo as the class type when
doing unmarshal. The unmarshalTypeName is optional, if not provided Camel will use a Map as the type -->
<json id="jack" library="Jackson" unmarshalTypeName="org.apache.camel.component.jackson.TestPojo"/>
</dataFormats>
]]></script>
-</div></div>
-
-<p>And then you can refer to this id in the route:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
- <route>
+</div></div><p>And then you can refer to this id in the route:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ <route>
<from uri="direct:back"/>
<unmarshal ref="jack"/>
<to uri="mock:reverse"/>
</route>
]]></script>
-</div></div>
-
-<h3 id="BookDataFormatAppendix-ExcludingPOJOfieldsfrommarshalling">Excluding POJO fields from marshalling</h3>
-<p><strong>As of Camel 2.10</strong><br clear="none">
-When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use <a shape="rect" class="external-link" href="http://wiki.fasterxml.com/JacksonJsonViews" rel="nofollow">JSON views</a> to accomplish this. First create one or more marker classes.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><h3 id="BookDataFormatAppendix-ExcludingPOJOfieldsfrommarshalling">Excluding POJO fields from marshalling</h3><p><strong>As of Camel 2.10</strong><br clear="none"> When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use <a shape="rect" class="external-link" href="http://wiki.fasterxml.com/JacksonJsonViews" rel="nofollow">JSON views</a> to accomplish this. First create one or more marker classes.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
public class Views {
@@ -1115,10 +1079,7 @@ public class Views {
static class Age { }
}
]]></script>
-</div></div>
-
-<p>Use the marker classes with the <code>@JsonView</code> annotation to include/exclude certain fields. The annotation also works on getters.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>Use the marker classes with the <code>@JsonView</code> annotation to include/exclude certain fields. The annotation also works on getters.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
@JsonView(Views.Age.class)
private int age = 30;
@@ -1128,25 +1089,15 @@ private int height = 190;
@JsonView(Views.Weight.class)
private int weight = 70;
]]></script>
-</div></div>
-
-<p>Finally use the Camel <code>JacksonDataFormat</code> to marshall the above POJO to JSON.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>Finally use the Camel <code>JacksonDataFormat</code> to marshall the above POJO to JSON.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
JacksonDataFormat ageViewFormat = new JacksonDataFormat(TestPojoView.class, Views.Age.class);
from("direct:inPojoAgeView").marshal(ageViewFormat);
]]></script>
-</div></div>
-
-<p>Note that the weight field is missing in the resulting JSON:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-{"age":30, "height":190}
+</div></div><p>Note that the weight field is missing in the resulting JSON:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[{"age":30, "height":190}
]]></script>
-</div></div>
-
-<p>The GSON library supports a similar feature through the notion of <a shape="rect" class="external-link" href="http://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/ExclusionStrategy.html" rel="nofollow">ExclusionStrategies</a>:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>The GSON library supports a similar feature through the notion of <a shape="rect" class="external-link" href="http://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/ExclusionStrategy.html" rel="nofollow">ExclusionStrategies</a>:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
/**
* Strategy to exclude {@link ExcludeAge} annotated fields
@@ -1164,38 +1115,20 @@ protected static class AgeExclusionStrat
}
}
]]></script>
-</div></div>
-
-<p>The <code>GsonDataFormat</code> accepts an <code>ExclusionStrategy</code> in its constructor:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>The <code>GsonDataFormat</code> accepts an <code>ExclusionStrategy</code> in its constructor:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
GsonDataFormat ageExclusionFormat = new GsonDataFormat(TestPojoExclusion.class, new AgeExclusionStrategy());
from("direct:inPojoExcludeAge").marshal(ageExclusionFormat);
]]></script>
-</div></div>
-<p>The line above will exclude fields annotated with <code>@ExcludeAge</code> when marshalling to JSON.</p>
-
-
-<h3 id="BookDataFormatAppendix-Configuringfieldnamingpolicy">Configuring field naming policy</h3>
-<p><strong>Available as of Camel 2.11</strong></p>
-
-<p>The GSON library supports specifying policies and strategies for mapping from json to POJO fields. A common naming convention is to map json fields using lower case with underscores. </p>
-
-<p>We may have this JSON string</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-{
+</div></div><p>The line above will exclude fields annotated with <code>@ExcludeAge</code> when marshalling to JSON.</p><h3 id="BookDataFormatAppendix-Configuringfieldnamingpolicy">Configuring field naming policy</h3><p><strong>Available as of Camel 2.11</strong></p><p>The GSON library supports specifying policies and strategies for mapping from json to POJO fields. A common naming convention is to map json fields using lower case with underscores.</p><p>We may have this JSON string</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[{
"id" : 123,
"first_name" : "Donald"
"last_name" : "Duck"
}
]]></script>
-</div></div>
-
-<p>Which we want to map to a POJO that has getter/setters as</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-public class PersonPojo {
+</div></div><p>Which we want to map to a POJO that has getter/setters as</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>PersonPojo.java</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[public class PersonPojo {
private int id;
private String firstName;
@@ -1226,13 +1159,8 @@ public class PersonPojo {
}
}
]]></script>
-</div></div>
-
-<p>Then we can configure the <code>org.apache.camel.component.gson.GsonDataFormat</code> in a Spring XML files as shown below. Notice we use <code>fieldNamingPolicy</code> property to set the field mapping. This property is an enum from GSon <code>com.google.gson.FieldNamingPolicy</code> which has a number of pre defined mappings. If you need full control you can use the property <code>FieldNamingStrategy</code> and implement a custom <code>com.google.gson.FieldNamingStrategy</code> where you can control the mapping.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
- <!-- define the gson data format, where we configure the data format using the properties -->
+</div></div><p>Then we can configure the <code>org.apache.camel.component.gson.GsonDataFormat</code> in a Spring XML files as shown below. Notice we use <code>fieldNamingPolicy</code> property to set the field mapping. This property is an enum from GSon <code>com.google.gson.FieldNamingPolicy</code> which has a number of pre defined mappings. If you need full control you can use the property <code>FieldNamingStrategy</code> and implement a custom <code>com.google.gson.FieldNamingStrategy</code> where you can control the mapping.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Configuring GsonDataFromat in Spring XML file</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ <!-- define the gson data format, where we configure the data format using the properties -->
<bean id="gson" class="org.apache.camel.component.gson.GsonDataFormat">
<!-- we want to unmarshal to person pojo -->
<property name="unmarshalType" value="org.apache.camel.component.gson.PersonPojo"/>
@@ -1240,12 +1168,8 @@ public class PersonPojo {
<property name="fieldNamingPolicy" value="LOWER_CASE_WITH_UNDERSCORES"/>
</bean>
]]></script>
-</div></div>
-
-<p>And use it in Camel routes by referring to its bean id as shown:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
- <camelContext xmlns="http://camel.apache.org/schema/spring">
+</div></div><p>And use it in Camel routes by referring to its bean id as shown:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Using gson from Camel Routes</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ <camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:inPojo"/>
@@ -1259,83 +1183,37 @@ public class PersonPojo {
</camelContext>
]]></script>
-</div></div>
-
-
-<h3 id="BookDataFormatAppendix-Include/ExcludefieldsusingthejsonViewattributewithJacksonDataFormat">Include/Exclude fields using the <code>jsonView</code> attribute with <code>JacksonDataFormat</code></h3>
-<p><strong>Available as of Camel 2.12</strong></p>
-
-<p>As an example of using this attribute you can instead of:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-JacksonDataFormat ageViewFormat = new JacksonDataFormat(TestPojoView.class, Views.Age.class);
+</div></div><h3 id="BookDataFormatAppendix-Include/ExcludefieldsusingthejsonViewattributewithJacksonDataFormat">Include/Exclude fields using the <code>jsonView</code> attribute with <code>JacksonDataFormat</code></h3><p><strong>Available as of Camel 2.12</strong></p><p>As an example of using this attribute you can instead of:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[JacksonDataFormat ageViewFormat = new JacksonDataFormat(TestPojoView.class, Views.Age.class);
from("direct:inPojoAgeView").
marshal(ageViewFormat);
]]></script>
-</div></div>
-
-<p>Directly specify your <a shape="rect" class="external-link" href="http://wiki.fasterxml.com/JacksonJsonViews" rel="nofollow">JSON view</a> inside the Java DSL as:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-from("direct:inPojoAgeView").
+</div></div><p>Directly specify your <a shape="rect" class="external-link" href="http://wiki.fasterxml.com/JacksonJsonViews" rel="nofollow">JSON view</a> inside the Java DSL as:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[from("direct:inPojoAgeView").
marshal().json(TestPojoView.class, Views.Age.class);
]]></script>
-</div></div>
-
-<p>And the same in XML DSL:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-<from uri="direct:inPojoAgeView"/>
+</div></div><p>And the same in XML DSL:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[<from uri="direct:inPojoAgeView"/>
<marshal>
<json library="Jackson" unmarshalTypeName="org.apache.camel.component.jackson.TestPojoView" jsonView="org.apache.camel.component.jackson.Views$Age"/>
</marshal>
]]></script>
-</div></div>
-
-<h3 id="BookDataFormatAppendix-DependenciesforXStream">Dependencies for XStream</h3>
-
-<p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-xstream</strong> which implements this data format. </p>
-
-<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="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-<dependency>
+</div></div><h3 id="BookDataFormatAppendix-DependenciesforXStream">Dependencies for XStream</h3><p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-xstream</strong> which implements this data format.</p><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="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xstream</artifactId>
<version>2.9.2</version>
</dependency>
]]></script>
-</div></div>
-
-<h3 id="BookDataFormatAppendix-DependenciesforJackson">Dependencies for Jackson</h3>
-
-<p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-jackson</strong> which implements this data format. </p>
-
-<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="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-<dependency>
+</div></div><h3 id="BookDataFormatAppendix-DependenciesforJackson">Dependencies for Jackson</h3><p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-jackson</strong> which implements this data format.</p><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="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jackson</artifactId>
<version>2.9.2</version>
</dependency>
]]></script>
-</div></div>
-
-<h3 id="BookDataFormatAppendix-DependenciesforGSON">Dependencies for GSON</h3>
-
-<p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-gson</strong> which implements this data format. </p>
-
-<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="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-<dependency>
+</div></div><h3 id="BookDataFormatAppendix-DependenciesforGSON">Dependencies for GSON</h3><p>To use JSON in your camel routes you need to add the a dependency on <strong>camel-gson</strong> which implements this data format.</p><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="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-gson</artifactId>
<version>2.10.0</version>
@@ -1385,7 +1263,7 @@ from("direct:start").marshal()
<p>In this example we unmarshal a zipped payload from an ActiveMQ queue called MY_QUEUE to its original format, and forward it for processing to the UnZippedMessageProcessor. Note that the compression Level employed during the marshalling should be identical to the one employed during unmarshalling to avoid errors.</p>
<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-from("activemq:queue:MY_QUEUE").unmarshal().zip().process(new UnZippedMessageProcessor());Â
+from("activemq:queue:MY_QUEUE").unmarshal().zip().process(new UnZippedMessageProcessor());Ê
]]></script>
</div></div>