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

Merge 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4351 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4352 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4353 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4362 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 14:36:46 +00:00
parent 488450a988
commit 760cb0fe77
20 changed files with 332 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,9 +223,6 @@
<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>
@@ -233,20 +230,23 @@
<value>${index.recovery.mode}</value>
</property>
<!-- helper beans -->
<property name="authenticationComponent">
<ref bean="authenticationComponent"/>
<property name="transactionService">
<ref bean="transactionComponent"/>
</property>
<property name="dictionaryService">
<ref bean="DictionaryService"/>
<property name="systemBootstrap">
<ref bean="systemBootstrap"/>
</property>
<property name="namespaceService">
<ref bean="namespaceService"/>
</property>
<property name="nodeService">
<ref bean="NodeService"/>
<ref bean="nodeService"/>
</property>
<property name="searchService">
<ref bean="SearchService"/>
<ref bean="searchService"/>
</property>
<property name="contentService">
<ref bean="ContentService"/>
<ref bean="contentService"/>
</property>
</bean>