Merged V2.1 to HEAD

6950: Fix for forum issue (6111) when using xsl:include
   6951: Partial fix for WCM-862
   6952: Merged V1.4 to V2.1
      6921: Reindex tracking refactoring.
   6954: Merged V1.4 to V2.1
      6927: Config and startup changes for index tracking


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-11-12 23:52:46 +00:00
parent 209dd85a0d
commit e82c2cd946
22 changed files with 824 additions and 456 deletions

View File

@@ -28,19 +28,18 @@
</bean>
<!-- index recovery and validation -->
<!--
Recovery types are:
NONE: Ignore
VALIDATE: Checks that the last transaction for each store is represented in the indexes
AUTO: Validates and auto-recovers if validation fails
FULL: Full index rebuild, processing all transactions in order. The server is temporarily suspended.
-->
<bean
id="indexRecoveryComponent"
class="org.alfresco.repo.node.index.FullIndexRecoveryComponent"
parent="indexRecoveryComponentBase">
<property name="recoveryMode">
<value>${index.recovery.mode}</value>
<value>${index.recovery.mode}</value>
</property>
<property name="stopOnError">
<value>${index.recovery.stopOnError}</value>
</property>
<property name="indexTracker">
<ref bean="admIndexTrackerComponent" />
</property>
</bean>
@@ -60,6 +59,50 @@
</bean>
<!-- Index tracking -->
<!--
This is the default index tracker component. It is used during bootstrap when incremental recovery
is required. It is also used, by default in the clustered index tracking sample.
-->
<bean
id="admIndexTrackerComponent"
class="org.alfresco.repo.node.index.IndexTransactionTracker"
parent="indexRecoveryComponentBase">
<property name="maxTxnDurationMinutes">
<value>${index.tracking.maxTxnDurationMinutes}</value>
</property>
<property name="reindexLagMs">
<value>${index.tracking.reindexLagMs}</value>
</property>
<property name="maxRecordSetSize">
<value>${index.tracking.maxRecordSetSize}</value>
</property>
</bean>
<!-- Schedule index tracking for ADM -->
<bean id="admIndexTrackerTrigger" class="org.alfresco.util.CronTriggerBean">
<property name="jobDetail">
<bean class="org.springframework.scheduling.quartz.JobDetailBean">
<property name="jobClass">
<value>org.alfresco.repo.node.index.IndexRecoveryJob</value>
</property>
<property name="jobDataAsMap">
<map>
<entry key="indexRecoveryComponent">
<ref bean="admIndexTrackerComponent" />
</entry>
</map>
</property>
</bean>
</property>
<property name="scheduler">
<ref bean="schedulerFactory" />
</property>
<property name="cronExpression">
<value>${index.tracking.cronExpression}</value>
</property>
</bean>
<!-- Bean that attempts to index content that was previously missing -->
<bean
id="missingContentReindexComponent"