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

source/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java

@@ -602,6 +602,12 @@ public abstract class AlfrescoTransactionSupport
             {
                 lucene.prepare();
             }
+            
+            // Flush the DAOs
+            for (TransactionalDao dao : daoServices)
+            {
+                dao.beforeCommit();
+            }
         }
         
         /**

source/java/org/alfresco/repo/transaction/TransactionalDao.java

@@ -23,4 +23,11 @@ public interface TransactionalDao
      * @return true => changes are pending
      */
     public boolean isDirty();
+    
+    /**
+     * This callback provides a chance for the DAO to do any pre-commit work.
+     * 
+     * @since 1.4.5
+     */
+    public void beforeCommit();
 }