inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 1.4 to HEAD

Browse Source 
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:
Derek Hulley
2006-12-19 12:35:52 +00:00
parent 00e6c989fc
commit 473c9ff1ff
20 changed files with 751 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
config/alfresco/bootstrap-context.xml
View File

@@ -217,6 +217,38 @@
<ref bean="searchService"/>
</property>
</bean>
<!-- This component checks the interconnection between the metadata, indexes and content -->
<bean id="configurationChecker" class="org.alfresco.repo.admin.ConfigurationChecker">
<property name="strict">
<value>${system.bootstrap.config_check.strict}</value>
</property>
<property name="checkAllContent">
<value>false</value>
</property>
<property name="dirRoot">
<value>${dir.root}</value>
</property>
<property name="indexRecoveryMode">
<value>${index.recovery.mode}</value>
</property>
<!-- helper beans -->
<property name="authenticationComponent">
<ref bean="authenticationComponent"/>
</property>
<property name="dictionaryService">
<ref bean="DictionaryService"/>
</property>
<property name="nodeService">
<ref bean="NodeService"/>
</property>
<property name="searchService">
<ref bean="SearchService"/>
</property>
<property name="contentService">
<ref bean="ContentService"/>
</property>
</bean>
<!-- This component ensures that patches get applied on startup -->

40
config/alfresco/extension/custom-connection-pool-context.xml.sample
View File

@@ -9,7 +9,8 @@
-->
<beans>
<!-- Datasource bean -->
<!-- DBCP Configuration -->
<!-- http://jakarta.apache.org/commons/dbcp/configuration.html -->
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<!-- connection settings -->
<property name="driverClassName">
@@ -28,30 +29,39 @@
<value>false</value>
</property>
<!-- pool settings -->
<property name="initialSize" >
<property name="minIdle" >
<value>${db.pool.initial}</value>
</property>
<property name="maxActive" >
<value>${db.pool.max}</value>
</property>
<property name="timeBetweenEvictionRunsMillis" >
<value>300000</value>
</property>
<property name="minEvictableIdleTimeMillis" >
<value>-1</value>
</property>
<property name="testOnBorrow" >
<value>false</value>
</property>
<property name="maxWait" >
<value>50000</value>
</property>
<property name="testWhileIdle" >
<value>true</value>
<value>10000</value>
</property>
<property name="validationQuery" >
<value>select 1</value>
</property>
<property name="timeBetweenEvictionRunsMillis" >
<value>300000</value>
</property>
<property name="minEvictableIdleTimeMillis" >
<value>60000</value>
</property>
<property name="testOnBorrow" >
<value>false</value>
</property>
<property name="testOnReturn" >
<value>false</value>
</property>
<property name="testWhileIdle" >
<value>true</value>
</property>
<property name="removeAbandoned" >
<value>true</value>
</property>
<property name="removeAbandonedTimeout" >
<value>30</value>
</property>
</bean>
</beans>

13
config/alfresco/messages/system-messages.properties
View File

@@ -1,4 +1,15 @@
# System-related messages
system.err.property_not_set=Property ''{0}'' has not been set: {1}
system.err.duplicate_name=Duplicate child name not allowed: {0}
system.err.duplicate_name=Duplicate child name not allowed: {0}
# Bootstrap configuration check messages
system.config_check.warn.dir_root=The Alfresco ''dir.root'' property is set to a relative path ''{0}''. ''dir.root'' should be overridden to point to a specific folder.
system.config_check.msg.dir_root=The Alfresco root data directory (''dir.root'') is: {0}
system.config_check.err.indexes.duplicate_root_node=The store ''{0}'' has a duplicate root node entry.
system.config_check.err.missing_index=CONTENT INTEGRITY ERROR: Indexes not found for {0} stores.
system.config_check.err.missing_content=CONTENT INTEGRITY ERROR: Content not found for {0} stores.
system.config_check.err.fix_dir_root=Ensure that the ''dir.root'' property is pointing to the correct data location.
system.config_check.msg.howto_index_recover=You may set 'index.recovery.mode=FULL' if you need to rebuild the indexes.
system.config_check.warn.starting_with_errors=Alfresco is starting with errors.

2
config/alfresco/model/forumModel.xml
View File

@@ -46,7 +46,7 @@
</source>
<target>
<class>fm:forum</class>
<mandatory>true</mandatory>
<mandatory enforced="true">true</mandatory>
<many>false</many>
</target>
<duplicate>false</duplicate>

4
config/alfresco/model/jcrModel.xml
View File

@@ -24,7 +24,7 @@
<property name="jcr:primaryType">
<type>d:qname</type>
<protected>true</protected>
<mandatory>true</mandatory>
<mandatory enforced="true">true</mandatory>
</property>
<property name="jcr:mixinTypes">
<type>d:qname</type>
@@ -56,7 +56,7 @@
</source>
<target>
<class>nt:base</class>
<mandatory>true</mandatory>
<mandatory enforced="true">true</mandatory>
<many>false</many>
</target>
<child-name>jcr:content</child-name>

11
config/alfresco/repository.properties
View File

@@ -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.