Modified: websites/production/camel/content/component.html
==============================================================================
--- websites/production/camel/content/component.html (original)
+++ websites/production/camel/content/component.html Thu Jan 31 18:21:49 2013
@@ -779,7 +779,12 @@ scalate:templateName 
 <pre class="code-xml">
 unmarshal(edi)
 </pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> GPL 
</td><td colspan="1" rowspan="1" class="confluenceTd"> For working with EDI 
parsing using the <a shape="rect" class="external-link" 
href="http://milyn.codehaus.org/Smooks"; rel="nofollow">Smooks library</a>. This 
component is <b>deprecated</b> as Smooks now provides <a shape="rect" 
class="external-link" 
href="http://www.smooks.org/mediawiki/index.php?title=V1.5:Smooks_v1.5_User_Guide#Apache_Camel_Integration";
 rel="nofollow">Camel integration out of the box</a>  </td></tr></tbody></table>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> GPL 
</td><td colspan="1" rowspan="1" class="confluenceTd"> For working with EDI 
parsing using the <a shape="rect" class="external-link" 
href="http://milyn.codehaus.org/Smooks"; rel="nofollow">Smooks library</a>. This 
component is <b>deprecated</b> as Smooks now provides <a shape="rect" 
class="external-link" 
href="http://www.smooks.org/mediawiki/index.php?title=V1.5:Smooks_v1.5_User_Guide#Apache_Camel_Integration";
 rel="nofollow">Camel integration out of the box</a>  </td></tr><tr><td 
colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" 
href="zeromq.html" title="ZeroMQ">ZeroMQ</a> / camel-zeromq in <a shape="rect" 
class="external-link" href="http://code.google.com/p/camel-extra/"; 
rel="nofollow">camel-extra</a>. 
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-xml">
+zeromq:(tcp|ipc)://hostname:port
+</pre>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> LGPL 
</td><td colspan="1" rowspan="1" class="confluenceTd"> The ZeroMQ component 
allows you to consumer or produce messages using <a shape="rect" 
class="external-link" href="http://zeromq.org"; rel="nofollow">ZeroMQ</a>. 
</td></tr></tbody></table>
 </div>
 
 

Modified: websites/production/camel/content/cxf-example.html
==============================================================================
--- websites/production/camel/content/cxf-example.html (original)
+++ websites/production/camel/content/cxf-example.html Thu Jan 31 18:21:49 2013
@@ -204,8 +204,6 @@ If you want to run this example in a Tom
 please replace the cxf-extension-http-jetty.xml with cxf-servlet.xml
 --&gt;
 
-<span class="code-tag">&lt;import resource=<span 
class="code-quote">"classpath:META-INF/cxf/cxf.xml"</span>/&gt;</span>
-
 <span class="code-tag">&lt;bean id=<span class="code-quote">"testBean"</span> 
class=<span 
class="code-quote">"org.apache.camel.example.cxf.provider.TesterBean"</span>/&gt;</span>
 
 &lt;cxf:cxfEndpoint id=<span class="code-quote">"soapMessageEndpoint"</span>

Modified: websites/production/camel/content/cxf-proxy-example.html
==============================================================================
--- websites/production/camel/content/cxf-proxy-example.html (original)
+++ websites/production/camel/content/cxf-proxy-example.html Thu Jan 31 
18:21:49 2013
@@ -116,8 +116,6 @@ The reply from the real web service is t
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
        http://camel.apache.org/schema/cxf 
http://camel.apache.org/schema/cxf/camel-cxf.xsd"&gt;
 
-  <span class="code-tag">&lt;import resource=<span 
class="code-quote">"classpath:META-INF/cxf/cxf.xml"</span>/&gt;</span>
-
   <span class="code-tag"><span class="code-comment">&lt;!-- spring property 
placeholder, ignore resource not found as the file resource is for unit testing 
--&gt;</span></span>
   &lt;context:property-placeholder location=<span 
class="code-quote">"classpath:incident.properties,file:target/custom.properties"</span>
                                 ignore-resource-not-found=<span 
class="code-quote">"true"</span>/&gt;

Modified: websites/production/camel/content/cxf-tomcat-example.html
==============================================================================
--- websites/production/camel/content/cxf-tomcat-example.html (original)
+++ websites/production/camel/content/cxf-tomcat-example.html Thu Jan 31 
18:21:49 2013
@@ -184,8 +184,6 @@ cxf:/incident?serviceClass=org.apache.ca
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
        http://camel.apache.org/schema/cxf 
http://camel.apache.org/schema/cxf/camel-cxf.xsd"&gt;
 
-  <span class="code-tag">&lt;import resource=<span 
class="code-quote">"classpath:META-INF/cxf/cxf.xml"</span>/&gt;</span>
-
   <span class="code-tag">&lt;bean id=<span 
class="code-quote">"myRoutes"</span> class=<span 
class="code-quote">"org.apache.camel.example.cxf.CamelRoute"</span>/&gt;</span>
 
   <span class="code-tag">&lt;camelContext xmlns=<span 
class="code-quote">"http://camel.apache.org/schema/spring";</span>&gt;</span>

Modified: websites/production/camel/content/cxf.html
==============================================================================
--- websites/production/camel/content/cxf.html (original)
+++ websites/production/camel/content/cxf.html Thu Jan 31 18:21:49 2013
@@ -815,7 +815,7 @@ Assert.assertEquals(300, image.getHeight
         CxfPayload&lt;SoapHeader&gt; in = 
exchange.getIn().getBody(CxfPayload.class);
         
         <span class="code-comment">// verify request
-</span>        Assert.assertEquals(1, in.getBody().size());
+</span>        assertEquals(1, in.getBody().size());
         
         Map&lt;<span class="code-object">String</span>, <span 
class="code-object">String</span>&gt; ns = <span 
class="code-keyword">new</span> HashMap&lt;<span 
class="code-object">String</span>, <span 
class="code-object">String</span>&gt;();
         ns.put(<span class="code-quote">"ns"</span>, 
MtomTestHelper.SERVICE_TYPES_NS);
@@ -826,19 +826,19 @@ Assert.assertEquals(300, image.getHeight
         Element ele = (Element)xu.getValue(<span class="code-quote">"<span 
class="code-comment">//ns:Detail/ns:photo/xop:Include"</span>, body,
 </span>                                           XPathConstants.NODE);
         <span class="code-object">String</span> photoId = 
ele.getAttribute(<span class="code-quote">"href"</span>).substring(4); <span 
class="code-comment">// skip <span class="code-quote">"cid:"</span>
-</span>        Assert.assertEquals(MtomTestHelper.REQ_PHOTO_CID, photoId);
+</span>        assertEquals(MtomTestHelper.REQ_PHOTO_CID, photoId);
 
         ele = (Element)xu.getValue(<span class="code-quote">"<span 
class="code-comment">//ns:Detail/ns:image/xop:Include"</span>, body,
 </span>                                           XPathConstants.NODE);
         <span class="code-object">String</span> imageId = 
ele.getAttribute(<span class="code-quote">"href"</span>).substring(4); <span 
class="code-comment">// skip <span class="code-quote">"cid:"</span>
-</span>        Assert.assertEquals(MtomTestHelper.REQ_IMAGE_CID, imageId);
+</span>        assertEquals(MtomTestHelper.REQ_IMAGE_CID, imageId);
 
         DataHandler dr = exchange.getIn().getAttachment(photoId);
-        Assert.assertEquals(<span 
class="code-quote">"application/octet-stream"</span>, dr.getContentType());
+        assertEquals(<span 
class="code-quote">"application/octet-stream"</span>, dr.getContentType());
         MtomTestHelper.assertEquals(MtomTestHelper.REQ_PHOTO_DATA, 
IOUtils.readBytesFromStream(dr.getInputStream()));
    
         dr = exchange.getIn().getAttachment(imageId);
-        Assert.assertEquals(<span class="code-quote">"image/jpeg"</span>, 
dr.getContentType());
+        assertEquals(<span class="code-quote">"image/jpeg"</span>, 
dr.getContentType());
         MtomTestHelper.assertEquals(MtomTestHelper.requestJpeg, 
IOUtils.readBytesFromStream(dr.getInputStream()));
 
         <span class="code-comment">// create response

Modified: websites/production/camel/content/developers.html
==============================================================================
--- websites/production/camel/content/developers.html (original)
+++ websites/production/camel/content/developers.html Thu Jan 31 18:21:49 2013
@@ -79,7 +79,7 @@
 
 <p>The following section contains developer related links for Apache Camel</p>
 
-<ul><li><a shape="rect" href="source.html" 
title="Source">Source</a></li><li><a shape="rect" href="building.html" 
title="Building">Building</a><ul><li><a shape="rect" 
href="continuous-integration-builds.html" title="Continuous integration 
builds">Continuous integration builds</a></li></ul></li><li><a shape="rect" 
href="add-new-component-guide.html" title="Add New Component Guide">Add New 
Component Guide</a></li><li><a shape="rect" href="code-walkthrough.html" 
title="Code Walkthrough">Code Walkthrough</a></li><li><a shape="rect" 
href="customizing-xml.html" title="Customizing XML">Customizing 
XML</a></li><li><a shape="rect" href="design-notes.html" title="Design 
Notes">Design Notes</a><ul><li><a shape="rect" href="camel-20-design.html" 
title="Camel 2.0 Design">Camel 2.0 Design</a></li><li><a shape="rect" 
href="camel-23-overhaul-of-aggregator-eip.html" title="Camel 2.3 - Overhaul of 
Aggregator EIP">Camel 2.3 - Overhaul of Aggregator EIP</a></li><li><a 
shape="rect" href="camel-2
 3-threadpool-configuration.html" title="Camel 2.3 - ThreadPool 
Configuration">Camel 2.3 - ThreadPool Configuration</a></li><li><a shape="rect" 
href="camel-27-roadmap.html" title="Camel 2.7 - Roadmap">Camel 2.7 - 
Roadmap</a></li><li><a shape="rect" 
href="camel-29-jmx-and-reducing-spring-dependency.html" title="Camel 2.9 - JMX 
and reducing Spring dependency">Camel 2.9 - JMX and reducing Spring 
dependency</a></li><li><a shape="rect" href="camel-2x-debugger-api.html" 
title="Camel 2.x - Debugger API">Camel 2.x - Debugger API</a></li><li><a 
shape="rect" href="camel-2x-speed-optimizations.html" title="Camel 2.x Speed 
optimizations">Camel 2.x Speed optimizations</a></li><li><a shape="rect" 
href="camel-30-introduce-an-api-for-components.html" title="Camel 3.0 - 
Introduce an API for components">Camel 3.0 - Introduce an API for 
components</a></li><li><a shape="rect" href="camel-30-roadmap.html" 
title="Camel 3.0 - Roadmap">Camel 3.0 - Roadmap</a></li><li><a shape="rect" 
href="camel-cxf-
 design.html" title="Camel CXF Design">Camel CXF Design</a></li><li><a 
shape="rect" href="camel-security.html" title="Camel Security">Camel 
Security</a></li></ul></li><li><a shape="rect" href="javadoc.html" 
title="JavaDoc">JavaDoc</a></li><li><a shape="rect" 
href="merging-commits-from-trunk-to-fixes-branch.html" title="Merging commits 
from trunk to fixes branch">Merging commits from trunk to fixes 
branch</a></li><li><a shape="rect" href="pdf-documentation-guide.html" 
title="PDF Documentation Guide">PDF Documentation Guide</a></li><li><a 
shape="rect" href="release-guide.html" title="Release Guide">Release 
Guide</a><ul><li><a shape="rect" href="testing-a-release-candidate.html" 
title="Testing a release candidate">Testing a release 
candidate</a></li></ul></li><li><a shape="rect" href="running-rat.html" 
title="Running RAT">Running RAT</a></li><li><a shape="rect" 
href="running-unit-tests.html" title="Running Unit Tests">Running Unit 
Tests</a></li><li><a shape="rect" href="tools.ht
 ml" title="Tools">Tools</a></li><li><a shape="rect" 
href="upgrade-dependency-guide.html" title="Upgrade dependency guide">Upgrade 
dependency guide</a></li><li><a shape="rect" href="writing-components.html" 
title="Writing Components">Writing Components</a></li><li><a shape="rect" 
href="xml-reference.html" title="Xml Reference">Xml Reference</a></li></ul> 
</div>
+<ul><li><a shape="rect" href="source.html" 
title="Source">Source</a></li><li><a shape="rect" href="building.html" 
title="Building">Building</a><ul><li><a shape="rect" 
href="continuous-integration-builds.html" title="Continuous integration 
builds">Continuous integration builds</a></li></ul></li><li><a shape="rect" 
href="add-new-component-guide.html" title="Add New Component Guide">Add New 
Component Guide</a></li><li><a shape="rect" href="code-walkthrough.html" 
title="Code Walkthrough">Code Walkthrough</a></li><li><a shape="rect" 
href="customizing-xml.html" title="Customizing XML">Customizing 
XML</a></li><li><a shape="rect" href="design-notes.html" title="Design 
Notes">Design Notes</a><ul><li><a shape="rect" href="camel-20-design.html" 
title="Camel 2.0 Design">Camel 2.0 Design</a></li><li><a shape="rect" 
href="camel-23-overhaul-of-aggregator-eip.html" title="Camel 2.3 - Overhaul of 
Aggregator EIP">Camel 2.3 - Overhaul of Aggregator EIP</a></li><li><a 
shape="rect" href="camel-2
 3-threadpool-configuration.html" title="Camel 2.3 - ThreadPool 
Configuration">Camel 2.3 - ThreadPool Configuration</a></li><li><a shape="rect" 
href="camel-27-roadmap.html" title="Camel 2.7 - Roadmap">Camel 2.7 - 
Roadmap</a></li><li><a shape="rect" 
href="camel-29-jmx-and-reducing-spring-dependency.html" title="Camel 2.9 - JMX 
and reducing Spring dependency">Camel 2.9 - JMX and reducing Spring 
dependency</a></li><li><a shape="rect" href="camel-2x-debugger-api.html" 
title="Camel 2.x - Debugger API">Camel 2.x - Debugger API</a></li><li><a 
shape="rect" href="camel-2x-speed-optimizations.html" title="Camel 2.x Speed 
optimizations">Camel 2.x Speed optimizations</a></li><li><a shape="rect" 
href="camel-30-ideas.html" title="Camel 3.0 - Ideas">Camel 3.0 - 
Ideas</a></li><li><a shape="rect" 
href="camel-30-introduce-an-api-for-components.html" title="Camel 3.0 - 
Introduce an API for components">Camel 3.0 - Introduce an API for 
components</a></li><li><a shape="rect" href="camel-30-roadmap
 .html" title="Camel 3.0 - Roadmap">Camel 3.0 - Roadmap</a></li><li><a 
shape="rect" href="camel-cxf-design.html" title="Camel CXF Design">Camel CXF 
Design</a></li><li><a shape="rect" href="camel-security.html" title="Camel 
Security">Camel Security</a></li></ul></li><li><a shape="rect" 
href="javadoc.html" title="JavaDoc">JavaDoc</a></li><li><a shape="rect" 
href="merging-commits-from-trunk-to-fixes-branch.html" title="Merging commits 
from trunk to fixes branch">Merging commits from trunk to fixes 
branch</a></li><li><a shape="rect" href="pdf-documentation-guide.html" 
title="PDF Documentation Guide">PDF Documentation Guide</a></li><li><a 
shape="rect" href="release-guide.html" title="Release Guide">Release 
Guide</a><ul><li><a shape="rect" href="testing-a-release-candidate.html" 
title="Testing a release candidate">Testing a release 
candidate</a></li></ul></li><li><a shape="rect" href="running-rat.html" 
title="Running RAT">Running RAT</a></li><li><a shape="rect" href="running-unit-t
 ests.html" title="Running Unit Tests">Running Unit Tests</a></li><li><a 
shape="rect" href="tools.html" title="Tools">Tools</a></li><li><a shape="rect" 
href="upgrade-dependency-guide.html" title="Upgrade dependency guide">Upgrade 
dependency guide</a></li><li><a shape="rect" href="writing-components.html" 
title="Writing Components">Writing Components</a></li><li><a shape="rect" 
href="xml-reference.html" title="Xml Reference">Xml Reference</a></li></ul> 
</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/camel/content/index.html
==============================================================================
--- websites/production/camel/content/index.html (original)
+++ websites/production/camel/content/index.html Thu Jan 31 18:21:49 2013
@@ -111,7 +111,7 @@ There's a great discussion about Camel a
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/[email protected]";>Hadrian 
Zbarcea</a> posted on Dec 13, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/12/13/Apache+Camel+2.10.3+and+2.9.5+Released";>Apache
 Camel 2.10.3 and 2.9.5 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/12/13/apache-camel-2103-and-295-released.html">Apache Camel 2.10.3 
and 2.9.5 Released</a>
             
         </div>
     
@@ -135,7 +135,7 @@ There's a great discussion about Camel a
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~muellerc";>Christian 
Mueller</a> posted on Nov 17, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/11/17/Back+from+ApacheCon+EU+2012";>Back
 from ApacheCon EU 2012</a>
+                <a shape="rect" class="blogHeading" 
href="2012/11/17/back-from-apachecon-eu-2012.html">Back from ApacheCon EU 
2012</a>
             
         </div>
     
@@ -179,7 +179,7 @@ Christian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/[email protected]";>Hadrian 
Zbarcea</a> posted on Oct 16, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/10/16/Apache+Camel+2.10.2+and+2.9.4+Released";>Apache
 Camel 2.10.2 and 2.9.4 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/10/16/apache-camel-2102-and-294-released.html">Apache Camel 2.10.2 
and 2.9.4 Released</a>
             
         </div>
     
@@ -201,7 +201,7 @@ Christian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~muellerc";>Christian 
Mueller</a> posted on Oct 10, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/10/10/Welcome+two+new+Camel+PMC+members";>Welcome
 two new Camel PMC members</a>
+                <a shape="rect" class="blogHeading" 
href="2012/10/10/welcome-two-new-camel-pmc-members.html">Welcome two new Camel 
PMC members</a>
             
         </div>
     
@@ -226,7 +226,7 @@ VP, Apache Camel</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~muellerc";>Christian 
Mueller</a> posted on Sep 18, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/09/18/The+Camel+Riders+Welcome+Three+New+Committers";>The
 Camel Riders Welcome Three New Committers</a>
+                <a shape="rect" class="blogHeading" 
href="2012/09/18/the-camel-riders-welcome-three-new-committers.html">The Camel 
Riders Welcome Three New Committers</a>
             
         </div>
     
@@ -251,7 +251,7 @@ Christian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~dkulp";>Daniel Kulp</a> 
posted on Aug 30, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/08/30/Apache+Camel+2.10.1+and+2.9.3+Released";>Apache
 Camel 2.10.1 and 2.9.3 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/08/30/apache-camel-2101-and-293-released.html">Apache Camel 2.10.1 
and 2.9.3 Released</a>
             
         </div>
     

Modified: websites/production/camel/content/news.html
==============================================================================
--- websites/production/camel/content/news.html (original)
+++ websites/production/camel/content/news.html Thu Jan 31 18:21:49 2013
@@ -89,7 +89,7 @@
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/[email protected]";>Hadrian 
Zbarcea</a> posted on Dec 13, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/12/13/Apache+Camel+2.10.3+and+2.9.5+Released";>Apache
 Camel 2.10.3 and 2.9.5 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/12/13/apache-camel-2103-and-295-released.html">Apache Camel 2.10.3 
and 2.9.5 Released</a>
             
         </div>
     
@@ -113,7 +113,7 @@
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~muellerc";>Christian 
Mueller</a> posted on Nov 17, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/11/17/Back+from+ApacheCon+EU+2012";>Back
 from ApacheCon EU 2012</a>
+                <a shape="rect" class="blogHeading" 
href="2012/11/17/back-from-apachecon-eu-2012.html">Back from ApacheCon EU 
2012</a>
             
         </div>
     
@@ -157,7 +157,7 @@ Christian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/[email protected]";>Hadrian 
Zbarcea</a> posted on Oct 16, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/10/16/Apache+Camel+2.10.2+and+2.9.4+Released";>Apache
 Camel 2.10.2 and 2.9.4 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/10/16/apache-camel-2102-and-294-released.html">Apache Camel 2.10.2 
and 2.9.4 Released</a>
             
         </div>
     
@@ -179,7 +179,7 @@ Christian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~muellerc";>Christian 
Mueller</a> posted on Oct 10, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/10/10/Welcome+two+new+Camel+PMC+members";>Welcome
 two new Camel PMC members</a>
+                <a shape="rect" class="blogHeading" 
href="2012/10/10/welcome-two-new-camel-pmc-members.html">Welcome two new Camel 
PMC members</a>
             
         </div>
     
@@ -204,7 +204,7 @@ VP, Apache Camel</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~muellerc";>Christian 
Mueller</a> posted on Sep 18, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/09/18/The+Camel+Riders+Welcome+Three+New+Committers";>The
 Camel Riders Welcome Three New Committers</a>
+                <a shape="rect" class="blogHeading" 
href="2012/09/18/the-camel-riders-welcome-three-new-committers.html">The Camel 
Riders Welcome Three New Committers</a>
             
         </div>
     
@@ -229,7 +229,7 @@ Christian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~dkulp";>Daniel Kulp</a> 
posted on Aug 30, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/08/30/Apache+Camel+2.10.1+and+2.9.3+Released";>Apache
 Camel 2.10.1 and 2.9.3 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/08/30/apache-camel-2101-and-293-released.html">Apache Camel 2.10.1 
and 2.9.3 Released</a>
             
         </div>
     
@@ -253,7 +253,7 @@ Christian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~davsclaus";>Claus Ibsen</a> 
posted on Jul 20, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/07/20/Happy+5+years+birthday+Apache+Camel";>Happy
 5 years birthday Apache Camel</a>
+                <a shape="rect" class="blogHeading" 
href="2012/07/20/happy-5-years-birthday-apache-camel.html">Happy 5 years 
birthday Apache Camel</a>
             
         </div>
     
@@ -296,7 +296,7 @@ Christian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~muellerc";>Christian 
Mueller</a> posted on Jul 12, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/07/12/Apache+Camel+2.8.6+Released";>Apache
 Camel 2.8.6 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/07/12/apache-camel-286-released.html">Apache Camel 2.8.6 Released</a>
             
         </div>
     
@@ -321,7 +321,7 @@ Christian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/[email protected]";>Hadrian 
Zbarcea</a> posted on Jul 03, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/07/03/Apache+Camel+2.10.0+Released";>Apache
 Camel 2.10.0 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/07/04/apache-camel-2100-released.html">Apache Camel 2.10.0 
Released</a>
             
         </div>
     
@@ -351,7 +351,7 @@ Hadrian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/[email protected]";>Hadrian 
Zbarcea</a> posted on May 01, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/05/01/Apache+Camel+2.8.5+Released";>Apache
 Camel 2.8.5 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/05/02/apache-camel-285-released.html">Apache Camel 2.8.5 Released</a>
             
         </div>
     
@@ -376,7 +376,7 @@ Hadrian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/[email protected]";>Hadrian 
Zbarcea</a> posted on Apr 18, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/04/18/Apache+Camel+2.9.2+Released";>Apache
 Camel 2.9.2 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/04/18/apache-camel-292-released.html">Apache Camel 2.9.2 Released</a>
             
         </div>
     
@@ -402,7 +402,7 @@ For more details please take a look at t
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/[email protected]";>Hadrian 
Zbarcea</a> posted on Mar 06, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/03/06/Apache+Camel+2.9.1+Released";>Apache
 Camel 2.9.1 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/03/06/apache-camel-291-released.html">Apache Camel 2.9.1 Released</a>
             
         </div>
     
@@ -428,7 +428,7 @@ For more details please take a look at t
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~muellerc";>Christian 
Mueller</a> posted on Mar 01, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/03/01/Welcome+Bilgin+Ibryam+as+the+newest+Camel+Rider";>Welcome
 Bilgin Ibryam as the newest Camel Rider</a>
+                <a shape="rect" class="blogHeading" 
href="2012/03/01/welcome-bilgin-ibryam-as-the-newest-camel-rider.html">Welcome 
Bilgin Ibryam as the newest Camel Rider</a>
             
         </div>
     
@@ -453,7 +453,7 @@ Christian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/[email protected]";>Hadrian 
Zbarcea</a> posted on Jan 30, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/01/30/Apache+Camel+2.8.4+Released";>Apache
 Camel 2.8.4 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/01/31/apache-camel-284-released.html">Apache Camel 2.8.4 Released</a>
             
         </div>
     
@@ -482,7 +482,7 @@ For more details please take a look at t
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~muellerc";>Christian 
Mueller</a> posted on Jan 17, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/01/17/Welcome+Babak+Vahdat+as+the+newest+Camel+Rider";>Welcome
 Babak Vahdat as the newest Camel Rider</a>
+                <a shape="rect" class="blogHeading" 
href="2012/01/17/welcome-babak-vahdat-as-the-newest-camel-rider.html">Welcome 
Babak Vahdat as the newest Camel Rider</a>
             
         </div>
     
@@ -498,7 +498,7 @@ Christian</p>
         
         <div class="endsection">
         
-                    <a shape="rect" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/01/17/Welcome+Babak+Vahdat+as+the+newest+Camel+Rider";>
+                    <a shape="rect" 
href="2012/01/17/welcome-babak-vahdat-as-the-newest-camel-rider.html?showComments=true##comments">
             1
                             Comment</a>
                                             </div>
@@ -513,7 +513,7 @@ Christian</p>
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~muellerc";>Christian 
Mueller</a> posted on Jan 15, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/01/15/Apache+Camel+2.7.5+released";>Apache
 Camel 2.7.5 released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/01/15/apache-camel-275-released.html">Apache Camel 2.7.5 released</a>
             
         </div>
     
@@ -539,7 +539,7 @@ For the release notes we suggest to take
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/[email protected]";>Hadrian 
Zbarcea</a> posted on Jan 01, 2012</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2012/01/01/Apache+Camel+2.9.0+Released";>Apache
 Camel 2.9.0 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2012/01/02/apache-camel-290-released.html">Apache Camel 2.9.0 Released</a>
             
         </div>
     
@@ -567,7 +567,7 @@ For the release notes we suggest to take
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~njiang";>willem jiang</a> 
posted on Nov 23, 2011</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2011/11/23/Apache+Camel+2.8.3+Released";>Apache
 Camel 2.8.3 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2011/11/23/apache-camel-283-released.html">Apache Camel 2.8.3 Released</a>
             
         </div>
     
@@ -591,7 +591,7 @@ For the release notes we suggest to take
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/~davsclaus";>Claus Ibsen</a> 
posted on Nov 12, 2011</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2011/11/12/Apache+Camel+2.9.0-RC1+Released";>Apache
 Camel 2.9.0-RC1 Released</a>
+                <a shape="rect" class="blogHeading" 
href="2011/11/12/apache-camel-290-rc1-released.html">Apache Camel 2.9.0-RC1 
Released</a>
             
         </div>
     
@@ -622,7 +622,7 @@ For the release notes we suggest to take
            </a>            </span>
             <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" 
class="url fn confluence-userlink" 
href="https://cwiki.apache.org/confluence/display/[email protected]";>Hadrian 
Zbarcea</a> posted on Nov 02, 2011</div>
-                <a shape="rect" class="blogHeading" 
href="https://cwiki.apache.org/confluence/display/CAMEL/2011/11/02/Welcome+Ioannis+Canellos+as+a+New+Committer";>Welcome
 Ioannis Canellos as a New Committer</a>
+                <a shape="rect" class="blogHeading" 
href="2011/11/03/welcome-ioannis-canellos-as-a-new-committer.html">Welcome 
Ioannis Canellos as a New Committer</a>
             
         </div>
     

Modified: websites/production/camel/content/pojo-messaging-example.html
==============================================================================
--- websites/production/camel/content/pojo-messaging-example.html (original)
+++ websites/production/camel/content/pojo-messaging-example.html Thu Jan 31 
18:21:49 2013
@@ -110,7 +110,7 @@ mvn compile camel:run
     @Produce(uri = <span 
class="code-quote">"activemq:personnel.records"</span>)
     ProducerTemplate producer;
 
-    @Consume(uri = <span class="code-quote">"file:src/data?noop=<span 
class="code-keyword">true</span>"</span>)
+    @Consume(uri = <span class="code-quote">"file:src/data?noop=<span 
class="code-keyword">true</span>&amp;initialDelay=100&amp;delay=100"</span>)
     <span class="code-keyword">public</span> void onFileSendToQueue(<span 
class="code-object">String</span> body) {
         producer.sendBody(body);
     }

Modified: websites/production/camel/content/polling-consumer.html
==============================================================================
--- websites/production/camel/content/polling-consumer.html (original)
+++ websites/production/camel/content/polling-consumer.html Thu Jan 31 18:21:49 
2013
@@ -150,7 +150,7 @@ ConsumerTemplate consumer = context.crea
 <p>Then we can get leverage Spring to inject the <tt>ConsumerTemplate</tt> in 
our java class. The code below is part of an unit test but it shows how the 
consumer and producer can work together. </p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-java">@ContextConfiguration
-<span class="code-keyword">public</span> class SpringConsumerTemplateTest 
<span class="code-keyword">extends</span> AbstractJUnit38SpringContextTests {
+<span class="code-keyword">public</span> class SpringConsumerTemplateTest 
<span class="code-keyword">extends</span> SpringRunWithTestSupport {
 
     @Autowired
     <span class="code-keyword">private</span> ProducerTemplate producer;
@@ -161,6 +161,7 @@ ConsumerTemplate consumer = context.crea
     @EndpointInject(ref = <span class="code-quote">"result"</span>)
     <span class="code-keyword">private</span> MockEndpoint mock;
 
+    @Test
     <span class="code-keyword">public</span> void testConsumeTemplate() <span 
class="code-keyword">throws</span> Exception {
         <span class="code-comment">// we expect Hello World received in our 
mock endpoint
 </span>        mock.expectedBodiesReceived(<span class="code-quote">"Hello 
World"</span>);

Modified: websites/production/camel/content/siteindex.html
==============================================================================
--- websites/production/camel/content/siteindex.html (original)
+++ websites/production/camel/content/siteindex.html Thu Jan 31 18:21:49 2013
@@ -80,7 +80,7 @@
 
 <p>
 <table class="grid" width="99%" cellspacing="0"><tr><td colspan="2" 
rowspan="1">
-         <table width="100%"><tr><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-0-9">0-9</a> ... 0</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-A">A</a> ... 31</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-B">B</a> ... 35</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-C">C</a> ... 130</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-D">D</a> ... 28</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-E">E</a> ... 28</td></tr><tr><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-F">F</a> ... 12</td><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-G">G</a> ... 24</td><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-H">H</a> ... 80</td><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-I">I</a> ... 15</td><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-J">J</a> ... 25</td><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-K">K</a> ... 3</td></tr><tr><td colspan
 ="1" rowspan="1"><a shape="rect" href="#index-L">L</a> ... 16</td><td 
colspan="1" rowspan="1"><a shape="rect" href="#index-M">M</a> ... 27</td><td 
colspan="1" rowspan="1"><a shape="rect" href="#index-N">N</a> ... 8</td><td 
colspan="1" rowspan="1"><a shape="rect" href="#index-O">O</a> ... 4</td><td 
colspan="1" rowspan="1"><a shape="rect" href="#index-P">P</a> ... 24</td><td 
colspan="1" rowspan="1"><a shape="rect" href="#index-Q">Q</a> ... 
4</td></tr><tr><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-R">R</a> ... 27</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-S">S</a> ... 66</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-T">T</a> ... 40</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-U">U</a> ... 17</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-V">V</a> ... 6</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-W">W</a> ... 28</td></tr><tr><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-X">X<
 /a> ... 12</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-Y">Y</a> ... 0</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-Z">Z</a> ... 3</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-%21@%23%24">!@#$</a> ... 0</td><td colspan="1" 
rowspan="1">&#160;</td><td colspan="1" rowspan="1">&#160;</td></tr></table>
+         <table width="100%"><tr><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-0-9">0-9</a> ... 0</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-A">A</a> ... 31</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-B">B</a> ... 35</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-C">C</a> ... 131</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-D">D</a> ... 28</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-E">E</a> ... 28</td></tr><tr><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-F">F</a> ... 12</td><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-G">G</a> ... 24</td><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-H">H</a> ... 80</td><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-I">I</a> ... 15</td><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-J">J</a> ... 25</td><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-K">K</a> ... 3</td></tr><tr><td colspan
 ="1" rowspan="1"><a shape="rect" href="#index-L">L</a> ... 16</td><td 
colspan="1" rowspan="1"><a shape="rect" href="#index-M">M</a> ... 27</td><td 
colspan="1" rowspan="1"><a shape="rect" href="#index-N">N</a> ... 8</td><td 
colspan="1" rowspan="1"><a shape="rect" href="#index-O">O</a> ... 4</td><td 
colspan="1" rowspan="1"><a shape="rect" href="#index-P">P</a> ... 24</td><td 
colspan="1" rowspan="1"><a shape="rect" href="#index-Q">Q</a> ... 
4</td></tr><tr><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-R">R</a> ... 27</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-S">S</a> ... 67</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-T">T</a> ... 41</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-U">U</a> ... 17</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-V">V</a> ... 6</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-W">W</a> ... 28</td></tr><tr><td colspan="1" rowspan="1"><a 
shape="rect" href="#index-X">X<
 /a> ... 12</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-Y">Y</a> ... 0</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-Z">Z</a> ... 3</td><td colspan="1" rowspan="1"><a shape="rect" 
href="#index-%21@%23%24">!@#$</a> ... 0</td><td colspan="1" 
rowspan="1">&#160;</td><td colspan="1" rowspan="1">&#160;</td></tr></table>
         </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 
style="margin-top: 0px"><a shape="rect" name="index-0-9"></a>0-9</h4>
         </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a 
shape="rect" name="index-A"></a>A</h4>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
@@ -480,7 +480,7 @@
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" href="camel-27-roadmap.html">Camel 
2.7 - Roadmap</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Camel 2.7 
roadmap  This is a roadmap which details the overall and major goals for Camel 
2.7. Fell free to discuss this at the Camel Mailing Lists if you have ideas or 
feedback. The goals on this page was intended to be introduced in Camel 3.0 
Camel 3.0 Roadmap ... </div>
+             <div class="smalltext" style="margin: 0 0 0 36px">Camel 2.7 
roadmap  This is a roadmap which details the overall and major goals for Camel 
2.7. Fell free to discuss this at the Camel Mailing Lists if you have ideas or 
feedback. The goals on this page was intended to be introduced in Camel 3.0 
Camel 3.0 Ideas ... </div>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" href="camel-270-release.html">Camel 
2.7.0 Release</a>
         <br clear="none">
@@ -570,13 +570,17 @@
         <br clear="none">
              <div class="smalltext" style="margin: 0 0 0 36px">Camel 2.x Speed 
optimizations  This design page is about how to optimize and make Camel 2.x 
more performant.    Source code We got an experiment branch at Apache at: 
{{https://svn.apache.org/repos/asf/camel/sandbox/tuningexperiment/ https ... 
</div>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
+                         <a shape="rect" href="camel-30-ideas.html">Camel 3.0 
- Ideas</a>
+        <br clear="none">
+             <div class="smalltext" style="margin: 0 0 0 36px">Camel 3.0 Ideas 
     Camel is now almost 6 years old and its second revision camel2.x is more 
than 4.5 years old already. Camel is extremely mature, used in production by a 
large number of organizations from small to large ... </div>
+                                 <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" 
href="camel-30-introduce-an-api-for-components.html">Camel 3.0 - Introduce an 
API for components</a>
         <br clear="none">
              <div class="smalltext" style="margin: 0 0 0 36px">Currently each 
component needs to depend on the camelcore. So it sucks in a lot more than it 
really needs.  The idea is to define a minimal API that contains everything a 
typical component needs. This API should be as independent of the camel 
implementation as possible. Optionally we ... </div>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" href="camel-30-roadmap.html">Camel 
3.0 - Roadmap</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Camel 3.0 
roadmap  This is a roadmap which details the overall and major goals for Camel 
3.0. Fell free to discuss this at the Camel Mailing Lists if you have ideas or 
feedback.  The Camel PMC conducted a survey in Oct 2010 camelsurvey2010.pdf to 
get a better ... </div>
+             <div class="smalltext" style="margin: 0 0 0 36px">Camel 3.0 
Roadmap  This page contains a summary of the ideas Camel 3.0 Ideas planned for 
the camel3.0.0 release.   Tasks for camel2.x (prepare)   Example task 
(champion)  Endorsements 1: muellerc 1: [email protected]  The Camel's hump is 
an ugly lump Which ... </div>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" 
href="camel-configuration-utilities.html">Camel Configuration Utilities</a>
         <br clear="none">
@@ -1094,7 +1098,7 @@
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" href="expression.html">Expression</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Expressions  To 
support dynamic rules Camel supports pluggable Expression 
http://camel.apache.org/maven/current/camelcore/apidocs/org/apache/camel/Expression.html
 strategies using a variety of different Languages.  Expressions and Predicates 
Predicate can then be used to create the various ... </div>
+             <div class="smalltext" style="margin: 0 0 0 36px">Expressions  
Expressions and Predicates Predicate can then be used to create the various 
Enterprise Integration Patterns Enterprise Integration Patterns in the DSL or 
Xml Configuration like the Recipient List. To support dynamic rules Camel 
supports pluggable Expression http://camel.apache.org/maven ... </div>
         </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 
style="margin-top: 0px"><a shape="rect" name="index-F"></a>F</h4>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" href="faq.html">FAQ</a>
@@ -1216,7 +1220,7 @@
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" href="guice.html">Guice</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Camel Guice  We 
have support for Google Guice http://code.google.com/p/googleguice/ as a 
dependency injection framework. To use it just be dependent on camelguice.jar 
which also depends on the following jars 
http://activemq.apache.org/camel/maven/camelguice/dependencies.html.   
Dependency ... </div>
+             <div class="smalltext" style="margin: 0 0 0 36px">Camel Guice  We 
have support for Google Guice http://code.google.com/p/googleguice/ as a 
dependency injection framework.  Maven users will need to add the following 
dependency to their {{pom.xml}} for this component:   &lt;dependency&gt;   
&lt;groupId&gt;org.apache.camel&lt;/groupId&gt;   
&lt;artifactId&gt;camelguice&lt;/artifactId&gt;   &lt;version ... </div>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" 
href="guice-dot-maven-goal-.html">Guice Dot Maven Goal </a>
         <br clear="none">
@@ -1629,7 +1633,7 @@
         <br clear="none">
              <div class="smalltext" style="margin: 0 0 0 36px">Jasypt 
component Available as of Camel 2.5  Jasypt http://www.jasypt.org/ is a 
simplified encryption library which makes encryption and decryption easy. Camel 
integrates with Jasypt to allow sensitive information in Properties files to be 
encrypted. By dropping {{cameljasypt}} on the classpath those encrypted ... 
</div>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
-                         <a shape="rect" 
href="https://cwiki.apache.org/confluence/display/CAMEL/Java+DSL";>Java DSL</a>
+                         <a shape="rect" href="java-dsl.html">Java DSL</a>
         <br clear="none">
              <div class="smalltext" style="margin: 0 0 0 36px">Java DSL  
Apache Camel offers a Java based DSL using the fluent builder style. The Java 
DSL is available by extending the RouteBuilder class, and implement the 
{{configure}} method.  This is best illustrate by an example. In the code below 
we create a new ... </div>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
@@ -2408,12 +2412,16 @@
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" href="sql.html">SQL</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">SQL  The SQL 
support is added by JoSQL http://josql.sourceforge.net/ and is primarily used 
for performing SQL queries on inmemory objects. If you prefer to perform actual 
database queries then check out the JPA component.  To use SQL in your camel 
routes you ... </div>
+             <div class="smalltext" style="margin: 0 0 0 36px">SQL Language  
The SQL support is added by JoSQL http://josql.sourceforge.net/ and is 
primarily used for performing SQL queries on inmemory objects. If you prefer to 
perform actual database queries then check out the JPA component.    Camel has 
both a SQL language ... </div>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" href="sql-component.html">SQL 
Component</a>
         <br clear="none">
              <div class="smalltext" style="margin: 0 0 0 36px">SQL Component  
The sql: component allows you to work with databases using JDBC queries. The 
difference between this component and JDBC component is that in case of SQL the 
query is a property of the endpoint and it uses message payload as parameters 
passed to the query.  This component uses {{springjdbc ... </div>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
+                         <a shape="rect" href="sql-example.html">SQL 
Example</a>
+        <br clear="none">
+             <div class="smalltext" style="margin: 0 0 0 36px">SQL Example 
Available as of Camel 2.11  This example is located in the 
{{examples/camelexamplesql}} directory of the Camel distribution. There is a 
{{README.txt}} file with instructions how to run it.  If you use maven then you 
can easily compile and install the example from the command line:   mvn ... 
</div>
+                                 <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" href="ssh.html">SSH</a>
         <br clear="none">
              <div class="smalltext" style="margin: 0 0 0 36px">SSH Available 
as of Camel 2.10  The SSH component enables access to SSH servers such that you 
can send an SSH command, and process the response.  Maven users will need to 
add the following dependency to their {{pom.xml}} for this component:   
&lt;dependency&gt;   &lt;groupId&gt;org.apache.camel&lt;/groupId ... </div>
@@ -2567,6 +2575,10 @@
         <br clear="none">
              <div class="smalltext" style="margin: 0 0 0 36px">Part 5   ... 
Continued from Part 4 We continue from part 4 where we have the routing in 
place. However as you might have noticed we aren't quiet there yet with a nice 
solution, we are still coding ... </div>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
+                         <a shape="rect" 
href="tutorial-example-reportincident-part6.html">Tutorial-Example-ReportIncident-Part6</a>
+        <br clear="none">
+             <div class="smalltext" style="margin: 0 0 0 36px">Part 6   ... 
Continued from Part 5 We continue from part 5 where we ended up with a complete 
solution using routes defined in Java code. In this last part of this tutorial 
we will define the route in XML instead ... </div>
+                                 <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" 
href="tutorial-jmsremoting.html">Tutorial-JmsRemoting</a>
         <br clear="none">
              <div class="smalltext" style="margin: 0 0 0 36px">Tutorial on 
Spring Remoting with JMS  &amp;nbsp;  This tutorial was kindly donated to 
Apache Camel by Martin Gilday.     Preface  This tutorial aims to guide the 
reader through the stages of creating a project which uses Camel to facilitate 
the routing of messages from a JMS queue ... </div>
@@ -2871,7 +2883,7 @@
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" href="zeromq.html">ZeroMQ</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Camel ZeroMQ 
Component Available as of Camel 2.10  The zeromq: component allows you to 
consumer or produce messages using ZeroMQ http://zeromq.org/. Zeromq requires a 
bit of work to get setup, especially on windows. Refer to the documentation 
http://www.zeromq.org/intro ... </div>
+             <div class="smalltext" style="margin: 0 0 0 36px">Camel ZeroMQ 
Component Available as of Camel 2.11  The zeromq: component allows you to 
consumer or produce messages using ZeroMQ http://zeromq.org/. Zeromq requires a 
bit of work to get setup, especially on windows. Refer to the documentation 
http://www.zeromq.org/intro ... </div>
                                  <span class="icon icon-page" 
title="Page">Page:</span>
                          <a shape="rect" href="zip-dataformat.html">Zip 
DataFormat</a>
         <br clear="none">


Reply via email to