mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merged V2.9 to HEAD
10561: Merged V2.2 to V2.9 9882: Node DAO separation 10580: Merged V2.2 to V2.9 10576: Missing onContentDelete firing 10577: More policies: beforeCreateNode and beforeDeleteNode when archiving nodes in hierarchy - Updated UsageService and TenantService to conform to the new node DAO (more separation) - TODO: Tenant node interceptor not present. This must be added if Multi-Tentant features are required. - NodeMonitor event processing now checks that the nodes are still valid before processing. - onMove firing was breaking NodeMonitor. Changed onMove to not fire when nodes are moved between stores. - Raised ALFCOM-1912: ClassCastException when accessing property of type ver2:versionNumber - Pull setFixedAcls fully into Node DAO for simpler and speedier execution git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -153,6 +153,14 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws UnsupportedOperationException Always
|
||||
*/
|
||||
public void deleteStore(StoreRef storeRef) throws InvalidStoreRefException
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
/**
|
||||
* Does the indicated store exist?
|
||||
* @param storeRef a reference to the store to look for
|
||||
@@ -303,7 +311,7 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
|
||||
{
|
||||
throw new InvalidTypeException("Invalid node type for AVM.", nodeTypeQName);
|
||||
}
|
||||
addDefaultPropertyValues(nodeTypeDef, properties);
|
||||
properties.putAll(getDefaultProperties(nodeTypeDef));
|
||||
addDefaultAspects(nodeTypeDef, avmPath, properties);
|
||||
}
|
||||
catch (AVMNotFoundException e)
|
||||
@@ -316,7 +324,7 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
|
||||
}
|
||||
String newAVMPath = AVMNodeConverter.ExtendAVMPath(avmPath, nodeName);
|
||||
NodeRef childRef = AVMNodeConverter.ToNodeRef(-1, newAVMPath);
|
||||
addDefaultPropertyValues(nodeTypeDef, properties);
|
||||
properties.putAll(getDefaultProperties(nodeTypeDef));
|
||||
addDefaultAspects(nodeTypeDef, newAVMPath, properties);
|
||||
Map<QName, PropertyValue> props = new HashMap<QName, PropertyValue>();
|
||||
for (Map.Entry<QName, Serializable> entry : properties.entrySet())
|
||||
@@ -578,7 +586,8 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
|
||||
properties.putAll(aspectProperties);
|
||||
}
|
||||
// Now set any unspecified default properties for the aspect.
|
||||
addDefaultPropertyValues(aspectDef, properties);
|
||||
Map<QName, Serializable> defaultProperties = getDefaultProperties(aspectDef);
|
||||
properties.putAll(defaultProperties);
|
||||
// Now add any cascading aspects.
|
||||
addDefaultAspects(aspectDef, avmPath, properties);
|
||||
// Set the property values on the AVM Node.
|
||||
@@ -637,7 +646,7 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
|
||||
{
|
||||
// invokeBeforeAddAspect(nodeRef, def.getName());
|
||||
addAspect(nodeRef, def.getName(), Collections.<QName, Serializable>emptyMap());
|
||||
addDefaultPropertyValues(def, properties);
|
||||
properties.putAll(getDefaultProperties(def));
|
||||
// invokeOnAddAspect(nodeRef, def.getName());
|
||||
// recurse
|
||||
addDefaultAspects(def, path, properties);
|
||||
|
Reference in New Issue
Block a user