Merged V3.0 to HEAD

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

View File

@@ -28,8 +28,6 @@ import java.io.ByteArrayInputStream;
import java.nio.charset.Charset;
import java.util.List;
import net.sf.acegisecurity.Authentication;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.encoding.ContentCharsetFinder;
import org.alfresco.repo.node.db.NodeDaoService;
@@ -131,7 +129,7 @@ public class LoaderRemoteServer implements LoaderRemote
public String authenticate(String username, String password)
{
// We need to authenticate
Authentication authentication = AuthenticationUtil.getCurrentAuthentication();
AuthenticationUtil.pushAuthentication();
try
{
authenticationService.authenticate(username, password.toCharArray());
@@ -145,7 +143,7 @@ public class LoaderRemoteServer implements LoaderRemote
}
finally
{
AuthenticationUtil.setCurrentAuthentication(authentication);
AuthenticationUtil.popAuthentication();
}
}
@@ -154,7 +152,7 @@ public class LoaderRemoteServer implements LoaderRemote
*/
public NodeRef getOrCreateWorkingRoot(String ticket, final StoreRef storeRef)
{
Authentication authentication = AuthenticationUtil.getCurrentAuthentication();
AuthenticationUtil.pushAuthentication();
try
{
authenticationService.validate(ticket);
@@ -208,7 +206,7 @@ public class LoaderRemoteServer implements LoaderRemote
}
finally
{
AuthenticationUtil.setCurrentAuthentication(authentication);
AuthenticationUtil.popAuthentication();
}
}
@@ -239,7 +237,7 @@ public class LoaderRemoteServer implements LoaderRemote
throw new IllegalArgumentException("The number of files must match the number of binary byte arrays given.");
}
Authentication authentication = AuthenticationUtil.getCurrentAuthentication();
AuthenticationUtil.pushAuthentication();
try
{
authenticationService.validate(ticket);
@@ -284,7 +282,7 @@ public class LoaderRemoteServer implements LoaderRemote
}
finally
{
AuthenticationUtil.setCurrentAuthentication(authentication);
AuthenticationUtil.popAuthentication();
}
}
}