Merged V2.1 to HEAD

6486: Fix for AWC-1134 (Made minimum length for username and password configurable)
   6487: Added "copy.verbose" property to build script to list all files being copied in the 'deploy-tomcat-exploded' and 'deploy-webclient-changes' targets
   6488: Changed default CIFS server to remove underscore as it can cause problems with OpenOffice.
   6489: Fix for WCM-498 (Expired items that are deleted are not represented as such in the change request dialog or submit dialog)
   6490: Fix for WCM-446 and WCM-624. Multi-select and All operations in Modified Files list respect items in workflow and ignore them.
   6491: Fixes profoundly brain dead behavior in AVMLockingService.init().
   6492: Refactoring of LookupCache to be clustering compatible
   6493: Staging and locking changes
   6494: WCM Revert action moved to end of all action lists to avoid accidently clicking it (as it has no confirmation screen!)
   6496: Fixes for WCM-746 and WCM-747 - Edit File Properties and Edit Folder Properties working correctly again for AVM objects.
   6497: Enable virtualization server to be (re)started at any point prior or during the startup of the alfresco webapp (fixes WCM-750).
   6498: WCM-742 - moving locks from the preview sandbox to the main user sandbox.


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

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

@@ -407,6 +407,7 @@ public class SubmitDialog extends BaseDialogBean
       String stagingPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getStagingStore());
       List<AVMDifference> diffs = new ArrayList<AVMDifference>(items.size());
 
+      String storeId = this.avmBrowseBean.getWebProject().getStoreId();
       for (ItemWrapper wrapper : items)
       {
          String srcPath = sandboxPath + wrapper.getPath();
@@ -415,7 +416,7 @@ public class SubmitDialog extends BaseDialogBean
          diffs.add(diff);
          
          // recursively remove locks from this item
-         recursivelyRemoveLocks(this.avmBrowseBean.getWebProject().getStoreId(), -1, srcPath);
+         recursivelyRemoveLocks(storeId, -1, srcPath);
          
          // If nothing has required notifying the virtualization server
          // so far, check to see if destPath forces a notification
@@ -481,11 +482,11 @@ public class SubmitDialog extends BaseDialogBean
             // server that it exists because it's useful to 
             // defer this operation until everything is already
             // in place; this allows pointlessly fine-grained
-            //  notifications to be suppressed (they're expensive).
+            // notifications to be suppressed (they're expensive).
             //
             // Therefore, just derive the name of the webapp
             // in the workflow sandbox from the 1st item in 
-            // the submiot list (even if it's not in WEB-INF), 
+            // the submit list (even if it's not in WEB-INF), 
             // and force the virt server notification after the
             // transaction has completed via doPostCommitProcessing.
             if (this.virtUpdatePath  == null)