Merged V2.0 to HEAD

5457: Merge error on copy web project action
   5459: AR-1278
   5461:
   5462: A few deployment fixes
   5469: Dictionary messages
   5470: L2 cache checks
   5478: WCM-374


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

source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java

@@ -195,19 +195,21 @@ public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
       DeploymentReport report = null;
       try
       {
+         String host = targetServer;
          int port = defaultRmiPort;
          
          // check whether there is a port number present, if so, use it
          int idx = targetServer.indexOf(":");
          if (idx != -1)
          {
+            host = targetServer.substring(0, idx);
             String strPort = targetServer.substring(idx+1);
             port = Integer.parseInt(strPort);
          }
          
          // TODO: we need to capture username/password for the remote server at some
-         //       point, for now we use the admin/admin account, need to externalise this too!
-         report = this.deployService.deployDifference(version, path, targetServer, port, 
+         //       point, for now we use the configured username/password for all servers
+         report = this.deployService.deployDifference(version, path, host, port, 
                   remoteUsername, remotePassword, targetPath, true, false, false, callback);
       }
       catch (Throwable err)
@@ -247,8 +249,7 @@ public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
       }
       
       // create the deployment report node
-      createDeploymentReportNode(report, (String)action.getParameterValue(PARAM_TARGET_SERVER), 
-               version, websiteRef, startDate, deployError);
+      createDeploymentReportNode(report, targetServer, version, websiteRef, startDate, deployError);
    }
 
    /**