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/HttpClientTransmitterImpl.java

@@ -34,6 +34,7 @@ import java.util.TreeMap;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.transfer.TransferException;
+import org.alfresco.service.cmr.transfer.TransferProgress;
 import org.alfresco.service.cmr.transfer.TransferTarget;
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
@@ -554,6 +555,59 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
             messagesRequest.releaseConnection();
         }
     }
+    
+    /**
+     * 
+     */
+    public TransferProgress getStatus(Transfer transfer) throws TransferException
+    {
+        TransferTarget target = transfer.getTransferTarget();
+        HttpMethod statusRequest = new PostMethod();
+        try
+        {
+            HostConfiguration hostConfig = getHostConfig(target);
+            HttpState httpState = getHttpState(target);
+            
+            statusRequest.setPath(target.getEndpointPath() + "/status");
+            //Put the transferId on the query string
+            statusRequest.setQueryString(
+                    new NameValuePair[] {new NameValuePair("transferId", transfer.getTransferId())});
+            
+            try
+            {
+                int responseStatus = httpClient.executeMethod(hostConfig, statusRequest, httpState);
+                checkResponseStatus("status", responseStatus, statusRequest);
+                //If we get here then we've received a 200 response
+                String statusPayload = statusRequest.getResponseBodyAsString();
+                JSONObject statusObj = new JSONObject(statusPayload);
+                //We're expecting the transfer progress encoded in a JSON object... 
+                int currentPosition  = statusObj.getInt("currentPosition");
+                int endPosition  = statusObj.getInt("endPosition");
+                String statusStr= statusObj.getString("status");
+                //We're expecting the transfer progress encoded in a JSON object... 
+                TransferProgress p = new TransferProgress();
+                p.setStatus(TransferProgress.Status.valueOf(statusStr));
+                p.setCurrentPosition(currentPosition);
+                p.setEndPosition(endPosition);
+                return p;
+            } 
+            catch (RuntimeException e)
+            {
+                throw e;
+            } 
+            catch (Exception e)
+            {
+                String error = "Failed to execute HTTP request to target";
+                log.debug(error, e);
+                throw new TransferException(MSG_HTTP_REQUEST_FAILED, new Object[]{"status", target.toString(), e.toString()}, e);
+            }
+        } 
+        finally
+        {
+            statusRequest.releaseConnection();
+        }
+    }
+    
 
     public void setContentService(ContentService contentService)
     {
@@ -566,4 +620,6 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
     }
 
 
+
+
 } // end of class