JAMES-1958 Adding defaults configurations for WebAdmin and Tls
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fd82c99e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fd82c99e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fd82c99e Branch: refs/heads/master Commit: fd82c99ed86ecbd766cc49a1895640e1691e01da Parents: 553ba85 Author: benwa <btell...@linagora.com> Authored: Mon Mar 13 17:48:30 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Wed Mar 15 09:02:31 2017 +0700 ---------------------------------------------------------------------- .../apache/james/modules/server/WebAdminServerModule.java | 9 +++------ .../java/org/apache/james/webadmin/TlsConfiguration.java | 4 ++++ .../org/apache/james/webadmin/WebAdminConfiguration.java | 8 ++++++++ .../main/java/org/apache/james/webadmin/WebAdminServer.java | 5 +---- 4 files changed, 16 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/fd82c99e/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java index 0af2cce..4695bdd 100644 --- a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java +++ b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java @@ -19,6 +19,7 @@ package org.apache.james.modules.server; +import static org.apache.james.webadmin.WebAdminConfiguration.DISABLED_CONFIGURATION; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import java.io.FileNotFoundException; @@ -96,9 +97,7 @@ public class WebAdminServerModule extends AbstractModule { .build(); } catch (FileNotFoundException e) { LOGGER.info("No webadmin.properties file. Disabling WebAdmin interface."); - return WebAdminConfiguration.builder() - .disabled() - .build(); + return DISABLED_CONFIGURATION; } } @@ -127,9 +126,7 @@ public class WebAdminServerModule extends AbstractModule { configurationFile.getString("https.trust.password", DEFAULT_NO_TRUST_PASSWORD)) .build(); } - return TlsConfiguration.builder() - .disabled() - .build(); + return TlsConfiguration.DEFAULT_DISABLE; } @Singleton http://git-wip-us.apache.org/repos/asf/james-project/blob/fd82c99e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/TlsConfiguration.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/TlsConfiguration.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/TlsConfiguration.java index 78cc209..81ecb66 100644 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/TlsConfiguration.java +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/TlsConfiguration.java @@ -27,6 +27,10 @@ import com.google.common.base.Preconditions; public class TlsConfiguration { + public static final TlsConfiguration DEFAULT_DISABLE = TlsConfiguration.builder() + .disabled() + .build(); + public static Builder builder() { return new Builder(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fd82c99e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java index 115aaef..c61ae86 100644 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java @@ -31,6 +31,14 @@ public class WebAdminConfiguration { public static final boolean DEFAULT_CORS_DISABLED = false; public static final String CORS_ALL_ORIGINS = "*"; + public static final WebAdminConfiguration TESTING_CONFIGURATION = WebAdminConfiguration.builder() + .enabled() + .port(new RandomPort()) + .build(); + public static final WebAdminConfiguration DISABLED_CONFIGURATION = WebAdminConfiguration.builder() + .disabled() + .build(); + public static Builder builder() { return new Builder(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fd82c99e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminServer.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminServer.java index e2144bf..7c16045 100644 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminServer.java +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminServer.java @@ -67,10 +67,7 @@ public class WebAdminServer implements Configurable { @VisibleForTesting public WebAdminServer(MetricFactory metricFactory, Routes... routes) throws IOException { - this(WebAdminConfiguration.builder() - .enabled() - .port(new RandomPort()) - .build(), + this(WebAdminConfiguration.TESTING_CONFIGURATION, ImmutableSet.copyOf(routes), new NoAuthenticationFilter(), metricFactory); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
