Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

76890: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      65482: Merge DEV to PLATFORM1
        ACE-502 - Transfer service : implement transferring of categories and tags
            58825 : 	MNT-8098 - Create categories on target runs as "System". Bug fix when removing categories which results in a "null" node ref.
            58716 : 	MNT-8098 - transfer of categories and tags.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 10:11:19 +00:00
parent 9a685756c1
commit f0fb9f279f
14 changed files with 705 additions and 26 deletions

View File

@@ -71,14 +71,14 @@ public class UnitTestTransferManifestNodeFactory implements TransferManifestNode
this.realFactory = realFactory;
}
public TransferManifestNode createTransferManifestNode(NodeRef nodeRef, TransferDefinition definition)
public TransferManifestNode createTransferManifestNode(NodeRef nodeRef, TransferDefinition definition, TransferContext transferContext)
{
return createTransferManifestNode(nodeRef, definition, false);
return createTransferManifestNode(nodeRef, definition, transferContext, false);
}
public TransferManifestNode createTransferManifestNode(NodeRef nodeRef, TransferDefinition definition, boolean forceDelete)
public TransferManifestNode createTransferManifestNode(NodeRef nodeRef, TransferDefinition definition, TransferContext transferContext, boolean forceDelete)
{
TransferManifestNode newNode = realFactory.createTransferManifestNode(nodeRef, definition);
TransferManifestNode newNode = realFactory.createTransferManifestNode(nodeRef, definition, transferContext);
NodeRef origNodeRef = newNode.getNodeRef();