mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged DEV/IMAP3 to HEAD
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -37,7 +37,6 @@ import org.alfresco.service.cmr.security.PersonService;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
import com.icegreen.greenmail.imap.ImapHostManager;
|
||||
import com.icegreen.greenmail.user.GreenMailUser;
|
||||
import com.icegreen.greenmail.user.UserException;
|
||||
import com.icegreen.greenmail.user.UserManager;
|
||||
@@ -50,7 +49,6 @@ public class AlfrescoImapUserManager extends UserManager
|
||||
private Log logger = LogFactory.getLog(AlfrescoImapUserManager.class);
|
||||
|
||||
protected Map<String, GreenMailUser> userMap = Collections.synchronizedMap(new HashMap<String, GreenMailUser>());
|
||||
protected ImapHostManager imapHostManager;
|
||||
|
||||
protected AuthenticationService authenticationService;
|
||||
protected PersonService personService;
|
||||
@@ -61,17 +59,11 @@ public class AlfrescoImapUserManager extends UserManager
|
||||
super(null);
|
||||
}
|
||||
|
||||
public AlfrescoImapUserManager(ImapHostManager imapHostManager)
|
||||
{
|
||||
this();
|
||||
this.imapHostManager = imapHostManager;
|
||||
}
|
||||
|
||||
public GreenMailUser createUser(String email, String login, String password) throws UserException
|
||||
{
|
||||
// TODO: User creation/addition code should be implemented here (in the AlfrescoImapUserManager).
|
||||
// Following code is not need and not used in the current implementation.
|
||||
GreenMailUser user = new AlfrescoImapUser(email, login, password, imapHostManager);
|
||||
GreenMailUser user = new AlfrescoImapUser(email, login, password);
|
||||
user.create();
|
||||
addUser(user);
|
||||
return user;
|
||||
@@ -129,7 +121,7 @@ public class AlfrescoImapUserManager extends UserManager
|
||||
NodeRef personNodeRef = personService.getPerson(userid);
|
||||
email = (String) nodeService.getProperty(personNodeRef, ContentModel.PROP_EMAIL);
|
||||
}
|
||||
GreenMailUser user = new AlfrescoImapUser(email, userid, password, imapHostManager);
|
||||
GreenMailUser user = new AlfrescoImapUser(email, userid, password);
|
||||
addUser(user);
|
||||
}
|
||||
catch (AuthenticationException ex)
|
||||
@@ -140,16 +132,6 @@ public class AlfrescoImapUserManager extends UserManager
|
||||
return true;
|
||||
}
|
||||
|
||||
public ImapHostManager getImapHostManager()
|
||||
{
|
||||
return this.imapHostManager;
|
||||
}
|
||||
|
||||
public void setImapHostManager(ImapHostManager imapHostManager)
|
||||
{
|
||||
this.imapHostManager = imapHostManager;
|
||||
}
|
||||
|
||||
public void setAuthenticationService(AuthenticationService authenticationService)
|
||||
{
|
||||
this.authenticationService = authenticationService;
|
||||
|
Reference in New Issue
Block a user