Merge remote-tracking branch 'btellier/JAMES-2085'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1128983f Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1128983f Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1128983f Branch: refs/heads/master Commit: 1128983f434f6a4d5f470af6dd2a63b31ffa9e14 Parents: 9d8d71c 5da9d3d Author: Antoine Duprat <adup...@linagora.com> Authored: Wed Jul 5 15:58:27 2017 +0200 Committer: Antoine Duprat <adup...@linagora.com> Committed: Wed Jul 5 15:58:27 2017 +0200 ---------------------------------------------------------------------- .../exception/MalformedSoredACLException.java | 38 ---- .../james/mailbox/model/MessageResult.java | 4 +- .../CacheInvalidatingMailboxListener.java | 8 +- .../mail/CassandraMailboxMapperTest.java | 6 +- ...lasticSearchListeningMessageSearchIndex.java | 22 +- .../json/IndexableMessageTest.java | 32 --- .../hbase/HBaseNonTransactionalMapper.java | 1 - .../lucene/search/LuceneMessageSearchIndex.java | 2 +- .../maildir/mail/MaildirMailboxMapper.java | 5 +- .../maildir/mail/MaildirMessageMapper.java | 25 +- .../james/mailbox/store/MimeDescriptorImpl.java | 6 +- .../james/mailbox/store/ResultHeader.java | 4 +- .../mailbox/store/StoreMessageIdManager.java | 37 +-- .../dto/MessageMetaDataDataTransferObject.java | 2 +- .../store/search/LazyMessageSearchIndex.java | 3 +- .../search/ListeningMessageSearchIndex.java | 9 +- .../mailbox/store/search/MessageSearches.java | 2 +- .../james/mailbox/store/search/SearchUtil.java | 11 +- .../comparator/AbstractHeaderComparator.java | 17 +- .../store/streaming/FullByteContent.java | 6 +- .../mailbox/store/search/SearchUtilTest.java | 35 --- .../james/mailbox/jpa/migrator/JpaMigrator.java | 17 +- .../mailbox/jpa/migrator/JpaMigratorTest.java | 67 ++---- .../apache/mailet/base/FlowedMessageUtils.java | 12 +- .../org/apache/mailet/base/StringUtils.java | 2 +- .../transport/mailets/SMIMECheckSignature.java | 1 - .../james/transport/mailets/ClamAVScan.java | 85 +------ .../james/transport/mailets/LogMessage.java | 1 + .../james/mpt/protocol/ProtocolSession.java | 29 +-- .../james/mpt/session/ImapSessionImpl.java | 2 - .../mpt/user/InMemoryMailboxUserManager.java | 2 - .../apache/james/protocols/api/Protocol.java | 6 + .../james/protocols/api/ProtocolImpl.java | 3 + .../api/future/FutureResponseImpl.java | 10 +- .../imap/api/display/HumanReadableText.java | 6 + .../james/imap/api/message/MessageFlags.java | 2 +- .../imap/processor/AbstractAuthProcessor.java | 4 +- .../processor/AbstractMailboxProcessor.java | 3 +- .../AbstractMessageRangeProcessor.java | 9 +- .../processor/AbstractSelectionProcessor.java | 2 +- .../james/imap/processor/AppendProcessor.java | 19 +- .../james/imap/processor/CloseProcessor.java | 4 +- .../james/imap/processor/CreateProcessor.java | 4 +- .../imap/processor/DeleteACLProcessor.java | 6 +- .../james/imap/processor/DeleteProcessor.java | 4 +- .../james/imap/processor/ExpungeProcessor.java | 4 +- .../james/imap/processor/GetACLProcessor.java | 6 +- .../imap/processor/GetAnnotationProcessor.java | 2 +- .../james/imap/processor/IdleProcessor.java | 11 +- .../james/imap/processor/LSubProcessor.java | 4 +- .../james/imap/processor/ListProcessor.java | 25 +- .../imap/processor/ListRightsProcessor.java | 6 +- .../james/imap/processor/LogoutProcessor.java | 4 +- .../james/imap/processor/MyRightsProcessor.java | 5 +- .../james/imap/processor/RenameProcessor.java | 6 +- .../james/imap/processor/SearchProcessor.java | 6 +- .../james/imap/processor/SetACLProcessor.java | 6 +- .../imap/processor/SetAnnotationProcessor.java | 2 +- .../james/imap/processor/StatusProcessor.java | 4 +- .../james/imap/processor/StoreProcessor.java | 8 +- .../imap/processor/SystemMessageProcessor.java | 6 +- .../processor/base/SelectedMailboxImpl.java | 4 +- .../processor/fetch/ContentBodyElement.java | 2 +- .../imap/processor/fetch/EnvelopeBuilder.java | 2 +- .../imap/processor/fetch/FetchProcessor.java | 12 +- .../imap/processor/fetch/MimeBodyElement.java | 6 +- .../james/protocols/imap/IMAPRequest.java | 6 +- .../james/imap/decode/parser/MockLogger.java | 3 +- .../netty/BasicChannelUpstreamHandler.java | 16 +- .../james/cli/probe/impl/JmxMailboxProbe.java | 3 - .../java/org/apache/james/core/MailImpl.java | 8 +- .../james/core/MimeMessageCopyOnWriteProxy.java | 14 -- .../core/MimeMessageCopyOnWriteProxyTest.java | 6 +- .../james/core/MimeMessageWrapperTest.java | 81 +++---- .../org/apache/james/GuiceJamesServerTest.java | 7 +- .../AbstractLoaderBeanFactory.java | 9 +- .../MailRepositoryStoreBeanFactory.java | 9 +- .../osgi/OSGIConfigurationProvider.java | 1 - .../spring/tool/James23ImporterManagement.java | 48 +--- .../util/bayesian/JDBCBayesianAnalyzer.java | 6 + .../mailrepository/file/FileMailRepository.java | 3 +- .../mailrepository/jcr/JCRMailRepository.java | 15 +- .../user/jdbc/AbstractJdbcUsersRepository.java | 5 - .../repository/file/AbstractFileRepository.java | 39 ++-- .../domainlist/lib/AbstractDomainListTest.java | 8 +- .../AbstractMailRepositoryTest.java | 9 +- .../dnsservice/dnsjava/DNSJavaService.java | 4 +- .../dnsservice/dnsjava/DNSJavaServiceTest.java | 4 + .../lib/AbstractStateMailetProcessor.java | 4 +- .../AbstractStateCompositeProcessorTest.java | 85 +++---- .../transport/mailets/BayesianAnalysis.java | 1 + .../mailets/BayesianAnalysisFeeder.java | 4 +- .../transport/mailets/WhiteListManager.java | 3 + ...ddressesArrayToMailAddressListConverter.java | 2 +- .../mailets/remoteDelivery/MailDelivrer.java | 8 +- .../integration/cucumber/DownloadStepdefs.java | 2 - .../java/org/apache/james/jmap/JMAPServlet.java | 7 +- .../james/jmap/methods/RequestHandler.java | 2 +- .../methods/SetMailboxesUpdateProcessor.java | 4 + .../james/jmap/methods/SetMessagesMethod.java | 9 +- .../apache/james/jmap/model/MailboxFactory.java | 7 +- .../james/jmap/send/PostDequeueDecorator.java | 2 +- .../netty/ImapChannelUpstreamHandler.java | 3 +- .../imapserver/netty/ImapIdleStateHandler.java | 4 +- .../netty/AbstractConfigurableAsyncServer.java | 11 +- .../hook/MailboxDeliverToRecipientHandler.java | 10 +- .../ManageSieveChannelUpstreamHandler.java | 3 +- .../james/smtpserver/MailPriorityHandler.java | 2 +- .../SenderAuthIdentifyVerificationRcptHook.java | 4 +- .../james/smtpserver/SetMimeHeaderHandler.java | 2 +- .../org/apache/james/smtpserver/TLDLookup.java | 9 +- .../fastfail/JDBCGreylistHandler.java | 2 +- .../smtpserver/fastfail/MaxRcptHandler.java | 3 +- .../fastfail/MaxUnknownCmdHandler.java | 3 +- .../smtpserver/fastfail/URIRBLHandler.java | 3 +- .../smtpserver/jmx/SMTPCommandHandlerStats.java | 5 +- .../apache/james/smtpserver/SMTPServerTest.java | 9 +- .../james/smtpserver/ValidRcptHandlerTest.java | 2 - .../james/queue/activemq/ActiveMQMailQueue.java | 46 +--- .../queue/activemq/ActiveMQMailQueueItem.java | 5 +- .../james/queue/activemq/EmbeddedActiveMQ.java | 6 +- .../activemq/ActiveMQMailQueueBlobTest.java | 12 - .../org/apache/james/queue/api/MailQueue.java | 2 +- .../james/queue/api/mock/MockMailQueue.java | 16 +- .../apache/james/queue/jms/JMSMailQueue.java | 227 ++++++------------- .../james/queue/jms/JMSMailQueueItem.java | 22 +- .../jms/MimeMessageObjectMessageSource.java | 15 +- .../queue/jms/AbstractJMSMailQueueTest.java | 17 +- .../james/queue/jms/JMSMailQueueTest.java | 10 - 129 files changed, 542 insertions(+), 1061 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
