From 3a3842e8744fdc1b2d7b5e462fb17972cf5083fb Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Thu, 21 Jun 2007 09:27:11 +0000
Subject: [PATCH] Added configuration for new Person cache. Added sample
 configuration for clustering

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6046 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/cache-context.xml             | 72 +++++++++----------
 config/alfresco/ehcache-default.xml           |  6 ++
 .../ehcache-custom.xml.sample.cluster         | 17 +++++
 3 files changed, 59 insertions(+), 36 deletions(-)

diff --git a/config/alfresco/cache-context.xml b/config/alfresco/cache-context.xml
index fb78a916bf..651394492c 100644
--- a/config/alfresco/cache-context.xml
+++ b/config/alfresco/cache-context.xml
@@ -172,42 +172,6 @@
       </property>
    </bean>
    
-   <!-- ===================================== -->
-   <!-- Authentication Ticket Cache           -->
-   <!-- ===================================== -->
-
-   <!-- The cross-transaction shared cache for In-Memory Tickets -->
-   
-   <bean name="ticketsSharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
-      <property name="cache">
-         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
-            <property name="cacheManager">
-               <ref bean="internalEHCacheManager" />
-            </property>
-            <property name="cacheName">
-               <value>org.alfresco.cache.ticketsCache</value>
-            </property>
-         </bean>
-      </property>
-   </bean>
-   
-   <!-- The transactional cache for In-Memory Tickets -->
-   
-   <bean name="ticketsCache" class="org.alfresco.repo.cache.TransactionalCache">
-      <property name="sharedCache">
-         <ref bean="ticketsSharedCache" />
-      </property>
-      <property name="cacheManager" >
-         <ref bean="transactionalEHCacheManager" />
-      </property>
-      <property name="name">
-         <value>org.alfresco.ticketsTransactionalCache</value>
-      </property>
-      <property name="maxCacheSize">
-         <value>10</value>
-      </property>
-   </bean>
-   
    <!-- ===================================== -->
    <!-- Person username to NodeRef cache      -->
    <!-- ===================================== -->
@@ -245,4 +209,40 @@
       </property>
    </bean>
 
+   <!-- ===================================== -->
+   <!-- Authentication Ticket Cache           -->
+   <!-- ===================================== -->
+
+   <!-- The cross-transaction shared cache for In-Memory Tickets -->
+   
+   <bean name="ticketsSharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
+      <property name="cache">
+         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
+            <property name="cacheManager">
+               <ref bean="internalEHCacheManager" />
+            </property>
+            <property name="cacheName">
+               <value>org.alfresco.cache.ticketsCache</value>
+            </property>
+         </bean>
+      </property>
+   </bean>
+   
+   <!-- The transactional cache for In-Memory Tickets -->
+   
+   <bean name="ticketsCache" class="org.alfresco.repo.cache.TransactionalCache">
+      <property name="sharedCache">
+         <ref bean="ticketsSharedCache" />
+      </property>
+      <property name="cacheManager" >
+         <ref bean="transactionalEHCacheManager" />
+      </property>
+      <property name="name">
+         <value>org.alfresco.ticketsTransactionalCache</value>
+      </property>
+      <property name="maxCacheSize">
+         <value>10</value>
+      </property>
+   </bean>
+   
 </beans>
\ No newline at end of file
diff --git a/config/alfresco/ehcache-default.xml b/config/alfresco/ehcache-default.xml
index a6983499f2..99a645e731 100644
--- a/config/alfresco/ehcache-default.xml
+++ b/config/alfresco/ehcache-default.xml
@@ -280,6 +280,12 @@
         eternal="true"
         overflowToDisk="false"
         />
+    <cache 
+        name="org.alfresco.cache.personCache" 
+        maxElementsInMemory="1000"
+        eternal="true"
+        overflowToDisk="false"
+        />
     <cache 
         name="org.alfresco.cache.ticketsCache" 
         maxElementsInMemory="1000"
diff --git a/config/alfresco/extension/ehcache-custom.xml.sample.cluster b/config/alfresco/extension/ehcache-custom.xml.sample.cluster
index 026f193265..4467734168 100644
--- a/config/alfresco/extension/ehcache-custom.xml.sample.cluster
+++ b/config/alfresco/extension/ehcache-custom.xml.sample.cluster
@@ -481,6 +481,23 @@
                                 replicateAsynchronously = false"/>
 
 
+    </cache>
+
+    <cache
+        name="org.alfresco.cache.personCache"
+        maxElementsInMemory="1000"
+        eternal="true"
+        overflowToDisk="false">
+
+            <cacheEventListenerFactory
+                    class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
+                    properties="replicatePuts = false,
+                                replicateUpdates = true,
+                                replicateRemovals = true,
+                                replicateUpdatesViaCopy = false,
+                                replicateAsynchronously = false"/>
+
+
     </cache>
 
     <cache