diff --git a/source/java/org/alfresco/repo/transfer/TransferEventProcessor.java b/source/java/org/alfresco/repo/transfer/TransferEventProcessor.java index 8b88818cbb..4bc725782b 100644 --- a/source/java/org/alfresco/repo/transfer/TransferEventProcessor.java +++ b/source/java/org/alfresco/repo/transfer/TransferEventProcessor.java @@ -31,7 +31,7 @@ import org.alfresco.service.cmr.transfer.TransferEventEndState; import org.alfresco.service.cmr.transfer.TransferEventEnterState; import org.alfresco.service.cmr.transfer.TransferEventError; import org.alfresco.service.cmr.transfer.TransferEventSendingContent; -import org.alfresco.service.cmr.transfer.TransferEventSendingManifest; +import org.alfresco.service.cmr.transfer.TransferEventSendingSnapshot; import org.alfresco.service.cmr.transfer.TransferEventSuccess; /** @@ -145,15 +145,15 @@ public class TransferEventProcessor * @param range * @param position */ - public void sendManifest(long range, long position) + public void sendSnapshot(long range, long position) { - setState(TransferEvent.TransferState.SENDING_MANIFEST); + setState(TransferEvent.TransferState.SENDING_SNAPSHOT); - TransferEventSendingManifest event = new TransferEventSendingManifest(); - event.setTransferState(TransferEvent.TransferState.SENDING_MANIFEST); + TransferEventSendingSnapshot event = new TransferEventSendingSnapshot(); + event.setTransferState(TransferEvent.TransferState.SENDING_SNAPSHOT); event.setRange(range); event.setPosition(position); - event.setMessage("sending manifest"); + event.setMessage("sending snapshot"); queue.add(event); notifyObservers(); } diff --git a/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java b/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java index 381636d4f7..9b5200a89a 100644 --- a/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java +++ b/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java @@ -606,7 +606,7 @@ public class TransferServiceImpl implements TransferService /** * send Manifest */ - eventProcessor.sendManifest(1,1); + eventProcessor.sendSnapshot(1,1); transmitter.sendManifest(transfer, snapshotFile); logger.debug("manifest sent"); diff --git a/source/java/org/alfresco/service/cmr/transfer/TransferEvent.java b/source/java/org/alfresco/service/cmr/transfer/TransferEvent.java index 68473cd63a..e7a0cc7eda 100644 --- a/source/java/org/alfresco/service/cmr/transfer/TransferEvent.java +++ b/source/java/org/alfresco/service/cmr/transfer/TransferEvent.java @@ -35,7 +35,7 @@ public interface TransferEvent /** * The transfer events will Start with a START event and finish with either SUCCESS or ERROR */ - enum TransferState { START, SENDING_MANIFEST, SENDING_CONTENT, PREPARING, COMMITTING, SUCCESS, ERROR }; + enum TransferState { START, SENDING_SNAPSHOT, SENDING_CONTENT, PREPARING, COMMITTING, SUCCESS, ERROR }; /** * Get the state of this transfer diff --git a/source/java/org/alfresco/service/cmr/transfer/TransferEventSendingManifest.java b/source/java/org/alfresco/service/cmr/transfer/TransferEventSendingSnapshot.java similarity index 82% rename from source/java/org/alfresco/service/cmr/transfer/TransferEventSendingManifest.java rename to source/java/org/alfresco/service/cmr/transfer/TransferEventSendingSnapshot.java index 6347eb3c6b..095055b574 100644 --- a/source/java/org/alfresco/service/cmr/transfer/TransferEventSendingManifest.java +++ b/source/java/org/alfresco/service/cmr/transfer/TransferEventSendingSnapshot.java @@ -21,14 +21,14 @@ package org.alfresco.service.cmr.transfer; import org.alfresco.repo.transfer.TransferEventImpl; /** - * Event for sending the transfer manifest. + * Event for sending the properties snapshot. * */ -public class TransferEventSendingManifest extends TransferEventImpl implements RangedTransferEvent +public class TransferEventSendingSnapshot extends TransferEventImpl implements RangedTransferEvent { public String toString() { - return "TransferEventSendingManifest: " + super.getPosition() + " of " + super.getRange(); + return "TransferEventSendingSnapshot: " + super.getPosition() + " of " + super.getRange(); } }