inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACE-5040: Merged 5.1.N (5.1.1) to HEAD (5.1)

Browse Source 
120106 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120071 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
         119848 adragoi: Merged DEV to 5.0.3 (5.0.3)
            119808 adragoi: MNT-15338 : CMIS get object by path only shows the working copy file and not the original file
               - reverted commits related to "Ghost versions when Document is created with CheckinType CHECKOUT" stask :  
               100772 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100260: MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Fix for tests failures
               100824 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                     100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                        99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Don't include PWC in a version series
                        99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Return PWC as a part of version series. Fixes to pass TCK
               100837 : Fix another merge issue as a result of a re factor that has taken place in 5.0
                  Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                     100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                        100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                           99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                              - Don't include PWC in a version series
                           99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                              - Return PWC as a part of version series. Fixes to pass TCK
               101404 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  101273: Merged DEV to V4.2-GUB-FIX (4.2.5)
                     100792 : MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                        - Added init-method for CMISConnector. Test is added
               101597 : Merged DEV to 5.0.N (5.0.2)
                  101560 : MNT-13813 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Fix to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121388 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2016-01-25 12:16:13 +00:00
parent c1b1962a39
commit 863f91e15c
4 changed files with 23 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
View File

@@ -30,7 +30,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -486,7 +485,12 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
{
typeqnames.add(type.getAlfrescoClass());
}
PagingResults<FileInfo> pageOfNodeInfos = connector.getChildren(folderNodeRef, typeqnames, sortProps, pageRequest);
PagingResults<FileInfo> pageOfNodeInfos = connector.getFileFolderService().list(
folderNodeRef,
typeqnames,
null, //ignoreAspectQNames,
sortProps,
pageRequest);
if (max > 0)
{
@@ -2304,7 +2308,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
List<ObjectData> result = new ArrayList<ObjectData>();
// what kind of object is it?
CMISNodeInfo info = getOrCreateNodeInfo(objectId);
CMISNodeInfo info = getOrCreateNodeInfo(versionSeriesId, "Version Series");
// when webservices binding is used, objectId points to null and versionSeriesId points to original node instead of PWC
// see MNT-13839
@@ -2318,7 +2322,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
}
}
if (!EnumSet.of(CMISObjectVariant.CURRENT_VERSION, CMISObjectVariant.PWC, CMISObjectVariant.VERSION).contains(info.getObjectVariant()))
if (!info.isVariant(CMISObjectVariant.CURRENT_VERSION))
{
// the version series id is the id of current version, which is a
// document
@@ -2329,7 +2333,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
NodeRef nodeRef = info.getNodeRef();
VersionHistory versionHistory = ((CMISNodeInfoImpl) info).getVersionHistory();
if (versionHistory == null || info.isPWC())
if (versionHistory == null)
{
// add current version
result.add(connector.createCMISObject(info, filter, includeAllowableActions, IncludeRelationships.NONE,
@@ -2352,7 +2356,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
pwcInfo, filter, includeAllowableActions,
IncludeRelationships.NONE, CMISConnector.RENDITION_NONE, false, false));
boolean isObjectInfoRequired = getContext().isObjectInfoRequired();
boolean isObjectInfoRequired = getContext().isObjectInfoRequired();
if (isObjectInfoRequired)
{
getObjectInfo(repositoryId, pwcInfo.getObjectId(), IncludeRelationships.NONE);
@@ -2366,7 +2370,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
// MNT-9557 fix. Replace head version with current node info
if (versionHistory.getHeadVersion().equals(version))
{
versionInfo = createNodeInfo(info.getCurrentNodeNodeRef());
versionInfo = createNodeInfo(nodeRef);
}
result.add(