inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for AR-636

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-06-05 16:14:38 +00:00
parent 7c17d38207
commit 77d0d67fb7
3 changed files with 91 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/core-services-context.xml
View File

@@ -98,6 +98,9 @@
<property name="password"> <property name="password">
<value>${mail.password}</value> <value>${mail.password}</value>
</property> </property>
<property name="defaultEncoding">
<value>${mail.encoding}</value>
</property>
</bean> </bean>
<!-- --> <!-- -->

2
config/alfresco/repository.properties
View File

@@ -63,6 +63,8 @@ mail.host=
mail.port=25 mail.port=25
mail.username=anonymous mail.username=anonymous
mail.password= mail.password=
# Set this value to UTF-8 or similar for encoding of email messages as required
mail.encoding=
# System Configuration # System Configuration

50
source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
View File

@@ -23,9 +23,11 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.repo.action.ParameterDefinitionImpl;
import org.alfresco.repo.security.authentication.AuthenticationException;
import org.alfresco.repo.template.DateCompareMethod; import org.alfresco.repo.template.DateCompareMethod;
import org.alfresco.repo.template.HasAspectMethod; import org.alfresco.repo.template.HasAspectMethod;
import org.alfresco.repo.template.I18NMessageMethod; import org.alfresco.repo.template.I18NMessageMethod;
@@ -33,7 +35,6 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ParameterDefinition; import org.alfresco.service.cmr.action.ParameterDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.TemplateNode; import org.alfresco.service.cmr.repository.TemplateNode;
@@ -44,8 +45,9 @@ import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.mail.SimpleMailMessage;
import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.mail.javamail.MimeMessagePreparator;
/** /**
* Mail action executor implementation. * Mail action executor implementation.
@@ -168,17 +170,21 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
*/ */
@Override @Override
protected void executeImpl( protected void executeImpl(
Action ruleAction, final Action ruleAction,
NodeRef actionedUponNodeRef) final NodeRef actionedUponNodeRef)
{ {
// Create the simple mail message // Create the mime mail message
SimpleMailMessage simpleMailMessage = new SimpleMailMessage(); MimeMessagePreparator mailPreparer = new MimeMessagePreparator()
{
public void prepare(MimeMessage mimeMessage) throws MessagingException
{
MimeMessageHelper message = new MimeMessageHelper(mimeMessage);
// set recipient // set recipient
String to = (String)ruleAction.getParameterValue(PARAM_TO); String to = (String)ruleAction.getParameterValue(PARAM_TO);
if (to != null && to.length() != 0) if (to != null && to.length() != 0)
{ {
simpleMailMessage.setTo(to); message.setTo(to);
} }
else else
{ {
@@ -192,10 +198,10 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
AuthorityType authType = AuthorityType.getAuthorityType(authority); AuthorityType authType = AuthorityType.getAuthorityType(authority);
if (authType.equals(AuthorityType.USER)) if (authType.equals(AuthorityType.USER))
{ {
if (this.personService.personExists(authority) == true) if (personService.personExists(authority) == true)
{ {
NodeRef person = this.personService.getPerson(authority); NodeRef person = personService.getPerson(authority);
String address = (String)this.nodeService.getProperty(person, ContentModel.PROP_EMAIL); String address = (String)nodeService.getProperty(person, ContentModel.PROP_EMAIL);
if (address != null && address.length() != 0) if (address != null && address.length() != 0)
{ {
recipients.add(address); recipients.add(address);
@@ -205,13 +211,13 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
else if (authType.equals(AuthorityType.GROUP)) else if (authType.equals(AuthorityType.GROUP))
{ {
// else notify all members of the group // else notify all members of the group
Set<String> users = this.authorityService.getContainedAuthorities(AuthorityType.USER, authority, false); Set<String> users = authorityService.getContainedAuthorities(AuthorityType.USER, authority, false);
for (String userAuth : users) for (String userAuth : users)
{ {
if (this.personService.personExists(userAuth) == true) if (personService.personExists(userAuth) == true)
{ {
NodeRef person = this.personService.getPerson(authority); NodeRef person = personService.getPerson(authority);
String address = (String)this.nodeService.getProperty(person, ContentModel.PROP_EMAIL); String address = (String)nodeService.getProperty(person, ContentModel.PROP_EMAIL);
if (address != null && address.length() != 0) if (address != null && address.length() != 0)
{ {
recipients.add(address); recipients.add(address);
@@ -221,12 +227,12 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
} }
} }
simpleMailMessage.setTo(recipients.toArray(new String[recipients.size()])); message.setTo(recipients.toArray(new String[recipients.size()]));
} }
} }
// set subject line // set subject line
simpleMailMessage.setSubject((String)ruleAction.getParameterValue(PARAM_SUBJECT)); message.setSubject((String)ruleAction.getParameterValue(PARAM_SUBJECT));
// See if an email template has been specified // See if an email template has been specified
String text = null; String text = null;
@@ -245,23 +251,25 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
{ {
text = (String)ruleAction.getParameterValue(PARAM_TEXT); text = (String)ruleAction.getParameterValue(PARAM_TEXT);
} }
simpleMailMessage.setText(text); message.setText(text);
// set the from address - use the default if not set // set the from address - use the default if not set
String from = (String)ruleAction.getParameterValue(PARAM_FROM); String from = (String)ruleAction.getParameterValue(PARAM_FROM);
if (from != null) if (from != null)
{ {
simpleMailMessage.setFrom(from); message.setFrom(from);
} }
else else
{ {
simpleMailMessage.setFrom(FROM_ADDRESS); message.setFrom(FROM_ADDRESS);
} }
}
};
try try
{ {
// Send the message // Send the message
javaMailSender.send(simpleMailMessage); javaMailSender.send(mailPreparer);
} }
catch (Throwable e) catch (Throwable e)
{ {