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

12
source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
View File

@@ -168,7 +168,7 @@ public class ActivityServiceImpl implements ActivityService
private void postActivity(String activityType, String siteNetwork, String appTool, String activityData, ActivityPostDAO.STATUS status)
{
String currentUser = AuthenticationUtil.getCurrentUserName();
String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
try
{
@@ -379,7 +379,7 @@ public class ActivityServiceImpl implements ActivityService
{
ParameterCheck.mandatory("feedControl", feedControl);
String userId = AuthenticationUtil.getCurrentUserName();
String userId = AuthenticationUtil.getFullyAuthenticatedUser();
if (! userNamesAreCaseSensitive)
{
userId = userId.toLowerCase();
@@ -405,7 +405,7 @@ public class ActivityServiceImpl implements ActivityService
*/
public List<FeedControl> getFeedControls()
{
String userId = AuthenticationUtil.getCurrentUserName();
String userId = AuthenticationUtil.getFullyAuthenticatedUser();
return getFeedControlsImpl(userId);
}
@@ -415,7 +415,7 @@ public class ActivityServiceImpl implements ActivityService
public List<FeedControl> getFeedControls(String userId)
{
ParameterCheck.mandatoryString("userId", userId);
String currentUser = AuthenticationUtil.getCurrentUserName();
String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
if ((currentUser == null) || ((! currentUser.equals(AuthenticationUtil.getSystemUserName())) && (! currentUser.equals(userId)) && (! authorityService.isAdminAuthority(currentUser))))
{
@@ -460,7 +460,7 @@ public class ActivityServiceImpl implements ActivityService
{
ParameterCheck.mandatory("feedControl", feedControl);
String userId = AuthenticationUtil.getCurrentUserName();
String userId = AuthenticationUtil.getFullyAuthenticatedUser();
if (! userNamesAreCaseSensitive)
{
userId = userId.toLowerCase();
@@ -485,7 +485,7 @@ public class ActivityServiceImpl implements ActivityService
{
ParameterCheck.mandatory("feedControl", feedControl);
String userId = AuthenticationUtil.getCurrentUserName();
String userId = AuthenticationUtil.getFullyAuthenticatedUser();
if (! userNamesAreCaseSensitive)
{