inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.0 to HEAD

Browse Source 
12145: Merged V2.2 to V3.0 (AuthenticationUtil)
    12109: AuthenticationUtil and AuthenticationComponent refactor
  12152: Removed Lucene usage from lookup of 'sites' root folder
  12153: Fix InviteServiceTest by cleaning up leaking authentications
  12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-12-19 12:15:59 +00:00
parent 21bb599e20
commit cd09266213
74 changed files with 870 additions and 997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/wcm/webproject/WebProjectServiceImpl.java
View File

@@ -248,7 +248,7 @@ public class WebProjectServiceImpl extends WCMUtil implements WebProjectService
// TODO: Currently auto-creates author sandbox for creator of web project (eg. an admin or a DM contributor to web projects root space)
// NOTE: JSF client does not yet allow explicit creation of author sandboxes
inviteWebUser(wpNodeRef, AuthenticationUtil.getCurrentEffectiveUserName(), WCMUtil.ROLE_CONTENT_MANAGER, true);
inviteWebUser(wpNodeRef, AuthenticationUtil.getRunAsUser(), WCMUtil.ROLE_CONTENT_MANAGER, true);
// Bind the post-commit transaction listener with data required for virtualization server notification
CreateWebProjectTransactionListener tl = new CreateWebProjectTransactionListener(wpStoreId);
@@ -670,7 +670,7 @@ public class WebProjectServiceImpl extends WCMUtil implements WebProjectService
*/
public boolean isContentManager(String storeName)
{
return isContentManager(storeName, AuthenticationUtil.getCurrentEffectiveUserName());
return isContentManager(storeName, AuthenticationUtil.getRunAsUser());
}
/* (non-Javadoc)
@@ -697,7 +697,7 @@ public class WebProjectServiceImpl extends WCMUtil implements WebProjectService
*/
public boolean isContentManager(NodeRef wpNodeRef)
{
return isContentManager(wpNodeRef, AuthenticationUtil.getCurrentEffectiveUserName());
return isContentManager(wpNodeRef, AuthenticationUtil.getRunAsUser());
}
/* (non-Javadoc)
@@ -759,7 +759,7 @@ public class WebProjectServiceImpl extends WCMUtil implements WebProjectService
public Map<String, String> listWebUsers(NodeRef wpNodeRef)
{
// special case: allow System - eg. to allow user to create their own sandbox on-demand (createAuthorSandbox)
if (isContentManager(wpNodeRef) || (AuthenticationUtil.getCurrentEffectiveUserName().equals(AuthenticationUtil.getSystemUserName())))
if (isContentManager(wpNodeRef) || (AuthenticationUtil.getRunAsUser().equals(AuthenticationUtil.getSystemUserName())))
{
return WCMUtil.listWebUsers(nodeService, wpNodeRef);
}