Merge DM-DM_deployment to HEAD

18665 : Switch over to using new surf <formdata multipart-processing="false" /> configuration option.
   - now the PostContentCommandProcessor and PostSnapshotCommandProcessor handle their own MimePart processing.
  18683 : SAIL-288 Implementation of TransferService client side cancelAsync.
  18716 : Adding TransferEventBegin missed from asyncCancel work.
  18734 : Transfer format : implementation of null properties and Serialized base64 Java objects for type d:any
  18749 : SAIL-290: Added features that provide asynchronous commit on the receiver end and the ability to query commit status, as well as code that writes a progress report on the server side (currently only plain text) and the functionality to allow a transfer to be cancelled
  18750 : New files that should have been checked in with previous commit but weren't...
  18770 : Various transfer service work.
   - correction to transfer report name.
   - use surf Base64 Encoder
   - implementation of async commit to the TransferServiceImpl
   - implementation of the statusCommand through the HttpClientTransmitter.
  18773 : transferId was null.
  18780 : Changed the server-side commit to occur asynchronously.
	Added two test actions to transfer a single node or a tree of nodes.
	Tweaked TransferDefinition to provide varargs version of setNodes.
  18793 : SAIL-290:    Added a couple of test actions.
    	Added varargs versions of transfer and transferAsync on TransferService.
  18794 : SAIL-290: Added "targetExists" operation to the TransferService interface.
  18804 : SAIL-36: Fixed an issue where transfer could fail if numerous nodes with the same cm:name value are transferred.
  18805 : SAIL-36: Added model file that should have been with last commit.
  18808 Continuing work on transfer report.
  18825 TransferServiceImplTest green line.
  18836 : Added a little more output to the server-side transfer report. 
  18848 : More work on transfer report.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/transfer/RepoSecondaryManifestProcessorImpl.java

@@ -34,57 +34,42 @@ import org.alfresco.repo.transfer.manifest.TransferManifestDeletedNode;
 import org.alfresco.repo.transfer.manifest.TransferManifestHeader;
 import org.alfresco.repo.transfer.manifest.TransferManifestNodeHelper;
 import org.alfresco.repo.transfer.manifest.TransferManifestNormalNode;
-import org.alfresco.repo.transfer.manifest.TransferManifestProcessor;
 import org.alfresco.service.cmr.repository.AssociationRef;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.transfer.TransferReceiver;
 import org.alfresco.service.namespace.RegexQNamePattern;
 
 /**
  * @author brian
  * 
  */
-public class RepoSecondaryManifestProcessorImpl implements TransferManifestProcessor
+public class RepoSecondaryManifestProcessorImpl extends AbstractManifestProcessorBase
 {
     private NodeService nodeService;
     private CorrespondingNodeResolver nodeResolver;
-    private String transferId;
 
     /**
+     * @param receiver 
      * @param transferId
      */
-    public RepoSecondaryManifestProcessorImpl(String transferId)
+    public RepoSecondaryManifestProcessorImpl(TransferReceiver receiver, String transferId)
     {
-        this.transferId = transferId;
+        super(receiver, transferId);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.transfer.manifest.TransferManifestProcessor#endTransferManifest()
-     */
-    public void endTransferManifest()
+    protected void endManifest()
     {
-        // TODO Auto-generated method stub
-
+        //NOOP
     }
     
-    /**
-     * 
-     */
-    public void processTransferManifestNode(TransferManifestDeletedNode node)
+    protected void processNode(TransferManifestDeletedNode node)
     {
+        //NOOP
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.alfresco.repo.transfer.manifest.TransferManifestProcessor#processTransferManifestNode(org.alfresco.repo.transfer
-     * .manifest.TransferManifestNode)
-     */
-    public void processTransferManifestNode(TransferManifestNormalNode node)
+    protected void processNode(TransferManifestNormalNode node)
     {
         NodeRef correspondingNodeRef = nodeResolver.resolveCorrespondingNode(node.getNodeRef(),
                 TransferManifestNodeHelper.getPrimaryParentAssoc(node), node.getParentPath()).resolvedChild;
@@ -245,17 +230,9 @@ public class RepoSecondaryManifestProcessorImpl implements TransferManifestProce
     }
     
     
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.alfresco.repo.transfer.manifest.TransferManifestProcessor#processTransferManifiestHeader(org.alfresco.repo
-     * .transfer.manifest.TransferManifestHeader)
-     */
-    public void processTransferManifiestHeader(TransferManifestHeader header)
+    protected void processHeader(TransferManifestHeader header)
     {
-        // TODO Auto-generated method stub
-
+        //NOOP
     }
 
     /*
@@ -263,10 +240,9 @@ public class RepoSecondaryManifestProcessorImpl implements TransferManifestProce
      * 
      * @see org.alfresco.repo.transfer.manifest.TransferManifestProcessor#startTransferManifest()
      */
-    public void startTransferManifest()
+    protected void startManifest()
     {
-        // TODO Auto-generated method stub
-
+        //NOOP
     }
 
     /**
@@ -286,7 +262,4 @@ public class RepoSecondaryManifestProcessorImpl implements TransferManifestProce
     {
         this.nodeResolver = nodeResolver;
     }
-
-
-
 }