EHCache upgrade.

- some minor API changes
 - Spring and Hibernate share same CacheManagerFactory now.  This allows overridable config
 - Moved EHCache config files down into config/alfresco

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2521 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-03-07 15:34:17 +00:00
parent f64119ac90
commit 2cf407613a
7 changed files with 223 additions and 33 deletions

View File

@@ -15,10 +15,16 @@
<bean name="transactionalEHCacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean" >
<property name="configLocation">
<value>classpath:ehcache-transactional.xml</value>
<value>classpath:alfresco/ehcache-transactional.xml</value>
</property>
</bean>
<!-- ============================================ -->
<!-- EH Cache Manager to produce shared EH Caches -->
<!-- ============================================ -->
<bean name="internalEHCacheManager" class="org.alfresco.repo.cache.InternalEhCacheManagerFactoryBean" />
<!-- ================ -->
<!-- Null permissions -->
<!-- ================ -->
@@ -28,8 +34,10 @@
<bean name="nullPermissionSharedCache" 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">
<!-- The name of the ehCache area -->
<value>nullPermissionCache</value>
</property>
<property name="maxElementsInMemory">
@@ -51,7 +59,6 @@
<property name="cacheManager" >
<ref bean="transactionalEHCacheManager" />
</property>
<!-- Eh cache area -->
<property name="name">
<value>nullPermissionTransactionalCache</value>
</property>
@@ -69,8 +76,10 @@
<bean name="userToAuthoritySharedCache" 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">
<!-- The name of the ehCache area -->
<value>userToAuthorityCache</value>
</property>
<property name="maxElementsInMemory">
@@ -92,7 +101,6 @@
<property name="cacheManager" >
<ref bean="transactionalEHCacheManager" />
</property>
<!-- Eh cache area -->
<property name="name">
<value>userToAuthorityTransactionalCache</value>
</property>
@@ -110,8 +118,10 @@
<bean name="permissionsAccessSharedCache" 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">
<!-- The name of the ehCache area -->
<value>permissionsAccessCache</value>
</property>
<property name="maxElementsInMemory">
@@ -151,8 +161,10 @@
<bean name="nodeOwnerSharedCache" 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">
<!-- The name of the ehCache area -->
<value>nodeOwnerCache</value>
</property>
<property name="maxElementsInMemory">
@@ -174,7 +186,6 @@
<property name="cacheManager" >
<ref bean="transactionalEHCacheManager" />
</property>
<!-- Eh cache area -->
<property name="name">
<value>nodeOwnerTransactionalCache</value>
</property>