Merged V3.0 to HEAD

12140: Merged V2.2 to V3.0
    11732: Fixed ETWOTWO-804: Node and Transaction Cleanup Job
    11747: Missed config for Node and Txn purging
    11826: WCM - fix ETWOTWO-817
    11951: Fixed ETWOTWO-901: NodeService cleanup must be pluggable
    11961: Merged V2.1 to V2.2
      11561: ETWOONE-224: when renaming duplicates during copy association names where not renamed 
      11583: (ALREADY PRESENT) Updated NTLM config example in web.xml - adding missing servlet mappings
      11584: Fix for ETWOONE-209 - JavaScript People.createGroup() API now correctly checks for actual group name when testing for existence
      11585: Fix for ETWOONE-214 - View In CIFS link now works even when users des not have view permissions on the parent folder
      11612: Fix for ETWOONE-91: the description textarea in the modify space properties web form eats one leading newline each time it is submitted
      11613: Fix 2.1 build and adjust implementation of ETWOONE-224 fix
      11621: Fix for ETWOONE-343
      11669: Improved debug from index tracking when exceptions occur
  12141: Avoid annoying Spring WARN messages for ClientAbortException
  12143: File that should have been deleted in CHK-5460 (rev 12140)
  12177: Fix failing FS Deployment Tests since introduction of transaction check advice.


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

source/java/org/alfresco/repo/node/db/NodeDaoService.java

@@ -69,7 +69,7 @@ public interface NodeDaoService
      * @return Returns a list of stores
      */
     @DirtySessionAnnotation(markDirty=false)
-    public List<StoreRef> getStoreRefs();
+    public List<Pair<Long, StoreRef>> getStores();
     
     @DirtySessionAnnotation(markDirty=false)
     public Pair<Long, NodeRef> getRootNode(StoreRef storeRef);
@@ -164,11 +164,19 @@ public interface NodeDaoService
     public boolean hasNodeAspect(Long nodeId, QName aspectQName);
     
     /**
-     * Deletes the node and all entities
+     * Deletes the node and all entities.  Note that the node entry will still exist and be
+     * associated with a live transaction.
      */
     @DirtySessionAnnotation(markDirty=true)
     public void deleteNode(Long nodeId);
     
+    /**
+     * Remove all traces of the node.  This assumes that the node has been marked
+     * for deletion using {@link #deleteNode(Long)}.
+     */
+    @DirtySessionAnnotation(markDirty=true)
+    public void purgeNode(Long nodeId);
+    
     /**
      * @param name              the <b>cm:name</b> to apply to the association
      * @return                  Returns the persisted and filled association's ID
@@ -286,8 +294,21 @@ public interface NodeDaoService
         boolean handle(Pair<Long, NodeRef> nodePair);
     }
     
+    /**
+     * Gets a set of nodes that have parents in the given store, but are themselves located in a different
+     * store.
+     * 
+     * @param storeId               the store of the parent nodes
+     * @param minNodeId             the min node ID to return
+     * @param count                 the maximum number of results
+     * @param resultsCallback       the node callback
+     */
     @DirtySessionAnnotation(markDirty=false)
-    public void getNodesWithChildrenInDifferentStores(Long minNodeId, int count, NodeRefQueryCallback resultsCallback);
+    public void getNodesWithChildrenInDifferentStore(
+            Long storeId,
+            Long minNodeId,
+            int count,
+            NodeRefQueryCallback resultsCallback);
     
     @DirtySessionAnnotation(markDirty=false)
     public void getNodesWithAspect(QName aspectQName, Long minNodeId, int count, NodeRefQueryCallback resultsCallback);
@@ -454,6 +475,17 @@ public interface NodeDaoService
     @DirtySessionAnnotation(markDirty=true)
     public void getPropertyValuesByActualType(DataTypeDefinition actualDataTypeDefinition, NodePropertyHandler handler);
     
+    /**
+     * Gets a batch of deleted nodes in old transactions.
+     * 
+     * @param minNodeId                     the minimum node ID
+     * @param maxCommitTime                 the maximum commit time (to set a minimum transaction age)
+     * @param count                         the maximum number of results (for batching)
+     * @param resultsCallback               the callback to pass results back
+     */
+    @DirtySessionAnnotation(markDirty=false)
+    public void getNodesDeletedInOldTxns(Long minNodeId, long maxCommitTime, int count, NodeRefQueryCallback resultsCallback);
+    
     /**
      * Iterface to handle callbacks when iterating over properties
      * 
@@ -465,6 +497,20 @@ public interface NodeDaoService
         void handle(NodeRef nodeRef, QName nodeTypeQName, QName propertyQName, Serializable value);
     }
     
+    /**
+     * Retrieves the maximum transaction ID for which the commit time is less than the given time.
+     * 
+     * @param maxCommitTime         the max commit time (ms)
+     * @return                      the last transaction <i>on or before</i> the given time
+     */
+    @DirtySessionAnnotation(markDirty=true)
+    public Long getMaxTxnIdByCommitTime(final long maxCommitTime);
+    /**
+     * Retrieves a specific transaction.
+     * 
+     * @param txnId                 the unique transaction ID.
+     * @return                      the requested transaction or <tt>null</tt>
+     */
     @DirtySessionAnnotation(markDirty=true)
     public Transaction getTxnById(long txnId);
     /**
@@ -518,4 +564,10 @@ public interface NodeDaoService
     
     @DirtySessionAnnotation(markDirty=false)
     public List<NodeRef> getTxnChanges(final long txnId);
+    
+    @DirtySessionAnnotation(markDirty=false)
+    public List<Long> getTxnsUnused(Long minTxnId, long maxCommitTime, int count);
+    
+    @DirtySessionAnnotation(markDirty=true)
+    public void purgeTxn(Long txnId);
 }