From bded2e28e7f45e68ae99dc03f8825c2c10e38e16 Mon Sep 17 00:00:00 2001 From: Cody Lerum Date: Thu, 17 Mar 2011 11:27:48 -0600 Subject: [PATCH] update pom add put method --- .../org/jboss/seam/mail/api/MailMessage.java | 8 +++++ .../jboss/seam/mail/core/MailMessageImpl.java | 6 ++++ .../org/jboss/seam/mail/example/SendMail.java | 2 +- .../org/jboss/seam/mail/MailMessageTest.java | 16 +++++----- pom.xml | 30 ++++++++++++++++--- 5 files changed, 49 insertions(+), 13 deletions(-) diff --git a/core/api/src/main/java/org/jboss/seam/mail/api/MailMessage.java b/core/api/src/main/java/org/jboss/seam/mail/api/MailMessage.java index 228b051..6a03c35 100644 --- a/core/api/src/main/java/org/jboss/seam/mail/api/MailMessage.java +++ b/core/api/src/main/java/org/jboss/seam/mail/api/MailMessage.java @@ -20,6 +20,7 @@ import java.io.File; import java.io.InputStream; import java.util.Collection; +import java.util.Map; import javax.mail.Session; import javax.mail.internet.InternetAddress; @@ -449,4 +450,11 @@ public interface MailMessage * @param value the Object being placed in the context */ public MailMessage put(String name, Object value); + + /** + * Places a Map of variable in the templating engines context + * + * @param values Map containing the variables to be placed in the context + */ + public MailMessage put(Map values); } diff --git a/core/impl/src/main/java/org/jboss/seam/mail/core/MailMessageImpl.java b/core/impl/src/main/java/org/jboss/seam/mail/core/MailMessageImpl.java index 14bc385..ee59754 100644 --- a/core/impl/src/main/java/org/jboss/seam/mail/core/MailMessageImpl.java +++ b/core/impl/src/main/java/org/jboss/seam/mail/core/MailMessageImpl.java @@ -348,6 +348,12 @@ public MailMessage put(String key, Object value) templateContext.put(key, value); return this; } + + public MailMessage put(Map values) + { + templateContext.putAll(values); + return this; + } public EmailMessage getEmailMessage() { diff --git a/examples/sendmail/src/main/java/org/jboss/seam/mail/example/SendMail.java b/examples/sendmail/src/main/java/org/jboss/seam/mail/example/SendMail.java index 7f6499c..7286f22 100644 --- a/examples/sendmail/src/main/java/org/jboss/seam/mail/example/SendMail.java +++ b/examples/sendmail/src/main/java/org/jboss/seam/mail/example/SendMail.java @@ -68,7 +68,7 @@ public void sendText() .from("seam@test.test", "Seam Framework") .to( person.getEmail(), person.getName()) .subject("Text Message from Seam Mail - " + java.util.UUID.randomUUID().toString()) - .textBody(text) + .bodyText(text) .send(); } diff --git a/examples/sendmail/src/test/java/org/jboss/seam/mail/MailMessageTest.java b/examples/sendmail/src/test/java/org/jboss/seam/mail/MailMessageTest.java index a9055f8..697188f 100644 --- a/examples/sendmail/src/test/java/org/jboss/seam/mail/MailMessageTest.java +++ b/examples/sendmail/src/test/java/org/jboss/seam/mail/MailMessageTest.java @@ -123,7 +123,7 @@ public void testTextMailMessage() throws MessagingException, IOException .replyTo(replyToAddress) .to(toAddress, toName) .subject(subject) - .textBody(textBody) + .bodyText(textBody) .importance(MessagePriority.HIGH) .messageId(messageId) .send(session.get()); @@ -180,7 +180,7 @@ public void testHTMLMailMessage() throws MessagingException, IOException .replyTo(replyToAddress, replyToName) .to(person.getEmail(), person.getName()) .subject(subject) - .htmlBody(htmlBody) + .bodyHtml(htmlBody) .importance(MessagePriority.HIGH) .addAttachment(new URLAttachment("http://www.seamframework.org/themes/sfwkorg/img/seam_icon_large.png", "seamLogo.png", ContentDisposition.INLINE)).send(session.get()); } @@ -242,7 +242,7 @@ public void testHTMLTextAltMailMessage() throws MessagingException, IOException .from(fromAddress, fromName) .to(person.getEmail(), person.getName()) .subject(subject) - .htmlBodyTextAlt(htmlBody, textBody) + .bodyHtmlTextAlt(htmlBody, textBody) .importance(MessagePriority.LOW) .deliveryReceipt(fromAddress) .readReceipt("seam.test") @@ -323,7 +323,7 @@ public void testTextMailMessageLongFields() throws MessagingException, IOExcepti .to(longToAddress, longToName) .cc(longCcAddress, longCcName) .subject(subject) - .textBody(textBody) + .bodyText(textBody) .importance(MessagePriority.HIGH) .send(session.get()); } @@ -375,7 +375,7 @@ public void testTextMailMessageSendFailed() person.setName(toName); person.setEmail(toAddress); - mailMessage.get().from(fromAddress, fromName).replyTo(replyToAddress).to(toAddress, toName).subject(subject).textBody(textBody).importance(MessagePriority.HIGH).messageId(messageId).send(session.get()); + mailMessage.get().from(fromAddress, fromName).replyTo(replyToAddress).to(toAddress, toName).subject(subject).bodyText(textBody).importance(MessagePriority.HIGH).messageId(messageId).send(session.get()); } finally { @@ -403,7 +403,7 @@ public void testTextMailMessageInvalidAddress() throws SendFailedException person.setName(toName); person.setEmail(toAddress); - mailMessage.get().from("seam seamerson@test.com", fromName).replyTo(replyToAddress).to(toAddress, toName).subject(subject).textBody(textBody).importance(MessagePriority.HIGH).messageId(messageId).send(session.get()); + mailMessage.get().from("seam seamerson@test.com", fromName).replyTo(replyToAddress).to(toAddress, toName).subject(subject).bodyText(textBody).importance(MessagePriority.HIGH).messageId(messageId).send(session.get()); } finally { @@ -434,7 +434,7 @@ public void testTextMailMessageUsingPerson() throws MessagingException, IOExcept .replyTo(replyToAddress) .to(person) .subject(subject) - .textBody(textBody) + .bodyText(textBody) .importance(MessagePriority.HIGH) .messageId(messageId) .send(session.get()); @@ -491,7 +491,7 @@ public void testTextMailMessageUsingDefaultSession() throws MessagingException, .replyTo(replyToAddress) .to(person) .subject(subject) - .textBody(textBody) + .bodyText(textBody) .importance(MessagePriority.HIGH) .messageId(messageId) .send(); diff --git a/pom.xml b/pom.xml index 2d08c62..d98b279 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ seam-parent org.jboss.seam - 8 + 9 org.jboss.seam.mail @@ -14,7 +14,8 @@ Seam Mail Module - 3.0.0.b09 + 3.0.0-SNAPSHOT + 1.0.0.Final @@ -44,7 +45,7 @@ ${project.version} compile - + org.jboss.seam.mail seam-mail-core-impl @@ -58,7 +59,7 @@ ${project.version} runtime - + org.jboss.seam.mail seam-mail-render-impl @@ -72,7 +73,28 @@ ${project.version} runtime + + + + org.jboss.spec + jboss-javaee-6.0 + ${jboss.javaee.version} + import + pom + + + + + + org.jboss.spec + jboss-javaee-6.0 + ${jboss.javaee.version} + provided + pom + + +