Fix ALF-10571: Error executing transfer - Lock time out

- FTR now correctly reports its version.
ALF-10684: FTR: Insufficient hooks provided to allow developers to listen to inbound transfers
   - Initial work on this. More to do.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31238 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Brian Remmington
2011-10-14 14:40:13 +00:00
parent 7a134c42bc
commit bf7bc0b732
10 changed files with 46 additions and 55 deletions

View File

@@ -26,7 +26,6 @@ import java.util.TreeMap;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transfer.reportd.XMLTransferDestinationReportWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.transfer.TransferException;
import org.alfresco.service.cmr.transfer.TransferProgress;
import org.alfresco.service.cmr.transfer.TransferProgress.Status;
@@ -173,7 +172,7 @@ public abstract class AbstractTransferProgressMonitor implements TransferProgres
NodeRef sourceNode,
NodeRef destNode,
NodeRef parentNodeRef,
Path parentPath,
String parentPath,
boolean orphan)
{
TransferDestinationReportWriter writer = getLogWriter(transferId);
@@ -182,7 +181,7 @@ public abstract class AbstractTransferProgressMonitor implements TransferProgres
@Override
public void logUpdated(String transferId, NodeRef sourceNodeRef,
NodeRef destNodeRef, Path path)
NodeRef destNodeRef, String path)
{
TransferDestinationReportWriter writer = getLogWriter(transferId);
writer.writeUpdated(sourceNodeRef, destNodeRef, path);
@@ -190,7 +189,7 @@ public abstract class AbstractTransferProgressMonitor implements TransferProgres
@Override
public void logMoved(String transferId, NodeRef sourceNodeRef,
NodeRef destNodeRef, Path oldPath, NodeRef newParentNodeRef, Path newPath)
NodeRef destNodeRef, String oldPath, NodeRef newParentNodeRef, String newPath)
{
TransferDestinationReportWriter writer = getLogWriter(transferId);
writer.writeMoved(sourceNodeRef, destNodeRef, oldPath, newParentNodeRef, newPath);
@@ -200,7 +199,7 @@ public abstract class AbstractTransferProgressMonitor implements TransferProgres
public void logDeleted(String transferId,
NodeRef sourceNodeRef,
NodeRef destNodeRef,
Path oldPath)
String oldPath)
{
TransferDestinationReportWriter writer = getLogWriter(transferId);
writer.writeDeleted(sourceNodeRef, destNodeRef, oldPath);