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 ad...@apache.org on 2016/11/18 09:54:22 UTC

[29/29] james-project git commit: Merge remote-tracking branch 'quynhn/JPA_Guice'

Merge remote-tracking branch 'quynhn/JPA_Guice'


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/56acfd06
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/56acfd06
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/56acfd06

Branch: refs/heads/master
Commit: 56acfd067a5600c3403bbe8a14cbd91b945ba71a
Parents: 73a7c46 fd3c439
Author: Antoine Duprat <ad...@apache.org>
Authored: Fri Nov 18 10:53:22 2016 +0100
Committer: Antoine Duprat <ad...@apache.org>
Committed: Fri Nov 18 10:53:22 2016 +0100

----------------------------------------------------------------------
 dockerfiles/compilation/java-8/compile.sh       |   4 +-
 .../META-INF/spring/mailbox-cassandra.xml       |   4 +-
 .../org/apache/james/mailbox/jpa/JPAId.java     |   2 +-
 .../jpa/JPAMailboxSessionMapperFactory.java     |   2 +
 .../mailbox/jpa/JPASubscriptionManager.java     |   3 +
 .../mailbox/jpa/mail/JPAModSeqProvider.java     |   2 +
 .../james/mailbox/jpa/mail/JPAUidProvider.java  |   2 +
 .../jpa/openjpa/OpenJPAMailboxManager.java      |   3 +
 .../resources/META-INF/spring/mailbox-jpa.xml   |  12 +-
 .../lucene/search/LuceneMessageSearchIndex.java |   3 +-
 .../META-INF/spring/mailbox-maildir.xml         |   4 +-
 .../META-INF/spring/mailbox-memory.xml          |   4 +-
 .../META-INF/spring/spring-mailbox.xml          |   3 +-
 .../smtp/host/CassandraJamesSmtpHostSystem.java |   8 +-
 .../filesystem/api/AbstractFileSystemTest.java  |   1 -
 .../sample-configuration/cassandra.properties   |   6 +
 .../sample-configuration/dnsservice.xml         |  29 ++
 .../sample-configuration/domainlist.xml         |  28 ++
 .../elasticsearch.properties                    |  26 ++
 .../sample-configuration/imapserver.xml         |  54 +++
 .../sample-configuration/jmap.properties        |  11 +
 .../sample-configuration/jmx.properties         |  28 ++
 .../sample-configuration/lmtpserver.xml         |  41 +++
 .../sample-configuration/mailetcontainer.xml    | 138 ++++++++
 .../mailrepositorystore.xml                     |  34 ++
 .../sample-configuration/pop3server.xml         |  42 +++
 .../recipientrewritetable.xml                   |  27 ++
 .../sample-configuration/smtpserver.xml         | 105 ++++++
 .../sample-configuration/usersrepository.xml    |  27 ++
 .../org/apache/james/CassandraJamesServer.java  |  58 ++++
 .../apache/james/CassandraJamesServerMain.java  |   4 +-
 .../apache/james/CassandraJamesServerTest.java  |   6 +-
 .../james/JamesCapabilitiesServerTest.java      |   6 +-
 .../sample-configuration/cassandra.properties   |   6 -
 .../sample-configuration/dnsservice.xml         |  29 --
 .../sample-configuration/domainlist.xml         |  28 --
 .../elasticsearch.properties                    |  26 --
 .../sample-configuration/imapserver.xml         |  54 ---
 .../sample-configuration/jcr-repository.xml     |  72 ----
 .../sample-configuration/jmap.properties        |  11 -
 .../sample-configuration/jmx.properties         |  28 --
 .../sample-configuration/lmtpserver.xml         |  41 ---
 .../sample-configuration/mailetcontainer.xml    | 137 --------
 .../mailrepositorystore.xml                     |  34 --
 .../sample-configuration/pop3server.xml         |  42 ---
 .../recipientrewritetable.xml                   |  27 --
 .../sample-configuration/smtpserver.xml         | 105 ------
 .../sample-configuration/usersrepository.xml    |  27 --
 .../java/org/apache/james/GuiceJamesServer.java |  84 +----
 .../org/apache/james/GuiceJamesServerImpl.java  |  88 +++++
 .../java/org/apache/james/JmapJamesServer.java  |  23 ++
 .../main/java/org/apache/james/JmapServer.java  |  26 ++
 .../java/org/apache/james/WebAdminServer.java   |  25 ++
 .../java/org/apache/james/jmap/JMAPModule.java  |  15 -
 .../james/modules/CommonServicesModule.java     |   6 +-
 .../apache/james/modules/ProtocolsModule.java   |   2 -
 .../modules/data/SieveFileRepositoryModule.java |  36 ++
 .../modules/protocols/JMAPServerModule.java     |   3 +
 .../server/CamelMailetContainerModule.java      |  20 ++
 .../modules/server/WebAdminServerModule.java    |   3 +
 .../apache/james/utils/ExtendedServerProbe.java |   6 -
 .../java/org/apache/james/utils/GuiceProbe.java |  22 ++
 .../apache/james/utils/GuiceProbeProvider.java  |  47 +++
 .../apache/james/utils/GuiceServerProbe.java    |  22 +-
 .../org/apache/james/utils/JmapGuiceProbe.java  |  52 +++
 .../apache/james/utils/WebAdminGuiceProbe.java  |  37 +++
 .../apache/james/AbstractJamesServerTest.java   |  29 +-
 .../james/AbstractJmapJamesServerTest.java      | 140 ++++++++
 .../james/jmap/MailetPreconditionTest.java      |   5 +-
 .../james/utils/GuiceProbeProviderTest.java     |  67 ++++
 server/container/guice/jpa-guice/README.adoc    |  40 +++
 server/container/guice/jpa-guice/pom.xml        | 326 +++++++++++++++++++
 .../sample-configuration/dnsservice.xml         |  29 ++
 .../sample-configuration/domainlist.xml         |  28 ++
 .../sample-configuration/imapserver.xml         |  54 +++
 .../james-database.properties                   |  40 +++
 .../sample-configuration/jmx.properties         |  28 ++
 .../sample-configuration/lmtpserver.xml         |  41 +++
 .../sample-configuration/mailetcontainer.xml    | 137 ++++++++
 .../mailrepositorystore.xml                     |  34 ++
 .../sample-configuration/pop3server.xml         |  42 +++
 .../recipientrewritetable.xml                   |  27 ++
 .../sample-configuration/smtpserver.xml         | 105 ++++++
 .../sample-configuration/usersrepository.xml    |  27 ++
 .../java/org/apache/james/JPAConfiguration.java |  66 ++++
 .../org/apache/james/JPAJamesServerMain.java    |  50 +++
 .../james/modules/data/JPADataModule.java       |  32 ++
 .../james/modules/data/JPADomainListModule.java |  77 +++++
 .../data/JPARecipientRewriteTableModule.java    |  78 +++++
 .../modules/data/JPAUsersRepositoryModule.java  |  79 +++++
 .../james/modules/mailbox/JPAMailboxModule.java | 138 ++++++++
 .../mailbox/LuceneSearchMailboxModule.java      |  50 +++
 .../src/main/resources/META-INF/persistence.xml |  45 +++
 .../jpa-guice/src/main/resources/logback.xml    |  22 ++
 .../org/apache/james/JPAJamesServerTest.java    |  44 +++
 .../james/JamesCapabilitiesServerTest.java      |  75 +++++
 .../james/TestJPAConfigurationModule.java       |  48 +++
 .../jpa-guice/src/test/resources/dnsservice.xml |  29 ++
 .../test/resources/fakemailrepositorystore.xml  |  31 ++
 .../jpa-guice/src/test/resources/imapserver.xml |  54 +++
 .../guice/jpa-guice/src/test/resources/keystore | Bin 0 -> 2245 bytes
 .../jpa-guice/src/test/resources/lmtpserver.xml |  41 +++
 .../src/test/resources/mailetcontainer.xml      | 112 +++++++
 .../src/test/resources/mailrepositorystore.xml  |  31 ++
 .../src/test/resources/managesieveserver.xml    |  65 ++++
 .../jpa-guice/src/test/resources/pop3server.xml |  42 +++
 .../jpa-guice/src/test/resources/smtpserver.xml | 105 ++++++
 .../sample-configuration/dnsservice.xml         |  29 ++
 .../sample-configuration/domainlist.xml         |  28 ++
 .../sample-configuration/imapserver.xml         |  54 +++
 .../sample-configuration/jmap.properties        |  11 +
 .../sample-configuration/jmx.properties         |  28 ++
 .../sample-configuration/lmtpserver.xml         |  41 +++
 .../sample-configuration/mailetcontainer.xml    | 137 ++++++++
 .../mailrepositorystore.xml                     |  34 ++
 .../sample-configuration/pop3server.xml         |  42 +++
 .../recipientrewritetable.xml                   |  27 ++
 .../sample-configuration/smtpserver.xml         | 105 ++++++
 .../sample-configuration/usersrepository.xml    |  27 ++
 .../org/apache/james/MemoryJamesServer.java     |  56 ++++
 .../org/apache/james/MemoryJamesServerMain.java |   4 +-
 .../james/modules/data/MemoryDataModule.java    |   7 +-
 .../org/apache/james/MemoryJamesServerTest.java |   6 +-
 server/container/guice/pom.xml                  |   1 +
 .../james/domainlist/jpa/JPADomainList.java     |   2 +
 .../james/rrt/jpa/JPARecipientRewriteTable.java |  28 +-
 .../james/user/jpa/JPAUsersRepository.java      |   2 +
 .../james/mailets/TemporaryJamesServer.java     |  10 +-
 server/pom.xml                                  |   6 +
 .../CassandraGetMailboxesMethodTest.java        |   8 +-
 .../CassandraGetMessageListMethodTest.java      |   8 +-
 .../CassandraGetVacationResponseTest.java       |   8 +-
 .../CassandraJmapAuthenticationTest.java        |   8 +-
 .../CassandraSetMailboxesMethodTest.java        |   8 +-
 .../CassandraSetMessagesMethodTest.java         |   8 +-
 .../CassandraSetVacationResponseTest.java       |   8 +-
 .../CassandraVacationIntegrationTest.java       |   8 +-
 .../cassandra/cucumber/CassandraStepdefs.java   |   4 +-
 .../james/jmap/JMAPAuthenticationTest.java      |  13 +-
 .../james/jmap/VacationIntegrationTest.java     |  18 +-
 .../integration/GetMailboxesMethodTest.java     |  21 +-
 .../integration/GetMessageListMethodTest.java   |  13 +-
 .../integration/GetVacationResponseTest.java    |  33 +-
 .../integration/SetMailboxesMethodTest.java     |  21 +-
 .../integration/SetMessagesMethodTest.java      |  15 +-
 .../integration/SetVacationResponseTest.java    |  40 ++-
 .../integration/cucumber/MainStepdefs.java      |   7 +-
 .../integration/cucumber/UploadStepdefs.java    |   4 +-
 .../memory/MemoryGetMailboxesMethodTest.java    |   8 +-
 .../memory/MemoryGetMessageListMethodTest.java  |   8 +-
 .../MemoryGetVacationResponseMethodTest.java    |   8 +-
 .../memory/MemoryJmapAuthenticationTest.java    |   8 +-
 .../memory/MemorySetMailboxesMethodTest.java    |   8 +-
 .../memory/MemorySetMessagesMethodTest.java     |   8 +-
 .../MemorySetVacationResponseMethodTest.java    |   8 +-
 .../memory/MemoryVacationIntegrationTest.java   |   8 +-
 .../jmap/memory/cucumber/MemoryStepdefs.java    |   4 +-
 .../WebAdminServerIntegrationTest.java          |  11 +-
 158 files changed, 4409 insertions(+), 1032 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org