Merged V2.1 to HEAD:

6556: AVM performance tweaks
   6557: WCM-758.
   6558: Fixes WCM-753.
   6559: better handling of rename, copy and paste for form instance data and renditions.  addresses WCM-752 and partially addresses WCM-559.
   6560: Renamed JndiTest.java until we decide to keep it or not.
   6561: Oops.
   6562: probable fix WCM-669      
   6563: Build fix after the removal of flushing suport 
   6564: Fix for WCM-728
   6566: Support for avm index clustering via tracking - WCM-762
   6567: Test fix after flush changes
   6568: Fixed AWC-1517: Can now create space based on existing top-level space
   6569: misc IE fixes.
   6570: Various changes to improve AVM import performance and submit performance.
   6571: Session flushing is now deprecated and doesn't fail with an exception.
   6572: Reduced the iteration count to stress nextResults calls a bit more
   6573: WS query sessions put back into cache after more results have been fetched.
   6574: AR-1347: RepositoryServiceSoapBindingStub.queryAssociated() returns nothing when direction=target
   6575: Fixed AR-1680: XPath metadata extraction now handles Node, NodeList and String return values
   6577: Fix for AWC-1518 (User Homes renaming issue, and unreported issue with client config overriding of users home location)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

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

@@ -35,7 +35,6 @@ import java.util.Set;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.node.integrity.IntegrityChecker;
 import org.alfresco.repo.search.impl.lucene.LuceneIndexerAndSearcher;
-import org.alfresco.service.cmr.rule.RuleService;
 import org.alfresco.util.GUID;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -352,22 +351,13 @@ public abstract class AlfrescoTransactionSupport
     }
     
     /**
-     * Flush in-transaction resources.  A transaction must be active.
-     * <p>
-     * The flush may include:
-     * <ul>
-     *   <li>{@link TransactionalDao#flush()}</li>
-     *   <li>{@link RuleService#executePendingRules()}</li>
-     *   <li>{@link IntegrityChecker#checkIntegrity()}</li>
-     * </ul>
-     *
+     * No-op
+     * 
+     * @deprecated      No longer does anything
      */
     public static void flush()
     {
-        // get transaction-local synchronization
-        TransactionSynchronizationImpl synch = getSynchronization();
-        // flush
-        synch.flush();
+        // No-op
     }
 
     /**
@@ -548,15 +538,6 @@ public abstract class AlfrescoTransactionSupport
             return sb.toString();
         }
 
-        /**
-         * Performs the in-transaction flushing.  Typically done during a transaction or
-         * before commit.
-         */
-        public void flush()
-        {
-           throw new UnsupportedOperationException("Manual flush no longer supported.");
-        }
-        
         /**
          * @see AlfrescoTransactionSupport#SESSION_SYNCHRONIZATION_ORDER
          */
@@ -589,7 +570,7 @@ public abstract class AlfrescoTransactionSupport
         /**
          * Pre-commit cleanup.
          * <p>
-         * Ensures that the session resources are {@link #flush() flushed}.
+         * Ensures that the session transaction listeners are property executed.
          * The Lucene indexes are then prepared.
          */
         @Override

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

@@ -157,10 +157,6 @@ public class AlfrescoTransactionSupportTest extends TestCase
         // register it
         AlfrescoTransactionSupport.bindListener(listener);
 
-        // test flush
-        AlfrescoTransactionSupport.flush();
-        assertTrue("flush not called on listener", strings.contains("flush"));
-        
         // test commit
         txn.commit();
         assertTrue("beforeCommit not called on listener", strings.contains("beforeCommit"));

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

@@ -34,11 +34,7 @@ package org.alfresco.repo.transaction;
 public interface TransactionListener
 {
     /**
-     * Allows the listener to flush any consuming resources.  This mechanism is
-     * used primarily during long-lived transactions to ensure that system resources
-     * are not used up.
-     * <p>
-     * This method must not be used for implementing business logic.
+     * @deprecated      No longer supported
      */
     void flush();