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 2012/03/13 16:20:47 UTC

svn commit: r808510 - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache.html cache/main.pageCache camel-2100-release.html

Author: buildbot
Date: Tue Mar 13 15:20:46 2012
New Revision: 808510

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/book-component-appendix.html
    websites/production/camel/content/book-in-one-page.html
    websites/production/camel/content/cache.html
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/camel-2100-release.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 Tue Mar 13 15:20:46 2012
@@ -1024,7 +1024,7 @@ browse:someName
 
 <p>This component supports producer and event based consumer endpoints.</p>
 
-<p>The Cache consumer is an event based consumer and can be used to listen and respond to specific cache activities. If you need to perform selections from a pre-existing cache, used the processors defined for the cache component.</p>
+<p>The Cache consumer is an event based consumer and can be used to listen and respond to specific cache activities. If you need to perform selections from a pre-existing cache, use the processors defined for the cache component.</p>
 
 <p>Maven users will need to add the following dependency to their <tt>pom.xml</tt> for this component:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -1050,13 +1050,11 @@ cache:<span class="code-comment">//cache
 
 <h3><a shape="rect" name="BookComponentAppendix-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxElementsInMemory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The numer of elements that may be stored in the defined cache </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>memoryStoreEvictionPolicy</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>MemoryStoreEvictionPolicy.LFU</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of elements that may be stored in the defined cache. Options include
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxElementsInMemory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of elements that may be stored in the defined cache </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>memoryStoreEvictionPolicy</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>MemoryStoreEvictionPolicy.LFU</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of elements that may be stored in the defined cache. Options include
 <ul class="alternate" type="square"><li>MemoryStoreEvictionPolicy.LFU - Least frequently used</li><li>MemoryStoreEvictionPolicy.LRU - Least recently used</li><li>MemoryStoreEvictionPolicy.FIFO - first in first out, the oldest element by creation time</li></ul>
 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>overflowToDisk</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies whether cache may overflow to disk </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>eternal</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sets whether elements are eternal. If eternal, timeouts are ignored and the<br clear="none" class="atl-forced-newline">
- element is never expired. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToLiveSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum time between creation time and when an element expires.<br clear="none" class="atl-forced-newline">
- Is only used if the element is not eternal </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToIdleSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum amount of time between accesses before an element expires </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskPersistent</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether the disk store persists between restarts of the Virtual Machine.<br clear="none" class="atl-forced-newline">
- The default value is false. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskExpiryThreadIntervalSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>120</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of seconds between runs of the disk expiry thread. The default value<br clear="none" class="atl-forced-newline">
- is 120 seconds </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheManagerFactory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> If you want to use a custom factory which instantiates and creates the EHCache <tt>net.sf.ehcache.CacheManager</tt>. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> abstract org.apache.camel.component.cache.CacheManagerFactory </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>eventListenerRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of EHCache <tt>net.sf.ehcache.event.CacheEventListener</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none
 " class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheEventListenerRegistry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheLoaderRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of <tt>org.apache.camel.component.cache.CacheLoaderWrapper</tt> that extends EHCache <tt>net.sf.ehcache.loader.CacheLoader</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheLoaderRegistry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>key</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using a cache key by default. If 
 a key is provided in the message header, then the key from the header takes precedence. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>operation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using an cache operation by default. If an operation in the message header, then the operation from the header takes precedence. </td></tr></tbody></table>
+ element never expires. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToLiveSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum time between creation time and when an element expires.<br clear="none" class="atl-forced-newline">
+ Is used only if the element is not eternal </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToIdleSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum amount of time between accesses before an element expires </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskPersistent</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether the disk store persists between restarts of the Virtual Machine. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskExpiryThreadIntervalSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>120</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of seconds between runs of the disk expiry thread. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheManagerFacto
 ry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> If you want to use a custom factory which instantiates and creates the EHCache <tt>net.sf.ehcache.CacheManager</tt>. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> abstract org.apache.camel.component.cache.CacheManagerFactory </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>eventListenerRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of EHCache <tt>net.sf.ehcache.event.CacheEventListener</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheEventListenerRegi
 stry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheLoaderRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of <tt>org.apache.camel.component.cache.CacheLoaderWrapper</tt> that extends EHCache <tt>net.sf.ehcache.loader.CacheLoader</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheLoaderRegistry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>key</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using a cache key by default. If a key is provided in the message header, then the key from the header takes precedence. </td></tr><tr
 ><td colspan="1" rowspan="1" class="confluenceTd"> <tt>operation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using an cache operation by default. If an operation in the message header, then the operation from the header takes precedence. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -1064,16 +1062,16 @@ cache:<span class="code-comment">//cache
 
 <h4><a shape="rect" name="BookComponentAppendix-MessageHeadersuptoCamel2.7"></a>Message Headers up to Camel 2.7</h4>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CACHE_OPERATION</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The operation to be performed on the cache. The valid options are
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CACHE_OPERATION</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The operation to be performed on the cache. Valid options are
 <ul class="alternate" type="square"><li>GET</li><li>CHECK</li><li>ADD</li><li>UPDATE</li><li>DELETE</li><li>DELETEALL<br clear="none" class="atl-forced-newline">
- The <tt>GET</tt> and <tt>CHECK</tt> requires <b>Camel 2.3</b> onwards. </li></ul>
+<tt>GET</tt> and <tt>CHECK</tt> requires <b>Camel 2.3</b> onwards. </li></ul>
 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CACHE_KEY</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The cache key used to store the Message in the cache. The cache key is optional if the CACHE_OPERATION is DELETEALL </td></tr></tbody></table>
 </div>
 </div>
 
 <h4><a shape="rect" name="BookComponentAppendix-MessageHeadersCamel2.8%5C"></a>Message Headers Camel 2.8+</h4>
 
-<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"><b>Header changes in Camel 2.8</b><br clear="none">The header names and supported values have changed to be prefixed with 'CamelCache' and use mixed case.  This makes them easier to identify and keep separate from other headers.  The CacheConstants variable names remain unchanged, just their values have been changed.  Also, these headers are now being removed from the exchange after the cache operation is performed.</td></tr></table></div>
+<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"><b>Header changes in Camel 2.8</b><br clear="none">The header names and supported values have changed to be prefixed with 'CamelCache' and use mixed case.  This makes them easier to identify and keep separate from other headers.  The CacheConstants variable names remain unchanged, just their values have been changed.  Also, these headers are now removed from the exchange after the cache operation is performed.</td></tr></table></div>
 
 <div class="confluenceTableSmall"><div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelCacheOperation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The operation to be performed on the cache. The valid options are
@@ -1245,7 +1243,7 @@ from(<span class="code-quote">"direct:st
 
 <h4><a shape="rect" name="BookComponentAppendix-Example8%3ACheckingforanentryintheCache"></a>Example 8: Checking for an entry in the Cache</h4>
 
-<p>Note: CHECK command tests existence of the entry in the cache but doesn't place message to the body.</p>
+<p>Note: The CHECK command tests existence of an entry in the cache but doesn't place a message in the body.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
 from(<span class="code-quote">"direct:start"</span>)
@@ -1267,7 +1265,7 @@ from(<span class="code-quote">"direct:st
 
 <h3><a shape="rect" name="BookComponentAppendix-ManagementofEHCache"></a>Management of EHCache</h3>
 
-<p>EHCache has its own statistics and management from <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a>.</p>
+<p><a shape="rect" class="external-link" href="http://ehcache.org/" rel="nofollow">EHCache</a> has its own statistics and management from <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a>.</p>
 
 <p>Here's a snippet on how to expose them via JMX in a Spring application context:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -1298,31 +1296,31 @@ ManagementService.registerMBeans(CacheMa
 
 <h3><a shape="rect" name="BookComponentAppendix-CachereplicationCamel2.8%5C"></a>Cache replication Camel 2.8+</h3>
 
-<p>Camel Cache component is able to distribute cache across server nodes using several different replication mechanisms like: RMI, JGroups, JMS and Cache Server.</p>
+<p>The Camel Cache component is able to distribute a cache across server nodes using several different replication mechanisms including: RMI, JGroups, JMS and Cache Server.</p>
 
 
-<p>There are two different ways To make it work:</p>
+<p>There are two different ways to make it work:</p>
 
-<p><b>1.</b> you need to configure <tt>ehcache.xml</tt> manually</p>
+<p><b>1.</b> You can configure <tt>ehcache.xml</tt> manually</p>
 
 <p>OR</p>
 
-<p><b>2.</b> you have to take care about these three options:</p>
+<p><b>2.</b> You can configure these three options:</p>
 <ul class="alternate" type="square"><li>cacheManagerFactory</li><li>eventListenerRegistry</li><li>cacheLoaderRegistry</li></ul>
 
 
 
-<p>Configuring Camel Cache replication using 1st option- the <tt>ehcache.xml</tt> file is a bit hard work as you have to configure all caches separately. So in a situation when the all names of caches are not know, using <tt>ehcache.xml</tt> is not a good idea.</p>
+<p>Configuring Camel Cache replication using the first option is a bit of hard work as you have to configure all caches separately. So in a situation when the all names of caches are not known, using <tt>ehcache.xml</tt> is not a good idea.</p>
 
 <p>The second option is much better when you want to use many different caches as you do not need to define options per cache. This is because replication options are set per <tt>CacheManager</tt> and per <tt>CacheEndpoint</tt>. Also it is the only way when cache names are not know at the development phase.</p>
 
 
-<div class="panelMacro"><table class="noteMacro"><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/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">It might be useful to read EHCache manual to get better understanding of Camel Cache replication mechanism.</td></tr></table></div>
+<div class="panelMacro"><table class="noteMacro"><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/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">It might be useful to read the <a shape="rect" class="external-link" href="http://ehcache.org/documentation" rel="nofollow">EHCache manual</a> to get a better understanding of the Camel Cache replication mechanism.</td></tr></table></div>
 
 <h4><a shape="rect" name="BookComponentAppendix-Example%3AJMScachereplication"></a>Example: JMS cache replication</h4>
 
-<p>JMS replication is the most powerful and secured way. Used altogether with Camel Cache replication options is also the most easy way.<br clear="none">
-This example is available on <a shape="rect" href="cachereplicationjmsexample.html" title="cacheReplicationJMSExample">separated page</a>.</p>
+<p>JMS replication is the most powerful and secured replication method. Used together with Camel Cache replication makes it also rather simple.<br clear="none">
+An example is available on <a shape="rect" href="cachereplicationjmsexample.html" title="cacheReplicationJMSExample">a separate page</a>.</p>
 <h2><a shape="rect" name="BookComponentAppendix-ClassComponent"></a>Class Component</h2>
 <p><b>Available as of Camel 2.4</b></p>
 

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 Tue Mar 13 15:20:46 2012
@@ -21052,7 +21052,7 @@ browse:someName
 
 <p>This component supports producer and event based consumer endpoints.</p>
 
-<p>The Cache consumer is an event based consumer and can be used to listen and respond to specific cache activities. If you need to perform selections from a pre-existing cache, used the processors defined for the cache component.</p>
+<p>The Cache consumer is an event based consumer and can be used to listen and respond to specific cache activities. If you need to perform selections from a pre-existing cache, use the processors defined for the cache component.</p>
 
 <p>Maven users will need to add the following dependency to their <tt>pom.xml</tt> for this component:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -21078,13 +21078,11 @@ cache:<span class="code-comment">//cache
 
 <h3><a shape="rect" name="BookInOnePage-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxElementsInMemory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The numer of elements that may be stored in the defined cache </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>memoryStoreEvictionPolicy</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>MemoryStoreEvictionPolicy.LFU</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of elements that may be stored in the defined cache. Options include
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxElementsInMemory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of elements that may be stored in the defined cache </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>memoryStoreEvictionPolicy</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>MemoryStoreEvictionPolicy.LFU</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of elements that may be stored in the defined cache. Options include
 <ul class="alternate" type="square"><li>MemoryStoreEvictionPolicy.LFU - Least frequently used</li><li>MemoryStoreEvictionPolicy.LRU - Least recently used</li><li>MemoryStoreEvictionPolicy.FIFO - first in first out, the oldest element by creation time</li></ul>
 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>overflowToDisk</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies whether cache may overflow to disk </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>eternal</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sets whether elements are eternal. If eternal, timeouts are ignored and the<br clear="none" class="atl-forced-newline">
- element is never expired. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToLiveSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum time between creation time and when an element expires.<br clear="none" class="atl-forced-newline">
- Is only used if the element is not eternal </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToIdleSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum amount of time between accesses before an element expires </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskPersistent</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether the disk store persists between restarts of the Virtual Machine.<br clear="none" class="atl-forced-newline">
- The default value is false. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskExpiryThreadIntervalSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>120</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of seconds between runs of the disk expiry thread. The default value<br clear="none" class="atl-forced-newline">
- is 120 seconds </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheManagerFactory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> If you want to use a custom factory which instantiates and creates the EHCache <tt>net.sf.ehcache.CacheManager</tt>. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> abstract org.apache.camel.component.cache.CacheManagerFactory </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>eventListenerRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of EHCache <tt>net.sf.ehcache.event.CacheEventListener</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none
 " class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheEventListenerRegistry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheLoaderRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of <tt>org.apache.camel.component.cache.CacheLoaderWrapper</tt> that extends EHCache <tt>net.sf.ehcache.loader.CacheLoader</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheLoaderRegistry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>key</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using a cache key by default. If 
 a key is provided in the message header, then the key from the header takes precedence. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>operation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using an cache operation by default. If an operation in the message header, then the operation from the header takes precedence. </td></tr></tbody></table>
+ element never expires. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToLiveSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum time between creation time and when an element expires.<br clear="none" class="atl-forced-newline">
+ Is used only if the element is not eternal </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToIdleSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum amount of time between accesses before an element expires </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskPersistent</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether the disk store persists between restarts of the Virtual Machine. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskExpiryThreadIntervalSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>120</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of seconds between runs of the disk expiry thread. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheManagerFacto
 ry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> If you want to use a custom factory which instantiates and creates the EHCache <tt>net.sf.ehcache.CacheManager</tt>. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> abstract org.apache.camel.component.cache.CacheManagerFactory </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>eventListenerRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of EHCache <tt>net.sf.ehcache.event.CacheEventListener</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheEventListenerRegi
 stry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheLoaderRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of <tt>org.apache.camel.component.cache.CacheLoaderWrapper</tt> that extends EHCache <tt>net.sf.ehcache.loader.CacheLoader</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheLoaderRegistry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>key</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using a cache key by default. If a key is provided in the message header, then the key from the header takes precedence. </td></tr><tr
 ><td colspan="1" rowspan="1" class="confluenceTd"> <tt>operation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using an cache operation by default. If an operation in the message header, then the operation from the header takes precedence. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -21092,16 +21090,16 @@ cache:<span class="code-comment">//cache
 
 <h4><a shape="rect" name="BookInOnePage-MessageHeadersuptoCamel2.7"></a>Message Headers up to Camel 2.7</h4>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CACHE_OPERATION</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The operation to be performed on the cache. The valid options are
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CACHE_OPERATION</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The operation to be performed on the cache. Valid options are
 <ul class="alternate" type="square"><li>GET</li><li>CHECK</li><li>ADD</li><li>UPDATE</li><li>DELETE</li><li>DELETEALL<br clear="none" class="atl-forced-newline">
- The <tt>GET</tt> and <tt>CHECK</tt> requires <b>Camel 2.3</b> onwards. </li></ul>
+<tt>GET</tt> and <tt>CHECK</tt> requires <b>Camel 2.3</b> onwards. </li></ul>
 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CACHE_KEY</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The cache key used to store the Message in the cache. The cache key is optional if the CACHE_OPERATION is DELETEALL </td></tr></tbody></table>
 </div>
 </div>
 
 <h4><a shape="rect" name="BookInOnePage-MessageHeadersCamel2.8%5C"></a>Message Headers Camel 2.8+</h4>
 
-<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"><b>Header changes in Camel 2.8</b><br clear="none">The header names and supported values have changed to be prefixed with 'CamelCache' and use mixed case.  This makes them easier to identify and keep separate from other headers.  The CacheConstants variable names remain unchanged, just their values have been changed.  Also, these headers are now being removed from the exchange after the cache operation is performed.</td></tr></table></div>
+<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"><b>Header changes in Camel 2.8</b><br clear="none">The header names and supported values have changed to be prefixed with 'CamelCache' and use mixed case.  This makes them easier to identify and keep separate from other headers.  The CacheConstants variable names remain unchanged, just their values have been changed.  Also, these headers are now removed from the exchange after the cache operation is performed.</td></tr></table></div>
 
 <div class="confluenceTableSmall"><div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelCacheOperation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The operation to be performed on the cache. The valid options are
@@ -21273,7 +21271,7 @@ from(<span class="code-quote">"direct:st
 
 <h4><a shape="rect" name="BookInOnePage-Example8%3ACheckingforanentryintheCache"></a>Example 8: Checking for an entry in the Cache</h4>
 
-<p>Note: CHECK command tests existence of the entry in the cache but doesn't place message to the body.</p>
+<p>Note: The CHECK command tests existence of an entry in the cache but doesn't place a message in the body.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
 from(<span class="code-quote">"direct:start"</span>)
@@ -21295,7 +21293,7 @@ from(<span class="code-quote">"direct:st
 
 <h3><a shape="rect" name="BookInOnePage-ManagementofEHCache"></a>Management of EHCache</h3>
 
-<p>EHCache has its own statistics and management from <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a>.</p>
+<p><a shape="rect" class="external-link" href="http://ehcache.org/" rel="nofollow">EHCache</a> has its own statistics and management from <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a>.</p>
 
 <p>Here's a snippet on how to expose them via JMX in a Spring application context:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -21326,31 +21324,31 @@ ManagementService.registerMBeans(CacheMa
 
 <h3><a shape="rect" name="BookInOnePage-CachereplicationCamel2.8%5C"></a>Cache replication Camel 2.8+</h3>
 
-<p>Camel Cache component is able to distribute cache across server nodes using several different replication mechanisms like: RMI, JGroups, JMS and Cache Server.</p>
+<p>The Camel Cache component is able to distribute a cache across server nodes using several different replication mechanisms including: RMI, JGroups, JMS and Cache Server.</p>
 
 
-<p>There are two different ways To make it work:</p>
+<p>There are two different ways to make it work:</p>
 
-<p><b>1.</b> you need to configure <tt>ehcache.xml</tt> manually</p>
+<p><b>1.</b> You can configure <tt>ehcache.xml</tt> manually</p>
 
 <p>OR</p>
 
-<p><b>2.</b> you have to take care about these three options:</p>
+<p><b>2.</b> You can configure these three options:</p>
 <ul class="alternate" type="square"><li>cacheManagerFactory</li><li>eventListenerRegistry</li><li>cacheLoaderRegistry</li></ul>
 
 
 
-<p>Configuring Camel Cache replication using 1st option- the <tt>ehcache.xml</tt> file is a bit hard work as you have to configure all caches separately. So in a situation when the all names of caches are not know, using <tt>ehcache.xml</tt> is not a good idea.</p>
+<p>Configuring Camel Cache replication using the first option is a bit of hard work as you have to configure all caches separately. So in a situation when the all names of caches are not known, using <tt>ehcache.xml</tt> is not a good idea.</p>
 
 <p>The second option is much better when you want to use many different caches as you do not need to define options per cache. This is because replication options are set per <tt>CacheManager</tt> and per <tt>CacheEndpoint</tt>. Also it is the only way when cache names are not know at the development phase.</p>
 
 
-<div class="panelMacro"><table class="noteMacro"><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/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">It might be useful to read EHCache manual to get better understanding of Camel Cache replication mechanism.</td></tr></table></div>
+<div class="panelMacro"><table class="noteMacro"><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/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">It might be useful to read the <a shape="rect" class="external-link" href="http://ehcache.org/documentation" rel="nofollow">EHCache manual</a> to get a better understanding of the Camel Cache replication mechanism.</td></tr></table></div>
 
 <h4><a shape="rect" name="BookInOnePage-Example%3AJMScachereplication"></a>Example: JMS cache replication</h4>
 
-<p>JMS replication is the most powerful and secured way. Used altogether with Camel Cache replication options is also the most easy way.<br clear="none">
-This example is available on <a shape="rect" href="cachereplicationjmsexample.html" title="cacheReplicationJMSExample">separated page</a>.</p>
+<p>JMS replication is the most powerful and secured replication method. Used together with Camel Cache replication makes it also rather simple.<br clear="none">
+An example is available on <a shape="rect" href="cachereplicationjmsexample.html" title="cacheReplicationJMSExample">a separate page</a>.</p>
 <h2><a shape="rect" name="BookInOnePage-ClassComponent"></a>Class Component</h2>
 <p><b>Available as of Camel 2.4</b></p>
 

Modified: websites/production/camel/content/cache.html
==============================================================================
--- websites/production/camel/content/cache.html (original)
+++ websites/production/camel/content/cache.html Tue Mar 13 15:20:46 2012
@@ -83,7 +83,7 @@
 
 <p>This component supports producer and event based consumer endpoints.</p>
 
-<p>The Cache consumer is an event based consumer and can be used to listen and respond to specific cache activities. If you need to perform selections from a pre-existing cache, used the processors defined for the cache component.</p>
+<p>The Cache consumer is an event based consumer and can be used to listen and respond to specific cache activities. If you need to perform selections from a pre-existing cache, use the processors defined for the cache component.</p>
 
 <p>Maven users will need to add the following dependency to their <tt>pom.xml</tt> for this component:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -109,13 +109,11 @@ cache:<span class="code-comment">//cache
 
 <h3><a shape="rect" name="Cache-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxElementsInMemory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The numer of elements that may be stored in the defined cache </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>memoryStoreEvictionPolicy</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>MemoryStoreEvictionPolicy.LFU</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of elements that may be stored in the defined cache. Options include
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxElementsInMemory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of elements that may be stored in the defined cache </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>memoryStoreEvictionPolicy</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>MemoryStoreEvictionPolicy.LFU</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of elements that may be stored in the defined cache. Options include
 <ul class="alternate" type="square"><li>MemoryStoreEvictionPolicy.LFU - Least frequently used</li><li>MemoryStoreEvictionPolicy.LRU - Least recently used</li><li>MemoryStoreEvictionPolicy.FIFO - first in first out, the oldest element by creation time</li></ul>
 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>overflowToDisk</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies whether cache may overflow to disk </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>eternal</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sets whether elements are eternal. If eternal, timeouts are ignored and the<br clear="none" class="atl-forced-newline">
- element is never expired. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToLiveSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum time between creation time and when an element expires.<br clear="none" class="atl-forced-newline">
- Is only used if the element is not eternal </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToIdleSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum amount of time between accesses before an element expires </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskPersistent</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether the disk store persists between restarts of the Virtual Machine.<br clear="none" class="atl-forced-newline">
- The default value is false. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskExpiryThreadIntervalSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>120</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of seconds between runs of the disk expiry thread. The default value<br clear="none" class="atl-forced-newline">
- is 120 seconds </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheManagerFactory</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> If you want to use a custom factory which instantiates and creates the EHCache <tt>net.sf.ehcache.CacheManager</tt>. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> abstract org.apache.camel.component.cache.CacheManagerFactory </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>eventListenerRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of EHCache <tt>net.sf.ehcache.event.CacheEventListener</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none
 " class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheEventListenerRegistry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheLoaderRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of <tt>org.apache.camel.component.cache.CacheLoaderWrapper</tt> that extends EHCache <tt>net.sf.ehcache.loader.CacheLoader</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheLoaderRegistry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>key</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using a cache key by default. If 
 a key is provided in the message header, then the key from the header takes precedence. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>operation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using an cache operation by default. If an operation in the message header, then the operation from the header takes precedence. </td></tr></tbody></table>
+ element never expires. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToLiveSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum time between creation time and when an element expires.<br clear="none" class="atl-forced-newline">
+ Is used only if the element is not eternal </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>timeToIdleSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>300</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The maximum amount of time between accesses before an element expires </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskPersistent</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Whether the disk store persists between restarts of the Virtual Machine. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>diskExpiryThreadIntervalSeconds</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>120</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of seconds between runs of the disk expiry thread. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheManagerFacto
 ry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> If you want to use a custom factory which instantiates and creates the EHCache <tt>net.sf.ehcache.CacheManager</tt>. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> abstract org.apache.camel.component.cache.CacheManagerFactory </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>eventListenerRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of EHCache <tt>net.sf.ehcache.event.CacheEventListener</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheEventListenerRegi
 stry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cacheLoaderRegistry</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.8:</b> Sets a list of <tt>org.apache.camel.component.cache.CacheLoaderWrapper</tt> that extends EHCache <tt>net.sf.ehcache.loader.CacheLoader</tt> for all new caches- no need to define it per cache in EHCache xml config anymore. <br clear="none" class="atl-forced-newline">  <br clear="none" class="atl-forced-newline">  <em>Type:</em> org.apache.camel.component.cache.CacheLoaderRegistry </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>key</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using a cache key by default. If a key is provided in the message header, then the key from the header takes precedence. </td></tr><tr
 ><td colspan="1" rowspan="1" class="confluenceTd"> <tt>operation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.10:</b> To configure using an cache operation by default. If an operation in the message header, then the operation from the header takes precedence. </td></tr></tbody></table>
 </div>
 </div>
 
@@ -123,16 +121,16 @@ cache:<span class="code-comment">//cache
 
 <h4><a shape="rect" name="Cache-MessageHeadersuptoCamel2.7"></a>Message Headers up to Camel 2.7</h4>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CACHE_OPERATION</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The operation to be performed on the cache. The valid options are
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CACHE_OPERATION</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The operation to be performed on the cache. Valid options are
 <ul class="alternate" type="square"><li>GET</li><li>CHECK</li><li>ADD</li><li>UPDATE</li><li>DELETE</li><li>DELETEALL<br clear="none" class="atl-forced-newline">
- The <tt>GET</tt> and <tt>CHECK</tt> requires <b>Camel 2.3</b> onwards. </li></ul>
+<tt>GET</tt> and <tt>CHECK</tt> requires <b>Camel 2.3</b> onwards. </li></ul>
 </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CACHE_KEY</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The cache key used to store the Message in the cache. The cache key is optional if the CACHE_OPERATION is DELETEALL </td></tr></tbody></table>
 </div>
 </div>
 
 <h4><a shape="rect" name="Cache-MessageHeadersCamel2.8%5C"></a>Message Headers Camel 2.8+</h4>
 
-<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"><b>Header changes in Camel 2.8</b><br clear="none">The header names and supported values have changed to be prefixed with 'CamelCache' and use mixed case.  This makes them easier to identify and keep separate from other headers.  The CacheConstants variable names remain unchanged, just their values have been changed.  Also, these headers are now being removed from the exchange after the cache operation is performed.</td></tr></table></div>
+<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"><b>Header changes in Camel 2.8</b><br clear="none">The header names and supported values have changed to be prefixed with 'CamelCache' and use mixed case.  This makes them easier to identify and keep separate from other headers.  The CacheConstants variable names remain unchanged, just their values have been changed.  Also, these headers are now removed from the exchange after the cache operation is performed.</td></tr></table></div>
 
 <div class="confluenceTableSmall"><div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelCacheOperation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The operation to be performed on the cache. The valid options are
@@ -304,7 +302,7 @@ from(<span class="code-quote">"direct:st
 
 <h4><a shape="rect" name="Cache-Example8%3ACheckingforanentryintheCache"></a>Example 8: Checking for an entry in the Cache</h4>
 
-<p>Note: CHECK command tests existence of the entry in the cache but doesn't place message to the body.</p>
+<p>Note: The CHECK command tests existence of an entry in the cache but doesn't place a message in the body.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
 from(<span class="code-quote">"direct:start"</span>)
@@ -326,7 +324,7 @@ from(<span class="code-quote">"direct:st
 
 <h3><a shape="rect" name="Cache-ManagementofEHCache"></a>Management of EHCache</h3>
 
-<p>EHCache has its own statistics and management from <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a>.</p>
+<p><a shape="rect" class="external-link" href="http://ehcache.org/" rel="nofollow">EHCache</a> has its own statistics and management from <a shape="rect" href="camel-jmx.html" title="Camel JMX">JMX</a>.</p>
 
 <p>Here's a snippet on how to expose them via JMX in a Spring application context:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -357,31 +355,31 @@ ManagementService.registerMBeans(CacheMa
 
 <h3><a shape="rect" name="Cache-CachereplicationCamel2.8%5C"></a>Cache replication Camel 2.8+</h3>
 
-<p>Camel Cache component is able to distribute cache across server nodes using several different replication mechanisms like: RMI, JGroups, JMS and Cache Server.</p>
+<p>The Camel Cache component is able to distribute a cache across server nodes using several different replication mechanisms including: RMI, JGroups, JMS and Cache Server.</p>
 
 
-<p>There are two different ways To make it work:</p>
+<p>There are two different ways to make it work:</p>
 
-<p><b>1.</b> you need to configure <tt>ehcache.xml</tt> manually</p>
+<p><b>1.</b> You can configure <tt>ehcache.xml</tt> manually</p>
 
 <p>OR</p>
 
-<p><b>2.</b> you have to take care about these three options:</p>
+<p><b>2.</b> You can configure these three options:</p>
 <ul class="alternate" type="square"><li>cacheManagerFactory</li><li>eventListenerRegistry</li><li>cacheLoaderRegistry</li></ul>
 
 
 
-<p>Configuring Camel Cache replication using 1st option- the <tt>ehcache.xml</tt> file is a bit hard work as you have to configure all caches separately. So in a situation when the all names of caches are not know, using <tt>ehcache.xml</tt> is not a good idea.</p>
+<p>Configuring Camel Cache replication using the first option is a bit of hard work as you have to configure all caches separately. So in a situation when the all names of caches are not known, using <tt>ehcache.xml</tt> is not a good idea.</p>
 
 <p>The second option is much better when you want to use many different caches as you do not need to define options per cache. This is because replication options are set per <tt>CacheManager</tt> and per <tt>CacheEndpoint</tt>. Also it is the only way when cache names are not know at the development phase.</p>
 
 
-<div class="panelMacro"><table class="noteMacro"><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/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">It might be useful to read EHCache manual to get better understanding of Camel Cache replication mechanism.</td></tr></table></div>
+<div class="panelMacro"><table class="noteMacro"><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/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">It might be useful to read the <a shape="rect" class="external-link" href="http://ehcache.org/documentation" rel="nofollow">EHCache manual</a> to get a better understanding of the Camel Cache replication mechanism.</td></tr></table></div>
 
 <h4><a shape="rect" name="Cache-Example%3AJMScachereplication"></a>Example: JMS cache replication</h4>
 
-<p>JMS replication is the most powerful and secured way. Used altogether with Camel Cache replication options is also the most easy way.<br clear="none">
-This example is available on <a shape="rect" href="cachereplicationjmsexample.html" title="cacheReplicationJMSExample">separated page</a>.</p></div>
+<p>JMS replication is the most powerful and secured replication method. Used together with Camel Cache replication makes it also rather simple.<br clear="none">
+An example is available on <a shape="rect" href="cachereplicationjmsexample.html" title="cacheReplicationJMSExample">a separate page</a>.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

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

Modified: websites/production/camel/content/camel-2100-release.html
==============================================================================
--- websites/production/camel/content/camel-2100-release.html (original)
+++ websites/production/camel/content/camel-2100-release.html Tue Mar 13 15:20:46 2012
@@ -134,7 +134,7 @@
 
 <h2><a shape="rect" name="Camel2.10.0Release-DependencyUpgrades"></a>Dependency Upgrades</h2>
 
-<ul><li>AHC 1.6.5 to 1.7.1</li><li>AWS 1.2.2 to 1.3.0</li><li>Commons-codec 1.4 to 1.6</li><li>Commons-net 2.2 to 3.0.1</li><li>CXF 2.5.1 to 2.5.2</li><li>Groovy 1.8.5 to 1.8.6</li><li>Hadoop 0.20.203.0 to 1.0.0</li><li>Hazelcast 1.9.4.4 to 1.9.4.8</li><li>Jasypt 1.7 to 1.9.0</li><li>Jetty 7.5.3 to 7.5.4</li><li>JRuby 1.6.6 to 1.6.7</li><li>Kratti 0.4.1 to  0.4.3</li><li>Netty 3.2.6 to 3.3.1</li><li>Shiro 1.1.0 to 1.2.0</li><li>Spring 3.0.6 to 3.0.7</li><li>Spring Integration 2.0.5 to 2.1.0</li><li>Spring Security 3.0.7 to 3.1.0</li><li>Tagsoup 1.2 to 1.2.1</li></ul>
+<ul><li>AHC 1.6.5 to 1.7.1</li><li>AWS 1.2.2 to 1.3.0</li><li>Commons-codec 1.4 to 1.6</li><li>Commons-net 2.2 to 3.0.1</li><li>CXF 2.5.1 to 2.5.2</li><li>Freemarker 2.3.18 to 2.3.19</li><li>Groovy 1.8.5 to 1.8.6</li><li>Hadoop 0.20.203.0 to 1.0.0</li><li>HTTP4 core 4.1.2 to 4.1.4</li><li>HTTP4 client 4.1.2 to 4.1.3</li><li>Hazelcast 1.9.4.4 to 2.0.1</li><li>Jackson 1.9.2 to 1.9.5</li><li>Jackrabbit 2.2.4 to 2.2.11</li><li>Jasypt 1.7 to 1.9.0</li><li>JClouds 1.3.1 to 1.3.2</li><li>Jettison 1.3 to 1.3.1</li><li>Jetty 7.5.3 to 7.5.4</li><li>JRuby 1.6.6 to 1.6.7</li><li>JSCH 0.1.44 to 0.1.46</li><li>JuEL 2.1.3 to 2.1.4</li><li>Kratti 0.4.1 to  0.4.4</li><li>Lucene 3.0.3 to 3.5.0</li><li>Netty 3.2.6 to 3.3.1</li><li>OGNL 3.0.2 to 3.0.4</li><li>Resetlet 2.0.10 to 2.0.11</li><li>SNMP 1.8.1 to 1.10.1</li><li>Shiro 1.1.0 to 1.2.0</li><li>Stringtemplate 3.0 to 3.2.1</li><li>Spring 3.0.6 to 3.0.7</li><li>Spring Integration 2.0.5 to 2.1.0</li><li>Spring Security 3.0.7 to 3.1.0</li><li>
 Tagsoup 1.2 to 1.2.1</li><li>Woodstox 4.1.1 to 4.1.2</li><li>XStream 1.4.1 to 1.4.2</li><li>XML Security 1.4.5 to 1.5.1</li></ul>
 
 
 <h2><a shape="rect" name="Camel2.10.0Release-Importantchangestoconsiderwhenupgrading"></a>Important changes to consider when upgrading</h2>