Merge remote-tracking branch 'rouazana/JAMES-1691-2'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/00678d88 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/00678d88 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/00678d88 Branch: refs/heads/master Commit: 00678d88135fce013ef6bcec7ac3e813b910a05b Parents: ca25b82 a7d6601 Author: Antoine Duprat <[email protected]> Authored: Tue Mar 1 14:46:43 2016 +0100 Committer: Antoine Duprat <[email protected]> Committed: Tue Mar 1 14:46:43 2016 +0100 ---------------------------------------------------------------------- .../org/apache/james/jmap/JMAPCommonModule.java | 2 +- .../modules/server/ActiveMQQueueModule.java | 19 +- .../james/jmap/methods/GetMessagesMethod.java | 2 +- .../james/jmap/methods/SetMessagesMethod.java | 2 +- .../methods/SetMessagesUpdateProcessor.java | 2 +- .../org/apache/james/jmap/model/MessageId.java | 3 +- .../apache/james/jmap/send/MailMetadata.java | 64 +++++ .../org/apache/james/jmap/send/MailSpool.java | 45 ++++ .../james/jmap/send/PostDequeueDecorator.java | 159 ++++++++++++ .../jmap/send/PostDequeueDecoratorFactory.java | 51 ++++ .../MailShouldBeInOutboxException.java | 30 +++ .../exception/MailboxRoleNotFoundException.java | 30 +++ .../exception/MessageIdNotFoundException.java | 30 +++ .../org/apache/james/jmap/utils/MailSpool.java | 43 ---- .../james/jmap/send/MailMetadataTest.java | 38 +++ .../apache/james/jmap/send/MailSpoolTest.java | 107 ++++++++ .../jmap/send/PostDequeueDecoratorTest.java | 257 +++++++++++++++++++ .../apache/james/jmap/utils/MailSpoolTest.java | 106 -------- .../james/queue/activemq/ActiveMQMailQueue.java | 12 +- .../activemq/ActiveMQMailQueueFactory.java | 11 +- .../META-INF/spring/activemq-queue-context.xml | 10 +- .../queue/activemq/ActiveMQMailQueueTest.java | 5 +- server/queue/queue-api/pom.xml | 25 +- .../api/MailQueueItemDecoratorFactory.java | 61 +++++ .../apache/james/queue/file/FileMailQueue.java | 8 +- .../james/queue/file/FileMailQueueFactory.java | 7 +- .../apache/james/queue/jms/JMSMailQueue.java | 51 ++-- .../james/queue/jms/JMSMailQueueFactory.java | 11 +- .../queue/jms/AbstractJMSMailQueueTest.java | 43 ++-- 29 files changed, 1009 insertions(+), 225 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
