inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +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

66
source/java/org/alfresco/opencmis/CMISConnector.java
View File

@@ -71,14 +71,10 @@ import org.alfresco.opencmis.search.CMISQueryService;
import org.alfresco.opencmis.search.CMISResultSet;
import org.alfresco.opencmis.search.CMISResultSetColumn;
import org.alfresco.opencmis.search.CMISResultSetRow;
import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults;
import org.alfresco.repo.Client;
import org.alfresco.repo.Client.ClientType;
import org.alfresco.repo.action.executer.ContentMetadataExtracter;
import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.repo.dictionary.DictionaryDAO;
import org.alfresco.repo.dictionary.DictionaryListener;
import org.alfresco.repo.events.EventPreparator;
import org.alfresco.repo.events.EventPublisher;
import org.alfresco.repo.model.filefolder.GetChildrenCannedQuery;
@@ -245,7 +241,7 @@ import org.springframework.util.StringUtils;
* @author Derek Hulley
* @author steveglover
*/
public class CMISConnector implements ApplicationContextAware, ApplicationListener<ApplicationContextEvent>, TenantDeployer, DictionaryListener
public class CMISConnector implements ApplicationContextAware, ApplicationListener<ApplicationContextEvent>, TenantDeployer
{
private static Log logger = LogFactory.getLog(CMISConnector.class);
@@ -327,15 +323,12 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
private CmisActivityPoster activityPoster;
private BehaviourFilter behaviourFilter;
private DictionaryDAO dictionaryDAO;
private HiddenAspect hiddenAspect;
private StoreRef storeRef;
private String rootPath;
private Map<String, List<String>> kindToRenditionNames;
private Set<String> ignoreChildren = Collections.emptySet();
private Set<QName> ignoreChildrenQNames = Collections.emptySet();
// note: cache is tenant-aware (if using TransctionalCache impl)
@@ -467,11 +460,6 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
this.kindToRenditionNames = renditionKinds;
}
public void setIgnoreChildren(Set<String> ignoreChildren)
{
this.ignoreChildren = ignoreChildren;
}
public void setOpenHttpSession(boolean openHttpSession)
{
this.openHttpSession = openHttpSession;
@@ -510,11 +498,6 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
this.behaviourFilter = behaviourFilter;
}
public void setDictionaryDAO(DictionaryDAO dictionaryDAO)
{
this.dictionaryDAO = dictionaryDAO;
}
/**
* Sets the node service.
*/
@@ -832,7 +815,6 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
{
throw new AlfrescoRuntimeException("Failed to create CMIS temporary directory");
}
dictionaryDAO.registerListener(this);
}
public void init()
@@ -3946,15 +3928,6 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
return descriptorService.getCurrentRepositoryDescriptor().getId();
}
public PagingResults<FileInfo> getChildren(NodeRef folderNodeRef, Set<QName> typeqnames, List<Pair<QName, Boolean>> sortProps, PagingRequest pageRequest)
{
return fileFolderService.list(folderNodeRef, typeqnames, ignoreChildrenQNames, sortProps, pageRequest);
}
public PagingResults<FileInfo> getChildren(NodeRef folderNodeRef, List<Pair<QName, Boolean>> sortProps, PagingRequest pageRequest)
{
return fileFolderService.list(folderNodeRef, true, true, ignoreChildrenQNames, sortProps, pageRequest);
}
/**
* Creates the repository info object.
*/
@@ -4102,41 +4075,4 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
}
return renditionMapping;
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.dictionary.DictionaryListener#onDictionaryInit()
*/
@Override
public void onDictionaryInit()
{
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.dictionary.DictionaryListener#afterDictionaryInit()
*/
@Override
public void afterDictionaryInit()
{
this.ignoreChildrenQNames = new HashSet<QName>(this.ignoreChildren.size(), 1);
for (String prefixString : this.ignoreChildren)
{
try
{
this.ignoreChildrenQNames.add(QName.createQName(prefixString, this.namespaceService));
}
catch (Exception e)
{
logger.warn("Couldn't create QName from " + prefixString, e);
}
}
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.dictionary.DictionaryListener#afterDictionaryDestroy()
*/
@Override
public void afterDictionaryDestroy()
{
}
}