From fb6c00b89ed7fdc61be8ffe8232b62e9206a04fc Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 13 Oct 2009 14:09:52 +0000 Subject: [PATCH] Merged V3.2 to HEAD 15625: Merged V3.1 to V3.2 (record-only) 14075: (record-only) Merged V2.2 to V3.1 13859: (record-only) Removed dev from version label 14003: (record-only) Updated version to 2.2.5dev 14408: (record-only) VersionMigratorFix AMP (ETHREEOH-2102) - initial checkpoint 14414: (record-only) ETHREEOH-2102 - fix schema (valid patch for 3.1.0) 14501: (record-only) VersionMigratorFix AMP (ETHREEOH-2157) 14573: (record-only) Merged V2.2 to V3.1 14566: (record-only) ETWOTWO-1239 - remove workflow interpreter/console bootstrap 14572: (record-only) ETWOTWO-1239 - fix PersonTest to fix JBPMEngineTest (part-sourced from r13247) 14598: (record-only) VersionMigratorFix AMP (ETHREEOH-2192) 14777: (record-only) Merged V2.2 to V3.1 (record-only - due to back merge) 14776: (record-only) ETHREEOH-2225 - WCM upgrade (performance improvements for MySQL 15632: Fix log in to Explorer client 15697: Merged V3.1 to V3.2 (record only) 15696: Merged V3.2 to V3.1 15495: ETHREEOH-2149: Fix up setting of the content language filter in all authentication filters ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.1:r14075,14408,14414,14501,14573,14598,14777,15696 Merged /alfresco/BRANCHES/V3.2:r15625,15632,15697 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16872 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/app/servlet/AuthenticationHelper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java index ab945e03e9..ad66ea56ed 100644 --- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java +++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java @@ -42,6 +42,7 @@ import org.alfresco.model.ContentModel; import org.alfresco.repo.management.subsystems.ActivateableBean; import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationException; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.InvalidNodeRefException; @@ -206,7 +207,7 @@ public final class AuthenticationHelper auth.authenticateAsGuest(); // if we get here then Guest access was allowed and successful - setUser(sc, req, PermissionService.GUEST_AUTHORITY, false); + setUser(sc, req, AuthenticationUtil.getGuestUserName(), false); // Set up the thread context setupThread(sc, req, res); @@ -421,7 +422,7 @@ public final class AuthenticationHelper { auth.authenticateAsGuest(); - User user = createUser(ctx, auth, PermissionService.GUEST_AUTHORITY, false); + User user = createUser(ctx, auth, AuthenticationUtil.getGuestUserName(), false); // store the User object in the Session - the authentication servlet will then proceed session.setAttribute(AuthenticationHelper.AUTHENTICATION_USER, user);