[1/4] james-project git commit: JAMES-2589 a product should have a single module set, no need to describe it
Repository: james-project
Updated Branches:
refs/heads/master 642555e72 -> 579c87397
JAMES-2589 a product should have a single module set, no need to describe it
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/902e8050
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/902e8050
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/902e8050
Branch: refs/heads/master
Commit: 902e805058920838fd93f7087601f9e4901fe40b
Parents: 59fd99f
Author: Matthieu Baechler
Authored: Mon Nov 12 17:17:14 2018 +0100
Committer: Benoit Tellier
Committed: Wed Nov 14 11:19:19 2018 +0700
--
.../main/java/org/apache/james/CassandraLdapJamesServerMain.java | 4 ++--
.../test/java/org/apache/james/CassandraLdapJamesServerTest.java | 2 +-
.../java/org/apache/james/CassandraLdapJmapJamesServerTest.java | 2 +-
.../java/org/apache/james/CassandraRabbitMQJamesServerMain.java | 4 ++--
.../java/org/apache/james/CassandraRabbitMQJamesServerTest.java | 2 +-
.../org/apache/james/CassandraRabbitMQJmapJamesServerTest.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/902e8050/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
--
diff --git
a/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
b/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
index 25c9f64..74f47eb 100644
---
a/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
+++
b/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
@@ -30,7 +30,7 @@ import com.google.inject.util.Modules;
public class CassandraLdapJamesServerMain {
-public static final Module cassandraLdapServerModule =
Modules.override(ALL_BUT_JMX_CASSANDRA_MODULE)
+public static final Module MODULES =
Modules.override(ALL_BUT_JMX_CASSANDRA_MODULE)
.with(new LdapUsersRepositoryModule());
public static void main(String[] args) throws Exception {
@@ -39,7 +39,7 @@ public class CassandraLdapJamesServerMain {
.build();
GuiceJamesServer server =
GuiceJamesServer.forConfiguration(configuration)
-.combineWith(cassandraLdapServerModule, new JMXServerModule());
+.combineWith(MODULES, new JMXServerModule());
server.start();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/902e8050/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
--
diff --git
a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
index c198fc6..0f639ea 100644
---
a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
+++
b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
@@ -59,7 +59,7 @@ class CassandraLdapJamesServerTest implements
JmapJamesServerContract {
.extension(new CassandraExtension())
.extension(new LdapTestExtention())
.server(configuration ->
GuiceJamesServer.forConfiguration(configuration)
-
.combineWith(CassandraLdapJamesServerMain.cassandraLdapServerModule)
+.combineWith(CassandraLdapJamesServerMain.MODULES)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
.overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE))
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/902e8050/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
--
diff --git
a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
index c604b23..16476e9 100644
---
a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
+++
b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
@@ -31,7 +31,7 @@ class CassandraLdapJmapJamesServerTest implements
[1/4] james-project git commit: JAMES-2589 a product should have a single module set, no need to describe it
Repository: james-project
Updated Branches:
refs/heads/JAMES-2589-bind-object-storage [created] 579c87397
JAMES-2589 a product should have a single module set, no need to describe it
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/902e8050
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/902e8050
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/902e8050
Branch: refs/heads/JAMES-2589-bind-object-storage
Commit: 902e805058920838fd93f7087601f9e4901fe40b
Parents: 59fd99f
Author: Matthieu Baechler
Authored: Mon Nov 12 17:17:14 2018 +0100
Committer: Benoit Tellier
Committed: Wed Nov 14 11:19:19 2018 +0700
--
.../main/java/org/apache/james/CassandraLdapJamesServerMain.java | 4 ++--
.../test/java/org/apache/james/CassandraLdapJamesServerTest.java | 2 +-
.../java/org/apache/james/CassandraLdapJmapJamesServerTest.java | 2 +-
.../java/org/apache/james/CassandraRabbitMQJamesServerMain.java | 4 ++--
.../java/org/apache/james/CassandraRabbitMQJamesServerTest.java | 2 +-
.../org/apache/james/CassandraRabbitMQJmapJamesServerTest.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/902e8050/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
--
diff --git
a/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
b/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
index 25c9f64..74f47eb 100644
---
a/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
+++
b/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
@@ -30,7 +30,7 @@ import com.google.inject.util.Modules;
public class CassandraLdapJamesServerMain {
-public static final Module cassandraLdapServerModule =
Modules.override(ALL_BUT_JMX_CASSANDRA_MODULE)
+public static final Module MODULES =
Modules.override(ALL_BUT_JMX_CASSANDRA_MODULE)
.with(new LdapUsersRepositoryModule());
public static void main(String[] args) throws Exception {
@@ -39,7 +39,7 @@ public class CassandraLdapJamesServerMain {
.build();
GuiceJamesServer server =
GuiceJamesServer.forConfiguration(configuration)
-.combineWith(cassandraLdapServerModule, new JMXServerModule());
+.combineWith(MODULES, new JMXServerModule());
server.start();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/902e8050/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
--
diff --git
a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
index c198fc6..0f639ea 100644
---
a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
+++
b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
@@ -59,7 +59,7 @@ class CassandraLdapJamesServerTest implements
JmapJamesServerContract {
.extension(new CassandraExtension())
.extension(new LdapTestExtention())
.server(configuration ->
GuiceJamesServer.forConfiguration(configuration)
-
.combineWith(CassandraLdapJamesServerMain.cassandraLdapServerModule)
+.combineWith(CassandraLdapJamesServerMain.MODULES)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
.overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE))
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/902e8050/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
--
diff --git
a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
index c604b23..16476e9 100644
---
a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
+++
b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
@@ -31,7 +31,7 @@ class
