Merged V3.2E to HEAD

17246: ETHREEOH-3208: User profiles for users authenticated by immutable subsystems are now read only
         - Introduced MutableAuthenticationService interface, only implemented by Alfresco native authentication service
         - Split out those methods from AuthenticationService that mutate the user store and added isAuthenticationMutable()
         - Now both Alfresco Explorer and Share user profile / password edit link rendering is conditional on isAuthenticationMutable
         - Works with authentication chain containing mixture of internally and externally authenticated users
   17247: Fix failing unit tests
         - rm-public-services-security-context.xml needed to be brought in line with public-services-security-context.xml (and will forever more!)
   17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
   17253: *RECORD ONLY* ETHREEOH-2885: web.xml must conform to the schema to work on JBoss

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-01-18 15:32:57 +00:00
parent 0399805772
commit 7f24c8c4e7
59 changed files with 742 additions and 349 deletions

View File

@@ -45,7 +45,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.OwnableService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.usage.UsageService;
@@ -64,7 +64,7 @@ public class UserUsageTest extends TestCase
protected NodeService nodeService;
protected FileFolderService fileFolderService;
protected AuthenticationService authenticationService;
protected MutableAuthenticationService authenticationService;
private MutableAuthenticationDao authenticationDAO;
protected NodeRef rootNodeRef;
protected NodeRef systemNodeRef;
@@ -85,7 +85,7 @@ public class UserUsageTest extends TestCase
nodeService = (NodeService) applicationContext.getBean("nodeService");
fileFolderService = (FileFolderService) applicationContext.getBean("fileFolderService");
authenticationService = (AuthenticationService) applicationContext.getBean("authenticationService");
authenticationService = (MutableAuthenticationService) applicationContext.getBean("authenticationService");
authenticationComponent = (AuthenticationComponent) applicationContext.getBean("authenticationComponent");
authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName());

View File

@@ -41,7 +41,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.usage.ContentUsageService;
import org.alfresco.service.namespace.NamespaceService;
@@ -59,7 +59,7 @@ public class UserUsageTrackingComponentTest extends TestCase
private boolean clean = true;
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private ContentService contentService;
private TransactionService transactionService;
private PersonService personService;
@@ -80,7 +80,7 @@ public class UserUsageTrackingComponentTest extends TestCase
protected void setUp() throws Exception
{
nodeService = (NodeService)applicationContext.getBean("NodeService");
authenticationService = (AuthenticationService)applicationContext.getBean("authenticationService");
authenticationService = (MutableAuthenticationService)applicationContext.getBean("authenticationService");
transactionService = (TransactionService)applicationContext.getBean("transactionComponent");
personService = (PersonService)applicationContext.getBean("PersonService");
contentService = (ContentService)applicationContext.getBean("ContentService");