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

@@ -94,7 +94,6 @@ public class CreateWebsiteWizard extends BaseWizardBean
    
    // wizard step names (that are referenced)
    private static final String STEP_DETAILS = "details";
-   private static final String STEP_FORMS = "forms";
    private static final String STEP_DEPLOYMENT = "deployment";
    
    private static final String MATCH_DEFAULT = ".*";
@@ -439,7 +438,14 @@ public class CreateWebsiteWizard extends BaseWizardBean
                   repoProps);
          
          if (logger.isDebugEnabled())
-            logger.debug("Saved deploymentserver node using repo props: " + repoProps);
+         {
+            // overwrite the password property before logging
+            Map<QName, Serializable> tempProps = new HashMap<QName, Serializable>(repoProps.size());
+            tempProps.putAll(repoProps);
+            tempProps.put(WCMAppModel.PROP_DEPLOYSERVERPASSWORD, "*****");
+            
+            logger.debug("Saved deploymentserver node using repo props: " + tempProps);
+         }
       }
    }