You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2018/05/22 08:04:43 UTC
[5/8] james-project git commit: Merge branch 'JAMES-2399'
Merge branch 'JAMES-2399'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/956c0983
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/956c0983
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/956c0983
Branch: refs/heads/master
Commit: 956c0983cf93cc5b70921caf93a6e78cd3280288
Parents: aeb1f14 8e5f2cc
Author: Matthieu Baechler <ma...@apache.org>
Authored: Tue May 22 10:02:50 2018 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Tue May 22 10:02:50 2018 +0200
----------------------------------------------------------------------
.../dto/QuotaThresholdChangedEventDTO.java | 15 +-
.../mailbox/quota/cassandra/dto/DTOTest.java | 9 +-
.../src/test/resources/json/event.json | 2 +-
.../src/test/resources/json/event2.json | 2 +-
.../src/test/resources/json/event3.json | 2 +-
.../src/test/resources/json/event4.json | 2 +-
mailbox/plugin/quota-mailing/pom.xml | 30 +--
.../QuotaMailingListenerConfiguration.java | 100 +++++++++-
.../mailing/aggregates/UserQuotaThresholds.java | 43 ++++-
.../DetectThresholdCrossingHandler.java | 4 +-
.../QuotaThresholdCrossingListener.java | 40 +++-
.../mailbox/quota/model/QuotaThresholds.java | 16 ++
.../QuotaMailingListenerConfigurationTest.java | 181 +++++++++++++++++++
.../aggregates/UserQuotaThresholdsTest.java | 43 ++++-
.../QuotaThresholdListenersTestSystem.java | 4 +-
.../quota/model/QuotaThresholdsTest.java | 9 +
server/container/guice/cassandra-guice/pom.xml | 4 -
.../mailbox/CassandraQuotaMailingModule.java | 2 -
.../org/apache/james/CassandraJmapTestRule.java | 5 +-
.../guice/mailbox-plugin-quota-mailing/pom.xml | 45 -----
.../modules/mailbox/QuotaMailingModule.java | 41 -----
.../modules/mailbox/ListenerConfiguration.java | 23 ++-
.../mailbox/MailboxListenersLoaderImpl.java | 7 +-
.../mailbox/MailboxListenersLoaderImplTest.java | 8 +-
server/container/guice/memory-guice/pom.xml | 8 +-
.../org/apache/james/MemoryJamesServerMain.java | 7 +-
.../org/apache/james/MemoryJmapTestRule.java | 8 +-
server/container/guice/pom.xml | 6 -
.../org/apache/james/util/TimeConverter.java | 74 ++++----
.../apache/james/util/TimeConverterTest.java | 20 ++
.../CassandraGetMessageListMethodTest.java | 4 +-
.../src/test/resources/listeners.xml | 15 ++
.../integration/GetMessageListMethodTest.java | 1 +
.../methods/integration/QuotaMailingTest.java | 48 ++++-
.../memory/MemoryGetMessageListMethodTest.java | 3 +-
.../src/test/resources/listeners.xml | 15 ++
36 files changed, 633 insertions(+), 213 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org