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/domain/hibernate/Node.hbm.xml

@@ -249,9 +249,11 @@
    
    <query name="node.GetNodeByStoreIdAndUuid">
       select
-         node
+         node,
+         acl
       from 
          org.alfresco.repo.domain.hibernate.NodeImpl as node
+         left outer join node.accessControlList as acl
       where
          node.store.id = :storeId and
          node.uuid = :uuid
@@ -531,7 +533,7 @@
          assoc.id
    </query>
    
-   <query name="node.GetNodesWithChildrenInDifferentStores">
+   <query name="node.GetNodesWithChildrenInDifferentStore">
       select
          parent.id,
          parentStore.protocol,
@@ -542,8 +544,10 @@
          join assoc.parent as parent
          join parent.store as parentStore
          join assoc.child as child
+         join child.store as childStore
       where
-         child.store.id != parent.store.id and
+         parentStore.id = :parentStoreId and
+         childStore.id != :parentStoreId and
          parent.id > :minNodeId and
          assoc.isPrimary = true
       order by
@@ -704,4 +708,23 @@
          props.serializableValue is not null
    </query>
 
+   <query name="node.GetDeletedNodesByMaxTxnId">
+      <![CDATA[
+      select
+         node.id,
+         node.store.protocol,
+         node.store.identifier,
+         node.uuid
+      from
+         org.alfresco.repo.domain.hibernate.NodeImpl as node
+         join node.transaction as txn
+      where
+         node.id >= :minNodeId and
+         node.deleted = true and
+         txn.id <= :maxTxnId
+      order by
+         node.id asc
+      ]]>
+   </query>
+
 </hibernate-mapping>

source/java/org/alfresco/repo/domain/hibernate/Transaction.hbm.xml

@@ -88,6 +88,17 @@
          org.alfresco.repo.domain.hibernate.TransactionImpl as txn
    </query>
 
+   <query name="txn.GetMaxIdByCommitTime">
+      <![CDATA[
+      select
+         max(txn.id)
+      from
+         org.alfresco.repo.domain.hibernate.TransactionImpl as txn
+      where
+         txn.commitTimeMs <= :maxCommitTime
+      ]]>
+   </query>
+
    <query name="txn.GetTxnsByCommitTimeAsc">
       <![CDATA[
       select
@@ -185,4 +196,20 @@
          node.transaction.id = :txnId
    </query>
 
+   <query name="txn.GetTxnsUnused">
+      <![CDATA[
+      select
+         txn.id
+      from
+         org.alfresco.repo.domain.hibernate.NodeImpl as node
+         right join node.transaction as txn
+      where
+         node.id is null and
+         txn.id >= :minTxnId and
+         txn.commitTimeMs <= :maxCommitTime
+      order by
+         txn.id asc
+      ]]>
+   </query>
+
 </hibernate-mapping>