mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +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,138 +1,137 @@
|
||||
# Directory configuration
|
||||
|
||||
dir.root=./alf_data
|
||||
|
||||
dir.contentstore=${dir.root}/contentstore
|
||||
dir.contentstore.deleted=${dir.root}/contentstore.deleted
|
||||
|
||||
dir.auditcontentstore=${dir.root}/audit.contentstore
|
||||
|
||||
# The location for lucene index files
|
||||
dir.indexes=${dir.root}/lucene-indexes
|
||||
|
||||
# The location for lucene index locks
|
||||
dir.indexes.lock=${dir.indexes}/locks
|
||||
|
||||
# The index recovery mode (NONE, VALIDATE, AUTO, FULL)
|
||||
index.recovery.mode=VALIDATE
|
||||
|
||||
# #################### #
|
||||
# Lucene configuration #
|
||||
# #################### #
|
||||
#
|
||||
# Millisecond threshold for text transformations
|
||||
# Slower transformers will force the text extraction to be asynchronous
|
||||
#
|
||||
lucene.maxAtomicTransformationTime=20
|
||||
#
|
||||
# The maximum number of clauses that are allowed in a lucene query
|
||||
#
|
||||
lucene.query.maxClauses=10000
|
||||
#
|
||||
# The size of the queue of nodes waiting for index
|
||||
# Events are generated as nodes are changed, this is the maximum size of the queue used to coalesce event
|
||||
# When this size is reached the lists of nodes will be indexed
|
||||
#
|
||||
lucene.indexer.batchSize=1000
|
||||
#
|
||||
# Lucene index min merge docs - the in memory size of the index
|
||||
#
|
||||
lucene.indexer.minMergeDocs=1000
|
||||
#
|
||||
# When lucene index files are merged together - it will try to keep this number of segments/files in
|
||||
#
|
||||
lucene.indexer.mergeFactor=10
|
||||
#
|
||||
# Roughly the maximum number of nodes indexed in one file/segment
|
||||
#
|
||||
lucene.indexer.maxMergeDocs=100000
|
||||
#
|
||||
# The number of terms from a document that will be indexed
|
||||
#
|
||||
lucene.indexer.maxFieldLength=10000
|
||||
|
||||
lucene.write.lock.timeout=10000
|
||||
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
|
||||
db.url=jdbc:mysql:///${db.name}
|
||||
db.username=alfresco
|
||||
db.password=alfresco
|
||||
db.pool.initial=10
|
||||
db.pool.max=20
|
||||
db.pool.maxIdleTime=120
|
||||
|
||||
# Email configuration
|
||||
|
||||
mail.host=
|
||||
mail.port=25
|
||||
mail.username=anonymous
|
||||
mail.password=
|
||||
# Set this value to UTF-8 or similar for encoding of email messages as required
|
||||
mail.encoding=UTF-8
|
||||
# Set this value to 7bit or similar for Asian encoding of email headers as required
|
||||
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
|
||||
alfresco_user_store.authorities_container.childname=sys:authorities
|
||||
|
||||
# Spaces Archive Configuration
|
||||
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
|
||||
spaces.dictionary.childname=app:dictionary
|
||||
spaces.templates.childname=app:space_templates
|
||||
spaces.templates.content.childname=app:content_templates
|
||||
spaces.templates.email.childname=app:email_templates
|
||||
spaces.templates.rss.childname=app:rss_templates
|
||||
spaces.savedsearches.childname=app:saved_searches
|
||||
spaces.scripts.childname=app:scripts
|
||||
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?
|
||||
# ==============================
|
||||
#
|
||||
# NOTE: If you are using mysql you must have case sensitive collation
|
||||
#
|
||||
# You can do this when creating the alfresco database at the start
|
||||
# CREATE DATABASE alfresco CHARACTER SET utf8 COLLATION utf8_bin;
|
||||
# If you want to do this later this is a dump and load fix as it is done when the database, tables and columns are created.
|
||||
#
|
||||
# Must other databases are case sensitive by default.
|
||||
#
|
||||
|
||||
user.name.caseSensitive=false
|
||||
|
||||
# AVM Specific properties.
|
||||
avm.remote.idlestream.timeout=30000
|
||||
avm.remote.port=1313
|
||||
|
||||
# Directory configuration
|
||||
|
||||
dir.root=./alf_data
|
||||
|
||||
dir.contentstore=${dir.root}/contentstore
|
||||
dir.contentstore.deleted=${dir.root}/contentstore.deleted
|
||||
|
||||
dir.auditcontentstore=${dir.root}/audit.contentstore
|
||||
|
||||
# The location for lucene index files
|
||||
dir.indexes=${dir.root}/lucene-indexes
|
||||
|
||||
# The location for lucene index locks
|
||||
dir.indexes.lock=${dir.indexes}/locks
|
||||
|
||||
# The index recovery mode (NONE, VALIDATE, AUTO, FULL)
|
||||
index.recovery.mode=VALIDATE
|
||||
|
||||
# #################### #
|
||||
# Lucene configuration #
|
||||
# #################### #
|
||||
#
|
||||
# Millisecond threshold for text transformations
|
||||
# Slower transformers will force the text extraction to be asynchronous
|
||||
#
|
||||
lucene.maxAtomicTransformationTime=20
|
||||
#
|
||||
# The maximum number of clauses that are allowed in a lucene query
|
||||
#
|
||||
lucene.query.maxClauses=10000
|
||||
#
|
||||
# The size of the queue of nodes waiting for index
|
||||
# Events are generated as nodes are changed, this is the maximum size of the queue used to coalesce event
|
||||
# When this size is reached the lists of nodes will be indexed
|
||||
#
|
||||
lucene.indexer.batchSize=1000
|
||||
#
|
||||
# Lucene index min merge docs - the in memory size of the index
|
||||
#
|
||||
lucene.indexer.minMergeDocs=1000
|
||||
#
|
||||
# When lucene index files are merged together - it will try to keep this number of segments/files in
|
||||
#
|
||||
lucene.indexer.mergeFactor=10
|
||||
#
|
||||
# Roughly the maximum number of nodes indexed in one file/segment
|
||||
#
|
||||
lucene.indexer.maxMergeDocs=100000
|
||||
#
|
||||
# The number of terms from a document that will be indexed
|
||||
#
|
||||
lucene.indexer.maxFieldLength=10000
|
||||
|
||||
lucene.write.lock.timeout=10000
|
||||
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
|
||||
db.url=jdbc:mysql:///${db.name}
|
||||
db.username=alfresco
|
||||
db.password=alfresco
|
||||
db.pool.initial=10
|
||||
db.pool.max=20
|
||||
|
||||
# Email configuration
|
||||
|
||||
mail.host=
|
||||
mail.port=25
|
||||
mail.username=anonymous
|
||||
mail.password=
|
||||
# Set this value to UTF-8 or similar for encoding of email messages as required
|
||||
mail.encoding=UTF-8
|
||||
# Set this value to 7bit or similar for Asian encoding of email headers as required
|
||||
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
|
||||
alfresco_user_store.authorities_container.childname=sys:authorities
|
||||
|
||||
# Spaces Archive Configuration
|
||||
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
|
||||
spaces.dictionary.childname=app:dictionary
|
||||
spaces.templates.childname=app:space_templates
|
||||
spaces.templates.content.childname=app:content_templates
|
||||
spaces.templates.email.childname=app:email_templates
|
||||
spaces.templates.rss.childname=app:rss_templates
|
||||
spaces.savedsearches.childname=app:saved_searches
|
||||
spaces.scripts.childname=app:scripts
|
||||
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?
|
||||
# ==============================
|
||||
#
|
||||
# NOTE: If you are using mysql you must have case sensitive collation
|
||||
#
|
||||
# You can do this when creating the alfresco database at the start
|
||||
# CREATE DATABASE alfresco CHARACTER SET utf8 COLLATION utf8_bin;
|
||||
# If you want to do this later this is a dump and load fix as it is done when the database, tables and columns are created.
|
||||
#
|
||||
# Must other databases are case sensitive by default.
|
||||
#
|
||||
|
||||
user.name.caseSensitive=false
|
||||
|
||||
# AVM Specific properties.
|
||||
avm.remote.idlestream.timeout=30000
|
||||
avm.remote.port=1313
|
||||
|
||||
|
||||
Reference in New Issue
Block a user