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

config/alfresco/repository.properties

@@ -13,8 +13,29 @@ 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 and Tracking Configuration #
+# ######################################### #
+#
+# Recovery types are:
+#    NONE:     Ignore
+#    VALIDATE: Checks that the first and 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.
 index.recovery.mode=VALIDATE
+# Force FULL recovery to stop when encountering errors
+index.recovery.stopOnError=true
+# Set the frequency with which the index tracking is triggered.
+# By default, this is effectively never, but can be modified as required.
+#    Examples:
+#       Once every five seconds: 0/5 * * * * ?
+#       Once every two seconds : 0/2 * * * * ?
+#       See http://quartz.sourceforge.net/javadoc/org/quartz/CronTrigger.html
+index.tracking.cronExpression=* * * * * ? 2099
+# Other properties.
+index.tracking.maxTxnDurationMinutes=60
+index.tracking.reindexLagMs=50
+index.tracking.maxRecordSetSize=1000
 
 # Change the failure behaviour of the configuration checker
 system.bootstrap.config_check.strict=true