[seam-commits] [seam/mail] ae3c1e: Merge branch 'master' of ../master-mail

Branch: refs/heads/master Home: https://github.com/seam/mail Commit: ae3c1e1c3a47d74a1fa1ee4d6b7e8abe22e92549 https://github.com/seam/mail/commit/ae3c1e1c3a47d74a1fa1ee4d6b7e8abe22e92549 Author: Cody Lerum <cody.lerum(a)gmail.com&gt; Date: 2011-05-10 (Tue, 10 May 2011) Changed paths: M core/api/src/main/java/org/jboss/seam/mail/api/MailMessage.java M core/api/src/main/java/org/jboss/seam/mail/core/AttachmentException.java M core/api/src/main/java/org/jboss/seam/mail/core/BasicEmailContact.java M core/api/src/main/java/org/jboss/seam/mail/core/EmailAttachment.java M core/api/src/main/java/org/jboss/seam/mail/core/EmailContact.java M core/api/src/main/java/org/jboss/seam/mail/core/EmailMessage.java M core/api/src/main/java/org/jboss/seam/mail/core/Header.java M core/api/src/main/java/org/jboss/seam/mail/core/InvalidAddressException.java M core/api/src/main/java/org/jboss/seam/mail/core/MailException.java M core/api/src/main/java/org/jboss/seam/mail/core/SendFailedException.java M core/api/src/main/java/org/jboss/seam/mail/core/enumerations/ContentDisposition.java M core/api/src/main/java/org/jboss/seam/mail/core/enumerations/ContentType.java M core/api/src/main/java/org/jboss/seam/mail/core/enumerations/EmailMessageType.java M core/api/src/main/java/org/jboss/seam/mail/core/enumerations/MailHeader.java M core/api/src/main/java/org/jboss/seam/mail/core/enumerations/MessagePriority.java M core/api/src/main/java/org/jboss/seam/mail/core/enumerations/RecipientType.java M core/api/src/main/java/org/jboss/seam/mail/templating/MailContext.java M core/api/src/main/java/org/jboss/seam/mail/templating/TemplateProvider.java M core/api/src/main/resources/META-INF/beans.xml M core/impl/src/main/java/org/jboss/seam/mail/attachments/AttachmentPart.java M core/impl/src/main/java/org/jboss/seam/mail/attachments/BaseAttachment.java M core/impl/src/main/java/org/jboss/seam/mail/attachments/FileAttachment.java M core/impl/src/main/java/org/jboss/seam/mail/attachments/InputStreamAttachment.java M core/impl/src/main/java/org/jboss/seam/mail/attachments/URLAttachment.java M core/impl/src/main/java/org/jboss/seam/mail/core/BaseMailMessage.java M core/impl/src/main/java/org/jboss/seam/mail/core/MailConfig.java M core/impl/src/main/java/org/jboss/seam/mail/core/MailMessageImpl.java M core/impl/src/main/java/org/jboss/seam/mail/core/MailSessionAuthenticator.java M core/impl/src/main/java/org/jboss/seam/mail/core/MailSessionProducer.java M core/impl/src/main/java/org/jboss/seam/mail/core/RootMimeMessage.java M core/impl/src/main/java/org/jboss/seam/mail/templating/TemplatingException.java M core/impl/src/main/java/org/jboss/seam/mail/util/EmailAttachmentUtil.java M core/impl/src/main/java/org/jboss/seam/mail/util/MailTestUtil.java M core/impl/src/main/java/org/jboss/seam/mail/util/MailUtility.java M core/impl/src/main/java/org/jboss/seam/mail/util/Strings.java M core/impl/src/main/resources/META-INF/beans.xml M core/impl/src/test/java/org/jboss/mail/core/test/InternetAddressTest.java M examples/sendmail/pom.xml M examples/sendmail/src/main/java/org/jboss/seam/mail/example/Gmail.java M examples/sendmail/src/main/java/org/jboss/seam/mail/example/GmailSessionProducer.java M examples/sendmail/src/main/java/org/jboss/seam/mail/example/Person.java M examples/sendmail/src/main/java/org/jboss/seam/mail/example/SendMail.java M examples/sendmail/src/main/resources-jbossas/default-ds.xml M examples/sendmail/src/main/resources/META-INF/seam-beans.xml M examples/sendmail/src/main/webapp/META-INF/context.xml M examples/sendmail/src/main/webapp/WEB-INF/beans.xml M examples/sendmail/src/main/webapp/WEB-INF/faces-config.xml M examples/sendmail/src/main/webapp/WEB-INF/sun-web.xml M examples/sendmail/src/main/webapp/WEB-INF/templates/default.xhtml M examples/sendmail/src/main/webapp/WEB-INF/web.xml M examples/sendmail/src/main/webapp/home.xhtml M examples/sendmail/src/main/webapp/resources/css/screen.css M examples/sendmail/src/test/java/org/jboss/seam/mail/FreeMarkerMailMessageTest.java M examples/sendmail/src/test/java/org/jboss/seam/mail/MailMessageTest.java M examples/sendmail/src/test/java/org/jboss/seam/mail/SeamRenderMailMessageTest.java M examples/sendmail/src/test/java/org/jboss/seam/mail/VelocityMailMessageTest.java M examples/sendmail/src/test/java/org/jboss/seam/mail/util/MavenArtifactResolver.java M examples/sendmail/src/test/java/org/jboss/seam/mail/util/SMTPAuthenticator.java M examples/sendmail/src/test/resources/arquillian.xml M freemarker/impl/src/main/java/org/jboss/seam/mail/templating/freemarker/FreeMarkerTemplate.java M freemarker/impl/src/main/resources/META-INF/beans.xml M seam-render/impl/src/main/java/org/jboss/seam/mail/templating/render/RenderTemplate.java M seam-render/impl/src/main/resources/META-INF/beans.xml M velocity/impl/src/main/java/org/jboss/seam/mail/templating/velocity/CDIVelocityContext.java M velocity/impl/src/main/java/org/jboss/seam/mail/templating/velocity/VelocityTemplate.java M velocity/impl/src/main/resources/META-INF/beans.xml Log Message: ----------- Merge branch 'master' of ../master-mail Conflicts: core/api/src/main/java/org/jboss/seam/mail/api/MailMessage.java core/impl/src/main/java/org/jboss/seam/mail/core/MailMessageImpl.java