Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-11 17:01:57 +00:00
parent 6418bb6d23
commit a22ddfb666
74 changed files with 905 additions and 1190 deletions

View File

@@ -25,47 +25,6 @@
<bean name="internalEHCacheManager" class="org.alfresco.repo.cache.InternalEhCacheManagerFactoryBean" />
<!-- ================ -->
<!-- Null permissions -->
<!-- ================ -->
<!-- The cross-transaction shared cache for Null Node Permissions -->
<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">
<value>nullPermissionCache</value>
</property>
<property name="maxElementsInMemory">
<value>10000</value> <!-- approx 8MB memory required -->
</property>
<property name="overflowToDisk">
<value>false</value>
</property>
</bean>
</property>
</bean>
<!-- The transactional cache for Null Node Permissions -->
<bean name="nullPermissionCache" class="org.alfresco.repo.cache.TransactionalCache">
<property name="sharedCache">
<ref bean="nullPermissionSharedCache" />
</property>
<property name="cacheManager" >
<ref bean="transactionalEHCacheManager" />
</property>
<property name="name">
<value>nullPermissionTransactionalCache</value>
</property>
<property name="maxCacheSize">
<value>5000</value>
</property>
</bean>
<!-- ===================================== -->
<!-- Authority container look up for users -->