commit | 029e5cdab9147b2593c63ae10695fa2b1f7cd045 | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 16:35:39 2019 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Wed Mar 20 16:37:59 2019 -0400 |
tree | 377cbd932b5e1f004f5534cb0f3dd7624e3985a8 | |
parent | 8a803697692beaf10907cdcba11e81da812b4839 [diff] | |
parent | 90147ec11fa73983a39f16dd29b5a6940b0be306 [diff] |
Merge branch 'stable-2.16' * stable-2.16: Extend ServletModule instead of HttpPluginModule Change-Id: I1bf8cdd64fbfe19a680476a98e6b587950d1701c
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/HttpModule.java index 47196c3..80d86e2 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/HttpModule.java +++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/HttpModule.java
@@ -17,9 +17,9 @@ import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.extensions.webui.GwtPlugin; import com.google.gerrit.extensions.webui.WebUiPlugin; -import com.google.gerrit.httpd.plugins.HttpPluginModule; +import com.google.inject.servlet.ServletModule; -class HttpModule extends HttpPluginModule { +class HttpModule extends ServletModule { @Override protected void configureServlets() {