commit 64ad65266a40cf296a628ffd059b704d0350222f
author David Pursehouse <dpursehouse@collab.net> Wed Mar 20 11:29:51 2019 +0000
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 09:20:29 2019 -0400
tree 822f645be5fcbd9a6748a8db480b8e0b22d3d014
parent 65f66ed2c51e2e0441229fd61ab852983b9f2ef7

Extend ServletModule instead of HttpPluginModule

As described in I3b89150d1.

Change-Id: Ic91ce95719c6bccc73cc29a2139a2274f20d1939

src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java
index d51d918..5348c00 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java
@@ -17,12 +17,12 @@
 import com.google.gerrit.extensions.annotations.Exports;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.auth.oauth.OAuthServiceProvider;
-import com.google.gerrit.httpd.plugins.HttpPluginModule;
 import com.google.gerrit.server.config.PluginConfig;
 import com.google.gerrit.server.config.PluginConfigFactory;
 import com.google.inject.Inject;
+import com.google.inject.servlet.ServletModule;
 
-class HttpModule extends HttpPluginModule {
+class HttpModule extends ServletModule {
 
   private final PluginConfigFactory cfgFactory;
   private final String pluginName;