Modified: websites/production/camel/content/news.html
==============================================================================
--- websites/production/camel/content/news.html (original)
+++ websites/production/camel/content/news.html Fri Oct 30 09:25:11 2015
@@ -84,6 +84,26 @@
<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>
+ <span class="blogHeading">
+ <a shape="rect" class="blogHeading"
href="2015/10/30/apache-camel-2154-released.html">Apache Camel 2.15.4
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 Oct 30,
2015</div>
+
+ </div>
+
+ <div class="wiki-content">
+ <p>The Camel community announces the immediate availability of the new
patch release Camel 2.15.4. This release contains over 40 fixes applied in the
past few weeks by the community on the Camel 2.15.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";
style="text-decoration: underline;">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?projectId=12311211&version=12333271";>release
notes</a><a shape="rect" class="external-link"
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12324786&projectId=12311211";>.</a></p><p>Many
thanks to all who made this release possible.</p><p>On behalf of the Camel
PMC,</p><p>Gregor Zurowski</p>
+ </div>
+
+
+ </div>
+
+
+<div class="blog-post-listing">
+ <div class="logo-heading-block">
+ <span class="logoBlock">
<a shape="rect" class="userLogoLink" href="
/confluence/display/~muellerc ">
<img class="userLogo logo"
src="news.userimage/muellerc-38851-pp-christian.png" alt="User icon: muellerc"
title="muellerc">
</a> </span>
@@ -458,26 +478,6 @@
</div>
- </div>
-
-
-<div class="blog-post-listing">
- <div class="logo-heading-block">
- <span class="logoBlock">
- <a shape="rect" class="userLogoLink" href="
/confluence/display/~njiang ">
- <img class="userLogo logo"
src="news.userimage/njiang-38992-pp-pic.jpeg" alt="User icon: njiang"
title="njiang">
- </a> </span>
- <span class="blogHeading">
- <a shape="rect" class="blogHeading"
href="2014/07/07/apache-camel-2132-released.html">Apache Camel 2.13.2
Released</a>
- </span><div class="page-metadata not-personal"> <a
shape="rect" class="url fn confluence-userlink" href="
/confluence/display/~njiang ">willem jiang</a> posted on Jul 07, 2014</div>
-
- </div>
-
- <div class="wiki-content">
- <p>The Camel community announces the immediate availability of the new
patch release Camel 2.13.2. This release contains a total of 41 fixes applied
in the past 2 months by the community on the Camel 2.13.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=12326817&styleName=Html&projectId=12311211";>release
notes</a><a shape="rect" class="external-link"
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12324786&projectId=12311211";>.</a></p><p>Many
thanks to all who made this release possible.</p><p>On behalf of the Camel
PMC,</p><p>Willem</p>
- </div>
-
-
</div>
</div>
</td>
Added:
websites/production/camel/content/news.userimage/gzurowski-89607-pp-wojtek-avatar.png
==============================================================================
Binary file - no diff available.
Propchange:
websites/production/camel/content/news.userimage/gzurowski-89607-pp-wojtek-avatar.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: websites/production/camel/content/release-guide.html
==============================================================================
--- websites/production/camel/content/release-guide.html (original)
+++ websites/production/camel/content/release-guide.html Fri Oct 30 09:25:11
2015
@@ -186,7 +186,7 @@ Certificate information:
Fingerprint: bc:5f:40:92:fd:6a:49:aa:f8:b8:35:0d:ed:27:5e:a6:64:c1:7a:1b
(R)eject, accept (t)emporarily or accept (p)ermanently?
</pre>
-</div></div></div></div></li><li>Update the <a shape="rect"
href="xml-reference.html">Xml Reference</a> page with a link to the
XSD's</li><li>Update the <a shape="rect" href="manual.html">Manual</a> page
with a link to the PDF/HTML <strong>if</strong> it's a new major/minor
version</li><li>Mail the <a shape="rect" class="external-link"
href="mailto:d...@camel.apache.org"; rel="nofollow">dev</a>, <a shape="rect"
class="external-link" href="mailto:u...@camel.apache.org";
rel="nofollow">user</a> & <a shape="rect" class="external-link"
href="mailto:annou...@apache.org"; rel="nofollow">announce</a> lists</li><li><a
shape="rect"
href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=CAMEL";>Post</a>
a news entry in the wiki which <strong>links to the release page</strong> so
folks can download it!</li><li>perform a full export of the Camel WIKI sites to
see your blog on the Camel index site. To do this, you have to remove the
main.pageCache file in the content/cache
sub directory:<ol><li>execute: svn rm <a shape="rect" class="external-link"
href="https://svn.apache.org/repos/infra/websites/production/camel/content/cache/main.pageCache";>https://svn.apache.org/repos/infra/websites/production/camel/content/cache/main.pageCache</a></li></ol></li><li>Add
the release version number to the following <code>spring.schemas</code> file
located in <code>src/main/resources/META-INF</code> directory of the following
components:<br clear="none"> camel-cxf<br clear="none"> camel-spring<br
clear="none"> camel-spring-integration<br clear="none">
camel-spring-security</li><li>Have a beer! <img class="emoticon emoticon-smile"
src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png";
data-emoticon-name="smile" alt="(smile)"></li></ol><h2
id="ReleaseGuide-Createanewmaintenancebranch">Create a new maintenance
branch</h2><div class="confluence-information-macro
confluence-information-macro-inf
ormation"><p class="title">This section is out of date.</p><span
class="aui-icon aui-icon-small aui-iconfont-info
confluence-information-macro-icon"></span><div
class="confluence-information-macro-body"><p>This section just for creating a
maintenance branch in camel svn repo, it is much easy to create a new branch
after camel repo is switched to Git.</p></div></div><p> </p><p>When we
finish the major version release, we need to create a maintenance branch to
holds the bug fixes. Here are the steps for it.</p><ol><li><p>Create a branch
from trunk remotely</p><div class="code panel pdl" style="border-width:
1px;"><div class="codeContent panelContent pdl">
+</div></div></div></div></li><li>Update the <a shape="rect"
href="xml-reference.html">Xml Reference</a> page with a link to the
XSD's</li><li>Update the <a shape="rect" href="manual.html">Manual</a> page
with a link to the PDF/HTML <strong>if</strong> it's a new major/minor
version</li><li>Mail the <a shape="rect" class="external-link"
href="mailto:d...@camel.apache.org"; rel="nofollow">d...@camel.apache.org</a>,
<a shape="rect" class="external-link" href="mailto:us...@camel.apache.org";
rel="nofollow">us...@camel.apache.org</a> & <a shape="rect"
class="external-link" href="mailto:annou...@apache.org";
rel="nofollow">annou...@apache.org</a> lists</li><li><a shape="rect"
href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=CAMEL";>Post</a>
a news entry in the wiki which <strong>links to the release page</strong> so
folks can download it!</li><li>perform a full export of the Camel WIKI sites to
see your blog on the Camel index site. To do this, you have to remo
ve the main.pageCache file in the content/cache sub directory:<ol><li>execute:
svn rm <a shape="rect" class="external-link"
href="https://svn.apache.org/repos/infra/websites/production/camel/content/cache/main.pageCache";>https://svn.apache.org/repos/infra/websites/production/camel/content/cache/main.pageCache</a></li></ol></li><li>Add
the release version number to the following <code>spring.schemas</code> file
located in <code>src/main/resources/META-INF</code> directory of the following
components:<br clear="none"> camel-cxf<br clear="none"> camel-spring<br
clear="none"> camel-spring-integration<br clear="none">
camel-spring-security</li><li>Have a beer! <img class="emoticon emoticon-smile"
src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png";
data-emoticon-name="smile" alt="(smile)"></li></ol><h2
id="ReleaseGuide-Createanewmaintenancebranch">Create a new maintenance
branch</h2><div class="confluence-inf
ormation-macro confluence-information-macro-information"><p class="title">This
section is out of date.</p><span class="aui-icon aui-icon-small
aui-iconfont-info confluence-information-macro-icon"></span><div
class="confluence-information-macro-body"><p>This section just for creating a
maintenance branch in camel svn repo, it is much easy to create a new branch
after camel repo is switched to Git.</p></div></div><p> </p><p>When we
finish the major version release, we need to create a maintenance branch to
holds the bug fixes. Here are the steps for it.</p><ol><li><p>Create a branch
from trunk remotely</p><div class="code panel pdl" style="border-width:
1px;"><div class="codeContent panelContent pdl">
<script class="brush: text; gutter: false; theme: Default"
type="syntaxhighlighter"><![CDATA[svn copy -m "create camel 2.10.x fix
branch" https://svn.apache.org/repos/asf/camel/trunk/
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
]]></script>
</div></div></li></ol><ol><li><p>Check out the remote branch in a new
directory</p><div class="code panel pdl" style="border-width: 1px;"><div
class="codeContent panelContent pdl">
Modified: websites/production/camel/content/servlet-tomcat-example.html
==============================================================================
--- websites/production/camel/content/servlet-tomcat-example.html (original)
+++ websites/production/camel/content/servlet-tomcat-example.html Fri Oct 30
09:25:11 2015
@@ -136,7 +136,7 @@
<route id="helloRoute">
<!-- incoming requests from the servlet is routed -->
- <from uri="servlet:///hello"/>
+ <from uri="servlet:hello"/>
<choice>
<when>
<!-- is there a header with the key name? -->
Modified: websites/production/camel/content/servlet.html
==============================================================================
--- websites/production/camel/content/servlet.html (original)
+++ websites/production/camel/content/servlet.html Fri Oct 30 09:25:11 2015
@@ -145,7 +145,7 @@
]]></script>
</div></div><p>Then you can define your route as follows:</p><div class="code
panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
<script class="brush: java; gutter: false; theme: Default"
type="syntaxhighlighter"><
![https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png"](https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png"){kind=link}
