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 bt...@apache.org on 2020/05/20 11:00:30 UTC
[james-project] 04/11: JAMES-3140 JamesServer main should take a
GuiceJamesServer as parameter
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit adc264c1dfc5049bda00971d84706c06a798af5f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu May 14 17:39:52 2020 +0700
JAMES-3140 JamesServer main should take a GuiceJamesServer as parameter
---
.../src/main/java/org/apache/james/CassandraJamesServerMain.java | 5 ++++-
.../main/java/org/apache/james/CassandraLdapJamesServerMain.java | 5 ++++-
.../java/org/apache/james/CassandraRabbitMQJamesServerMain.java | 6 ++++--
.../org/apache/james/CassandraRabbitMQLdapJamesServerMain.java | 6 ++++--
.../src/main/java/org/apache/james/JamesServerMain.java | 8 +-------
.../src/main/java/org/apache/james/JPAJamesServerMain.java | 5 ++++-
.../src/main/java/org/apache/james/JPAJamesServerMain.java | 5 ++++-
.../src/main/java/org/apache/james/MemoryJamesServerMain.java | 7 +++++--
8 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
index a28abc2..f4370d3 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
@@ -167,7 +167,10 @@ public class CassandraJamesServerMain implements JamesServerMain {
.useWorkingDirectoryEnvProperty()
.build();
- JamesServerMain.main(configuration, ALL_BUT_JMX_CASSANDRA_MODULE, new JMXServerModule());
+ GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration)
+ .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE, new JMXServerModule());
+
+ JamesServerMain.main(server);
}
}
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 345c725..9dbfd9a 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
@@ -38,7 +38,10 @@ public class CassandraLdapJamesServerMain implements JamesServerMain {
.useWorkingDirectoryEnvProperty()
.build();
- JamesServerMain.main(configuration, MODULES, new JMXServerModule());
+ GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration)
+ .combineWith(MODULES, new JMXServerModule());
+
+ JamesServerMain.main(server);
}
}
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 d78ebaa..da6b40b 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
@@ -49,8 +49,10 @@ public class CassandraRabbitMQJamesServerMain implements JamesServerMain {
Module baseModule = modules(blobStoreConfiguration);
- JamesServerMain.main(configuration,
- baseModule, new JMXServerModule());
+ GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration)
+ .combineWith(baseModule, new JMXServerModule());
+
+ JamesServerMain.main(server);
}
public static Module modules(BlobStoreConfiguration blobStoreConfiguration) {
diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/main/java/org/apache/james/CassandraRabbitMQLdapJamesServerMain.java b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/main/java/org/apache/james/CassandraRabbitMQLdapJamesServerMain.java
index 212d639..d667c64 100644
--- a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/main/java/org/apache/james/CassandraRabbitMQLdapJamesServerMain.java
+++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/main/java/org/apache/james/CassandraRabbitMQLdapJamesServerMain.java
@@ -42,8 +42,10 @@ public class CassandraRabbitMQLdapJamesServerMain implements JamesServerMain {
BlobStoreConfiguration blobStoreConfiguration = BlobStoreConfiguration.parse(configuration);
Module baseModule = baseModule(blobStoreConfiguration);
- JamesServerMain.main(configuration,
- baseModule, new JMXServerModule());
+ GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration)
+ .combineWith(baseModule, new JMXServerModule());
+
+ JamesServerMain.main(server);
}
public static Module baseModule(BlobStoreConfiguration blobStoreConfiguration) {
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/JamesServerMain.java b/server/container/guice/guice-common/src/main/java/org/apache/james/JamesServerMain.java
index c9d3ffb..534354e 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/JamesServerMain.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/JamesServerMain.java
@@ -19,14 +19,8 @@
package org.apache.james;
-import org.apache.james.server.core.configuration.Configuration;
-
-import com.google.inject.Module;
-
public interface JamesServerMain {
- static void main(Configuration configuration, Module... modules) throws Exception {
- GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration)
- .combineWith(modules);
+ static void main(GuiceJamesServer server) throws Exception {
server.start();
Runtime.getRuntime().addShutdownHook(new Thread(server::stop));
diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
index f497a41..2560e88 100644
--- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
+++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
@@ -99,7 +99,10 @@ public class JPAJamesServerMain implements JamesServerMain {
.useWorkingDirectoryEnvProperty()
.build();
- JamesServerMain.main(configuration, JPA_MODULE_AGGREGATE, new JMXServerModule());
+ GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration)
+ .combineWith(JPA_MODULE_AGGREGATE, new JMXServerModule());
+
+ JamesServerMain.main(server);
}
}
diff --git a/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java
index ea629b2..e44b5ea 100644
--- a/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java
+++ b/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java
@@ -64,7 +64,10 @@ public class JPAJamesServerMain implements JamesServerMain {
.useWorkingDirectoryEnvProperty()
.build();
- JamesServerMain.main(configuration, JPA_SERVER_MODULE, PROTOCOLS, new DKIMMailetModule());
+ GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration)
+ .combineWith(JPA_SERVER_MODULE, PROTOCOLS, new DKIMMailetModule());
+
+ JamesServerMain.main(server);
}
}
diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
index 05c6649..aca4c6e 100644
--- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
+++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
@@ -138,10 +138,13 @@ public class MemoryJamesServerMain implements JamesServerMain {
.useWorkingDirectoryEnvProperty()
.build();
- JamesServerMain.main(configuration,
- IN_MEMORY_SERVER_AGGREGATE_MODULE,
+
+ GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration)
+ .combineWith(IN_MEMORY_SERVER_AGGREGATE_MODULE,
new FakeSearchMailboxModule(),
new JMXServerModule());
+
+ JamesServerMain.main(server);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org