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 BRANCHES/DEV/CLOUD1-BUG-FIX to HEAD:

Browse Source 
42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
   - note: also enable WebDAV activities by default (in both cases => file add/update/delete)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2012-10-18 13:56:03 +00:00
parent 502bb3d954
commit 6a930dd56b
6 changed files with 1506 additions and 1053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -58,6 +58,8 @@ import org.alfresco.opencmis.search.CMISResultSet;
import org.alfresco.opencmis.search.CMISResultSetColumn;
import org.alfresco.opencmis.search.CMISResultSetRow;
import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.repo.model.filefolder.HiddenAspect;
import org.alfresco.repo.model.filefolder.HiddenAspect.Visibility;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
@@ -99,6 +101,8 @@ import org.alfresco.service.cmr.security.AccessPermission;
import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.version.VersionService;
import org.alfresco.service.cmr.version.VersionType;
import org.alfresco.service.descriptor.Descriptor;
@@ -107,6 +111,8 @@ import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.FileFilterMode;
import org.alfresco.util.FileFilterMode.Client;
import org.apache.chemistry.opencmis.commons.BasicPermissions;
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.data.Ace;
@@ -250,8 +256,14 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
private NamespaceService namespaceService;
private SearchService searchService;
private DictionaryService dictionaryService;
private SiteService siteService;
private ActivityPoster activityPoster;
private BehaviourFilter behaviourFilter;
private HiddenAspect hiddenAspect;
private StoreRef storeRef;
private String rootPath;
private Map<String, List<String>> kindToRenditionNames;
@@ -277,7 +289,6 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
// --------------------------------------------------------------
// Configuration
// --------------------------------------------------------------
/**
* Sets the root store.
*
@@ -289,6 +300,32 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
this.storeRef = new StoreRef(store);
}
public void setSiteService(SiteService siteService)
{
this.siteService = siteService;
}
public void setActivityPoster(ActivityPoster activityPoster)
{
this.activityPoster = activityPoster;
}
public ActivityPoster getActivityPoster()
{
return activityPoster;
}
public void setHiddenAspect(HiddenAspect hiddenAspect)
{
this.hiddenAspect = hiddenAspect;
}
public boolean isHidden(NodeRef nodeRef)
{
final Client client = FileFilterMode.getClient();
return (hiddenAspect.getVisibility(client, nodeRef) == Visibility.NotVisible);
}
/**
* Sets the root path.
*
@@ -669,6 +706,11 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
// Alfresco methods
// --------------------------------------------------------------
public SiteInfo getSite(NodeRef nodeRef)
{
return siteService.getSite(nodeRef);
}
public boolean disableBehaviour(QName className, NodeRef nodeRef)
{
boolean wasEnabled = behaviourFilter.isEnabled(nodeRef, className);
@@ -694,6 +736,35 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
return getRootNodeRef().getStoreRef();
}
public void deleteNode(NodeRef nodeRef, boolean postActivity)
{
// post activity after removal of the node
postActivity &= hiddenAspect.getVisibility(Client.cmis, nodeRef) == Visibility.Visible;
String parentPath = null;
NodeRef parentNodeRef = null;
SiteInfo siteInfo = null;
String siteId = null;
String fileName = null;
// get this information before the node is deleted
if(postActivity)
{
parentPath = activityPoster.getParentPath(nodeRef);
parentNodeRef = getNodeService().getPrimaryParent(nodeRef).getParentRef();
siteInfo = siteService.getSite(nodeRef);
siteId = (siteInfo != null ? siteInfo.getShortName() : null);
fileName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
}
getNodeService().deleteNode(nodeRef);
// post activity after removal of the node
if(postActivity)
{
activityPoster.postFileDeleted(parentPath, parentNodeRef, nodeRef, siteId, fileName);
}
}
/**
* Returns the root folder node ref.
*/