mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
were both beyond me, and are just the raw conflict merge data. If Kev can't figure out how they should go together by tomorrow AM (for me) I'll dig back in. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
@@ -1,184 +1,184 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<ehcache>
|
||||
<!-- defaults -->
|
||||
<diskStore
|
||||
path="java.io.tmpdir"/>
|
||||
<!--
|
||||
<cacheManagerPeerProviderFactory
|
||||
class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
|
||||
properties="peerDiscovery=automatic, multicastGroupAddress=230.0.0.1,
|
||||
multicastGroupPort=4446"/>
|
||||
<cacheManagerPeerListenerFactory
|
||||
class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"/>
|
||||
-->
|
||||
<defaultCache
|
||||
maxElementsInMemory="5000"
|
||||
eternal="true"
|
||||
timeToIdleSeconds="0"
|
||||
timeToLiveSeconds="0"
|
||||
overflowToDisk="false"
|
||||
>
|
||||
<!--
|
||||
<cacheEventListenerFactory
|
||||
class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
|
||||
properties="replicateAsynchronously=false, replicatePuts=false,
|
||||
replicateUpdates=true, replicateUpdatesViaCopy=false,
|
||||
replicateRemovals=true"/>
|
||||
-->
|
||||
</defaultCache>
|
||||
<!-- Hibernate usage -->
|
||||
<cache
|
||||
name="org.hibernate.cache.StandardQueryCache"
|
||||
maxElementsInMemory="50"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 0.4MB memory required -->
|
||||
<cache
|
||||
name="org.hibernate.cache.UpdateTimestampsCache"
|
||||
maxElementsInMemory="2000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 40MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 0.1 MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.QNameEntityImpl"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 40MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeStatusImpl"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 15MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.aspects"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 10MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.properties"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 10MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.parentAssocs"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 250MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.ChildAssocImpl"
|
||||
maxElementsInMemory="200000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- general use node associations are not common -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeAssocImpl"
|
||||
maxElementsInMemory="1000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- low numbers of objects expected -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.StoreImpl"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- version counters -->
|
||||
<!-- approx 0.4MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.VersionCountImpl"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 0.1MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.AppliedPatchImpl"
|
||||
maxElementsInMemory="100"
|
||||
timeToLiveSeconds="300"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- Permission related caches -->
|
||||
<!-- approx 1MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl"
|
||||
maxElementsInMemory="1000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 1MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl.entries"
|
||||
maxElementsInMemory="1000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 5MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl"
|
||||
maxElementsInMemory="5000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 1MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbPermissionImpl"
|
||||
maxElementsInMemory="500"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 10MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 5MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl.externalKeys"
|
||||
maxElementsInMemory="5000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- Audit caches -->
|
||||
<cache
|
||||
name="org.alfresco.repo.audit.hibernate.AuditConfigImpl"
|
||||
maxElementsInMemory="2"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<cache
|
||||
name="org.alfresco.repo.audit.hibernate.AuditDateImpl"
|
||||
maxElementsInMemory="2"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<cache
|
||||
name="org.alfresco.repo.audit.hibernate.AuditSourceImpl"
|
||||
maxElementsInMemory="2000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<ehcache>
|
||||
<!-- defaults -->
|
||||
<diskStore
|
||||
path="java.io.tmpdir"/>
|
||||
<!--
|
||||
<cacheManagerPeerProviderFactory
|
||||
class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
|
||||
properties="peerDiscovery=automatic, multicastGroupAddress=230.0.0.1,
|
||||
multicastGroupPort=4446"/>
|
||||
<cacheManagerPeerListenerFactory
|
||||
class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"/>
|
||||
-->
|
||||
<defaultCache
|
||||
maxElementsInMemory="5000"
|
||||
eternal="true"
|
||||
timeToIdleSeconds="0"
|
||||
timeToLiveSeconds="0"
|
||||
overflowToDisk="false"
|
||||
>
|
||||
<!--
|
||||
<cacheEventListenerFactory
|
||||
class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
|
||||
properties="replicateAsynchronously=false, replicatePuts=false,
|
||||
replicateUpdates=true, replicateUpdatesViaCopy=false,
|
||||
replicateRemovals=true"/>
|
||||
-->
|
||||
</defaultCache>
|
||||
<!-- Hibernate usage -->
|
||||
<cache
|
||||
name="org.hibernate.cache.StandardQueryCache"
|
||||
maxElementsInMemory="50"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 0.4MB memory required -->
|
||||
<cache
|
||||
name="org.hibernate.cache.UpdateTimestampsCache"
|
||||
maxElementsInMemory="2000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 40MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 0.1 MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.QNameEntityImpl"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 40MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeStatusImpl"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 15MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.aspects"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 10MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.properties"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 10MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.parentAssocs"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 250MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.ChildAssocImpl"
|
||||
maxElementsInMemory="200000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- general use node associations are not common -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeAssocImpl"
|
||||
maxElementsInMemory="1000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- low numbers of objects expected -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.StoreImpl"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- version counters -->
|
||||
<!-- approx 0.4MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.VersionCountImpl"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 0.1MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.AppliedPatchImpl"
|
||||
maxElementsInMemory="100"
|
||||
timeToLiveSeconds="300"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- Permission related caches -->
|
||||
<!-- approx 1MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl"
|
||||
maxElementsInMemory="1000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 1MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl.entries"
|
||||
maxElementsInMemory="1000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 5MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl"
|
||||
maxElementsInMemory="5000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 1MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbPermissionImpl"
|
||||
maxElementsInMemory="500"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 10MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl"
|
||||
maxElementsInMemory="10000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 5MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl.externalKeys"
|
||||
maxElementsInMemory="5000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- Audit caches -->
|
||||
<cache
|
||||
name="org.alfresco.repo.audit.hibernate.AuditConfigImpl"
|
||||
maxElementsInMemory="2"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<cache
|
||||
name="org.alfresco.repo.audit.hibernate.AuditDateImpl"
|
||||
maxElementsInMemory="2"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<cache
|
||||
name="org.alfresco.repo.audit.hibernate.AuditSourceImpl"
|
||||
maxElementsInMemory="2000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
|
||||
</ehcache>
|
||||
Reference in New Issue
Block a user