Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2919 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-18 14:26:58 +00:00
parent eb073b24f1
commit 80215dd3a0
3 changed files with 23 additions and 31 deletions

View File

@@ -16,10 +16,10 @@
eternal="true" eternal="true"
timeToLiveSeconds="0" timeToLiveSeconds="0"
overflowToDisk="false"/> overflowToDisk="false"/>
<!-- approx 1MB memory required --> <!-- approx 0.4MB memory required -->
<cache <cache
name="org.hibernate.cache.UpdateTimestampsCache" name="org.hibernate.cache.UpdateTimestampsCache"
maxElementsInMemory="5000" maxElementsInMemory="2000"
eternal="true" eternal="true"
overflowToDisk="false"/> overflowToDisk="false"/>
<!-- approx 40MB memory required --> <!-- approx 40MB memory required -->
@@ -31,7 +31,7 @@
timeToLiveSeconds="0" timeToLiveSeconds="0"
overflowToDisk="false" overflowToDisk="false"
/> />
<!-- approx XXX MB memory required --> <!-- approx 0.1 MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.QNameEntityImpl" name="org.alfresco.repo.domain.hibernate.QNameEntityImpl"
maxElementsInMemory="100" maxElementsInMemory="100"
@@ -40,19 +40,19 @@
timeToLiveSeconds="0" timeToLiveSeconds="0"
overflowToDisk="false" overflowToDisk="false"
/> />
<!-- approx 20MB memory required --> <!-- approx 40MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.NodeStatusImpl" name="org.alfresco.repo.domain.hibernate.NodeStatusImpl"
maxElementsInMemory="5000" maxElementsInMemory="10000"
eternal="true" eternal="true"
timeToIdleSeconds="0" timeToIdleSeconds="0"
timeToLiveSeconds="0" timeToLiveSeconds="0"
overflowToDisk="false" overflowToDisk="false"
/> />
<!-- approx 40MB memory required --> <!-- approx 25MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.NodeImpl.aspects" name="org.alfresco.repo.domain.hibernate.NodeImpl.aspects"
maxElementsInMemory="10000" maxElementsInMemory="20000"
eternal="true" eternal="true"
timeToIdleSeconds="0" timeToIdleSeconds="0"
timeToLiveSeconds="0" timeToLiveSeconds="0"
@@ -61,7 +61,7 @@
<!-- approx 50MB memory required --> <!-- approx 50MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.NodeImpl.properties" name="org.alfresco.repo.domain.hibernate.NodeImpl.properties"
maxElementsInMemory="10000" maxElementsInMemory="50000"
eternal="true" eternal="true"
timeToIdleSeconds="0" timeToIdleSeconds="0"
timeToLiveSeconds="0" timeToLiveSeconds="0"
@@ -70,25 +70,25 @@
<!-- approx 50MB memory required --> <!-- approx 50MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.NodeImpl.childAssocs" name="org.alfresco.repo.domain.hibernate.NodeImpl.childAssocs"
maxElementsInMemory="25000" maxElementsInMemory="50000"
eternal="true" eternal="true"
timeToIdleSeconds="0" timeToIdleSeconds="0"
timeToLiveSeconds="0" timeToLiveSeconds="0"
overflowToDisk="false" overflowToDisk="false"
/> />
<!-- approx 40MB memory required --> <!-- approx 50MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.NodeImpl.parentAssocs" name="org.alfresco.repo.domain.hibernate.NodeImpl.parentAssocs"
maxElementsInMemory="10000" maxElementsInMemory="50000"
eternal="true" eternal="true"
timeToIdleSeconds="0" timeToIdleSeconds="0"
timeToLiveSeconds="0" timeToLiveSeconds="0"
overflowToDisk="false" overflowToDisk="false"
/> />
<!-- approx 40MB memory required --> <!-- approx 70MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.ChildAssocImpl" name="org.alfresco.repo.domain.hibernate.ChildAssocImpl"
maxElementsInMemory="25000" maxElementsInMemory="50000"
eternal="true" eternal="true"
timeToIdleSeconds="0" timeToIdleSeconds="0"
timeToLiveSeconds="0" timeToLiveSeconds="0"
@@ -97,7 +97,7 @@
<!-- approx 20MB memory required --> <!-- approx 20MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.NodeImpl.sourceNodeAssocs" name="org.alfresco.repo.domain.hibernate.NodeImpl.sourceNodeAssocs"
maxElementsInMemory="5000" maxElementsInMemory="20000"
eternal="true" eternal="true"
timeToIdleSeconds="0" timeToIdleSeconds="0"
timeToLiveSeconds="0" timeToLiveSeconds="0"
@@ -106,7 +106,7 @@
<!-- approx 20MB memory required --> <!-- approx 20MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.NodeImpl.targetNodeAssocs" name="org.alfresco.repo.domain.hibernate.NodeImpl.targetNodeAssocs"
maxElementsInMemory="5000" maxElementsInMemory="20000"
eternal="true" eternal="true"
timeToIdleSeconds="0" timeToIdleSeconds="0"
timeToLiveSeconds="0" timeToLiveSeconds="0"
@@ -131,6 +131,7 @@
overflowToDisk="false" overflowToDisk="false"
/> />
<!-- version counters --> <!-- version counters -->
<!-- approx 0.4MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.VersionCountImpl" name="org.alfresco.repo.domain.hibernate.VersionCountImpl"
maxElementsInMemory="100" maxElementsInMemory="100"
@@ -149,36 +150,37 @@
overflowToDisk="false" overflowToDisk="false"
/> />
<!-- Permission related caches --> <!-- Permission related caches -->
<!-- approx 40MB memory required --> <!-- approx 10MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl" name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl"
maxElementsInMemory="10000" maxElementsInMemory="10000"
eternal="true" eternal="true"
overflowToDisk="false"/> overflowToDisk="false"/>
<!-- approx ??MB memory required --> <!-- approx 10MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl.entries" name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl.entries"
maxElementsInMemory="10000" maxElementsInMemory="10000"
eternal="true" eternal="true"
overflowToDisk="false"/> overflowToDisk="false"/>
<!-- approx 35MB memory required --> <!-- approx 30MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl" name="org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl"
maxElementsInMemory="25000" maxElementsInMemory="25000"
eternal="true" eternal="true"
overflowToDisk="false"/> overflowToDisk="false"/>
<!-- approx 2MB memory required --> <!-- approx 1MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.DbPermissionImpl" name="org.alfresco.repo.domain.hibernate.DbPermissionImpl"
maxElementsInMemory="500" maxElementsInMemory="500"
eternal="true" eternal="true"
overflowToDisk="false"/> overflowToDisk="false"/>
<!-- approx 40MB memory required --> <!-- approx 10MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl" name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl"
maxElementsInMemory="10000" maxElementsInMemory="10000"
eternal="true" eternal="true"
overflowToDisk="false"/> overflowToDisk="false"/>
<!-- approx 5MB memory required -->
<cache <cache
name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl.externalKeys" name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl.externalKeys"
maxElementsInMemory="5000" maxElementsInMemory="5000"

View File

@@ -10,7 +10,7 @@
# #
# MySQL dialect (default) # MySQL dialect (default)
# #
#hibernate.dialect=org.hibernate.dialect.MySQLDialect #hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
# #
# Oracle dialect # Oracle dialect

View File

@@ -19,16 +19,6 @@
<generator class="native" /> <generator class="native" />
</id> </id>
<set name="entries"
inverse="true"
lazy="false"
cascade="delete"
optimistic-lock="true"
fetch="join" >
<key column="acl_id" />
<one-to-many class="org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl" />
</set>
<set name="entries" <set name="entries"
inverse="true" inverse="true"
lazy="false" lazy="false"