Merge remote-tracking branch 'benoit/JAMES-1854'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/def450ba Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/def450ba Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/def450ba Branch: refs/heads/master Commit: def450ba2c76f34bbd2929811488f913a86399e9 Parents: 2a30769 83d60cb Author: Raphael Ouazana <[email protected]> Authored: Wed Nov 23 14:47:49 2016 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Wed Nov 23 14:47:49 2016 +0100 ---------------------------------------------------------------------- .../guice/destination/conf/mailetcontainer.xml | 1 + .../spring/destination/conf/mailetcontainer.xml | 1 + .../java/org/apache/mailet/MailAddress.java | 4 + .../mailet/base/test/FakeMailContext.java | 91 +- .../main/resources/mailetcontainer-template.xml | 1 + .../apache/james/utils/ExtendedServerProbe.java | 2 + .../apache/james/utils/GuiceServerProbe.java | 7 +- .../apache/james/user/api/UsersRepository.java | 10 + .../file/SieveFileRepository.java | 2 +- .../user/ldap/ReadOnlyUsersLDAPRepository.java | 6 + .../james/user/lib/AbstractUsersRepository.java | 10 + .../user/lib/AbstractUsersRepositoryTest.java | 21 + .../org/apache/james/mailets/SieveDelivery.java | 98 ++ .../mailets/configuration/CommonProcessors.java | 4 + .../james/mailets/utils/IMAPMessageReader.java | 6 +- .../impl/JamesMailetContext.java | 7 +- .../impl/camel/CamelProcessor.java | 3 + server/mailet/mailets/pom.xml | 22 + .../james/transport/mailets/LocalDelivery.java | 131 +-- .../james/transport/mailets/RemoteDelivery.java | 10 +- .../transport/mailets/ResourceLocatorImpl.java | 62 -- .../apache/james/transport/mailets/Sieve.java | 139 +++ .../james/transport/mailets/SieveMailet.java | 223 ----- .../transport/mailets/ToRecipientFolder.java | 98 +- .../james/transport/mailets/ToSenderFolder.java | 100 +- .../mailets/delivery/DeliveryUtils.java | 34 + .../mailets/delivery/MailDispatcher.java | 153 +++ .../transport/mailets/delivery/MailStore.java | 31 + .../mailets/delivery/MailboxAppender.java | 117 +++ .../mailets/delivery/SimpleMailStore.java | 111 +++ .../transport/mailets/jsieve/ActionContext.java | 3 +- .../mailets/jsieve/CommonsLoggingAdapter.java | 97 +- .../mailets/jsieve/FileIntoAction.java | 35 +- .../james/transport/mailets/jsieve/Poster.java | 4 +- .../mailets/jsieve/RedirectAction.java | 1 - .../transport/mailets/jsieve/RejectAction.java | 2 - .../mailets/jsieve/ResourceLocator.java | 69 +- .../mailets/jsieve/SieveMailAdapter.java | 3 +- .../mailets/jsieve/SieveMailboxMailet.java | 463 --------- .../mailets/jsieve/delivery/SieveExecutor.java | 157 +++ .../delivery/SieveFailureMessageComposer.java | 59 ++ .../mailets/jsieve/delivery/SievePoster.java | 104 ++ .../matchers/AbstractStorageQuota.java | 20 +- .../james/transport/util/MailetContextLog.java | 734 -------------- .../james/transport/mailets/BounceTest.java | 11 +- .../mailets/ResourceLocatorImplTest.java | 57 -- .../transport/mailets/ResourceLocatorTest.java | 69 ++ .../mailets/delivery/DeliveryUtilsTest.java | 40 + .../mailets/delivery/LocalDeliveryTest.java | 139 ++- .../mailets/delivery/MailDispatcherTest.java | 258 +++++ .../mailets/delivery/MailboxAppenderTest.java | 145 +++ .../mailets/delivery/SieveIntegrationTest.java | 976 +++++++++++++++++++ .../mailets/delivery/SieveMailetTest.java | 946 ------------------ .../mailets/delivery/SimpleMailStoreTest.java | 115 +++ .../mailets/delivery/ToRecipientFolderTest.java | 80 +- .../jsieve/CommonsLoggingAdapterTest.java | 259 +++++ .../managesieve/ManageSieveMailetTestCase.java | 6 +- .../james/fetchmail/MessageProcessor.java | 16 +- .../src/test/resources/mailetcontainer.xml | 1 + .../src/test/resources/mailetcontainer.xml | 1 + .../src/test/resources/mailetcontainer.xml | 1 + 61 files changed, 3365 insertions(+), 3011 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
