inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DEV to HEAD

Browse Source 
- 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
This commit is contained in:
Derek Hulley
2011-07-19 03:22:11 +00:00
parent 8a561b38ca
commit 6ec3f44c29
58 changed files with 2277 additions and 1845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java
View File

@@ -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;
}