[zanata/zanata-server] dee142: Use Velocity to generate email

GitHub noreply at github.com
Thu Jul 24 00:55:02 UTC 2014


  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: dee14288ab106ab212af7865077a0f2ba3b42d36
      https://github.com/zanata/zanata-server/commit/dee14288ab106ab212af7865077a0f2ba3b42d36
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    A zanata-war/src/main/java/org/zanata/email/ActivationEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/Addresses.java
    A zanata-war/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    A zanata-war/src/main/java/org/zanata/email/EmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/EmailUtil.java
    A zanata-war/src/main/java/org/zanata/email/EmailValidationEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/java/org/zanata/seam/mail/ZanataMailSession.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/activation.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_admin.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_role_language.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_validation.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/password_reset.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/username_changed.vm
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A zanata-war/src/test/java/org/zanata/email/EmailBuilderITCase.java
    A zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    A zanata-war/src/test/java/org/zanata/email/EmailUtilTest.java

  Log Message:
  -----------
  Use Velocity to generate email

https://github.com/zanata/zanata-server/pull/534

Squashed commit of the following:

commit cd0fbee650b4e92b9ccd795a9410259e87d8d2ca
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Jul 22 14:14:35 2014 +1000

    Update unit test: HTML should appear after text

commit 58f956aa565815b47655213441f02df76a0070a9
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 18 18:10:50 2014 +1000

    Add @AutoCreate to injected components

commit d035448add298583965b7bb2abf87f6d94147427
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 18 18:08:27 2014 +1000

    Construct Reply-To correctly

commit 8ee323c2b561b415b8898e5e8a04457adecb90db
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 18 17:58:24 2014 +1000

    Add HTML mail part after text; produce text version of the HTML body

commit bae62c5a5f417600bc2bd0718f34649caceb0762
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Jul 14 17:13:36 2014 +1000

    Refactor email-handling code and fix injection of mailSession

    Eliminate redundant template "email_activation.vm".
    Rename EmailUtil -> Addresses and use it more.
    Rename EmailBuilderStrategy -> EmailStrategy.
    Move all EmailStrategy classes to top-level under org.zanata.email.
    Ensure that all emails go through EmailService and get FacesMessages
       from Msgs so that they can be localised.

commit 8365f539ea292770257821f2953785c268199365
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Jul 14 12:22:28 2014 +1000

    Make EmailBuilder into a component

commit 6f9ec47af5e5227fb3a68962ea97e34f54063b73
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 11 12:46:36 2014 +1000

    Use Velocity to generate email




More information about the zanata-commits mailing list