Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4421 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4462 .
   svn resolved root\projects\repository\source\java\org\alfresco\repo\model\filefolder\FileFolderPerformanceTester.java
   svn revert root\projects\repository\config\alfresco\version.properties
   svn resolved  root\projects\3rd-party\.classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 16:15:44 +00:00
parent ced83b971b
commit 58ee1796a2
9 changed files with 139 additions and 80 deletions

View File

@@ -39,11 +39,14 @@
<ref bean="internalEHCacheManager" />
</property>
<property name="cacheName">
<value>userToAuthorityCache</value>
<value>org.alfresco.userToAuthorityCache</value>
</property>
<property name="maxElementsInMemory">
<value>10000</value> <!-- approx 2MB memory required -->
</property>
<property name="eternal">
<value>true</value>
</property>
<property name="overflowToDisk">
<value>false</value>
</property>
@@ -61,10 +64,10 @@
<ref bean="transactionalEHCacheManager" />
</property>
<property name="name">
<value>userToAuthorityTransactionalCache</value>
<value>org.alfresco.userToAuthorityTransactionalCache</value>
</property>
<property name="maxCacheSize">
<value>5000</value>
<value>100</value>
</property>
</bean>
@@ -81,11 +84,14 @@
<ref bean="internalEHCacheManager" />
</property>
<property name="cacheName">
<value>permissionsAccessCache</value>
<value>org.alfresco.permissionsAccessCache</value>
</property>
<property name="maxElementsInMemory">
<value>50000</value> <!-- approx 20MB memory required -->
</property>
<property name="eternal">
<value>true</value>
</property>
<property name="overflowToDisk">
<value>false</value>
</property>
@@ -104,10 +110,10 @@
</property>
<!-- Eh cache area -->
<property name="name">
<value>permissionsAccessTransactionalCache</value>
<value>org.alfresco.permissionsAccessTransactionalCache</value>
</property>
<property name="maxCacheSize">
<value>5000</value>
<value>10000</value>
</property>
</bean>
@@ -124,11 +130,14 @@
<ref bean="internalEHCacheManager" />
</property>
<property name="cacheName">
<value>nodeOwnerCache</value>
<value>org.alfresco.nodeOwnerCache</value>
</property>
<property name="maxElementsInMemory">
<value>20000</value> <!-- approx 20MB memory required -->
</property>
<property name="eternal">
<value>true</value>
</property>
<property name="overflowToDisk">
<value>false</value>
</property>
@@ -146,10 +155,10 @@
<ref bean="transactionalEHCacheManager" />
</property>
<property name="name">
<value>nodeOwnerTransactionalCache</value>
<value>org.alfresco.nodeOwnerTransactionalCache</value>
</property>
<property name="maxCacheSize">
<value>5000</value>
<value>10000</value>
</property>
</bean>
@@ -166,11 +175,14 @@
<ref bean="internalEHCacheManager" />
</property>
<property name="cacheName">
<value>ticketsCache</value>
<value>org.alfresco.ticketsCache</value>
</property>
<property name="maxElementsInMemory">
<value>1000</value>
</property>
<property name="eternal">
<value>true</value>
</property>
<property name="overflowToDisk">
<value>false</value>
</property>
@@ -188,7 +200,7 @@
<ref bean="transactionalEHCacheManager" />
</property>
<property name="name">
<value>ticketsTransactionalCache</value>
<value>org.alfresco.ticketsTransactionalCache</value>
</property>
<property name="maxCacheSize">
<value>10</value>

View File

@@ -212,10 +212,10 @@
<ref bean="authenticationServiceImpl" />
</property>
<property name="maxPermissionCheckTimeMillis">
<value>${lucene.query.maxPermissionCheckTimeMillis}</value>
<value>${system.acl.maxPermissionCheckTimeMillis}</value>
</property>
<property name="maxPermissionChecks">
<value>${lucene.query.maxPermissionChecks}</value>
<value>${system.acl.maxPermissionChecks}</value>
</property>
</bean>
@@ -352,6 +352,7 @@
org.alfresco.service.cmr.repository.NodeService.setProperty=ACL_NODE.0.sys:base.WriteProperties
org.alfresco.service.cmr.repository.NodeService.getParentAssocs=ACL_NODE.0.sys:base.ReadProperties,AFTER_ACL_PARENT.sys:base.Read
org.alfresco.service.cmr.repository.NodeService.getChildAssocs=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.Read
org.alfresco.service.cmr.repository.NodeService.getChildByName=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.Read
org.alfresco.service.cmr.repository.NodeService.getPrimaryParent=ACL_NODE.0.sys:base.ReadProperties,AFTER_ACL_PARENT.sys:base.Read
org.alfresco.service.cmr.repository.NodeService.createAssociation=ROLE_AUTHENTICATED
org.alfresco.service.cmr.repository.NodeService.removeAssociation=ROLE_AUTHENTICATED
@@ -653,6 +654,10 @@
org.alfresco.service.cmr.security.AuthenticationService.getCurrentTicket=ACL_ALLOW
org.alfresco.service.cmr.security.AuthenticationService.clearCurrentSecurityContext=ACL_ALLOW
org.alfresco.service.cmr.security.AuthenticationService.isCurrentUserTheSystemUser=ACL_ALLOW
org.alfresco.service.cmr.security.AuthenticationService.getDomains=ACL_METHOD.ROLE_ADMINISTRATOR
org.alfresco.service.cmr.security.AuthenticationService.getDomainsThatAllowUserCreation=ACL_METHOD.ROLE_ADMINISTRATOR
org.alfresco.service.cmr.security.AuthenticationService.getDomainsThatAllowUserDeletion=ACL_METHOD.ROLE_ADMINISTRATOR
org.alfresco.service.cmr.security.AuthenticationService.getDomiansThatAllowUserPasswordChanges=ACL_METHOD.ROLE_ADMINISTRATOR
</value>
</property>
</bean>
@@ -698,6 +703,8 @@
org.alfresco.service.cmr.security.PersonService.deletePerson=ACL_METHOD.ROLE_ADMINISTRATOR
org.alfresco.service.cmr.security.PersonService.getAllPeople=ACL_ALLOW
org.alfresco.service.cmr.security.PersonService.getPeopleContainer=ACL_ALLOW
org.alfresco.service.cmr.security.PersonService.getUserNamesAreCaseSensitive=ACL_ALLOW
org.alfresco.service.cmr.security.PersonService.getUserIdentifier=ACL_ALLOW
</value>
</property>
</bean>

View File

@@ -19,18 +19,18 @@ index.recovery.mode=VALIDATE
# Change the failure behaviour of the configuration checker
system.bootstrap.config_check.strict=true
#
# Properties to limit resources spent on individual searches
#
# The maximum time spent pruning results
system.acl.maxPermissionCheckTimeMillis=10000
# The maximum number of results to perform permission checks against
system.acl.maxPermissionChecks=1000
# #################### #
# Lucene configuration #
# #################### #
#
# The maximum time spent pruning query results
#
lucene.query.maxPermissionCheckTimeMillis=10000
#
# The maximum number of results to perform permission checks against
#
lucene.query.maxPermissionChecks=1000
#
# Millisecond threshold for text transformations
# Slower transformers will force the text extraction to be asynchronous
#