Merged V2.1 to HEAD

6338: Some WCM-435.
   6344: Fix for AWC-1452 (dialog close navigation issue)
   6345: Fix for AR-1611 and other related CIFS and NFS fixes
   6346: Minor javadoc fix for ReplicatingContentStore
   6347: Handle exceptions arising from UserTransaction.begin().
   6348: Many WCM fixes in one
            Conflicts resolved on faces-config-beans.xml


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

source/java/org/alfresco/web/app/servlet/command/EditWebContentCommand.java

@@ -41,7 +41,6 @@ import org.alfresco.web.app.servlet.BaseServlet;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.NavigationBean;
 import org.alfresco.web.bean.wcm.AVMBrowseBean;
-import org.alfresco.web.bean.wcm.AVMEditBean;
 import org.alfresco.web.bean.wizard.WizardManager;
 import org.alfresco.web.ui.wcm.component.UIUserSandboxes;
 
@@ -73,7 +72,6 @@ public class EditWebContentCommand extends BaseUIActionCommand
       ServletResponse res = (ServletResponse)properties.get(PROP_RESPONSE);
       FacesContext fc = FacesHelper.getFacesContext(req, res, sc);
       AVMBrowseBean avmBrowseBean = (AVMBrowseBean)FacesHelper.getManagedBean(fc, AVMBrowseBean.BEAN_NAME);
-      AVMEditBean avmEditBean = (AVMEditBean)FacesHelper.getManagedBean(fc, AVMEditBean.BEAN_NAME);
       NavigationBean navigator = (NavigationBean)FacesHelper.getManagedBean(fc, NavigationBean.BEAN_NAME);
       
       // setup context from url args in properties map
@@ -86,7 +84,7 @@ public class EditWebContentCommand extends BaseUIActionCommand
       navigator.setCurrentNodeId(webProjectId);
       avmBrowseBean.setSandbox(sandbox);
       // navigation handler is called directly in this method
-      avmEditBean.setupEditAction(path);
+      avmBrowseBean.setupEditAction(path);
       
       String viewId = fc.getViewRoot().getViewId();
       try