Merge remote-tracking branch 'linagora/pr/986'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8c460636 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8c460636 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8c460636 Branch: refs/heads/master Commit: 8c46063609ed9ea8e1a189d83342e7865c55a788 Parents: 4c3e040 c15f403 Author: Matthieu Baechler <matth...@apache.org> Authored: Thu Sep 28 09:57:50 2017 +0200 Committer: Matthieu Baechler <matth...@apache.org> Committed: Thu Sep 28 09:57:50 2017 +0200 ---------------------------------------------------------------------- mailbox/cassandra/pom.xml | 1 - mailbox/elasticsearch/pom.xml | 1 - mailbox/store/pom.xml | 1 - mailet/icalendar/pom.xml | 1 - mailet/standard/pom.xml | 13 ++ .../transport/mailets/AmqpForwardAttribute.java | 40 +++-- .../transport/mailets/ContactExtractor.java | 130 +++++++++++++++ .../mailets/AmqpForwardAttributeTest.java | 48 +++++- .../transport/mailets/ContactExtractorTest.java | 142 ++++++++++++++++ pom.xml | 5 + server/mailet/integration-testing/pom.xml | 5 + .../mailets/configuration/CommonProcessors.java | 161 ++++++++++-------- .../configuration/MailetConfiguration.java | 66 +++++--- .../configuration/MailetConfigurationTest.java | 70 ++++++++ .../crypto/SMIMEDecryptIntegrationTest.java | 26 +-- .../crypto/SMIMESignIntegrationTest.java | 54 +++--- .../mailets/AmqpForwardAttachmentTest.java | 41 ++--- .../transport/mailets/ContactExtractorTest.java | 166 +++++++++++++++++++ .../transport/mailets/GroupMappingTest.java | 42 +++-- .../mailets/ICSAttachmentWorkflowTest.java | 50 +++--- .../transport/mailets/StripAttachmentTest.java | 33 ++-- .../src/test/resources/logback-test.xml | 15 ++ server/protocols/jmap/pom.xml | 1 - .../apache/james/utils/SMTPMessageSender.java | 11 +- 24 files changed, 905 insertions(+), 218 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
