Merged V2.2 to HEAD

8049: Fix for WCM-1033: Only admin users can create web projects
   8051: Merged V2.1 to V2.2
      8006: Merged V2.1-A to V2.1 (Virtual Server fixes)
         7723: The JMX server connector is now lazily instantiated in the server context.
         7734: Fix for WCM-934.
         7735: The linkvalidation service now provides a public API
         7742: Possible fix for ACT #361
      8012: Merged V2.1-A to V2.1
         7749: Fix stack overflow
         7955: Fix for issue ADB-18 Forward slash '/' in username causes Advanced Search failure
         7975: AR-1832: Allow setting of timeout value in the Java webservices client
         7995: Include the alf_child_assoc.type_qname in the check for duplicate children.
   8052: Build fix
   8054: Merged V2.1 to V2.2
      8045: Patch fix to solve WCM-1051 - also reruns fixed patch on previously patched repos (see CHK-2143)
   8058: Fixed compilation issues following merge


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

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

@@ -148,6 +148,13 @@ public class InviteWebsiteUsersWizard extends BaseInviteUsersWizard
          {
             this.userGroupRoles.add(new UserGroupRole(currentUser, AVMUtil.ROLE_CONTENT_MANAGER, null));
             managers.add(currentUser);
+            
+            // assign permissions explicitly for the current user
+            this.getPermissionService().setPermission(
+                     nodeRef,
+                     currentUser,
+                     AVMUtil.ROLE_CONTENT_MANAGER,
+                     true);
          }
       }
       else
@@ -199,6 +206,8 @@ public class InviteWebsiteUsersWizard extends BaseInviteUsersWizard
                SandboxInfo info = SandboxFactory.createUserSandbox(
                      getAvmStore(), managers, userAuth, userRole.getRole());
                
+               SandboxFactory.addStagingAreaUser(getAvmStore(), userAuth, userRole.getRole());
+               
                this.sandboxInfoList.add(info);
                
                // create an app:webuser instance for each authority and assoc to the website node