opendev/gerrit
Code Issues Proposed changes

Hoist StaticModule out of WebModule

Browse Source 
In the multi-tenant environment of googlesource.com, we serve the
static content much higher in the filter stack, so we'd rather just
not install this module at all. We do need to expose a few more
members as public to get the bindings we need for that.

Change-Id: Id93a7f8adb440d30d960c19bf5b93e27454241a4
This commit is contained in:
Dave Borowitz
2015-11-16 16:05:11 -05:00
parent f3ff4db9c3
commit a5004ead38
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
View File

@@ -23,6 +23,7 @@ import com.google.gerrit.gpg.GpgModule;
import com.google.gerrit.httpd.auth.oauth.OAuthModule;
import com.google.gerrit.httpd.auth.openid.OpenIdModule;
import com.google.gerrit.httpd.plugins.HttpPluginModule;
import com.google.gerrit.httpd.raw.StaticModule;
import com.google.gerrit.lifecycle.LifecycleManager;
import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.gerrit.lucene.LuceneIndexModule;
@@ -354,6 +355,7 @@ public class WebAppInitializer extends GuiceServletContextListener
modules.add(RequestMetricsFilter.module());
modules.add(sysInjector.getInstance(GitOverHttpModule.class));
modules.add(sysInjector.getInstance(WebModule.class));
modules.add(sysInjector.getInstance(StaticModule.class));
modules.add(sysInjector.getInstance(RequireSslFilter.Module.class));
if (sshInjector != null) {
modules.add(sshInjector.getInstance(WebSshGlueModule.class));