mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merge DEV\WCM_SERVICES2 to HEAD
12513 Implementation of Asset.getProperties 12469 Implement paths relative to web app. And unit tests. Asset Test is now clean of TODOs. 12413 Implementation of WCM Asset. Still work remaining but this is 80% of the implementation. 12404 WCM Services - asset service - fix rename/move folder issue (folders are not locked) - sandbox service - fix delete sandbox test 12374 WCM Services - optimise get/is web project 12347 WCM Services - "asset service" - add/remove/has aspect, get aspects 12341 WCM Services - "asset service" checkpoint (locking fixes, bulk import, more tests added) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -35,6 +35,7 @@ import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.mbeans.VirtServerRegistry;
|
||||
@@ -443,13 +444,54 @@ public class AssetServiceImpl implements AssetService
|
||||
private void setProperties(String avmPath, Map<QName, Serializable> properties)
|
||||
{
|
||||
NodeRef avmNodeRef = AVMNodeConverter.ToNodeRef(-1, avmPath);
|
||||
avmNodeService.setProperties(avmNodeRef, properties); // note: assumes lock, if applicable, is taken by caller
|
||||
avmNodeService.setProperties(avmNodeRef, properties);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.wcm.asset.AssetService#addAspect(org.alfresco.wcm.asset.AssetInfo, org.alfresco.service.namespace.QName, java.util.Map)
|
||||
*/
|
||||
public void addAspect(AssetInfo asset, QName aspectName, Map<QName, Serializable> properties)
|
||||
{
|
||||
addAspect(asset.getAvmPath(), aspectName, properties);
|
||||
}
|
||||
|
||||
private void addAspect(String avmPath, QName aspect, Map<QName, Serializable> properties)
|
||||
{
|
||||
NodeRef avmNodeRef = AVMNodeConverter.ToNodeRef(-1, avmPath);
|
||||
avmNodeService.addAspect(avmNodeRef, aspect, properties); // note: assumes lock, if applicable, is taken by caller
|
||||
avmNodeService.addAspect(avmNodeRef, aspect, properties);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.wcm.asset.AssetService#removeAspect(org.alfresco.wcm.asset.AssetInfo, org.alfresco.service.namespace.QName)
|
||||
*/
|
||||
public void removeAspect(AssetInfo asset, QName aspectName)
|
||||
{
|
||||
ParameterCheck.mandatory("asset", asset);
|
||||
|
||||
NodeRef avmNodeRef = AVMNodeConverter.ToNodeRef(-1, asset.getAvmPath());
|
||||
avmNodeService.removeAspect(avmNodeRef, aspectName);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.wcm.asset.AssetService#getAspects(org.alfresco.wcm.asset.AssetInfo)
|
||||
*/
|
||||
public Set<QName> getAspects(AssetInfo asset)
|
||||
{
|
||||
ParameterCheck.mandatory("asset", asset);
|
||||
|
||||
NodeRef avmNodeRef = AVMNodeConverter.ToNodeRef(asset.getSandboxVersion(), asset.getAvmPath());
|
||||
return avmNodeService.getAspects(avmNodeRef);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.wcm.asset.AssetService#hasAspect(org.alfresco.wcm.asset.AssetInfo, org.alfresco.service.namespace.QName)
|
||||
*/
|
||||
public boolean hasAspect(AssetInfo asset, QName aspectName)
|
||||
{
|
||||
ParameterCheck.mandatory("asset", asset);
|
||||
|
||||
NodeRef avmNodeRef = AVMNodeConverter.ToNodeRef(asset.getSandboxVersion(), asset.getAvmPath());
|
||||
return avmNodeService.hasAspect(avmNodeRef, aspectName);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
|
Reference in New Issue
Block a user