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 <matth...@apache.org> Authored: Mon Nov 12 17:17:14 2018 +0100 Committer: Benoit Tellier <btell...@linagora.com> 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 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-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java index 78cd1a6..da0a1a0 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java @@ -29,7 +29,7 @@ import com.google.inject.Module; import com.google.inject.util.Modules; public class CassandraRabbitMQJamesServerMain { - public static final Module ALL_BUT_JMX_CASSANDRA_RABBITMQ_MODULE = Modules.override(ALL_BUT_JMX_CASSANDRA_MODULE) + public static final Module MODULES = Modules.override(ALL_BUT_JMX_CASSANDRA_MODULE) .with(new RabbitMQModule()); public static void main(String[] args) throws Exception { @@ -38,7 +38,7 @@ public class CassandraRabbitMQJamesServerMain { .build(); GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration) - .combineWith(ALL_BUT_JMX_CASSANDRA_RABBITMQ_MODULE, new JMXServerModule()); + .combineWith(MODULES, new JMXServerModule()); server.start(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/902e8050/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java index 00de859..d925ebb 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java @@ -58,7 +58,7 @@ class CassandraRabbitMQJamesServerTest implements JmapJamesServerContract { .extension(new CassandraExtension()) .extension(new RabbitMQExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(CassandraRabbitMQJamesServerMain.ALL_BUT_JMX_CASSANDRA_RABBITMQ_MODULE) + .combineWith(CassandraRabbitMQJamesServerMain.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-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJmapJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJmapJamesServerTest.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJmapJamesServerTest.java index 9bb2ec8..0cb02b7 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJmapJamesServerTest.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJmapJamesServerTest.java @@ -32,7 +32,7 @@ public class CassandraRabbitMQJmapJamesServerTest implements JmapJamesServerCont .extension(new CassandraExtension()) .extension(new RabbitMQExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(CassandraRabbitMQJamesServerMain.ALL_BUT_JMX_CASSANDRA_RABBITMQ_MODULE) + .combineWith(CassandraRabbitMQJamesServerMain.MODULES) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
