[zanata/zanata] c47d99: Add configurable email logging appender.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: c47d9969eb4ddcd5da96194dcd49f78a03762992
      https://github.com/zanata/zanata/commit/c47d9969eb4ddcd5da96194dcd49f78a03762992
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Add configurable email logging appender.


  Commit: 4ba07fe7d02e9b0881458a885c34621e617a8ac0
      https://github.com/zanata/zanata/commit/4ba07fe7d02e9b0881458a885c34621e617a8ac0
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Merge branch '1.6' of github.com:zanata/zanata into 1.6


  Commit: c182b54e4dffa9ba581d2879332b93b6405fe39d
      https://github.com/zanata/zanata/commit/c182b54e4dffa9ba581d2879332b93b6405fe39d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Merge branch '1.6' into integration/master


Compare: https://github.com/zanata/zanata/compare/9d6128bbc708...c182b54e4dff