svn commit: r849756 - in /websites/production/camel/content: book-component-appendix.html servlet.html

[buildbot]

Author: buildbot
Date: Thu Feb  7 14:25:38 2013
New Revision: 849756

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/book-component-appendix.html
    websites/production/camel/content/servlet.html

Modified: websites/production/camel/content/book-component-appendix.html
==============================================================================
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Thu Feb  7 
14:25:38 2013
@@ -14658,6 +14658,25 @@ servlet:<span class="code-comment">//rel
 </div></div>
 
 
+<p>From <b>Camel 2.11</b> onwards Camel will detect this duplicate and fail to 
start the application. You can control to ignore this duplicate by setting the 
servlet init-parameter ignoreDuplicateServletName to true as follows:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-xml">
+  <span class="code-tag">&lt;servlet&gt;</span>
+    <span class="code-tag">&lt;servlet-name&gt;</span>CamelServlet<span 
class="code-tag">&lt;/servlet-name&gt;</span>
+    <span class="code-tag">&lt;display-name&gt;</span>Camel Http Transport 
Servlet<span class="code-tag">&lt;/display-name&gt;</span>
+    <span 
class="code-tag">&lt;servlet-class&gt;</span>org.apache.camel.component.servlet.CamelHttpTransportServlet<span
 class="code-tag">&lt;/servlet-class&gt;</span>
+    <span class="code-tag">&lt;init-param&gt;</span>
+      <span 
class="code-tag">&lt;param-name&gt;</span>ignoreDuplicateServletName<span 
class="code-tag">&lt;/param-name&gt;</span>
+      <span class="code-tag">&lt;param-value&gt;</span>true<span 
class="code-tag">&lt;/param-value&gt;</span>
+    <span class="code-tag">&lt;/init-param&gt;</span>
+  <span class="code-tag">&lt;/servlet&gt;</span>
+</pre>
+</div></div>
+
+<p>But its <b>strongly advised</b> to use unique servlet-name for each Camel 
application to avoid this duplication clash, as well any unforeseen 
side-effects.</p>
+
+
 <h3><a shape="rect" name="BookComponentAppendix-Sample"></a>Sample</h3>
 
 <div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col 
span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" 
valign="top"><img align="middle" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif";
 width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">From 
Camel 2.7 onwards it's easier to use <a shape="rect" href="servlet.html" 
title="SERVLET">Servlet</a> in Spring web applications. See <a shape="rect" 
href="servlet-tomcat-example.html" title="Servlet Tomcat Example">Servlet 
Tomcat Example</a> for details.</td></tr></table></div>

Modified: websites/production/camel/content/servlet.html
==============================================================================
--- websites/production/camel/content/servlet.html (original)
+++ websites/production/camel/content/servlet.html Thu Feb  7 14:25:38 2013
@@ -151,6 +151,25 @@ servlet:<span class="code-comment">//rel
 </div></div>
 
 
+<p>From <b>Camel 2.11</b> onwards Camel will detect this duplicate and fail to 
start the application. You can control to ignore this duplicate by setting the 
servlet init-parameter ignoreDuplicateServletName to true as follows:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-xml">
+  <span class="code-tag">&lt;servlet&gt;</span>
+    <span class="code-tag">&lt;servlet-name&gt;</span>CamelServlet<span 
class="code-tag">&lt;/servlet-name&gt;</span>
+    <span class="code-tag">&lt;display-name&gt;</span>Camel Http Transport 
Servlet<span class="code-tag">&lt;/display-name&gt;</span>
+    <span 
class="code-tag">&lt;servlet-class&gt;</span>org.apache.camel.component.servlet.CamelHttpTransportServlet<span
 class="code-tag">&lt;/servlet-class&gt;</span>
+    <span class="code-tag">&lt;init-param&gt;</span>
+      <span 
class="code-tag">&lt;param-name&gt;</span>ignoreDuplicateServletName<span 
class="code-tag">&lt;/param-name&gt;</span>
+      <span class="code-tag">&lt;param-value&gt;</span>true<span 
class="code-tag">&lt;/param-value&gt;</span>
+    <span class="code-tag">&lt;/init-param&gt;</span>
+  <span class="code-tag">&lt;/servlet&gt;</span>
+</pre>
+</div></div>
+
+<p>But its <b>strongly advised</b> to use unique servlet-name for each Camel 
application to avoid this duplication clash, as well any unforeseen 
side-effects.</p>
+
+
 <h3><a shape="rect" name="SERVLET-Sample"></a>Sample</h3>
 
 <div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col 
span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" 
valign="top"><img align="middle" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif";
 width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">From 
Camel 2.7 onwards it's easier to use <a shape="rect" href="servlet.html" 
title="SERVLET">Servlet</a> in Spring web applications. See <a shape="rect" 
href="servlet-tomcat-example.html" title="Servlet Tomcat Example">Servlet 
Tomcat Example</a> for details.</td></tr></table></div>