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/cmis/mapping/AbstractVersioningProperty.java

@@ -39,16 +39,12 @@ public abstract class AbstractVersioningProperty extends AbstractProperty
 
     /**
      * Construct
-     * 
-     * @param serviceRegistry
-     * @param propertyName
      */
     protected AbstractVersioningProperty(ServiceRegistry serviceRegistry, String propertyName)
     {
         super(serviceRegistry, propertyName);
     }
 
-    
     public NodeRef getVersionSeries(NodeRef nodeRef)
     {
         if (nodeRef.getStoreRef().getProtocol().equals(VersionBaseModel.STORE_PROTOCOL))
@@ -56,20 +52,21 @@ public abstract class AbstractVersioningProperty extends AbstractProperty
             // Due to the remapping done for us by the versioned node services, we can simply look up the properties
             // containing the component parts of the node ref to map back to the original node
             Map<QName, Serializable> properties = getServiceRegistry().getNodeService().getProperties(nodeRef);
-            return new NodeRef((String) properties.get(ContentModel.PROP_STORE_PROTOCOL),
+            nodeRef = new NodeRef((String) properties.get(ContentModel.PROP_STORE_PROTOCOL),
                     (String) properties.get(ContentModel.PROP_STORE_IDENTIFIER), (String) properties
                             .get(ContentModel.PROP_NODE_UUID));
         }
         else if (isWorkingCopy(nodeRef))
         {
-            return (NodeRef) getServiceRegistry().getNodeService().getProperty(nodeRef, ContentModel.PROP_COPY_REFERENCE);
+            NodeRef originalNodeRef = getServiceRegistry().getCopyService().getOriginal(nodeRef);
+            nodeRef = originalNodeRef == null ? nodeRef : originalNodeRef;
         }
         return nodeRef;
     }
 
     public boolean isWorkingCopy(NodeRef nodeRef)
     {
-        return getServiceRegistry().getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY);
+        return getServiceRegistry().getCheckOutCheckInService().isWorkingCopy(nodeRef);
     }
     
     public boolean hasWorkingCopy(NodeRef nodeRef)

source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java

@@ -1341,11 +1341,8 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
         return nodeService.getPrimaryParent(folderRef).getParentRef();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.CMISServices#getVersionSeries(java.lang.String, java.lang.Class, boolean)
-     */
     @SuppressWarnings("unchecked")
+    @Override
     public <T> T getVersionSeries(String objectId, Class<T> requiredType, boolean isVersionable)
             throws CMISConstraintException, CMISVersioningException, CMISObjectNotFoundException,
             CMISInvalidArgumentException, CMISPermissionDeniedException
@@ -1367,12 +1364,13 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
         {
             NodeRef nodeRef = (NodeRef) object;
             // Map working copy nodes back to where they were checked out from
-            if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY))
+            NodeRef workingCopyNodeRef = checkOutCheckInService.getCheckedOut(nodeRef);
+            if (workingCopyNodeRef != null)
             {
-                result = (NodeRef) nodeService.getProperty(nodeRef, ContentModel.PROP_COPY_REFERENCE);
+                // It is a working copy
+                result = workingCopyNodeRef;
             }
-            // Preserve all other nodes
-            else
+            else                    // Preserve all other nodes
             {
                 result = nodeRef;
             }

source/java/org/alfresco/cmis/mapping/VersionSeriesIdProperty.java

@@ -21,10 +21,9 @@ package org.alfresco.cmis.mapping;
 import java.io.Serializable;
 
 import org.alfresco.cmis.CMISDictionaryModel;
-import org.alfresco.model.ContentModel;
 import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
 
 /**
  * @author dward
@@ -33,28 +32,29 @@ public class VersionSeriesIdProperty extends AbstractVersioningProperty
 {
     /**
      * Construct
-     * 
-     * @param serviceRegistry
      */
     public VersionSeriesIdProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_VERSION_SERIES_ID);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyAccessor#getValue(org.alfresco.service.cmr.repository.NodeRef)
-     */
+    @Override
     public Serializable getValue(NodeRef nodeRef)
     {
-        NodeService nodeService = getServiceRegistry().getNodeService();
-        if (isWorkingCopy(nodeRef))
+        CheckOutCheckInService checkOutCheckInService = getServiceRegistry().getCheckOutCheckInService();
+        NodeRef result = null;
+        if (checkOutCheckInService.isWorkingCopy(nodeRef))
         {
-            return nodeService.getProperty(nodeRef, ContentModel.PROP_COPY_REFERENCE).toString();
+            result = checkOutCheckInService.getCheckedOut(nodeRef);
+            if (result == null)
+            {
+                result = nodeRef;
+            }
         }
         else
         {
-            return getVersionSeries(nodeRef).toString();
+            result = getVersionSeries(nodeRef);
         }
+        return result.toString();
     }
 }