Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/LoginBean.java

@@ -279,12 +279,15 @@ public class LoginBean
             // in the session - this is used by the servlet filter etc. on each page to check for login
             this.authenticationService.authenticate(this.username, this.password.toCharArray());
             
+            // Set the user name as stored by the back end 
+            this.username = this.authenticationService.getCurrentUserName();
+            
             // remove the session invalidated flag (used to remove last username cookie by AuthenticationFilter)
             session.remove(AuthenticationHelper.SESSION_INVALIDATED);
             
             // setup User object and Home space ID
             User user = new User(
-                  this.authenticationService.getCurrentUserName(),
+                    this.username,
                   this.authenticationService.getCurrentTicket(),
                   personService.getPerson(this.username));
             
@@ -325,7 +328,17 @@ public class LoginBean
             }
             else
             {
-               return "success";
+               // special case to handle jump to My Alfresco page initially
+               String location = Application.getClientConfig(FacesContext.getCurrentInstance()).getInitialLocation();
+               if (NavigationBean.LOCATION_MYALFRESCO.equals(location))
+               {
+                  return "myalfresco";
+               }
+               else
+               {
+                  // generally this will navigate to the generic browse screen
+                  return "success";
+               }
             }
          }
          catch (AuthenticationException aerr)