You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bu...@apache.org on 2018/04/04 10:23:50 UTC

svn commit: r1027827 - in /websites/production/camel/content: ./ 2018/04/ 2018/04/04/ cache/

Author: buildbot
Date: Wed Apr  4 10:23:50 2018
New Revision: 1027827

Log:
Production update by buildbot for camel

Added:
    websites/production/camel/content/2018/04/
    websites/production/camel/content/2018/04/04/
    websites/production/camel/content/2018/04/04/status-update-on-the-apache-camel-website-and-documentation.html
    websites/production/camel/content/cache/main.pageCache   (with props)
Modified:
    websites/production/camel/content/book-in-one-page.html
    websites/production/camel/content/book-tutorials.html
    websites/production/camel/content/index.html
    websites/production/camel/content/news.html
    websites/production/camel/content/spark-rest.html

Added: websites/production/camel/content/2018/04/04/status-update-on-the-apache-camel-website-and-documentation.html
==============================================================================
--- websites/production/camel/content/2018/04/04/status-update-on-the-apache-camel-website-and-documentation.html (added)
+++ websites/production/camel/content/2018/04/04/status-update-on-the-apache-camel-website-and-documentation.html Wed Apr  4 10:23:50 2018
@@ -0,0 +1,150 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+<head>
+    <link href="//camel.apache.org/styles/site.css" rel="stylesheet" type="text/css">
+    <link href="//camel.apache.org/styles/type-settings.css" rel="stylesheet" type="text/css">
+    <script src="//camel.apache.org/styles/prototype.js" type="text/javascript"></script>
+    <script src="//camel.apache.org/styles/rico.js" type="text/javascript"></script>    
+    <script src="//camel.apache.org/styles/site.js" type="text/javascript"></script>
+
+    <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+
+    <style type="text/css">
+      .maincontent { overflow:hidden; }
+    </style>
+    <!--[if IE]>
+    <style type="text/css">
+      .maincontent { width:100%; }
+    </style>
+    <![endif]-->
+
+
+
+    <title>
+    Apache Camel: Status update on the Apache Camel website and documentation
+    </title>
+</head>
+<body>
+<div class="white_box">
+<div class="header">
+  <div class="header_l">
+    <div class="header_r">
+    </div>
+  </div>
+</div>
+<div class="content">
+  <div class="content_l">
+    <div class="content_r">
+      <div>
+          <!-- Banner -->
+<div id="banner-content"><div id="asf_logo">
+	<div id="activemq_logo" style="height:108px; background:transparent url(banner.data/apache-camel-7.png) no-repeat scroll left top;">
+            <a shape="rect" style="float:left; width:310px;display:block;text-indent:-5000px;text-decoration:none;line-height:140px; margin-top:20px; margin-left:18px;" href="http://camel.apache.org/">Camel</a>
+            <a shape="rect" style="float:right; width:180px;display:block;text-indent:-5000px;text-decoration:none;line-height:80px; margin-top:45px; margin-right:10px;" href="http://www.apache.org">Apache</a>
+	</div>
+</div></div>
+          <!-- Banner -->
+        <div class="top_red_bar">
+          <div id="site-breadcrumbs">
+                <!-- Breadcrumbs -->
+<a href="../../../index.html">Apache Camel</a>&nbsp;&gt;&nbsp;2018&nbsp;&gt;&nbsp;04&nbsp;&gt;&nbsp;04&nbsp;&gt;&nbsp;<a href="status-update-on-the-apache-camel-website-and-documentation.html">Status update on the Apache Camel website and documentation</a>
+          </div>
+          <!-- Quicklinks -->
+<div id="site-quicklinks"><p><a shape="rect" href="download.html">Download</a> | <a shape="rect" href="javadoc.html">JavaDoc</a> | <a shape="rect" href="source.html">Source</a> | <a shape="rect" class="external-link" href="https://github.com/apache/camel/" rel="nofollow">GitHub</a> | <a shape="rect" class="external-link" href="https://gitter.im/apache/apache-camel" rel="nofollow">Gitter</a> |&#160;<a shape="rect" href="support.html">Support</a></p></div>
+          <!-- Quicklinks -->
+        </div>
+
+        <br> Since we're on a major migration process of this website, some component documents here are out of sync right now. In the meantime you may want to look at the asciidoc in the repository:
+            https://github.com/apache/camel/blob/master/README.md
+            https://github.com/apache/camel/blob/master/components/readme.adoc </br>
+	<table border="0">
+	<tbody>
+        <tr>
+        <td valign="top" width="100%">
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The current Apache Camel website and documentation is currently undergoing&#160;</span><span style="color: rgb(34,34,34);">work to be rewamped and updated for a modern website.</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">This work has been underway for a longer time. We kicked off the work by&#160;</span><span style="color: rgb(34,34,34);">migrating the documentation of every Camel component<br clear="none">from the wiki system&#160;</span><span style="color: rgb(34,34,34);">to the source code as ascii doc files. This allowed us during the build&#160;</span><span style="color: rgb(34,34,34);">of the Apache Camel project to automatic<br clear="none">keep parts of the documentation&#160;</span><span style="color: rgb(34,34,34);">up-to-date with the source code, such as when new options is added to&#160;</span><span style="color: rgb(34,34,34);">components.<br clear="none"></spa
 n><span style="color: rgb(34,34,34);">We then moved on migrate all the data formats, languages, and the EIP patterns.<br clear="none"><span>This has been substantial work, as if you were to print all the&#160;</span><span>Camel documentation&#160;</span><span>then it would be more than 3000 sheets of papers.</span><br clear="none"></span></p><p><br clear="none"><span style="color: rgb(34,34,34);">At this point of time, we are about to draft up a new table of content&#160;</span><span style="color: rgb(34,34,34);">(TOC) for the&#160;</span><span style="color: rgb(34,34,34);">new Apache Camel documentation and user guide.<br clear="none">With the new TOC we&#160;</span><span style="color: rgb(34,34,34);">will then re-work&#160;</span><span style="color: rgb(34,34,34);">all the user guide documentation to be updated and focus on modern&#160;</span><span style="color: rgb(34,34,34);">development with Camel.</span><br clear="none"><span style="color: rgb(34,34,34);">In doing so we will g
 rab the good parts of the existing (older)&#160;</span><span style="color: rgb(34,34,34);">documentation, and in&#160;</span><span style="color: rgb(34,34,34);">places needed, we will rewrite the documentation.</span></p><p><br clear="none"><span style="color: rgb(34,34,34);">The new website and documentation has a new build system that is also&#160;</span><span style="color: rgb(34,34,34);">worked. When this&#160;&#160;</span><span style="color: rgb(34,34,34);">system is ready we will have a new<br clear="none">staging URL where we will regularly&#160;</span><span style="color: rgb(34,34,34);">publish the content,&#160;</span><span style="color: rgb(34,34,34);">so users can follow the progress.</span></p><p><span style="color: rgb(34,34,34);">&#160;</span><br clear="none"><span style="color: rgb(34,34,34);">Because the new documentation will be in the source code and in ascii&#160;</span><span style="color: rgb(34,34,34);">doc format, then it's&#160;</span><span style="color: rgb(3
 4,34,34);">easier for Camel users to contribute and help<br clear="none"> - you can simply just&#160;</span><span style="color: rgb(34,34,34);">submit patches as GitHub PRs.</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">Have patience with us, as it may take a couple of months for us to be&#160;</span><span style="color: rgb(34,34,34);">ready to publish the staging URL.</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">We anticipate to have a new website and documentation ready in Q3&#160;</span><span style="color: rgb(34,34,34);">2018 (after the holiday season).</span></p><p><span style="color: rgb(34,34,34);"><br clear="none"></span></p><p><span style="color: rgb(0,0,0);">On behalf of the Camel PMC,</span><br clear="none"><span style="color: rgb(0,0,0);">Claus Ibsen</span></p></div>
+        </td>
+        <td valign="top">
+          <div class="navigation">
+            <div class="navigation_top">
+                <!-- NavigationBar -->
+<div class="navigation_bottom" id="navigation_bottom"><h3 id="Navigation-Overview"><a shape="rect" href="overview.html">Overview</a></h3><ul class="alternate"><li><a shape="rect" href="index.html">Home</a></li><li><a shape="rect" href="download.html">Download</a></li><li><a shape="rect" href="getting-started.html">Getting Started</a></li><li><a shape="rect" href="faq.html">FAQ</a></li></ul><h3 id="Navigation-Documentation"><a shape="rect" href="documentation.html">Documentation</a></h3><ul class="alternate"><li><a shape="rect" href="user-guide.html">User Guide</a></li><li><a shape="rect" href="manual.html">Manual</a></li><li><a shape="rect" href="books.html">Books</a></li><li><a shape="rect" href="tutorials.html">Tutorials</a></li><li><a shape="rect" href="examples.html">Examples</a></li><li><a shape="rect" href="cookbook.html">Cookbook</a></li><li><a shape="rect" href="architecture.html">Architecture</a></li><li><a shape="rect" href="enterprise-integration-patterns.html">Enterprise
  Integration Patterns</a></li><li><a shape="rect" href="dsl.html">DSL</a></li><li><a shape="rect" href="components.html">Components</a></li><li><a shape="rect" href="data-format.html">Data Format</a></li><li><a shape="rect" href="languages.html">Languages</a></li><li><a shape="rect" href="security.html">Security</a></li><li><a shape="rect" href="security-advisories.html">Security Advisories</a></li></ul><h3 id="Navigation-Search">Search</h3><form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+  <div>
+    <input type="hidden" name="cx" value="007878419884033443453:m5nhvy4hmyq">
+    <input type="hidden" name="ie" value="UTF-8">
+    <input type="text" name="q" size="21">
+    <input type="submit" name="sa" value="Search">
+  </div>
+</form>
+<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&amp;lang=en"></script><h3 id="Navigation-Community"><a shape="rect" href="community.html">Community</a></h3><ul class="alternate"><li><a shape="rect" href="support.html">Support</a></li><li><a shape="rect" href="contributing.html">Contributing</a></li><li><a shape="rect" href="mailing-lists.html">Mailing Lists</a></li><li><a shape="rect" href="irc-room.html">Gitter / IRC Chat</a></li><li><a shape="rect" href="user-stories.html">User Stories</a></li><li><a shape="rect" href="news.html">News</a></li><li><a shape="rect" href="articles.html">Articles</a></li><li><a shape="rect" href="site.html">Site</a></li><li><a shape="rect" href="team.html">Team</a></li><li><a shape="rect" class="external-link" href="http://camel-extra.googlecode.com/" rel="nofollow">Camel Extra</a></li></ul><h3 id="Navigation-Developers"><a shape="rect" href="developers.html">Developers</a></h3><ul class="alternate"><li><a s
 hape="rect" href="developers.html">Developer Guide</a></li><li><a shape="rect" href="source.html">Source</a></li><li><a shape="rect" class="external-link" href="https://github.com/apache/camel/" rel="nofollow">Github</a></li><li><a shape="rect" href="building.html">Building</a></li><li><a shape="rect" href="javadoc.html">JavaDoc</a></li></ul><h3 id="Navigation-ApacheSoftwareFoundation">Apache Software Foundation</h3><ul class="alternate"><li><a shape="rect" class="external-link" href="http://www.apache.org/licenses/">License</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/security/">Security</a></li></ul></div>
+                <!-- NavigationBar -->
+            </div>
+          </div>
+        </td>
+        </tr>
+	</tbody>
+        </table>
+
+
+        <div class="bottom_red_bar"></div>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="black_box">
+<div class="footer">
+  <div class="footer_l">
+    <div class="footer_r">
+      <div>
+        <a href="$base/privacy-policy.html">Privacy Policy</a> -
+        (<a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=75978304">edit page</a>)
+   	 (<a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=75978304&amp;showComments=true&amp;showCommentArea=true#addcomment">add comment</a>)
+      </div>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+<div class="design_attribution">
+&copy; 2004-2015 The Apache Software Foundation.
+<br>          
+Apache Camel, Camel, Apache, the Apache feather logo, and the Apache Camel project logo are trademarks of The Apache Software Foundation.  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+<br>
+<a href="http://hiramchirino.com">Graphic Design By Hiram</a>
+</div>
+
+<!-- Camel committers that would like access to the Analytics, send a note to private@camel.apache.org -->
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-25976253-1']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+
+</body>
+</html>
+
+

Modified: websites/production/camel/content/book-in-one-page.html
==============================================================================
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Wed Apr  4 10:23:50 2018
@@ -4371,11 +4371,11 @@ So we completed the last piece in the pi
 <p>This example has been removed from <strong>Camel 2.9</strong> onwards. Apache Axis 1.4 is a very old and unsupported framework. We encourage users to use <a shape="rect" href="cxf.html">CXF</a> instead of Axis.</p></div></div>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1522397948964 {padding: 0px;}
-div.rbtoc1522397948964 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1522397948964 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1522837131664 {padding: 0px;}
+div.rbtoc1522837131664 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1522837131664 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1522397948964">
+/*]]>*/</style><div class="toc-macro rbtoc1522837131664">
 <ul class="toc-indentation"><li><a shape="rect" href="#BookInOnePage-TutorialusingAxis1.4withApacheCamel">Tutorial using Axis 1.4 with Apache Camel</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#BookInOnePage-Prerequisites">Prerequisites</a></li><li><a shape="rect" href="#BookInOnePage-Distribution">Distribution</a></li><li><a shape="rect" href="#BookInOnePage-Introduction">Introduction</a></li><li><a shape="rect" href="#BookInOnePage-SettinguptheprojecttorunAxis">Setting up the project to run Axis</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#BookInOnePage-Maven2">Maven 2</a></li><li><a shape="rect" href="#BookInOnePage-wsdl">wsdl</a></li><li><a shape="rect" href="#BookInOnePage-ConfiguringAxis">Configuring Axis</a></li><li><a shape="rect" href="#BookInOnePage-RunningtheExample">Running the Example</a></li></ul>

Modified: websites/production/camel/content/book-tutorials.html
==============================================================================
--- websites/production/camel/content/book-tutorials.html (original)
+++ websites/production/camel/content/book-tutorials.html Wed Apr  4 10:23:50 2018
@@ -1999,11 +1999,11 @@ So we completed the last piece in the pi
 <p>This example has been removed from <strong>Camel 2.9</strong> onwards. Apache Axis 1.4 is a very old and unsupported framework. We encourage users to use <a shape="rect" href="cxf.html">CXF</a> instead of Axis.</p></div></div>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1522398119529 {padding: 0px;}
-div.rbtoc1522398119529 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1522398119529 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1522837281550 {padding: 0px;}
+div.rbtoc1522837281550 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1522837281550 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1522398119529">
+/*]]>*/</style><div class="toc-macro rbtoc1522837281550">
 <ul class="toc-indentation"><li><a shape="rect" href="#BookTutorials-TutorialusingAxis1.4withApacheCamel">Tutorial using Axis 1.4 with Apache Camel</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#BookTutorials-Prerequisites">Prerequisites</a></li><li><a shape="rect" href="#BookTutorials-Distribution">Distribution</a></li><li><a shape="rect" href="#BookTutorials-Introduction">Introduction</a></li><li><a shape="rect" href="#BookTutorials-SettinguptheprojecttorunAxis">Setting up the project to run Axis</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#BookTutorials-Maven2">Maven 2</a></li><li><a shape="rect" href="#BookTutorials-wsdl">wsdl</a></li><li><a shape="rect" href="#BookTutorials-ConfiguringAxis">Configuring Axis</a></li><li><a shape="rect" href="#BookTutorials-RunningtheExample">Running the Example</a></li></ul>

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

Propchange: websites/production/camel/content/cache/main.pageCache
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: websites/production/camel/content/index.html
==============================================================================
--- websites/production/camel/content/index.html (original)
+++ websites/production/camel/content/index.html Wed Apr  4 10:23:50 2018
@@ -85,6 +85,26 @@
 </p><div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
+                <a shape="rect" class="userLogoLink" href="    /confluence/display/~davsclaus ">
+               <img class="userLogo logo" src="index.userimage/user-avatar" alt="User icon: davsclaus" title="davsclaus">
+           </a>            </span>
+            <span class="blogHeading">
+                <a shape="rect" class="blogHeading" href="2018/04/04/status-update-on-the-apache-camel-website-and-documentation.html">Status update on the Apache Camel website and documentation</a>
+                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="    /confluence/display/~davsclaus ">Claus Ibsen</a> posted on Apr 04, 2018</div>
+            
+        </div>
+    
+    <div class="wiki-content">
+        <p><span style="color: rgb(34,34,34);">The current Apache Camel website and documentation is currently undergoing&#160;</span><span style="color: rgb(34,34,34);">work to be rewamped and updated for a modern website.</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">This work has been underway for a longer time. We kicked off the work by&#160;</span><span style="color: rgb(34,34,34);">migrating the documentation of every Camel component<br clear="none">from the wiki system&#160;</span><span style="color: rgb(34,34,34);">to the source code as ascii doc files. This allowed us during the build&#160;</span><span style="color: rgb(34,34,34);">of the Apache Camel project to automatic<br clear="none">keep parts of the documentation&#160;</span><span style="color: rgb(34,34,34);">up-to-date with the source code, such as when new options is added to&#160;</span><span style="color: rgb(34,34,34);">components.<br clear="none"></span><span style="color: rgb(34,3
 4,34);">We then moved on migrate all the data formats, languages, and the EIP patterns.<br clear="none"><span>This has been substantial work, as if you were to print all the&#160;</span><span>Camel documentation&#160;</span><span>then it would be more than 3000 sheets of papers.</span><br clear="none"></span></p><p><br clear="none"><span style="color: rgb(34,34,34);">At this point of time, we are about to draft up a new table of content&#160;</span><span style="color: rgb(34,34,34);">(TOC) for the&#160;</span><span style="color: rgb(34,34,34);">new Apache Camel documentation and user guide.<br clear="none">With the new TOC we&#160;</span><span style="color: rgb(34,34,34);">will then re-work&#160;</span><span style="color: rgb(34,34,34);">all the user guide documentation to be updated and focus on modern&#160;</span><span style="color: rgb(34,34,34);">development with Camel.</span><br clear="none"><span style="color: rgb(34,34,34);">In doing so we will grab the good parts of the exis
 ting (older)&#160;</span><span style="color: rgb(34,34,34);">documentation, and in&#160;</span><span style="color: rgb(34,34,34);">places needed, we will rewrite the documentation.</span></p><p><br clear="none"><span style="color: rgb(34,34,34);">The new website and documentation has a new build system that is also&#160;</span><span style="color: rgb(34,34,34);">worked. When this&#160;&#160;</span><span style="color: rgb(34,34,34);">system is ready we will have a new<br clear="none">staging URL where we will regularly&#160;</span><span style="color: rgb(34,34,34);">publish the content,&#160;</span><span style="color: rgb(34,34,34);">so users can follow the progress.</span></p><p><span style="color: rgb(34,34,34);">&#160;</span><br clear="none"><span style="color: rgb(34,34,34);">Because the new documentation will be in the source code and in ascii&#160;</span><span style="color: rgb(34,34,34);">doc format, then it's&#160;</span><span style="color: rgb(34,34,34);">easier for Camel us
 ers to contribute and help<br clear="none"> - you can simply just&#160;</span><span style="color: rgb(34,34,34);">submit patches as GitHub PRs.</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">Have patience with us, as it may take a couple of months for us to be&#160;</span><span style="color: rgb(34,34,34);">ready to publish the staging URL.</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">We anticipate to have a new website and documentation ready in Q3&#160;</span><span style="color: rgb(34,34,34);">2018 (after the holiday season).</span></p><p><span style="color: rgb(34,34,34);"><br clear="none"></span></p><p><span style="color: rgb(0,0,0);">On behalf of the Camel PMC,</span><br clear="none"><span style="color: rgb(0,0,0);">Claus Ibsen</span></p>
+    </div>
+    
+        
+    </div>
+    
+        
+<div class="blog-post-listing">
+            <div class="logo-heading-block">
+            <span class="logoBlock">
                 <a shape="rect" class="userLogoLink" href="    /confluence/display/~gzurowski ">
                <img class="userLogo logo" src="index.userimage/gzurowski-89607-pp-wojtek-avatar.png" alt="User icon: gzurowski" title="gzurowski">
            </a>            </span>
@@ -179,26 +199,6 @@
     </div>
     
         
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="    /confluence/display/~gzurowski ">
-               <img class="userLogo logo" src="index.userimage/gzurowski-89607-pp-wojtek-avatar.png" alt="User icon: gzurowski" title="gzurowski">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2017/11/14/apache-camel-2201-released.html">Apache Camel 2.20.1 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="    /confluence/display/~gzurowski ">Gregor Zurowski</a> posted on Nov 14, 2017</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p>The Camel community announces the immediate availability of the new patch release Camel 2.20.1. This release contains 65 fixes applied in the past few weeks by the community on the Camel 2.20.x maintenance branch.</p><p>The artifacts are published and ready for you to <a shape="rect" class="external-link" href="http://camel.apache.org/download.html">download</a> either from the Apache mirrors or from the Central Maven repository. For more details please take a look at the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12341590&amp;projectId=12311211">release notes</a>.<br clear="none">Many thanks to all who made this release possible.</p><p>On behalf of the Camel PMC,<br clear="none">Gregor Zurowski</p>
-    </div>
-    
-        
     </div>
     <p><a shape="rect" href="https://cwiki.apache.org/confluence/createrssfeed.action?types=blogpost&amp;spaces=CAMEL&amp;title=Apache+Camel+News&amp;sort=modified&amp;maxResults=10&amp;timeSpan=60&amp;showContent=true&amp;confirm=Create+RSS+Feed">RSS Feed</a></p><h3 id="Index-Links">Links</h3><ul><li><a shape="rect" href="getting-started.html">Getting Started</a></li><li><a shape="rect" href="architecture.html">Architecture</a></li><li><a shape="rect" href="user-guide.html">User Guide</a></li><li><a shape="rect" href="enterprise-integration-patterns.html">Enterprise Integration Patterns</a></li><li><a shape="rect" href="news.html">More News</a></li></ul></div>
         </td>

Modified: websites/production/camel/content/news.html
==============================================================================
--- websites/production/camel/content/news.html (original)
+++ websites/production/camel/content/news.html Wed Apr  4 10:23:50 2018
@@ -87,6 +87,26 @@
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
+                <a shape="rect" class="userLogoLink" href="    /confluence/display/~davsclaus ">
+               <img class="userLogo logo" src="news.userimage/user-avatar" alt="User icon: davsclaus" title="davsclaus">
+           </a>            </span>
+            <span class="blogHeading">
+                <a shape="rect" class="blogHeading" href="2018/04/04/status-update-on-the-apache-camel-website-and-documentation.html">Status update on the Apache Camel website and documentation</a>
+                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="    /confluence/display/~davsclaus ">Claus Ibsen</a> posted on Apr 04, 2018</div>
+            
+        </div>
+    
+    <div class="wiki-content">
+        <p><span style="color: rgb(34,34,34);">The current Apache Camel website and documentation is currently undergoing&#160;</span><span style="color: rgb(34,34,34);">work to be rewamped and updated for a modern website.</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">This work has been underway for a longer time. We kicked off the work by&#160;</span><span style="color: rgb(34,34,34);">migrating the documentation of every Camel component<br clear="none">from the wiki system&#160;</span><span style="color: rgb(34,34,34);">to the source code as ascii doc files. This allowed us during the build&#160;</span><span style="color: rgb(34,34,34);">of the Apache Camel project to automatic<br clear="none">keep parts of the documentation&#160;</span><span style="color: rgb(34,34,34);">up-to-date with the source code, such as when new options is added to&#160;</span><span style="color: rgb(34,34,34);">components.<br clear="none"></span><span style="color: rgb(34,3
 4,34);">We then moved on migrate all the data formats, languages, and the EIP patterns.<br clear="none"><span>This has been substantial work, as if you were to print all the&#160;</span><span>Camel documentation&#160;</span><span>then it would be more than 3000 sheets of papers.</span><br clear="none"></span></p><p><br clear="none"><span style="color: rgb(34,34,34);">At this point of time, we are about to draft up a new table of content&#160;</span><span style="color: rgb(34,34,34);">(TOC) for the&#160;</span><span style="color: rgb(34,34,34);">new Apache Camel documentation and user guide.<br clear="none">With the new TOC we&#160;</span><span style="color: rgb(34,34,34);">will then re-work&#160;</span><span style="color: rgb(34,34,34);">all the user guide documentation to be updated and focus on modern&#160;</span><span style="color: rgb(34,34,34);">development with Camel.</span><br clear="none"><span style="color: rgb(34,34,34);">In doing so we will grab the good parts of the exis
 ting (older)&#160;</span><span style="color: rgb(34,34,34);">documentation, and in&#160;</span><span style="color: rgb(34,34,34);">places needed, we will rewrite the documentation.</span></p><p><br clear="none"><span style="color: rgb(34,34,34);">The new website and documentation has a new build system that is also&#160;</span><span style="color: rgb(34,34,34);">worked. When this&#160;&#160;</span><span style="color: rgb(34,34,34);">system is ready we will have a new<br clear="none">staging URL where we will regularly&#160;</span><span style="color: rgb(34,34,34);">publish the content,&#160;</span><span style="color: rgb(34,34,34);">so users can follow the progress.</span></p><p><span style="color: rgb(34,34,34);">&#160;</span><br clear="none"><span style="color: rgb(34,34,34);">Because the new documentation will be in the source code and in ascii&#160;</span><span style="color: rgb(34,34,34);">doc format, then it's&#160;</span><span style="color: rgb(34,34,34);">easier for Camel us
 ers to contribute and help<br clear="none"> - you can simply just&#160;</span><span style="color: rgb(34,34,34);">submit patches as GitHub PRs.</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">Have patience with us, as it may take a couple of months for us to be&#160;</span><span style="color: rgb(34,34,34);">ready to publish the staging URL.</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">We anticipate to have a new website and documentation ready in Q3&#160;</span><span style="color: rgb(34,34,34);">2018 (after the holiday season).</span></p><p><span style="color: rgb(34,34,34);"><br clear="none"></span></p><p><span style="color: rgb(0,0,0);">On behalf of the Camel PMC,</span><br clear="none"><span style="color: rgb(0,0,0);">Claus Ibsen</span></p>
+    </div>
+    
+        
+    </div>
+    
+        
+<div class="blog-post-listing">
+            <div class="logo-heading-block">
+            <span class="logoBlock">
                 <a shape="rect" class="userLogoLink" href="    /confluence/display/~gzurowski ">
                <img class="userLogo logo" src="news.userimage/gzurowski-89607-pp-wojtek-avatar.png" alt="User icon: gzurowski" title="gzurowski">
            </a>            </span>
@@ -461,26 +481,6 @@
     </div>
     
         
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="    /confluence/display/~davsclaus ">
-               <img class="userLogo logo" src="news.userimage/user-avatar" alt="User icon: davsclaus" title="davsclaus">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2017/03/19/apache-camel-first-commit-was-10-years-ago-on-march-19th.html">Apache Camel first commit was 10 years ago on March 19th</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="    /confluence/display/~davsclaus ">Claus Ibsen</a> posted on Mar 19, 2017</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p><span>Today marks a very special day as it was exactly 10 years ago the&#160;</span><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/camel/trunk/?pathrev=519901">first commit</a><span>&#160;of Apache Camel was done by its creator James Strachan.</span></p><pre>&#160;</pre><pre>Added Mon Mar 19 10:54:57 2007 UTC (10 years ago) by jstrachan</pre><pre>Initial checkin of Camel routing library</pre><p><span><span>The project was created as a sub-project to Apache ActiveMQ and back then github did not exists, so its using good old subversion.</span><br clear="none"><br clear="none"><span>In summer 2007 the first release of Apache Camel was published, which happened on July 2nd so lets wait until the summer to celebrate it's 10 years birthday.</span><br clear="none"></span></p>
-    </div>
-    
-        
     </div>
     </div>
         </td>

Modified: websites/production/camel/content/spark-rest.html
==============================================================================
--- websites/production/camel/content/spark-rest.html (original)
+++ websites/production/camel/content/spark-rest.html Wed Apr  4 10:23:50 2018
@@ -122,8 +122,7 @@
 </div></div>
 
     
-</div>
-<div class="cfm tabs-pane" id="RestDslTabsXml" data-pane-title="XML">
+</div><div class="cfm tabs-pane" id="RestDslTabsXml" data-pane-title="XML">
     <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[  &lt;camelContext xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
     &lt;rest uri=&quot;/hello/{me}&quot;&gt;
@@ -141,8 +140,7 @@
     
 </div>
 </div>
-<div style="clear:both"><p> </p></div>
-<p><span style="line-height: 1.4285715;">See more details at the&#160;</span><a shape="rect" href="rest-dsl.html">Rest DSL</a><span style="line-height: 1.4285715;">.</span></p><h3 id="Spark-rest-Moreexamples"><span style="font-size: 16.0px;line-height: 1.5625;">More examples</span></h3><p>There is a <strong>camel-example-spark-rest-tomcat</strong> example in the Apache Camel distribution, that demonstrates how to use camel-spark-rest in a web application that can be deployed on Apache Tomcat, or similar web containers.</p><p></p><h3 id="Spark-rest-SeeAlso">See Also</h3>
+<div style="clear:both"><p> </p></div><p><span style="line-height: 1.4285715;">See more details at the&#160;</span><a shape="rect" href="rest-dsl.html">Rest DSL</a><span style="line-height: 1.4285715;">.</span></p><h3 id="Spark-rest-Moreexamples"><span style="font-size: 16.0px;line-height: 1.5625;">More examples</span></h3><p>There is a <strong>camel-example-spark-rest-tomcat</strong> example in the Apache Camel distribution, that demonstrates how to use camel-spark-rest in a web application that can be deployed on Apache Tomcat, or similar web containers.</p><p></p><h3 id="Spark-rest-SeeAlso">See Also</h3>
 <ul><li><a shape="rect" href="configuring-camel.html">Configuring Camel</a></li><li><a shape="rect" href="component.html">Component</a></li><li><a shape="rect" href="endpoint.html">Endpoint</a></li><li><a shape="rect" href="getting-started.html">Getting Started</a></li></ul><ul style="list-style-type: square;"><li><a shape="rect" href="rest.html">Rest</a></li></ul></div>
         </td>
         <td valign="top">