From a1db33d09a62596e35856e5bbd9590fabe13043b Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 4 Sep 2013 09:03:50 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX to HEAD (4.2)    54742: Merged
 BRANCHES/DEV/BELARUS/HEAD-2013_08_27 to BRANCHES/DEV/HEAD-BUG-FIX:      
 54581: ALF-10301:Need simple configuration for TransactionalCache sizes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/caches.properties    | 46 ++++++++++++++
 config/alfresco/tx-cache-context.xml | 94 ++++++++++++++--------------
 2 files changed, 92 insertions(+), 48 deletions(-)

diff --git a/config/alfresco/caches.properties b/config/alfresco/caches.properties
index 58def50c59..ade3c81a06 100644
--- a/config/alfresco/caches.properties
+++ b/config/alfresco/caches.properties
@@ -3,34 +3,42 @@
 #
 # Note that the Community edition supports only the *.maxItems properties.
 #
+cache.propertyValueCache.tx.maxItems=1000
 cache.propertyValueCache.maxItems=10000
 cache.propertyValueCache.timeToLiveSeconds=0
 cache.propertyValueCache.maxIdleSeconds=0
 
+cache.contentDataSharedCache.tx.maxItems=65000
 cache.contentDataSharedCache.maxItems=130000
 cache.contentDataSharedCache.timeToLiveSeconds=0
 cache.contentDataSharedCache.maxIdleSeconds=0
 
+cache.immutableEntitySharedCache.tx.maxItems=10000
 cache.immutableEntitySharedCache.maxItems=50000
 cache.immutableEntitySharedCache.timeToLiveSeconds=0
 cache.immutableEntitySharedCache.maxIdleSeconds=0
 
+cache.node.rootNodesSharedCache.tx.maxItems=1000
 cache.node.rootNodesSharedCache.maxItems=1000
 cache.node.rootNodesSharedCache.timeToLiveSeconds=0
 cache.node.rootNodesSharedCache.maxIdleSeconds=0
 
+cache.node.allRootNodesSharedCache.tx.maxItems=500
 cache.node.allRootNodesSharedCache.maxItems=1000
 cache.node.allRootNodesSharedCache.timeToLiveSeconds=0
 cache.node.allRootNodesSharedCache.maxIdleSeconds=0
 
+cache.node.nodesSharedCache.tx.maxItems=125000
 cache.node.nodesSharedCache.maxItems=250000
 cache.node.nodesSharedCache.timeToLiveSeconds=0
 cache.node.nodesSharedCache.maxIdleSeconds=0
 
+cache.node.aspectsSharedCache.tx.maxItems=65000
 cache.node.aspectsSharedCache.maxItems=130000
 cache.node.aspectsSharedCache.timeToLiveSeconds=0
 cache.node.aspectsSharedCache.maxIdleSeconds=0
 
+cache.node.propertiesSharedCache.tx.maxItems=65000
 cache.node.propertiesSharedCache.maxItems=130000
 cache.node.propertiesSharedCache.timeToLiveSeconds=0
 cache.node.propertiesSharedCache.maxIdleSeconds=0
@@ -39,46 +47,59 @@ cache.node.parentAssocsSharedCache.maxItems=130000
 cache.node.parentAssocsSharedCache.timeToLiveSeconds=0
 cache.node.parentAssocsSharedCache.maxIdleSeconds=0
 
+cache.node.childByNameSharedCache.tx.maxItems=65000
 cache.node.childByNameSharedCache.maxItems=130000
 cache.node.childByNameSharedCache.timeToLiveSeconds=0
 cache.node.childByNameSharedCache.maxIdleSeconds=0
 
+cache.userToAuthoritySharedCache.tx.maxItems=100
 cache.userToAuthoritySharedCache.maxItems=5000
 cache.userToAuthoritySharedCache.timeToLiveSeconds=0
 cache.userToAuthoritySharedCache.maxIdleSeconds=0
 
+cache.authenticationSharedCache.tx.maxItems=100
 cache.authenticationSharedCache.maxItems=5000
 cache.authenticationSharedCache.timeToLiveSeconds=0
 cache.authenticationSharedCache.maxIdleSeconds=0
 
+cache.authoritySharedCache.tx.maxItems=10000
 cache.authoritySharedCache.maxItems=10000
 cache.authoritySharedCache.timeToLiveSeconds=0
 cache.authoritySharedCache.maxIdleSeconds=0
 
+cache.authorityToChildAuthoritySharedCache.tx.maxItems=40000
 cache.authorityToChildAuthoritySharedCache.maxItems=40000
 cache.authorityToChildAuthoritySharedCache.timeToLiveSeconds=0
 cache.authorityToChildAuthoritySharedCache.maxIdleSeconds=0
 
+cache.zoneToAuthoritySharedCache.tx.maxItems=500
 cache.zoneToAuthoritySharedCache.maxItems=500
 cache.zoneToAuthoritySharedCache.timeToLiveSeconds=0
 cache.zoneToAuthoritySharedCache.maxIdleSeconds=0
 
+cache.permissionsAccessSharedCache.tx.maxItems=10000
 cache.permissionsAccessSharedCache.maxItems=50000
 cache.permissionsAccessSharedCache.timeToLiveSeconds=0
 cache.permissionsAccessSharedCache.maxIdleSeconds=0
 
+cache.readersSharedCache.tx.maxItems=10000
 cache.readersSharedCache.maxItems=10000
 cache.readersSharedCache.timeToLiveSeconds=0
 cache.readersSharedCache.maxIdleSeconds=0
 
+cache.readersDeniedSharedCache.tx.maxItems=10000
 cache.readersDeniedSharedCache.maxItems=10000
 cache.readersDeniedSharedCache.timeToLiveSeconds=0
 cache.readersDeniedSharedCache.maxIdleSeconds=0
 
+cache.nodeOwnerSharedCache.tx.maxItems=40000
 cache.nodeOwnerSharedCache.maxItems=40000
 cache.nodeOwnerSharedCache.timeToLiveSeconds=0
 cache.nodeOwnerSharedCache.maxIdleSeconds=0
 
+cache.nodeRulesSharedCache.tx.maxItems=2000
+
+cache.personSharedCache.tx.maxItems=1000
 cache.personSharedCache.maxItems=1000
 cache.personSharedCache.timeToLiveSeconds=0
 cache.personSharedCache.maxIdleSeconds=0
@@ -87,6 +108,7 @@ cache.ticketsCache.maxItems=1000
 cache.ticketsCache.timeToLiveSeconds=0
 cache.ticketsCache.maxIdleSeconds=0
 
+cache.avmEntitySharedCache.tx.maxItems=5000
 cache.avmEntitySharedCache.maxItems=5000
 cache.avmEntitySharedCache.timeToLiveSeconds=0
 cache.avmEntitySharedCache.maxIdleSeconds=0
@@ -95,34 +117,48 @@ cache.avmVersionRootEntitySharedCache.maxItems=1000
 cache.avmVersionRootEntitySharedCache.timeToLiveSeconds=0
 cache.avmVersionRootEntitySharedCache.maxIdleSeconds=0
 
+cache.avmNodeSharedCache.tx.maxItems=5000
 cache.avmNodeSharedCache.maxItems=5000
 cache.avmNodeSharedCache.timeToLiveSeconds=0
 cache.avmNodeSharedCache.maxIdleSeconds=0
 
+cache.avmNodeAspectsSharedCache.tx.maxItems=5000
 cache.avmNodeAspectsSharedCache.maxItems=5000
 cache.avmNodeAspectsSharedCache.timeToLiveSeconds=0
 cache.avmNodeAspectsSharedCache.maxIdleSeconds=0
 
+cache.avmStoreSharedCache.tx.maxItems=1000
+
+cache.avmVersionRootEntityCache.tx.maxItems=100
+
+cache.authorityEntitySharedCache.tx.maxItems=50000
+
+cache.webServicesQuerySessionSharedCache.tx.maxItems=50
 cache.webServicesQuerySessionSharedCache.maxItems=1000
 cache.webServicesQuerySessionSharedCache.timeToLiveSeconds=0
 cache.webServicesQuerySessionSharedCache.maxIdleSeconds=0
 
+cache.aclSharedCache.tx.maxItems=20000
 cache.aclSharedCache.maxItems=50000
 cache.aclSharedCache.timeToLiveSeconds=0
 cache.aclSharedCache.maxIdleSeconds=0
 
+cache.aclEntitySharedCache.tx.maxItems=50000
 cache.aclEntitySharedCache.maxItems=50000
 cache.aclEntitySharedCache.timeToLiveSeconds=0
 cache.aclEntitySharedCache.maxIdleSeconds=0
 
+cache.resourceBundleBaseNamesSharedCache.tx.maxItems=1000
 cache.resourceBundleBaseNamesSharedCache.maxItems=1000
 cache.resourceBundleBaseNamesSharedCache.timeToLiveSeconds=0
 cache.resourceBundleBaseNamesSharedCache.maxIdleSeconds=0
 
+cache.loadedResourceBundlesSharedCache.tx.maxItems=1000
 cache.loadedResourceBundlesSharedCache.maxItems=1000
 cache.loadedResourceBundlesSharedCache.timeToLiveSeconds=0
 cache.loadedResourceBundlesSharedCache.maxIdleSeconds=0
 
+cache.messagesSharedCache.tx.maxItems=1000
 cache.messagesSharedCache.maxItems=1000
 cache.messagesSharedCache.timeToLiveSeconds=0
 cache.messagesSharedCache.maxIdleSeconds=0
@@ -135,6 +171,7 @@ cache.webScriptsRegistrySharedCache.maxItems=1000
 cache.webScriptsRegistrySharedCache.timeToLiveSeconds=0
 cache.webScriptsRegistrySharedCache.maxIdleSeconds=0
 
+cache.routingContentStoreSharedCache.tx.maxItems=10000
 cache.routingContentStoreSharedCache.maxItems=10000
 cache.routingContentStoreSharedCache.timeToLiveSeconds=0
 cache.routingContentStoreSharedCache.maxIdleSeconds=0
@@ -143,18 +180,22 @@ cache.executingActionsCache.maxItems=1000
 cache.executingActionsCache.timeToLiveSeconds=0
 cache.executingActionsCache.maxIdleSeconds=0
 
+cache.tagscopeSummarySharedCache.tx.maxItems=1000
 cache.tagscopeSummarySharedCache.maxItems=1000
 cache.tagscopeSummarySharedCache.timeToLiveSeconds=0
 cache.tagscopeSummarySharedCache.maxIdleSeconds=0
 
+cache.imapMessageSharedCache.tx.maxItems=1000
 cache.imapMessageSharedCache.maxItems=2000
 cache.imapMessageSharedCache.timeToLiveSeconds=0
 cache.imapMessageSharedCache.maxIdleSeconds=0
 
+cache.tenantEntitySharedCache.tx.maxItems=1000
 cache.tenantEntitySharedCache.maxItems=1000
 cache.tenantEntitySharedCache.timeToLiveSeconds=0
 cache.tenantEntitySharedCache.maxIdleSeconds=0
 
+cache.immutableSingletonSharedCache.tx.maxItems=12000
 cache.immutableSingletonSharedCache.maxItems=12000
 cache.immutableSingletonSharedCache.timeToLiveSeconds=0
 cache.immutableSingletonSharedCache.maxIdleSeconds=0
@@ -171,14 +212,19 @@ cache.globalConfigSharedCache.maxItems=1000
 cache.globalConfigSharedCache.timeToLiveSeconds=0
 cache.globalConfigSharedCache.maxIdleSeconds=0
 
+cache.permissionEntitySharedCache.tx.maxItems=50000
+
+cache.propertyUniqueContextSharedCache.tx.maxItems=10000
 cache.propertyUniqueContextSharedCache.maxItems=10000
 cache.propertyUniqueContextSharedCache.timeToLiveSeconds=0
 cache.propertyUniqueContextSharedCache.maxIdleSeconds=0
 
+cache.siteNodeRefSharedCache.tx.maxItems=5000
 cache.siteNodeRefSharedCache.maxItems=5000
 cache.siteNodeRefSharedCache.timeToLiveSeconds=0
 cache.siteNodeRefSharedCache.maxIdleSeconds=0
 
+cache.samlTrustEngineSharedCache.tx.maxItems=5000
 cache.samlTrustEngineSharedCache.maxItems=5000
 cache.samlTrustEngineSharedCache.timeToLiveSeconds=0
 cache.samlTrustEngineSharedCache.maxIdleSeconds=0
diff --git a/config/alfresco/tx-cache-context.xml b/config/alfresco/tx-cache-context.xml
index 43022ce25a..d2ef6053d0 100644
--- a/config/alfresco/tx-cache-context.xml
+++ b/config/alfresco/tx-cache-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
    
    <!-- The transactional cache for Encoding entities -->
@@ -12,11 +12,11 @@
       <property name="name">
          <value>org.alfresco.cache.propertyValueTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="1000" />
+      <property name="maxCacheSize" value="${cache.propertyValueCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
       <property name="tenantAware" value="false" />
-   </bean>
+   </bean>
    
    <!-- The transactional cache for Property Unique Contexts -->
    
@@ -27,7 +27,7 @@
       <property name="name">
          <value>org.alfresco.cache.propertyUniqueContextTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="10000" />
+      <property name="maxCacheSize" value="${cache.propertyUniqueContextSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
       <property name="tenantAware" value="false" />
@@ -42,7 +42,7 @@
       <property name="name">
          <value>org.alfresco.cache.contentDataTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="65000" />
+      <property name="maxCacheSize" value="${cache.contentDataSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="allowEqualsChecks" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
@@ -58,7 +58,7 @@
       <property name="name">
          <value>org.alfresco.cache.immutableEntityTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="10000" />
+      <property name="maxCacheSize" value="${cache.immutableEntitySharedCache.tx.maxItems}" />
       <property name="mutable" value="true" /><!-- Null value markers are allowed -->
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
       <property name="tenantAware" value="false" />
@@ -74,7 +74,7 @@
       <property name="name">
          <value>org.alfresco.cache.node.rootNodesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="1000" />
+      <property name="maxCacheSize" value="${cache.node.rootNodesSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
       <property name="tenantAware" value="false" />
@@ -90,7 +90,7 @@
       <property name="name">
          <value>org.alfresco.cache.node.allRootNodesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="500" />
+      <property name="maxCacheSize" value="${cache.node.allRootNodesSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -105,7 +105,7 @@
       <property name="name">
          <value>org.alfresco.cache.node.nodesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="125000" />
+      <property name="maxCacheSize" value="${cache.node.nodesSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="allowEqualsChecks" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
@@ -121,7 +121,7 @@
       <property name="name">
          <value>org.alfresco.cache.node.aspectsTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="65000" />
+      <property name="maxCacheSize" value="${cache.node.aspectsSharedCache.tx.maxItems}" />
       <property name="mutable" value="false" />
       <property name="disableSharedCache" value="${system.cache.disableImmutableSharedCaches}" />
    </bean>
@@ -136,7 +136,7 @@
       <property name="name">
          <value>org.alfresco.cache.node.propertiesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="65000" />
+      <property name="maxCacheSize" value="${cache.node.propertiesSharedCache.tx.maxItems}" />
       <property name="mutable" value="false" />
       <property name="disableSharedCache" value="${system.cache.disableImmutableSharedCaches}" />
    </bean>
@@ -152,7 +152,7 @@
       <property name="name">
          <value>org.alfresco.cache.node.childByNameTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="65000" />
+      <property name="maxCacheSize" value="${cache.node.childByNameSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -167,7 +167,7 @@
       <property name="name">
          <value>org.alfresco.nodeRulesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="2000" />
+      <property name="maxCacheSize" value="${cache.nodeRulesSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -182,7 +182,7 @@
       <property name="name">
          <value>org.alfresco.userToAuthorityTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="100" />
+      <property name="maxCacheSize" value="${cache.userToAuthoritySharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="allowEqualsChecks" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
@@ -198,9 +198,7 @@
       <property name="name">
          <value>org.alfresco.authenticationTransactionalCache</value>
       </property>
-      <property name="maxCacheSize">
-         <value>100</value>
-      </property>
+      <property name="maxCacheSize" value="${cache.authenticationSharedCache.tx.maxItems}" />
    </bean>
    
    
@@ -213,7 +211,7 @@
       <property name="name">
          <value>org.alfresco.authorityTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="10000" />
+      <property name="maxCacheSize" value="${cache.authoritySharedCache.tx.maxItems}" />
       <property name="allowEqualsChecks" value="true" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
@@ -229,7 +227,7 @@
       <property name="name">
          <value>org.alfresco.authorityToChildAuthorityTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="40000" />
+      <property name="maxCacheSize" value="${cache.authorityToChildAuthoritySharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="allowEqualsChecks" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
@@ -246,7 +244,7 @@
       <property name="name">
          <value>org.alfresco.zoneToAuthorityTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="500" />
+      <property name="maxCacheSize" value="${cache.zoneToAuthoritySharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -262,7 +260,7 @@
       <property name="name">
          <value>org.alfresco.permissionsAccessTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="10000" />
+      <property name="maxCacheSize" value="${cache.permissionsAccessSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -277,7 +275,7 @@
       <property name="name">
          <value>org.alfresco.readersTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="10000" />
+      <property name="maxCacheSize" value="${cache.readersSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -292,7 +290,7 @@
       <property name="name">
          <value>org.alfresco.readersDeniedTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="10000" />
+      <property name="maxCacheSize" value="${cache.readersDeniedSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -307,7 +305,7 @@
       <property name="name">
          <value>org.alfresco.nodeOwnerTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="40000" />
+      <property name="maxCacheSize" value="${cache.nodeOwnerSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -322,7 +320,7 @@
       <property name="name">
          <value>org.alfresco.personTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="1000" />
+      <property name="maxCacheSize" value="${cache.personSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -337,7 +335,7 @@
       <property name="name">
          <value>org.alfresco.cache.avmStoreTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="1000" />
+      <property name="maxCacheSize" value="${cache.avmStoreSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -352,7 +350,7 @@
       <property name="name">
          <value>org.alfresco.cache.avmEntityTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="5000" />
+      <property name="maxCacheSize" value="${cache.avmEntitySharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -367,7 +365,7 @@
       <property name="name">
          <value>org.alfresco.cache.avmVersionRootEntityTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="100" />
+      <property name="maxCacheSize" value="${cache.avmVersionRootEntityCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -382,7 +380,7 @@
       <property name="name">
          <value>org.alfresco.cache.avmNodeTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="5000" />
+      <property name="maxCacheSize" value="${cache.avmNodeSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -397,7 +395,7 @@
       <property name="name">
          <value>org.alfresco.cache.avmNodeAspectsTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="5000" />
+      <property name="maxCacheSize" value="${cache.avmNodeAspectsSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -412,7 +410,7 @@
        <property name="name">
            <value>org.alfresco.repo.webservices.querySessionTransactionalCache</value>
        </property>
-      <property name="maxCacheSize" value="50" />
+      <property name="maxCacheSize" value="${cache.webServicesQuerySessionSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -427,7 +425,7 @@
       <property name="name">
          <value>org.alfresco.aclTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="20000" />
+      <property name="maxCacheSize" value="${cache.aclSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -442,7 +440,7 @@
       <property name="name">
          <value>org.alfresco.cache.aclEntityTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="50000" />
+      <property name="maxCacheSize" value="${cache.aclEntitySharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="allowEqualsChecks" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
@@ -458,7 +456,7 @@
       <property name="name">
          <value>org.alfresco.cache.authorityEntityTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="50000" />
+      <property name="maxCacheSize" value="${cache.authorityEntitySharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -473,7 +471,7 @@
       <property name="name">
          <value>org.alfresco.cache.permissionEntityTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="50000" />
+      <property name="maxCacheSize" value="${cache.permissionEntitySharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -488,7 +486,7 @@
       <property name="name">
          <value>org.alfresco.resourceBundleBaseNamesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="1000" />
+      <property name="maxCacheSize" value="${cache.resourceBundleBaseNamesSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
       <property name="tenantAware" value="false" />
@@ -504,7 +502,7 @@
       <property name="name">
          <value>org.alfresco.loadedResourceBundlesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="1000" />
+      <property name="maxCacheSize" value="${cache.loadedResourceBundlesSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
       <property name="tenantAware" value="false" />
@@ -520,7 +518,7 @@
       <property name="name">
          <value>org.alfresco.messagesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="1000" />
+      <property name="maxCacheSize" value="${cache.messagesSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
       <property name="tenantAware" value="false" />
@@ -536,7 +534,7 @@
       <property name="name">
          <value>org.alfresco.routingContentStoreTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="10000" />
+      <property name="maxCacheSize" value="${cache.routingContentStoreSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -551,7 +549,7 @@
       <property name="name">
          <value>org.alfresco.cache.tagscopeSummaryTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="1000" />
+      <property name="maxCacheSize" value="${cache.tagscopeSummarySharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -566,7 +564,7 @@
       <property name="name">
          <value>org.alfresco.cache.imapMessageTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="1000" />
+      <property name="maxCacheSize" value="${cache.imapMessageSharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableImmutableSharedCaches}" />
    </bean>
@@ -581,7 +579,7 @@
       <property name="name">
          <value>org.alfresco.cache.tenantEntityTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="1000" />
+      <property name="maxCacheSize" value="${cache.tenantEntitySharedCache.tx.maxItems}" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
       <property name="tenantAware" value="false" />
@@ -597,10 +595,10 @@
       <property name="name">
          <value>org.alfresco.cache.immutableSingletonTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="12000" />
+      <property name="maxCacheSize" value="${cache.immutableSingletonSharedCache.tx.maxItems}" />
       <property name="mutable" value="false" />
       <property name="disableSharedCache" value="${system.cache.disableImmutableSharedCaches}" />
-   </bean>
+   </bean>
    
    <!-- The transactional cache for Site NodeRefs -->
    
@@ -611,11 +609,11 @@
       <property name="name">
          <value>org.alfresco.cache.siteNodeRefTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="5000" />
+      <property name="maxCacheSize" value="${cache.siteNodeRefSharedCache.tx.maxItems}" />
       <property name="mutable" value="false" />
       <property name="disableSharedCache" value="${system.cache.disableImmutableSharedCaches}" />
    </bean>
-   
+   
    <!-- The transactional cache for SAML TrustEngines  -->
    
    <bean name="samlTrustEngineCache" class="org.alfresco.repo.cache.TransactionalCache">
@@ -625,7 +623,7 @@
       <property name="name">
          <value>org.alfresco.cache.samlTrustEngineTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="5000" />
+      <property name="maxCacheSize" value="${cache.samlTrustEngineSharedCache.tx.maxItems}" />
       <property name="mutable" value="false" />
       <property name="disableSharedCache" value="${system.cache.disableImmutableSharedCaches}" />
    </bean>