Merged V2.2 to HEAD

7536: Encoded all outputted strings to avoid cross-site scripting issues
         Fixed potential issue where same id for a div could be used multiple times on one page
   7537: Ensured no passwords are logged when deployment debug is turned on
   7538: Fixed ordering of deployment attempts in 'more reports' panel
   7539: Allocated test server is now released when a user sandbox is deleted
   7540: Merged V2.1 to V2.2
      7411: This makes issuers compatible with clustering without a huge performance drop
   7547: AWC-1711 (contribution) - simple workflow actions are not displayed if the user does not have write permission
   7548: Fixed IE scrolling issue when editing deployment server config
   7551: Changed the way scrolling is done to support IE6 (for deployment server config editing)


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

source/java/org/alfresco/web/bean/wcm/DeploymentServerConfig.java

@@ -82,7 +82,17 @@ public final class DeploymentServerConfig implements Serializable
       buffer.append(" (id=").append(this.id);
       buffer.append(" serverRef=").append(this.serverRef);
       buffer.append(" deployType=").append(this.deployType);
-      buffer.append(" props=").append(this.props).append(")");
+      
+      // copy the properties map and overwrite the password (if password is present)
+      Map<String, Object> tempProps = new HashMap<String, Object>(this.props.size());
+      tempProps.putAll(this.props);
+      if (tempProps.containsKey(PROP_PASSWORD))
+      {
+         tempProps.put(PROP_PASSWORD, "*****");
+      }
+      
+      buffer.append(" props=").append(tempProps).append(")");
+      
       return buffer.toString();
    }