mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4329 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4331 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4332 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4339 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -16,6 +16,9 @@ dir.indexes.lock=${dir.indexes}/locks
|
||||
# The index recovery mode (NONE, VALIDATE, AUTO, FULL)
|
||||
index.recovery.mode=VALIDATE
|
||||
|
||||
# Change the failure behaviour of the configuration checker
|
||||
system.bootstrap.config_check.strict=true
|
||||
|
||||
# #################### #
|
||||
# Lucene configuration #
|
||||
# #################### #
|
||||
@@ -64,7 +67,6 @@ lucene.commit.lock.timeout=100000
|
||||
lucene.lock.poll.interval=100
|
||||
|
||||
# Database configuration
|
||||
|
||||
db.schema.update=true
|
||||
db.driver=org.gjt.mm.mysql.Driver
|
||||
db.name=alfresco
|
||||
@@ -75,7 +77,6 @@ db.pool.initial=10
|
||||
db.pool.max=20
|
||||
|
||||
# Email configuration
|
||||
|
||||
mail.host=
|
||||
mail.port=25
|
||||
mail.username=anonymous
|
||||
@@ -86,13 +87,11 @@ mail.encoding=UTF-8
|
||||
mail.header=
|
||||
|
||||
# System Configuration
|
||||
|
||||
system.store=system://system
|
||||
system.descriptor.childname=sys:descriptor
|
||||
system.descriptor.current.childname=sys:descriptor-current
|
||||
|
||||
# User config
|
||||
|
||||
alfresco_user_store.store=user://alfrescoUserStore
|
||||
alfresco_user_store.system_container.childname=sys:system
|
||||
alfresco_user_store.user_container.childname=sys:people
|
||||
@@ -102,7 +101,6 @@ alfresco_user_store.authorities_container.childname=sys:authorities
|
||||
spaces.archive.store=archive://SpacesStore
|
||||
|
||||
# Spaces Configuration
|
||||
|
||||
spaces.store=workspace://SpacesStore
|
||||
spaces.company_home.childname=app:company_home
|
||||
spaces.guest_home.childname=app:guest_home
|
||||
@@ -117,12 +115,10 @@ spaces.wcm.childname=app:wcm
|
||||
spaces.content_forms.childname=app:wcm_forms
|
||||
|
||||
# Folders for storing people
|
||||
|
||||
system.system_container.childname=sys:system
|
||||
system.people_container.childname=sys:people
|
||||
|
||||
# Folders for storing workflow related info
|
||||
|
||||
system.workflow_container.childname=sys:workflow
|
||||
|
||||
# Are user names case sensitive?
|
||||
@@ -136,7 +132,6 @@ system.workflow_container.childname=sys:workflow
|
||||
#
|
||||
# Must other databases are case sensitive by default.
|
||||
#
|
||||
|
||||
user.name.caseSensitive=false
|
||||
|
||||
# AVM Specific properties.
|
||||
|
Reference in New Issue
Block a user