[seam-commits] [seam/mail] 5e30ec: Merge branch 'master' into freekmarker

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/seam/mail

Commit: 5e30ec7e3fa75e4c65518c6c3096628b18c88c63
    https://github.com/seam/mail/commit/5e30ec7e3fa75e4c65518c6c3096628b18c88c63
Author: Cody Lerum <cody.lerum at gmail.com>
Date:   2011-03-03 (Thu, 03 Mar 2011)

Changed paths:
  M examples/sendmail/src/test/java/org/jboss/seam/mail/VelocityMailMessageTest.java

Log Message:
-----------
Merge branch 'master' into freekmarker


Commit: 287fdff6f93b060d8aafb15b6389b9ab066e91fc
    https://github.com/seam/mail/commit/287fdff6f93b060d8aafb15b6389b9ab066e91fc
Author: Cody Lerum <cody.lerum at gmail.com>
Date:   2011-03-03 (Thu, 03 Mar 2011)

Changed paths:
  A core/api/src/main/java/org/jboss/seam/mail/core/MailTemplate.java
  R core/impl/src/main/java/org/jboss/seam/mail/core/ClassPathEmailAttachment.java
  A core/impl/src/main/java/org/jboss/seam/mail/templating/ClassPathEmailAttachment.java
  A core/impl/src/main/java/org/jboss/seam/mail/templating/ClassPathTemplate.java
  A core/impl/src/main/java/org/jboss/seam/mail/templating/FileTemplate.java
  A core/impl/src/main/java/org/jboss/seam/mail/templating/InputStreamMailTemplate.java
  A core/impl/src/main/java/org/jboss/seam/mail/templating/TemplatingException.java
  A core/impl/src/main/java/org/jboss/seam/mail/templating/TextTemplate.java
  M examples/sendmail/pom.xml
  M examples/sendmail/src/main/java/org/jboss/seam/mail/example/SendMail.java
  R examples/sendmail/src/main/resources/META-INF/template.text.velocity
  M examples/sendmail/src/main/resources/template.html.freemarker
  M examples/sendmail/src/main/resources/template.html.velocity
  M examples/sendmail/src/main/resources/template.text.freemarker
  M examples/sendmail/src/main/resources/template.text.velocity
  M examples/sendmail/src/main/webapp/home.xhtml
  A 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/VelocityMailMessageTest.java
  A freemarker/api/src/main/java/org/jboss/seam/mail/templating/FreeMarkerMailMessage.java
  R freemarker/api/src/main/java/org/jboss/seam/mail/templating/TemplatingException.java
  R freemarker/api/src/main/java/org/jboss/seam/mail/templating/VelocityMailMessage.java
  R freemarker/api/src/main/java/org/jboss/seam/mail/templating/VelocityTemplate.java
  R freemarker/impl/src/main/java/org/jboss/seam/mail/templating/MailTemplate.java
  A freemarker/impl/src/main/java/org/jboss/seam/mail/templating/freemarker/FreeMarkerMailMessageImpl.java
  R freemarker/impl/src/main/java/org/jboss/seam/mail/templating/velocity/ClassPathTemplate.java
  R freemarker/impl/src/main/java/org/jboss/seam/mail/templating/velocity/FileTemplate.java
  R freemarker/impl/src/main/java/org/jboss/seam/mail/templating/velocity/FreeMarkerMailMessageImpl.java
  R freemarker/impl/src/main/java/org/jboss/seam/mail/templating/velocity/TextTemplate.java
  R velocity/api/src/main/java/org/jboss/seam/mail/templating/TemplatingException.java
  M velocity/api/src/main/java/org/jboss/seam/mail/templating/VelocityMailMessage.java
  R velocity/api/src/main/java/org/jboss/seam/mail/templating/VelocityTemplate.java
  R velocity/impl/src/main/java/org/jboss/seam/mail/templating/MailTemplate.java
  R velocity/impl/src/main/java/org/jboss/seam/mail/templating/velocity/VelocityClassPathTemplate.java
  R velocity/impl/src/main/java/org/jboss/seam/mail/templating/velocity/VelocityFileTemplate.java
  M velocity/impl/src/main/java/org/jboss/seam/mail/templating/velocity/VelocityMailMessageImpl.java
  R velocity/impl/src/main/java/org/jboss/seam/mail/templating/velocity/VelocityTextTemplate.java

Log Message:
-----------
initial impl of FreeMarker


Compare: https://github.com/seam/mail/compare/bf74ebb...287fdff