Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 .
   svn revert root\common\common.xml
   svn resolved root\projects\repository\config\alfresco\script-services-context.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-18 13:45:11 +00:00
parent 8e0a637886
commit 72bb79696d
48 changed files with 1960 additions and 299 deletions

View File

@@ -210,7 +210,13 @@
</property>
<property name="authenticationService">
<ref bean="authenticationServiceImpl" />
</property>
</property>
<property name="maxPermissionCheckTimeMillis">
<value>${lucene.query.maxPermissionCheckTimeMillis}</value>
</property>
<property name="maxPermissionChecks">
<value>${lucene.query.maxPermissionChecks}</value>
</property>
</bean>
<!-- Link up after method call security -->