diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
index 2775dc41bd..75962dbec9 100644
--- a/config/alfresco/authentication-services-context.xml
+++ b/config/alfresco/authentication-services-context.xml
@@ -78,6 +78,15 @@
org.alfresco.repo.security.authentication.MutableAuthenticationDao
+
+
+
+
+
+
+
+
+
diff --git a/config/alfresco/invitation-service-context.xml b/config/alfresco/invitation-service-context.xml
index b3b898859d..135b1a8e61 100644
--- a/config/alfresco/invitation-service-context.xml
+++ b/config/alfresco/invitation-service-context.xml
@@ -8,7 +8,6 @@
-
diff --git a/config/alfresco/public-services-context.xml b/config/alfresco/public-services-context.xml
index 51b528ac9d..ff7cfa0c13 100644
--- a/config/alfresco/public-services-context.xml
+++ b/config/alfresco/public-services-context.xml
@@ -612,7 +612,7 @@
- org.alfresco.service.cmr.security.AuthenticationService
+ org.alfresco.service.cmr.security.MutableAuthenticationService
true if this user's authentication may be mutated via the other methods.
+ */
+ @Auditable(parameters = {"userName"}, recordable = {true})
+ public boolean isAuthenticationMutable(String userName);
+
+ /**
+ * Create an authentication for the given user.
+ *
+ * @param userName
+ * @param password
+ * @throws AuthenticationException
+ */
+ @Auditable(parameters = {"userName", "password"}, recordable = {true, false})
+ public void createAuthentication(String userName, char[] password) throws AuthenticationException;
+
+ /**
+ * Update the login information for the user (typically called by the user)
+ *
+ * @param userName
+ * @param oldPassword
+ * @param newPassword
+ * @throws AuthenticationException
+ */
+ @Auditable(parameters = {"userName", "oldPassword", "newPassword"}, recordable = {true, false, false})
+ public void updateAuthentication(String userName, char[] oldPassword, char[] newPassword) throws AuthenticationException;
+
+ /**
+ * Set the login information for a user (typically called by an admin user)
+ *
+ * @param userName
+ * @param newPassword
+ * @throws AuthenticationException
+ */
+ @Auditable(parameters = {"userName", "newPassword"}, recordable = {true, false})
+ public void setAuthentication(String userName, char[] newPassword) throws AuthenticationException;
+
+
+ /**
+ * Delete an authentication entry
+ *
+ * @param userName
+ * @throws AuthenticationException
+ */
+ @Auditable(parameters = {"userName"})
+ public void deleteAuthentication(String userName) throws AuthenticationException;
+
+ /**
+ * Enable or disable an authentication entry
+ *
+ * @param userName
+ * @param enabled
+ */
+ @Auditable(parameters = {"userName", "enabled"})
+ public void setAuthenticationEnabled(String userName, boolean enabled) throws AuthenticationException;
+
+
+}
diff --git a/source/java/org/alfresco/util/BaseAlfrescoSpringTest.java b/source/java/org/alfresco/util/BaseAlfrescoSpringTest.java
index 4119007511..1cfed2b0f6 100644
--- a/source/java/org/alfresco/util/BaseAlfrescoSpringTest.java
+++ b/source/java/org/alfresco/util/BaseAlfrescoSpringTest.java
@@ -30,7 +30,7 @@ import org.alfresco.service.cmr.repository.ContentService;
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.transaction.TransactionService;
/**
@@ -51,7 +51,7 @@ public abstract class BaseAlfrescoSpringTest extends BaseSpringTest
protected ContentService contentService;
/** The authentication service */
- protected AuthenticationService authenticationService;
+ protected MutableAuthenticationService authenticationService;
/** The store reference */
protected StoreRef storeRef;
@@ -74,7 +74,7 @@ public abstract class BaseAlfrescoSpringTest extends BaseSpringTest
// Get a reference to the node service
this.nodeService = (NodeService) this.applicationContext.getBean("nodeService");
this.contentService = (ContentService) this.applicationContext.getBean("contentService");
- this.authenticationService = (AuthenticationService) this.applicationContext.getBean("authenticationService");
+ this.authenticationService = (MutableAuthenticationService) this.applicationContext.getBean("authenticationService");
this.actionService = (ActionService)this.applicationContext.getBean("actionService");
this.transactionService = (TransactionService)this.applicationContext.getBean("transactionComponent");
diff --git a/source/java/org/alfresco/util/TestWithUserUtils.java b/source/java/org/alfresco/util/TestWithUserUtils.java
index 6126c76e03..b54eb0a83c 100644
--- a/source/java/org/alfresco/util/TestWithUserUtils.java
+++ b/source/java/org/alfresco/util/TestWithUserUtils.java
@@ -32,6 +32,7 @@ import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
@@ -56,7 +57,7 @@ public abstract class TestWithUserUtils
String password,
NodeRef rootNodeRef,
NodeService nodeService,
- AuthenticationService authenticationService)
+ MutableAuthenticationService authenticationService)
{
// ignore if the user's authentication already exists
if (authenticationService.authenticationExists(userName))
@@ -105,7 +106,7 @@ public abstract class TestWithUserUtils
public static void authenticateUser(
String userName,
String password,
- AuthenticationService authenticationService,
+ MutableAuthenticationService authenticationService,
AuthenticationComponent authenticationComponent)
{
// go system
@@ -144,7 +145,7 @@ public abstract class TestWithUserUtils
}
- public static void deleteUser(String user_name, String pwd, NodeRef ref, NodeService service, AuthenticationService service2)
+ public static void deleteUser(String user_name, String pwd, NodeRef ref, NodeService service, MutableAuthenticationService service2)
{
service2.deleteAuthentication(user_name);
}
diff --git a/source/java/org/alfresco/util/ValueDerivingMapFactory.java b/source/java/org/alfresco/util/ValueDerivingMapFactory.java
new file mode 100644
index 0000000000..6f770dfac1
--- /dev/null
+++ b/source/java/org/alfresco/util/ValueDerivingMapFactory.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception. You should have received a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.util;
+
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A factory for maps that dynamically derive their looked up values from a given source object.
+ *
+ * @author dward
+ */
+public class ValueDerivingMapFactory
+{
+
+ /** A map of value derivers that derive the value of each entry from a given source. */
+ private final Map> valueDerivers;
+
+ /**
+ * Instantiates a new value deriving map factory.
+ *
+ * @param valueDerivers
+ * a map of value derivers that derive the value of each entry from a given source
+ */
+ public ValueDerivingMapFactory(Map> valueDerivers)
+ {
+ this.valueDerivers = valueDerivers;
+ }
+
+ /**
+ * Gets a map that derives its values from the given source.
+ *
+ * @param source
+ * the source
+ * @return the map
+ */
+ public Map getMap(final O source)
+ {
+ return new AbstractMap()
+ {
+
+ @Override
+ public V get(Object key)
+ {
+ ValueDeriver valueDeriver = ValueDerivingMapFactory.this.valueDerivers.get(key);
+ return valueDeriver == null ? null : valueDeriver.deriveValue(source);
+ }
+
+ @Override
+ public boolean containsKey(Object key)
+ {
+ return ValueDerivingMapFactory.this.valueDerivers.containsKey(key);
+ }
+
+ @Override
+ public Set keySet()
+ {
+ return ValueDerivingMapFactory.this.valueDerivers.keySet();
+ }
+
+ @Override
+ public int size()
+ {
+ return ValueDerivingMapFactory.this.valueDerivers.size();
+ }
+
+ @Override
+ public Set> entrySet()
+ {
+ final Set>> entries = ValueDerivingMapFactory.this.valueDerivers
+ .entrySet();
+ return new AbstractSet>()
+ {
+
+ @Override
+ public Iterator> iterator()
+ {
+ final Iterator>> i = entries.iterator();
+ return new Iterator>()
+ {
+
+ public boolean hasNext()
+ {
+ return i.hasNext();
+ }
+
+ public Map.Entry next()
+ {
+ final Map.Entry> next = i.next();
+ return new Map.Entry()
+ {
+
+ public K getKey()
+ {
+ return next.getKey();
+ }
+
+ public V getValue()
+ {
+ return get(next.getKey());
+ }
+
+ public V setValue(V value)
+ {
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
+
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
+
+ @Override
+ public int size()
+ {
+ return entries.size();
+ }
+ };
+ }
+ };
+ }
+
+ /**
+ * An interface for objects that derive the value for a specific entry in the map.
+ */
+ public interface ValueDeriver
+ {
+
+ /**
+ * Derives a value from the given source.
+ *
+ * @param source
+ * the source
+ * @return the derived value
+ */
+ public V deriveValue(O source);
+ }
+}
diff --git a/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java b/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java
index af10a05d04..7068f02355 100644
--- a/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java
+++ b/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java
@@ -32,7 +32,7 @@ import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-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.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper;
@@ -102,7 +102,7 @@ public class AbstractWCMServiceImplTest extends TestCase
protected SandboxService sbService;
protected AssetService assetService;
- protected AuthenticationService authenticationService;
+ protected MutableAuthenticationService authenticationService;
protected PersonService personService;
protected TransactionService transactionService;
@@ -115,7 +115,7 @@ public class AbstractWCMServiceImplTest extends TestCase
sbService = (SandboxService)ctx.getBean("SandboxService");
assetService = (AssetService)ctx.getBean("AssetService");
- authenticationService = (AuthenticationService)ctx.getBean("AuthenticationService");
+ authenticationService = (MutableAuthenticationService)ctx.getBean("AuthenticationService");
personService = (PersonService)ctx.getBean("PersonService");
transactionService = (TransactionService)ctx.getBean("TransactionService");
diff --git a/source/java/org/alfresco/wcm/webproject/WebProjectServiceImplTest.java b/source/java/org/alfresco/wcm/webproject/WebProjectServiceImplTest.java
index 979d38d8fb..fe74a5c5c4 100644
--- a/source/java/org/alfresco/wcm/webproject/WebProjectServiceImplTest.java
+++ b/source/java/org/alfresco/wcm/webproject/WebProjectServiceImplTest.java
@@ -42,9 +42,9 @@ import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.wcm.AbstractWCMServiceImplTest;
@@ -95,7 +95,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest
super.setUp();
// Get the required services
- authenticationService = (AuthenticationService)ctx.getBean("AuthenticationService");
+ authenticationService = (MutableAuthenticationService)ctx.getBean("AuthenticationService");
personService = (PersonService)ctx.getBean("PersonService");
fileFolderService = (FileFolderService)ctx.getBean("FileFolderService");
authorityService = (AuthorityService)ctx.getBean("AuthorityService");