From c6ad302873fc60cae0375b20aeb1f848c869a516 Mon Sep 17 00:00:00 2001 From: Tatyana Valkevych Date: Fri, 10 Apr 2015 21:18:10 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 101658: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 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@101705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/opencmis/AlfrescoCmisServiceImpl.java | 7 +------ source/java/org/alfresco/opencmis/CMISConnector.java | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java index f1e40ca1bc..5d9e94686b 100644 --- a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java +++ b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java @@ -479,12 +479,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr { typeqnames.add(type.getAlfrescoClass()); } - PagingResults pageOfNodeInfos = connector.getFileFolderService().list( - folderNodeRef, - typeqnames, - null, //ignoreAspectQNames, - sortProps, - pageRequest); + PagingResults pageOfNodeInfos = connector.getChildren(folderNodeRef, typeqnames, sortProps, pageRequest); if (max > 0) { diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java index e631bc79f3..8f56c4d8d3 100644 --- a/source/java/org/alfresco/opencmis/CMISConnector.java +++ b/source/java/org/alfresco/opencmis/CMISConnector.java @@ -4009,6 +4009,10 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen return descriptorService.getCurrentRepositoryDescriptor().getId(); } + public PagingResults getChildren(NodeRef folderNodeRef, Set typeqnames, List> sortProps, PagingRequest pageRequest) + { + return fileFolderService.list(folderNodeRef, typeqnames, ignoreChildrenQNames, sortProps, pageRequest); + } public PagingResults getChildren(NodeRef folderNodeRef, List> sortProps, PagingRequest pageRequest) { return fileFolderService.list(folderNodeRef, true, true, ignoreChildrenQNames, sortProps, pageRequest);