Merge remote-tracking branch 'btellier/JAMES-2089'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9d8d71cd Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9d8d71cd Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9d8d71cd Branch: refs/heads/master Commit: 9d8d71cd0a35ba0fb4edba8d943030b4ac970560 Parents: 01c3bd1 8b9824c Author: Antoine Duprat <[email protected]> Authored: Wed Jul 5 08:52:44 2017 +0200 Committer: Antoine Duprat <[email protected]> Committed: Wed Jul 5 08:52:44 2017 +0200 ---------------------------------------------------------------------- mpt/LICENSE.apache | 176 ---- mpt/RELEASE_NOTES.txt | 19 - server/README.txt | 62 -- server/app/README | 8 - server/app/README.txt | 31 - .../src/main/resources/dnsservice-template.xml | 65 -- server/app/src/main/resources/dnsservice.xml | 65 ++ .../src/main/resources/domainlist-template.xml | 63 -- server/app/src/main/resources/domainlist.xml | 63 ++ .../app/src/main/resources/events-template.xml | 90 -- server/app/src/main/resources/events.xml | 90 ++ .../src/main/resources/fetchmail-template.xml | 288 ------ server/app/src/main/resources/fetchmail.xml | 288 ++++++ .../src/main/resources/hbase-site-template.xml | 33 - .../src/main/resources/imapserver-template.xml | 77 -- server/app/src/main/resources/imapserver.xml | 77 ++ .../app/src/main/resources/indexer-template.xml | 33 - server/app/src/main/resources/indexer.xml | 33 + .../james-database-template.properties | 40 - .../main/resources/james-database.properties | 40 + .../main/resources/jcr-repository-template.xml | 72 -- .../app/src/main/resources/jcr-repository.xml | 72 ++ .../src/main/resources/jmx-template.properties | 28 - server/app/src/main/resources/jmx.properties | 28 + .../src/main/resources/lmtpserver-template.xml | 77 -- server/app/src/main/resources/lmtpserver.xml | 77 ++ .../main/resources/log4j-template.properties | 140 --- .../src/main/resources/mailbox-jcr-template.cnd | 74 -- server/app/src/main/resources/mailbox-jcr.cnd | 74 ++ .../mailbox-maildir-template.properties | 25 - .../main/resources/mailbox-maildir.properties | 25 + .../app/src/main/resources/mailbox-template.xml | 34 - server/app/src/main/resources/mailbox.xml | 34 + .../main/resources/mailetcontainer-template.xml | 518 ---------- .../app/src/main/resources/mailetcontainer.xml | 518 ++++++++++ .../resources/mailrepositorystore-template.xml | 96 -- .../src/main/resources/mailrepositorystore.xml | 96 ++ .../resources/managesieveserver-template.xml | 95 -- .../src/main/resources/managesieveserver.xml | 95 ++ .../src/main/resources/pop3server-template.xml | 81 -- server/app/src/main/resources/pop3server.xml | 81 ++ .../app/src/main/resources/quota-template.xml | 132 --- server/app/src/main/resources/quota.xml | 132 +++ .../recipientrewritetable-template.xml | 57 -- .../main/resources/recipientrewritetable.xml | 57 ++ .../main/resources/sieverepository-template.xml | 23 - .../app/src/main/resources/sieverepository.xml | 23 + .../src/main/resources/smtpserver-template.xml | 324 ------- server/app/src/main/resources/smtpserver.xml | 324 +++++++ .../main/resources/sqlResources-template.xml | 938 ------------------- .../main/resources/usersrepository-template.xml | 81 -- .../app/src/main/resources/usersrepository.xml | 81 ++ .../resources/usersrepository23-template.xml | 36 - .../src/main/resources/usersrepository23.xml | 36 + 54 files changed, 2409 insertions(+), 3816 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
