mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.0 to HEAD
5450: (from V1.4) 5423 (V1.4): CIFS authentication 5451: (from V1.4) 5432 (V1.4): 'No root node' fix 5437 (V1.4): EHCache upgrade 5440 (V1.4): AR-1355 - Ticket cache config fix 5442 (V1.4): Bootstrap reorganization 5446 (V1.4): AR-1353 5452: (from V1.4) 5391: AR-1310 (script rename fix) 5453: Win32NetBIOS LANA 5454: CIFS unused code git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -247,6 +247,15 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- Perform index recovery before applying any patches -->
|
||||
<!-- rebuild the index if required - before we check that it is there -->
|
||||
|
||||
<bean id="indexRecoveryBootstrap" class="org.alfresco.repo.node.index.IndexRecoveryBootstrapBean" >
|
||||
<property name="indexRecoveryComponent">
|
||||
<ref bean="indexRecoveryComponent"/>
|
||||
</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">
|
||||
@@ -278,7 +287,7 @@
|
||||
<ref bean="contentService"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
||||
<!-- This component ensures that patches get applied on startup -->
|
||||
|
||||
<bean id="patchExecuter" class="org.alfresco.repo.admin.patch.PatchExecuter">
|
||||
@@ -328,6 +337,14 @@
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
|
||||
<!-- Start the quartz scheduler -->
|
||||
|
||||
<bean id="schedulerStarter" class="org.alfresco.util.SchedulerStarterBean" >
|
||||
<property name="scheduler">
|
||||
<ref bean="schedulerFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- Startup Message -->
|
||||
|
||||
<bean id="startupLog" class="org.alfresco.repo.descriptor.DescriptorStartupLog">
|
||||
|
@@ -260,7 +260,7 @@
|
||||
name="org.alfresco.cache.ticketsCache"
|
||||
maxElementsInMemory="1000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
overflowToDisk="true"
|
||||
/>
|
||||
|
||||
</ehcache>
|
@@ -26,7 +26,7 @@
|
||||
<!--
|
||||
<cacheManagerPeerListenerFactory
|
||||
class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
|
||||
properties="port=40001, socketTimeoutMillis=2000"/>
|
||||
properties="port=40001, socketTimeoutMillis=5000"/>
|
||||
-->
|
||||
|
||||
<!-- ================================================================= -->
|
||||
@@ -489,7 +489,7 @@
|
||||
name="org.alfresco.cache.ticketsCache"
|
||||
maxElementsInMemory="1000"
|
||||
eternal="true"
|
||||
overflowToDisk="false">
|
||||
overflowToDisk="true">
|
||||
|
||||
<cacheEventListenerFactory
|
||||
class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
|
||||
|
@@ -16,6 +16,10 @@
|
||||
<property name="schedulerName">
|
||||
<value>DefaultScheduler</value>
|
||||
</property>
|
||||
<!-- Do not auto start the scheduler - this is done at the end of the bootstrap process -->
|
||||
<property name="autoStartup">
|
||||
<value>false</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- -->
|
||||
@@ -48,6 +52,8 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- This has now been moved into the bootstrap process and is not required here -->
|
||||
<!--
|
||||
<bean id="indexRecoveryTrigger" class="org.alfresco.util.TriggerBean">
|
||||
<property name="jobDetail">
|
||||
<bean class="org.springframework.scheduling.quartz.JobDetailBean">
|
||||
@@ -73,6 +79,7 @@
|
||||
<value>0</value>
|
||||
</property>
|
||||
</bean>
|
||||
-->
|
||||
|
||||
<bean id="tempFileCleanerTrigger" class="org.alfresco.util.TriggerBean">
|
||||
<property name="jobDetail">
|
||||
|
Reference in New Issue
Block a user