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 HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/transfer/TransferServiceImpl2.java
View File

@@ -576,6 +576,8 @@ public class TransferServiceImpl2 implements TransferService2
}
};
eventProcessor.addObserver(reportCallback);
TransferContext transferContext = new TransferContext();
// start transfer
ClientTransferState clientState = ClientTransferState.Begin;
@@ -589,7 +591,7 @@ public class TransferServiceImpl2 implements TransferService2
{
eventProcessor.start();
manifest = createManifest(definition, localRepositoryId, fromVersion);
manifest = createManifest(definition, localRepositoryId, fromVersion, transferContext);
logger.debug("transfer begin");
target = getTransferTarget(targetName);
checkTargetEnabled(target);
@@ -919,7 +921,7 @@ public class TransferServiceImpl2 implements TransferService2
}
}
private File createManifest(TransferDefinition definition, String repositoryId, TransferVersion fromVersion)
private File createManifest(TransferDefinition definition, String repositoryId, TransferVersion fromVersion, TransferContext transferContext)
throws IOException, SAXException
{
// which nodes to write to the snapshot
@@ -966,7 +968,7 @@ public class TransferServiceImpl2 implements TransferService2
{
for (NodeRef nodeRef : nodes)
{
TransferManifestNode node = transferManifestNodeFactory.createTransferManifestNode(nodeRef, definition);
TransferManifestNode node = transferManifestNodeFactory.createTransferManifestNode(nodeRef, definition, transferContext);
formatter.writeTransferManifestNode(node);
}
}
@@ -974,7 +976,7 @@ public class TransferServiceImpl2 implements TransferService2
{
for (NodeRef nodeRef : nodesToRemove)
{
TransferManifestNode node = transferManifestNodeFactory.createTransferManifestNode(nodeRef, definition,
TransferManifestNode node = transferManifestNodeFactory.createTransferManifestNode(nodeRef, definition, transferContext,
true);
formatter.writeTransferManifestNode(node);
}