diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 468e2233f8..577b043c72 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -309,7 +309,7 @@ diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java index a9cf8e4f7a..3b1c0b6f54 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java @@ -55,7 +55,7 @@ public class TransferCompleteAction extends RMActionExecuterAbstractBase protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { checkTransferSubClass(actionedUponNodeRef); - transferService.complete(actionedUponNodeRef); + transferService.completeTransfer(actionedUponNodeRef); } /** diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferService.java index 9b0bc35bdc..8305337b5e 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferService.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferService.java @@ -56,5 +56,5 @@ public interface TransferService * * @since 2.2 */ - void complete(NodeRef nodeRef); + void completeTransfer(NodeRef nodeRef); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java index 677c0fa4ef..ef26921f1a 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java @@ -218,10 +218,10 @@ public class TransferServiceImpl extends ServiceBaseImpl implements TransferServ } /** - * @see org.alfresco.module.org_alfresco_module_rm.transfer.TransferService#complete(NodeRef) + * @see org.alfresco.module.org_alfresco_module_rm.transfer.TransferService#completeTransfer(NodeRef) */ @Override - public void complete(NodeRef nodeRef) + public void completeTransfer(NodeRef nodeRef) { boolean accessionIndicator = ((Boolean)nodeService.getProperty(nodeRef, PROP_TRANSFER_ACCESSION_INDICATOR)).booleanValue(); String transferLocation = nodeService.getProperty(nodeRef, PROP_TRANSFER_LOCATION).toString();