Merged DEV to HEAD

- ALF-8806 RINF 41: Lucene Removal: Fix CopyService
     - ALF-9028: RINF 41: Fix Aspect cm:copiedFrom
   - ALF-9029 RINF 49: Lucene Removal: CheckOutCheckInService API
     - ALF-9032: RINF 49: fixes to cm:workingcopy aspect

   28996: Dev branch for De-Lucene work pending patches
   29004: Evaluator runs in read-only txn
   29006: Additional PermissionCheckedCollection.create method
          - Use an existing collection's permission check data (cut-off, etc) to wrap a new collection
   29007:
          CopyService and CheckOutCheckInService refactors to remove Lucene
          
          CopyService:
          
          Removed cm:source property from cm:copiedfrom aspect and replaced with a cm:original association.
          Added CQ-based APIs to query for copies
          Added APIs to support bi-directional walking of copy association
          Fixed sundry uses of cm:copiedfrom esp. all uses related to cm:workingcopy
          
          CheckOutCheckInService:
          
          Check-out now creates a source aspect cm:checkedOut with 1:1 relationship to cm:workingcopy via cm:workingcopylink
          Removed explicit use of cm:workingcopy aspect and replaced it with calls to COCI API
          
   29083: Audit tests fail when indexing is turned off.
          Also removed a getReader() call during rule evaluation, leading to a 'sub-action' read being recorded.
   29113: NodeDAO.getNodesWithAspects supports paging
   29135: Removed unused patch queries
   29139: Basic patch (still terminates with error) to upgrade cm:copiedfrom and cm:workingcopy
   29157: Tested patch for cm:copiedfrom and cm:workingcopy aspects


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

source/java/org/alfresco/repo/domain/patch/PatchDAO.java

@@ -20,6 +20,7 @@ package org.alfresco.repo.domain.patch;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.alfresco.repo.domain.avm.AVMNodeEntity;
 import org.alfresco.repo.domain.contentdata.ContentDataDAO;
@@ -215,33 +216,32 @@ public interface PatchDAO
     
     /**
      * Get shared acls with inheritance issues
-     * @return
      */
     public List<Map<String, Object>> getSharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent();
     
     /**
      * Get defining acls with inheritance issues
-     * @return
      */
     public List<Map<String, Object>> getDefiningAclsThatDoNotInheritCorrectlyFromThePrimaryParent();
     
     /**
      * Get acls that do not inherit from the primary parent.
-     * @return
      */
     public List<Map<String, Object>> getAclsThatInheritFromNonPrimaryParent();
     
     /**
      * Get acls that inherit with inheritance unset
-     * @return
      */
     public List<Map<String, Object>> getAclsThatInheritWithInheritanceUnset();
     
     /**
      * Get shared acls that do not inherit correctly from the defining acl
-     * @return
      */
     public List<Map<String, Object>> getSharedAclsThatDoNotInheritCorrectlyFromTheirDefiningAcl();
     
-    
+    /**
+     * @param qnames                the qnames to search for
+     * @return                      Returns a count of the number of nodes that have either of the aspects
+     */
+    public long getCountNodesWithAspects(Set<QName> qnames);
 }

source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java

@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.alfresco.ibatis.IdsEntity;
 import org.alfresco.model.ContentModel;
@@ -101,6 +102,8 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
     private static final String SELECT_SHARED_ACLS_THAT_DO_NOT_INHERIT_CORRECTLY_FROM_THE_PRIMARY_PARENT = "alfresco.patch.select_sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent";
     private static final String SELECT_SHARED_ACLS_THAT_DO_NOT_INHERIT_CORRECTLY_FROM_THEIR_DEFINING_ACL = "alfresco.patch.select_sharedAclsThatDoNotInheritCorrectlyFromTheirDefiningAcl";
    
+    private static final String SELECT_COUNT_NODES_WITH_ASPECTS = "alfresco.patch.select_CountNodesWithAspectIds";
+
     private LocaleDAO localeDAO;
     
     protected SqlSessionTemplate template;
@@ -628,4 +631,26 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
                 Boolean.TRUE);
         return rows;
     }
+
+    @Override
+    public long getCountNodesWithAspects(Set<QName> qnames)
+    {
+        // Resolve QNames
+        Set<Long> qnameIds = qnameDAO.convertQNamesToIds(qnames, false);
+        if (qnameIds.size() == 0)
+        {
+            return 0L;
+        }
+        IdsEntity params = new IdsEntity();
+        params.setIds(new ArrayList<Long>(qnameIds));
+        Long count = (Long) template.selectOne(SELECT_COUNT_NODES_WITH_ASPECTS, params);
+        if (count == null)
+        {
+            return 0L;
+        }
+        else
+        {
+            return count;
+        }
+    }
 }