. Implemented 'rename' for AVM files/folders

- this has highlighted some interesting future issues with AVM NodeRef objects - as unlike the usual noderefs, they can change due to a rename or move! . Fixed issue with navigating back to details and browse screens after a delete file/folder operation git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-07 17:49:17 +00:00 · 2006-10-03 11:49:37 +00:00
parent 1c6e3a68f0
commit 2d261f31f7
13 changed files with 615 additions and 427 deletions
--- a/config/alfresco/web-client-config-dialogs.xml
+++ b/config/alfresco/web-client-config-dialogs.xml
@@ -126,6 +126,14 @@
                 icon="/images/icons/delete_large.gif" title-id="delete_folder" 
                 description-id="delete_avm_folder_info" />
                 
+         <dialog name="deleteAvmFileBrowse" page="/jsp/dialog/delete.jsp" managed-bean="DeleteFileBrowseDialog"
+                 icon="/images/icons/delete_large.gif" title-id="delete_file" 
+                 description-id="delete_avm_file_info" />
+         
+         <dialog name="deleteAvmFolderBrowse" page="/jsp/dialog/delete.jsp" managed-bean="DeleteFolderBrowseDialog"
+                 icon="/images/icons/delete_large.gif" title-id="delete_folder" 
+                 description-id="delete_avm_folder_info" />
+         
         <dialog name="createAvmFolder" page="/jsp/wcm/create-folder-dialog.jsp" managed-bean="CreateFolderDialog"
                 icon="/images/icons/create_space_large.gif" title-id="create_folder" 
                 description-id="create_avm_folder_info" />
--- a/config/alfresco/web-client-config-wcm-actions.xml
+++ b/config/alfresco/web-client-config-wcm-actions.xml
@@ -24,6 +24,17 @@
            </params>
         </action>
         
+         <!-- Delete AVM file, with a return navigation outcome parameter -->
+         <action id="delete_file_browse">
+            <label-id>delete</label-id>
+            <image>/images/icons/delete.gif</image>
+            <action-listener>#{AVMBrowseBean.setupContentAction}</action-listener>
+            <action>dialog:deleteAvmFileBrowse</action>
+            <params>
+               <param name="id">#{actionContext.path}</param>
+            </params>
+         </action>
+         
         <!-- Delete AVM folder -->
         <action id="delete_folder">
            <label-id>delete</label-id>
@@ -35,6 +46,17 @@
            </params>
         </action>
         
+         <!-- Delete AVM folder, with a return navigation outcome parameter -->
+         <action id="delete_folder_browse">
+            <label-id>delete</label-id>
+            <image>/images/icons/delete.gif</image>
+            <action-listener>#{AVMBrowseBean.setupContentAction}</action-listener>
+            <action>dialog:deleteAvmFolderBrowse</action>
+            <params>
+               <param name="id">#{actionContext.path}</param>
+            </params>
+         </action>
+         
         <!-- Submit AVM node -->
         <action id="submit">
            <label-id>submit</label-id>
@@ -124,7 +146,7 @@
            <action idref="update_file" />
            <action idref="preview_file" />
            <action idref="file_details" />
-            <action idref="delete_file" />
+            <action idref="delete_file_browse" />
         </action-group>
         
         <!-- Actions for a folder in the AVM Browse screen -->
@@ -132,7 +154,7 @@
            <show-link>false</show-link>
            <action idref="preview_folder" />
            <action idref="folder_details" />
-            <action idref="delete_folder" />
+            <action idref="delete_folder_browse" />
         </action-group>
         
         <!-- Actions for a file in Modified Files list -->
@@ -179,13 +201,13 @@
            <show-link>false</show-link>
            <action idref="edit_file" />
            <action idref="update_file" />
-            <action idref="delete_file" />
+            <action idref="delete_file_browse" />
         </action-group>
         
         <!-- Actions for the Folder Details action menu -->
         <action-group id="avm_folder_details">
            <show-link>false</show-link>
-            <action idref="delete_folder" />
+            <action idref="delete_folder_browse" />
         </action-group>
         
      </actions>
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -67,7 +67,7 @@
         <from-email-address>alfresco@alfresco.org</from-email-address>
         
         <!-- WCM domain and port for virtualisation server -->
-         <wcm-domain>localdomain.lan</wcm-domain>
+         <wcm-domain>alfresco.dyndns.org</wcm-domain>
         <wcm-port>8180</wcm-port>
      </client>
   </config>
--- a/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
+++ b/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
@@ -69,16 +69,17 @@ public class EditContentPropertiesDialog extends BaseDialogBean
      NodeRef nodeRef = this.editableNode.getNodeRef();
      Map<String, Object> editedProps = this.editableNode.getProperties();
      
-      // get the name and move the node as necessary
-      String name = (String) editedProps.get(ContentModel.PROP_NAME);
+      // we deal with 'name' as a rename/move operation later
+      String name = (String)editedProps.get(ContentModel.PROP_NAME);
      if (name != null)
      {
-         fileFolderService.rename(nodeRef, name);
+         editedProps.remove(ContentModel.PROP_NAME);
      }
      
-      Map<QName, Serializable> repoProps = this.nodeService.getProperties(nodeRef);
      // we need to put all the properties from the editable bag back into 
      // the format expected by the repository
+      Map<QName, Serializable> repoProps = this.nodeService.getProperties(nodeRef);
+      repoProps.remove(ContentModel.PROP_NAME);
      
      // but first extract and deal with the special mimetype property for ContentData
      String mimetype = (String)editedProps.get(TEMP_PROP_MIMETYPE);
@@ -181,6 +182,13 @@ public class EditContentPropertiesDialog extends BaseDialogBean
         }
      }
      
+      // get the name and move the node as necessary
+      if (name != null)
+      {
+         this.fileFolderService.rename(nodeRef, name);
+         this.editableNode.getProperties().put(ContentModel.PROP_NAME.toString(), name);
+      }
+      
      return outcome;
   }
   
--- a/source/java/org/alfresco/web/bean/spaces/EditSpaceDialog.java
+++ b/source/java/org/alfresco/web/bean/spaces/EditSpaceDialog.java
@@ -72,15 +72,16 @@ public class EditSpaceDialog extends CreateSpaceDialog
      NodeRef nodeRef = this.editableNode.getNodeRef();
      Map<String, Object> editedProps = this.editableNode.getProperties();
      
-      // handle the name property separately, perform a rename in case it changed
+      // we deal with 'name' as a rename/move operation later
      String name = (String)editedProps.get(ContentModel.PROP_NAME);
      if (name != null)
      {
-         this.fileFolderService.rename(nodeRef, name);
+         editedProps.remove(ContentModel.PROP_NAME);
      }
      
      // get the current set of properties from the repository
      Map<QName, Serializable> repoProps = this.nodeService.getProperties(nodeRef);
+      repoProps.remove(ContentModel.PROP_NAME);
      
      // add the "uifacets" aspect if required, properties will get set below
      if (this.nodeService.hasAspect(nodeRef, ContentModel.ASPECT_UIFACETS) == false)
@@ -163,6 +164,13 @@ public class EditSpaceDialog extends CreateSpaceDialog
         }
      }
      
+      // get the name and move the node as necessary
+      if (name != null)
+      {
+         this.fileFolderService.rename(nodeRef, name);
+         this.editableNode.getProperties().put(ContentModel.PROP_NAME.toString(), name);
+      }
+            
      return outcome;
   }
   
--- a/source/java/org/alfresco/web/bean/wcm/DeleteFileBrowseDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/DeleteFileBrowseDialog.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wcm;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.web.app.AlfrescoNavigationHandler;
+
+/**
+ * @author Kevin Roast
+ */
+public class DeleteFileBrowseDialog extends DeleteFileDialog
+{
+   @Override
+   protected String doPostCommitProcessing(FacesContext context, String outcome)
+   {
+      return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
+             AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browseSandbox";
+   }
+}
--- a/source/java/org/alfresco/web/bean/wcm/DeleteFileDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/DeleteFileDialog.java
@@ -8,7 +8,6 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.dialog.BaseDialogBean;
-import org.alfresco.web.bean.repository.Node;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -72,9 +71,6 @@ public class DeleteFileDialog extends BaseDialogBean
   @Override
   protected String doPostCommitProcessing(FacesContext context, String outcome)
   {
-      // clear action context
-      this.avmBrowseBean.setAvmNode(null);
-      
      return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME;
   }
   
--- a/source/java/org/alfresco/web/bean/wcm/DeleteFolderBrowseDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/DeleteFolderBrowseDialog.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wcm;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.web.app.AlfrescoNavigationHandler;
+
+/**
+ * @author Kevin Roast
+ */
+public class DeleteFolderBrowseDialog extends DeleteFolderDialog
+{
+   @Override
+   protected String doPostCommitProcessing(FacesContext context, String outcome)
+   {
+      return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
+             AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browseSandbox";
+   }
+}
--- a/source/java/org/alfresco/web/bean/wcm/DeleteFolderDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/DeleteFolderDialog.java
@@ -8,7 +8,6 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.dialog.BaseDialogBean;
-import org.alfresco.web.bean.repository.Node;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -72,9 +71,6 @@ public class DeleteFolderDialog extends BaseDialogBean
   @Override
   protected String doPostCommitProcessing(FacesContext context, String outcome)
   {
-      // clear action context
-      this.avmBrowseBean.setAvmNode(null);
-      
      return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME;
   }
   
--- a/source/java/org/alfresco/web/bean/wcm/EditFilePropertiesDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/EditFilePropertiesDialog.java
@@ -20,6 +20,8 @@ import java.text.MessageFormat;

 import javax.faces.context.FacesContext;

+import org.alfresco.repo.avm.AVMNodeConverter;
+import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.model.FileExistsException;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.web.app.Application;
@@ -35,6 +37,7 @@ import org.alfresco.web.bean.repository.Repository;
 public class EditFilePropertiesDialog extends EditContentPropertiesDialog
 {
   protected AVMBrowseBean avmBrowseBean;
+   protected AVMService avmService;
   
   
   // ------------------------------------------------------------------------------
@@ -48,6 +51,14 @@ public class EditFilePropertiesDialog extends EditContentPropertiesDialog
      this.avmBrowseBean = avmBrowseBean;
   }
   
+   /**
+    * @param avmService       The AVMService to set.
+    */
+   public void setAvmService(AVMService avmService)
+   {
+      this.avmService = avmService;
+   }
+   
   
   // ------------------------------------------------------------------------------
   // Dialog implementation
@@ -64,6 +75,13 @@ public class EditFilePropertiesDialog extends EditContentPropertiesDialog
   @Override
   protected String doPostCommitProcessing(FacesContext context, String outcome)
   {
+      // a rename may have occured - we need to reset the NodeRef of the modified AVM Node
+      // as an AVM NodeRef contains the name as part of ref - which can therefore change! 
+      String name = this.editableNode.getName();
+      String oldPath = AVMNodeConverter.ToAVMVersionPath(this.editableNode.getNodeRef()).getSecond();
+      String newPath = oldPath.substring(0, oldPath.lastIndexOf('/') + 1) + name;
+      this.avmBrowseBean.setAvmNode(new AVMNode(this.avmService.lookup(-1, newPath)));
+      
      return outcome;
   }
   
--- a/source/java/org/alfresco/web/bean/wcm/EditFolderPropertiesDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/EditFolderPropertiesDialog.java
@@ -23,6 +23,8 @@ import java.util.List;

 import javax.faces.context.FacesContext;

+import org.alfresco.repo.avm.AVMNodeConverter;
+import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.spaces.EditSpaceDialog;
 import org.alfresco.web.ui.common.component.UIListItem;
@@ -35,6 +37,7 @@ import org.alfresco.web.ui.common.component.UIListItem;
 public class EditFolderPropertiesDialog extends EditSpaceDialog
 {
   protected AVMBrowseBean avmBrowseBean;
+   protected AVMService avmService;
   
   
   // ------------------------------------------------------------------------------
@@ -48,6 +51,14 @@ public class EditFolderPropertiesDialog extends EditSpaceDialog
      this.avmBrowseBean = avmBrowseBean;
   }
   
+   /**
+    * @param avmService       The AVMService to set.
+    */
+   public void setAvmService(AVMService avmService)
+   {
+      this.avmService = avmService;
+   }
+   
   
   // ------------------------------------------------------------------------------
   // Dialog implementation
@@ -64,6 +75,13 @@ public class EditFolderPropertiesDialog extends EditSpaceDialog
   @Override
   protected String doPostCommitProcessing(FacesContext context, String outcome)
   {
+      // a rename may have occured - we need to reset the NodeRef of the modified AVM Node
+      // as an AVM NodeRef contains the name as part of ref - which can therefore change! 
+      String name = this.editableNode.getName();
+      String oldPath = AVMNodeConverter.ToAVMVersionPath(this.editableNode.getNodeRef()).getSecond();
+      String newPath = oldPath.substring(0, oldPath.lastIndexOf('/') + 1) + name;
+      this.avmBrowseBean.setAvmNode(new AVMNode(this.avmService.lookup(-1, newPath)));
+      
      return outcome;
   }
   
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -505,409 +505,6 @@
      </managed-property>
   </managed-bean>
   
-   <managed-bean>
-      <description>
-         The bean that backs up the Create XML Content Type Wizard
-      </description>
-      <managed-bean-name>CreateXmlContentTypeWizard</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.content.CreateXmlContentTypeWizard</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>fileFolderService</property-name>
-         <value>#{FileFolderService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>navigator</property-name>
-         <value>#{NavigationBean}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>browseBean</property-name>
-         <value>#{BrowseBean}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>contentService</property-name>
-         <value>#{ContentService}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the Create Web Content Wizard
-      </description>
-      <managed-bean-name>CreateWebContentWizard</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.CreateWebContentWizard</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>fileFolderService</property-name>
-         <value>#{FileFolderService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>searchService</property-name>
-         <value>#{SearchService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>navigator</property-name>
-         <value>#{NavigationBean}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>browseBean</property-name>
-         <value>#{BrowseBean}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>contentService</property-name>
-         <value>#{ContentService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>dictionaryService</property-name>
-         <value>#{DictionaryService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmService</property-name>
-         <value>#{AVMService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmBrowseBean</property-name>
-         <value>#{AVMBrowseBean}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the Create Website Wizard
-      </description>
-      <managed-bean-name>CreateWebsiteWizard</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.CreateWebsiteWizard</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>fileFolderService</property-name>
-         <value>#{FileFolderService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>navigator</property-name>
-         <value>#{NavigationBean}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>searchService</property-name>
-         <value>#{SearchService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmService</property-name>
-         <value>#{AVMService}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the Import Website Dialog
-      </description>
-      <managed-bean-name>ImportWebsiteDialog</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.ImportWebsiteDialog</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{nodeService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>fileFolderService</property-name>
-         <value>#{FileFolderService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>contentService</property-name>
-         <value>#{ContentService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>navigationBean</property-name>
-         <value>#{NavigationBean}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmService</property-name>
-         <value>#{AVMService}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the Invite Users Wizard a website
-      </description>
-      <managed-bean-name>InviteWebsiteUsersWizard</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.InviteWebsiteUsersWizard</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>searchService</property-name>
-         <value>#{SearchService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>namespaceService</property-name>
-         <value>#{NamespaceService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>permissionService</property-name>
-         <value>#{PermissionService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>personService</property-name>
-         <value>#{PersonService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>navigator</property-name>
-         <value>#{NavigationBean}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>browseBean</property-name>
-         <value>#{BrowseBean}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>mailSender</property-name>
-         <value>#{mailService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>authorityService</property-name>
-         <value>#{AuthorityService}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the website file/folder browsing screens
-      </description>
-      <managed-bean-name>AVMBrowseBean</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.AVMBrowseBean</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>avmService</property-name>
-         <value>#{AVMService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>navigationBean</property-name>
-         <value>#{NavigationBean}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>actionService</property-name>
-         <value>#{ActionService}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the AVM file editing screens
-      </description>
-      <managed-bean-name>AVMEditBean</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.AVMEditBean</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>avmService</property-name>
-         <value>#{AVMService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>contentService</property-name>
-         <value>#{ContentService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmBrowseBean</property-name>
-         <value>#{AVMBrowseBean}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the Delete AVM File Dialog
-      </description>
-      <managed-bean-name>DeleteFileDialog</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.DeleteFileDialog</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>avmService</property-name>
-         <value>#{AVMService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmBrowseBean</property-name>
-         <value>#{AVMBrowseBean}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the Delete AVM Folder Dialog
-      </description>
-      <managed-bean-name>DeleteFolderDialog</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.DeleteFolderDialog</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>avmService</property-name>
-         <value>#{AVMService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmBrowseBean</property-name>
-         <value>#{AVMBrowseBean}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the Create AVM Folder Dialog
-      </description>
-      <managed-bean-name>CreateFolderDialog</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.CreateFolderDialog</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>avmService</property-name>
-         <value>#{AVMService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmBrowseBean</property-name>
-         <value>#{AVMBrowseBean}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the AVM Add Content Dialog
-      </description>
-      <managed-bean-name>AddAvmContentDialog</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.AddAvmContentDialog</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>contentService</property-name>
-         <value>#{ContentService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>dictionaryService</property-name>
-         <value>#{DictionaryService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmService</property-name>
-         <value>#{AVMService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmBrowseBean</property-name>
-         <value>#{AVMBrowseBean}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         Backing bean used by the AVM File details dialog
-      </description>
-      <managed-bean-name>FileDetailsBean</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.FileDetailsBean</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmService</property-name>
-         <value>#{AVMService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmBrowseBean</property-name>
-         <value>#{AVMBrowseBean}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         Backing bean used by the AVM Folder details dialog
-      </description>
-      <managed-bean-name>FolderDetailsBean</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.FolderDetailsBean</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmService</property-name>
-         <value>#{AVMService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmBrowseBean</property-name>
-         <value>#{AVMBrowseBean}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the Edit AVM File Properties Dialog
-      </description>
-      <managed-bean-name>EditFilePropertiesDialog</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.EditFilePropertiesDialog</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>fileFolderService</property-name>
-         <value>#{FileFolderService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>dictionaryService</property-name>
-         <value>#{DictionaryService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmBrowseBean</property-name>
-         <value>#{AVMBrowseBean}</value>
-      </managed-property>
-   </managed-bean>
-   
-   <managed-bean>
-      <description>
-         The bean that backs up the Edit AVM Folder Properties Dialog
-      </description>
-      <managed-bean-name>EditFolderPropertiesDialog</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.EditFolderPropertiesDialog</managed-bean-class>
-      <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>nodeService</property-name>
-         <value>#{NodeService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>fileFolderService</property-name>
-         <value>#{FileFolderService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>dictionaryService</property-name>
-         <value>#{DictionaryService}</value>
-      </managed-property>
-      <managed-property>
-         <property-name>avmBrowseBean</property-name>
-         <value>#{AVMBrowseBean}</value>
-      </managed-property>
-   </managed-bean>
-   
   <managed-bean>
      <description>
         The bean that backs up the Set Content Properties Dialog
@@ -2463,6 +2060,451 @@
      <managed-bean-scope>session</managed-bean-scope>
   </managed-bean>
   
+   <!-- ==================== WCM BEANS ==================== -->
+   <managed-bean>
+      <description>
+         The bean that backs up the Create XML Content Type Wizard
+      </description>
+      <managed-bean-name>CreateXmlContentTypeWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.content.CreateXmlContentTypeWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Create Web Content Wizard
+      </description>
+      <managed-bean-name>CreateWebContentWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.CreateWebContentWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Create Website Wizard
+      </description>
+      <managed-bean-name>CreateWebsiteWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.CreateWebsiteWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Import Website Dialog
+      </description>
+      <managed-bean-name>ImportWebsiteDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.ImportWebsiteDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{nodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigationBean</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Invite Users Wizard a website
+      </description>
+      <managed-bean-name>InviteWebsiteUsersWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.InviteWebsiteUsersWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>permissionService</property-name>
+         <value>#{PermissionService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>personService</property-name>
+         <value>#{PersonService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>mailSender</property-name>
+         <value>#{mailService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>authorityService</property-name>
+         <value>#{AuthorityService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the website file/folder browsing screens
+      </description>
+      <managed-bean-name>AVMBrowseBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.AVMBrowseBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigationBean</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>actionService</property-name>
+         <value>#{ActionService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the AVM file editing screens
+      </description>
+      <managed-bean-name>AVMEditBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.AVMEditBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Delete AVM File Dialog
+      </description>
+      <managed-bean-name>DeleteFileDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.DeleteFileDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Delete AVM Folder Dialog
+      </description>
+      <managed-bean-name>DeleteFolderDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.DeleteFolderDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Delete then browse AVM File Dialog
+      </description>
+      <managed-bean-name>DeleteFileBrowseDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.DeleteFileBrowseDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Delete then browse AVM Folder Dialog
+      </description>
+      <managed-bean-name>DeleteFolderBrowseDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.DeleteFolderBrowseDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Create AVM Folder Dialog
+      </description>
+      <managed-bean-name>CreateFolderDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.CreateFolderDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the AVM Add Content Dialog
+      </description>
+      <managed-bean-name>AddAvmContentDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.AddAvmContentDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         Backing bean used by the AVM File details dialog
+      </description>
+      <managed-bean-name>FileDetailsBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.FileDetailsBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         Backing bean used by the AVM Folder details dialog
+      </description>
+      <managed-bean-name>FolderDetailsBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.FolderDetailsBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Edit AVM File Properties Dialog
+      </description>
+      <managed-bean-name>EditFilePropertiesDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.EditFilePropertiesDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Edit AVM Folder Properties Dialog
+      </description>
+      <managed-bean-name>EditFolderPropertiesDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.EditFolderPropertiesDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
   
   <!-- ==================== COMPONENT GENERATOR BEANS ==================== -->
   <managed-bean>
--- a/source/web/WEB-INF/faces-config-navigation.xml
+++ b/source/web/WEB-INF/faces-config-navigation.xml
@@ -870,6 +870,14 @@
      </navigation-case>
   </navigation-rule>
   
+   <navigation-rule>
+      <from-view-id>/jsp/*</from-view-id>
+      <navigation-case>
+         <from-outcome>browseSandbox</from-outcome>
+         <to-view-id>/jsp/wcm/browse-sandbox.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
   <navigation-rule>
      <from-view-id>/jsp/wcm/*</from-view-id>
      <navigation-case>
@@ -880,10 +888,6 @@
         <from-outcome>addAvmContent</from-outcome>
         <to-view-id>/jsp/wcm/add-content-dialog.jsp</to-view-id>
      </navigation-case>
-      <navigation-case>
-         <from-outcome>browseSandbox</from-outcome>
-         <to-view-id>/jsp/wcm/browse-sandbox.jsp</to-view-id>
-      </navigation-case>
      <navigation-case>
         <from-outcome>editAvmFile</from-outcome>
         <to-view-id>/jsp/wcm/edit-file.jsp</to-view-id>