| commit | f3e4583ef5ae0cb9ced2d895ad9512396ce3c203 | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 10:06:18 2019 -0400 |
| committer | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 10:16:53 2019 -0400 |
| tree | 9f7951a58d14bd94b7acd1c8582f2bf29b52ea6d | |
| parent | 7f46a10b0bdac9035cdd513b9fa50ea54fb17972 [diff] | |
| parent | 06429fc1a3d9319471ec441a696987f66dabd1c4 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Extend ServletModule instead of HttpPluginModule Change-Id: I1fe75ddeee653e2d55fa26ed3929433a702e2ad6
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 43795e0..184157d 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);