From e5e0d24090842608b33e01073db878d9e48ab384 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 --- .../authentication/AbstractChainingAuthenticationService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationService.java b/source/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationService.java index e2e618c0a4..fd1a9dde63 100644 --- a/source/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationService.java +++ b/source/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationService.java @@ -30,7 +30,6 @@ import java.util.Set; import java.util.TreeSet; import org.alfresco.service.cmr.security.AuthenticationService; -import org.alfresco.service.cmr.security.PermissionService; /** * A base class for chaining authentication services. Where appropriate, methods will 'chain' across multiple @@ -180,7 +179,7 @@ public abstract class AbstractChainingAuthenticationService extends AbstractAuth */ public void authenticateAsGuest() throws AuthenticationException { - preAuthenticationCheck(PermissionService.GUEST_AUTHORITY); + preAuthenticationCheck(AuthenticationUtil.getGuestUserName()); for (AuthenticationService authService : getUsableAuthenticationServices()) { try