commit | 000da9352b185a4d2f175ba11874b67ede0aebba | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 12:10:31 2019 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 12:15:51 2019 -0400 |
tree | 7125c4b4ae61000e169ecb98bd2851062a02e7f1 | |
parent | cb804145fbd58f537ac1c29295ba90d67f39d662 [diff] | |
parent | f3e4583ef5ae0cb9ced2d895ad9512396ce3c203 [diff] |
Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Extend ServletModule instead of HttpPluginModule Change-Id: Iaedd17246e07b9b57e742a19f7de836e374c85a2
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java index 49741ae..6fa743f 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java +++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java
@@ -17,10 +17,10 @@ import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.RestForwarderServletModule; import com.ericsson.gerrit.plugins.highavailability.health.HealthServletModule; import com.ericsson.gerrit.plugins.highavailability.websession.file.FileBasedWebsessionModule; -import com.google.gerrit.httpd.plugins.HttpPluginModule; import com.google.inject.Inject; +import com.google.inject.servlet.ServletModule; -class HttpModule extends HttpPluginModule { +class HttpModule extends ServletModule { private final Configuration config; @Inject
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java index 17038e2..589bbef 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java +++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java
@@ -14,9 +14,9 @@ package com.ericsson.gerrit.plugins.highavailability.forwarder.rest; -import com.google.gerrit.httpd.plugins.HttpPluginModule; +import com.google.inject.servlet.ServletModule; -public class RestForwarderServletModule extends HttpPluginModule { +public class RestForwarderServletModule extends ServletModule { @Override protected void configureServlets() { serveRegex("/index/account/\\d+$").with(IndexAccountRestApiServlet.class);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/health/HealthServletModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/health/HealthServletModule.java index f3318a9..514ed03 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/health/HealthServletModule.java +++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/health/HealthServletModule.java
@@ -14,9 +14,9 @@ package com.ericsson.gerrit.plugins.highavailability.health; -import com.google.gerrit.httpd.plugins.HttpPluginModule; +import com.google.inject.servlet.ServletModule; -public class HealthServletModule extends HttpPluginModule { +public class HealthServletModule extends ServletModule { @Override protected void configureServlets() { serve("/health").with(HealthServlet.class);