Merge branch 'JAMES-2135'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/238d1c79 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/238d1c79 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/238d1c79 Branch: refs/heads/master Commit: 238d1c7996623987e234755a813bf83dbffd3a7d Parents: daaa36a 8aecdf0 Author: Matthieu Baechler <[email protected]> Authored: Mon Sep 11 11:29:09 2017 +0200 Committer: Matthieu Baechler <[email protected]> Committed: Mon Sep 11 11:29:09 2017 +0200 ---------------------------------------------------------------------- .../james/mailets/AddDeliveredToHeaderTest.java | 2 +- .../mailets/CommonMailetConfigurationTest.java | 2 +- .../RecipientRewriteTableIntegrationTest.java | 2 +- .../org/apache/james/mailets/SieveDelivery.java | 2 +- .../crypto/SMIMEDecryptIntegrationTest.java | 2 +- .../crypto/SMIMESignIntegrationTest.java | 2 +- .../james/mailets/utils/SMTPMessageSender.java | 117 --------- .../mailets/AmqpForwardAttachmentTest.java | 2 +- .../mailets/ICSAttachmentWorkflowTest.java | 32 ++- .../transport/mailets/StripAttachmentTest.java | 2 +- .../src/test/resources/eml/calendar.eml | 42 ++++ .../cassandra-jmap-integration-testing/pom.xml | 6 + .../src/test/resources/mailetcontainer.xml | 1 + .../jmap-integration-testing-common/pom.xml | 6 + .../integration/SetMessagesMethodTest.java | 76 +++++- .../src/test/resources/eml/calendar.eml | 42 ++++ .../memory-jmap-integration-testing/pom.xml | 6 + .../src/test/resources/mailetcontainer.xml | 1 + .../mailet/TextCalendarBodyToAttachment.java | 108 +++++++++ .../TextCalendarBodyToAttachmentTest.java | 243 +++++++++++++++++++ .../jmap/src/test/resources/calendar.eml | 42 ++++ server/testing/pom.xml | 4 + .../apache/james/utils/SMTPMessageSender.java | 117 +++++++++ 23 files changed, 719 insertions(+), 140 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
