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 2013/06/03 09:19:28 UTC

svn commit: r864163 - in /websites/production/camel/content: cache/main.pageCache camel-2120-release.html stream-caching.html

Author: buildbot
Date: Mon Jun  3 07:19:28 2013
New Revision: 864163

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/camel-2120-release.html
    websites/production/camel/content/stream-caching.html

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

Modified: websites/production/camel/content/camel-2120-release.html
==============================================================================
--- websites/production/camel/content/camel-2120-release.html (original)
+++ websites/production/camel/content/camel-2120-release.html Mon Jun  3 07:19:28 2013
@@ -124,7 +124,7 @@
 
 
 <h2><a shape="rect" name="Camel2.12.0Release-Changesthatmayaffectendusers"></a>Changes that may affect end users</h2>
-<ul><li>The <a shape="rect" href="file2.html" title="File2">File</a> and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> consumers when using idempotent repository will no longer invoke <tt>contains</tt> with a directory name; this has been changed to only be checked for files.</li><li>Shutting down using <a shape="rect" href="graceful-shutdown.html" title="Graceful Shutdown">Graceful Shutdown</a> now requires the timeout value to be positive. And improved logic to avoid getting stuck in waiting for inflight messages, and having counter go negative.</li><li><a shape="rect" href="tracer.html" title="Tracer">Tracer</a> now requires explicitly to be enabled on <tt>CamelContext</tt> to be available and in use.</li><li>The class <tt>org.apache.camel.processor.interceptor.BacklogTracerInterceptor</tt> has been removed as it was no longer needed due internal optimizations.</li></ul>
+<ul><li>The <a shape="rect" href="file2.html" title="File2">File</a> and <a shape="rect" href="ftp2.html" title="FTP2">FTP</a> consumers when using idempotent repository will no longer invoke <tt>contains</tt> with a directory name; this has been changed to only be checked for files.</li><li>Shutting down using <a shape="rect" href="graceful-shutdown.html" title="Graceful Shutdown">Graceful Shutdown</a> now requires the timeout value to be positive. And improved logic to avoid getting stuck in waiting for inflight messages, and having counter go negative.</li><li><a shape="rect" href="tracer.html" title="Tracer">Tracer</a> now requires explicitly to be enabled on <tt>CamelContext</tt> to be available and in use.</li><li>The class <tt>org.apache.camel.processor.interceptor.BacklogTracerInterceptor</tt> has been removed as it was no longer needed due internal optimizations.</li><li>The <a shape="rect" href="stream-caching.html" title="Stream caching">Stream caching</a> default
  threshold for spooling to disk has been changed from 64kb to 128kb.</li></ul>
 
 
 <h2><a shape="rect" name="Camel2.12.0Release-Importantchangestoconsiderwhenupgrading"></a>Important changes to consider when upgrading</h2>

Modified: websites/production/camel/content/stream-caching.html
==============================================================================
--- websites/production/camel/content/stream-caching.html (original)
+++ websites/production/camel/content/stream-caching.html Mon Jun  3 07:19:28 2013
@@ -78,7 +78,7 @@
 <div class="wiki-content maincontent"><h2><a shape="rect" name="Streamcaching-Streamcaching"></a>Stream caching</h2>
 <p>While stream types (like StreamSource, InputStream and Reader) are commonly used in messaging for performance reasons, they also have an important drawback: they can only be read once.  In order to be able to work with message content multiple times, the stream needs to be cached.</p>
 
-<p>Streams are caching in memory. In Camel 2.0, large stream messages (over 64 Kb) will be cached in a temporary file instead &#8211; Camel itself will handle deleting the temporary file once the cached stream is no longer necessary.</p>
+<p>Streams are caching in memory. In Camel 2.0, large stream messages (over 64 Kb in Camel 2.11 or older, and 128 kb from Camel 2.12 onwards) will be cached in a temporary file instead &#8211; Camel itself will handle deleting the temporary file once the cached stream is no longer necessary.</p>
 
 <p>In Camel 2.0 stream cache is default <b>disabled</b> out of the box.<br clear="none">
 In Camel 1.x stream cache is default <b>enabled</b> out of the box.</p>
@@ -148,7 +148,7 @@ from(<span class="code-quote">"jbi:servi
 </div></div>
 
 <h4><a shape="rect" name="Streamcaching-EnablingfromJavaDSL"></a>Enabling from Java DSL</h4>
-<p>In Camel 2.0 you can enable stream cache by setting the property on CamelContext, for instance in a RouteBuilder class:</p>
+<p>You can enable stream cache by setting the property on CamelContext, for instance in a RouteBuilder class:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
   context.setStreamCache(<span class="code-keyword">true</span>);
@@ -183,17 +183,12 @@ from(<span class="code-quote">"jbi:servi
 </pre>
 </div></div>
 
-<h3><a shape="rect" name="Streamcaching-Implicitlyenabledformulticastanddeadletterchannel%28Camel1.x%29"></a>Implicitly enabled for multicast and dead letter channel (Camel 1.x)</h3>
-<p>Some EIPs require that the message content can be read multiple times. Stream caching will be automatically enabled when using these EIPs in your routes:</p>
-<ul><li><a shape="rect" href="multicast.html" title="Multicast">Multicast </a> will implicitly cache streams to ensure that all the endpoints can access the message content</li><li><a shape="rect" href="dead-letter-channel.html" title="Dead Letter Channel">Dead Letter Channel </a> uses stream caching to ensure that the message content can actually be read again when redelivering a message</li></ul>
-
-
 
 <h3><a shape="rect" name="Streamcaching-Streamingcachetofiles"></a>Streaming cache to files</h3>
 <p>When stream cache is enabled it will by default spool big streams to files instead of keeping them in memory. The default threshold is 64kb but you can configure it with the following properties:</p>
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Property </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> CamelCachedOutputStreamBufferSize </td><td colspan="1" rowspan="1" class="confluenceTd"> 2kb </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.4, 2.10.2, 2.11.0:</b> Size in bytes of the buffer used in the stream. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> CamelCachedOutputStreamThreshold </td><td colspan="1" rowspan="1" class="confluenceTd"> 64kb </td><td colspan="1" rowspan="1" class="confluenceTd"> Size in bytes when the stream should be spooled to disk instead of keeping in memory. Use a value of 0 or negative to disable it all together so streams is always kept in memory regardless of their size. </td></tr><tr><td colspan="1" rowspan="1" clas
 s="confluenceTd"> CamelCachedOutputStreamOutputDirectory </td><td colspan="1" rowspan="1" class="confluenceTd"> java.io.tmpdir </td><td colspan="1" rowspan="1" class="confluenceTd"> Base directory where temporary files for spooled streams should be stored. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> CamelCachedOutputStreamCipherTransformation </td><td colspan="1" rowspan="1" class="confluenceTd"> null </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11.0:</b> If set, the temporary files are encrypted using the specified cipher transformation (i.e., a valid stream or 8-bit cipher name such as "RC4", "AES/CTR/NoPadding". An empty name "" is treated as null).</td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Property </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> CamelCachedOutputStreamBufferSize </td><td colspan="1" rowspan="1" class="confluenceTd"> 2kb </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.9.4, 2.10.2, 2.11.0:</b> Size in bytes of the buffer used in the stream. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> CamelCachedOutputStreamThreshold </td><td colspan="1" rowspan="1" class="confluenceTd"> 64kb or 128kb </td><td colspan="1" rowspan="1" class="confluenceTd"> 64kb for <b>Camel 2.11</b> or older. 128kb for <b>Camel 2.12</b> onwards. Size in bytes when the stream should be spooled to disk instead of keeping in memory. Use a value of 0 or negative to disable it all together so streams is always kept
  in memory regardless of their size. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> CamelCachedOutputStreamOutputDirectory </td><td colspan="1" rowspan="1" class="confluenceTd"> java.io.tmpdir </td><td colspan="1" rowspan="1" class="confluenceTd"> Base directory where temporary files for spooled streams should be stored. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> CamelCachedOutputStreamCipherTransformation </td><td colspan="1" rowspan="1" class="confluenceTd"> null </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.11.0:</b> If set, the temporary files are encrypted using the specified cipher transformation (i.e., a valid stream or 8-bit cipher name such as "RC4", "AES/CTR/NoPadding". An empty name "" is treated as null).</td></tr></tbody></table>
 </div>
 
 
@@ -210,8 +205,7 @@ context.getProperties().put(CachedOutput
 </div></div>
 
 <h4><a shape="rect" name="Streamcaching-Disablingspoolingtodisk"></a>Disabling spooling to disk</h4>
-<p><b>Available as of *Camel 1.6.2/2.0</b><br clear="none">
-You can disable spooling to disk by setting a threshold of 0 or a negative value.</p>
+<p>You can disable spooling to disk by setting a threshold of 0 or a negative value.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
 <span class="code-comment">// disable spooling to disk