Merged V2.1 to HEAD

6455: OpenOffice transformer and extractor register regardless of the initial connection state.
   6456: Fix for WCM-636 (Clicking OK twice while deleting web project results in exception)
   6457: Updated installers and associated config
   6458: AR-1669 Add getQnamePath to Javascript
   6459: Fix for AWC-1456 - Word and Excel documents were being stored as octet streams rather than their correct mimetype
   6460: Reverse order of reject & approve transitions, so that approve appears first in list of ui actions.
   6461: Removed Process.exe (often detected as a virus) and updated config wizard.
   6462: Switch to synchronous indexing for AVM by default
   6463: Better support to query the state of AVM indexes
   6464: Added Office 2007 document mimetypes and icons
   6465: Added Office 2007 icons without the typo this time


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

config/alfresco/messages/webclient.properties

@@ -1735,6 +1735,7 @@ delete_user_confirm=The User will no longer be able to access the system. Are yo
 remove_invited_user_confirm=The User will no longer be able to access the documents and folders in this space. Are you sure you want to remove user \"{0}\"?
 remove_content_user_confirm=The User will no longer be able to access this content. Are you sure you want to remove user \"{0}\"?
 delete_companyroot_confirm=WARNING: This folder is a special folder accessed by all Users! Please be sure that you wish to delete this folder. It may cause System Errors if you remove it.
+delete_node_not_found=The item you are trying to delete can not be found, this may be because it has already been deleted. Please close this dialog and try the delete operation again.
 
 # Status Messages
 status_space_created=Successfully created space ''{0}''.

source/java/org/alfresco/web/bean/forums/DeleteForumDialog.java

@@ -24,7 +24,6 @@
  */
 package org.alfresco.web.bean.forums;
 
-import java.text.MessageFormat;
 import java.util.Map;
 
 import javax.faces.context.FacesContext;
@@ -34,7 +33,6 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
-import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.spaces.DeleteSpaceDialog;
 
@@ -108,20 +106,15 @@ public class DeleteForumDialog extends DeleteSpaceDialog
       }
    }
    
-   // ------------------------------------------------------------------------------
-   // Bean Getters and Setters
-   
    /**
-    * Returns the confirmation to display to the user before deleting the content.
+    * Returns the message bundle id of the confirmation message to display to 
+    * the user before deleting the forum.
     * 
-    * @return The formatted message to display
+    * @return The message bundle id
     */
-   public String getConfirmMessage()
+   @Override
+   protected String getConfirmMessageId()
    {
-      String fileConfirmMsg = Application.getMessage(FacesContext.getCurrentInstance(), 
-               "delete_forum_confirm");
-      
-      return MessageFormat.format(fileConfirmMsg, 
-            new Object[] {this.browseBean.getActionSpace().getName()});
+      return "delete_forum_confirm";
    }
 }

source/java/org/alfresco/web/bean/forums/DeleteTopicDialog.java

@@ -24,7 +24,6 @@
  */
 package org.alfresco.web.bean.forums;
 
-import java.text.MessageFormat;
 import java.util.Map;
 
 import javax.faces.context.FacesContext;
@@ -34,7 +33,6 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
-import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.spaces.DeleteSpaceDialog;
 
@@ -94,20 +92,15 @@ public class DeleteTopicDialog extends DeleteSpaceDialog
       }
    }
    
-   // ------------------------------------------------------------------------------
-   // Bean Getters and Setters
-   
    /**
-    * Returns the confirmation to display to the user before deleting the content.
+    * Returns the message bundle id of the confirmation message to display to 
+    * the user before deleting the topic.
     * 
-    * @return The formatted message to display
+    * @return The message bundle id
     */
-   public String getConfirmMessage()
+   @Override
+   protected String getConfirmMessageId()
    {
-      String fileConfirmMsg = Application.getMessage(FacesContext.getCurrentInstance(), 
-               "delete_topic_confirm");
-      
-      return MessageFormat.format(fileConfirmMsg, 
-            new Object[] {this.browseBean.getActionSpace().getName()});
+      return "delete_topic_confirm";
    }
 }

source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java

@@ -28,7 +28,6 @@ import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
 import javax.transaction.UserTransaction;
 
@@ -43,10 +42,8 @@ import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.content.DeleteContentDialog;
 import org.alfresco.web.bean.dialog.BaseDialogBean;
-import org.alfresco.web.bean.repository.MapNode;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
-import org.alfresco.web.ui.common.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -205,6 +202,10 @@ public class DeleteSpaceDialog extends BaseDialogBean
       return false;
    }
    
+   protected String getConfirmMessageId()
+   {
+      return "delete_space_confirm";
+   }
    
    // ------------------------------------------------------------------------------
    // Bean Getters and Setters
@@ -217,10 +218,18 @@ public class DeleteSpaceDialog extends BaseDialogBean
    public String getConfirmMessage()
    {
       String fileConfirmMsg = Application.getMessage(FacesContext.getCurrentInstance(), 
-               "delete_space_confirm");
+               getConfirmMessageId());
       
-      return MessageFormat.format(fileConfirmMsg, 
-            new Object[] {this.browseBean.getActionSpace().getName()});
+      Node node = this.browseBean.getActionSpace();
+      if (node != null)
+      {
+         return MessageFormat.format(fileConfirmMsg, new Object[] {node.getName()});
+      }
+      else
+      {
+         return Application.getMessage(FacesContext.getCurrentInstance(), 
+                  "delete_node_not_found");
+      }
    }
    
    /**

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

@@ -24,7 +24,6 @@
  */
 package org.alfresco.web.bean.wcm;
 
-import java.text.MessageFormat;
 import java.util.List;
 
 import javax.faces.context.FacesContext;
@@ -33,7 +32,6 @@ import org.alfresco.model.WCMAppModel;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.spaces.DeleteSpaceDialog;
 
@@ -70,6 +68,8 @@ public class DeleteWebsiteDialog extends DeleteSpaceDialog
    {
       Node websiteNode = this.browseBean.getActionSpace();
       
+      if (websiteNode != null)
+      {
          // delete all attached website sandboxes in reverse order to the layering
          String storeRoot = (String)websiteNode.getProperties().get(WCMAppModel.PROP_AVMSTORE);
    
@@ -115,6 +115,7 @@ public class DeleteWebsiteDialog extends DeleteSpaceDialog
          // remove the main staging and preview stores
          deleteStore(AVMUtil.buildStagingPreviewStoreName(storeRoot));
          deleteStore(AVMUtil.buildStagingStoreName(storeRoot));
+      }
       
       // use the super implementation to delete the node itself
       return super.finishImpl(context, outcome);
@@ -134,21 +135,15 @@ public class DeleteWebsiteDialog extends DeleteSpaceDialog
       }
    }
    
-   
-   // ------------------------------------------------------------------------------
-   // Bean Getters and Setters
-   
    /**
-    * Returns the confirmation to display to the user before deleting the content.
+    * Returns the message bundle id of the confirmation message to display to 
+    * the user before deleting the website.
     * 
-    * @return The formatted message to display
+    * @return The message bundle id
     */
-   public String getConfirmMessage()
+   @Override
+   protected String getConfirmMessageId()
    {
-      String fileConfirmMsg = Application.getMessage(FacesContext.getCurrentInstance(), 
-               "delete_website_confirm");
-      
-      return MessageFormat.format(fileConfirmMsg, 
-            new Object[] {this.browseBean.getActionSpace().getName()});
+      return "delete_website_confirm";
    }
 }