Merged V3.0 to HEAD

11509: ETHREEOH-394: Incorrect message in activity feed when user accepts an invitation to a site
   11510: Fix to set position
   11511: Fix for ETHREEOH-533: Dialogs access via ExternalAccessServlet return to blank empty container.jsp page when Close button is clicked
   11512: Fix DM ACL deletion after merge forward for shared and defining ACLs.
   11513: Merged V2.2 to V3.0
      11501: Expose if set permissions are inherited or not and fix relatd behaviour for import/copy
   11514: Fix for ETHREEOH-476 (Impossible to create Site Invite Workflow) & ETHREEOH-254 (Default value at 'Start Advanced Workflow Wizard' page)
   11515: Fix for ETHREEOH-446 and ETHREEOH-447
   11517: Fix for ETHREEOH-225: Web Forms with repeating elements don't work
   11518: Merged V2.2 to V3.0
      11343: ACL upgrades may require a COW - it now warns when this happens.
      11369: Always lock against staging - ETWOTWO-763
   11519: Merged V2.2 to V3.0
      11467: Fixed ETWOTWO-774: CreateVersionTxnListener.afterCommit() throws NPE
      11468: More defensive coding on AVM txn listeners (avoid NPEs)
      11475: More defensive checks to avoid NPE
   11520: Merged V2.2 to V3.0
      11478: Keep creator and owner as orihinally set in AVM - Fix for ETWOTWO-604
   11521: RuntimeExec: Added optional directive SPLIT: to force argument tokenization
   11522: Limited tests to just check the command format not execute it for "dir . .."
   11523: Undid revision 11520 (Merged V2.2 11478)

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

source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java

@@ -26,6 +26,7 @@ package org.alfresco.web.app.servlet;
 
 import java.io.IOException;
 import java.text.MessageFormat;
+import java.util.Stack;
 import java.util.StringTokenizer;
 
 import javax.faces.application.NavigationHandler;
@@ -132,6 +133,16 @@ public class ExternalAccessServlet extends BaseServlet
       ServiceRegistry serviceRegistry = getServiceRegistry(getServletContext());
       PermissionService permissionService = serviceRegistry.getPermissionService();
       
+      // as we are potentially coming in from an external app reset the view stack
+      Stack viewStack = (Stack)fc.getExternalContext().getSessionMap().get("_alfViewStack");
+      if (viewStack != null)
+      {
+         viewStack.clear();
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Cleared view stack");
+      }
+      
       // setup is required for certain outcome requests
       if (OUTCOME_DOCDETAILS.equals(outcome))
       {