opendev/gerrit
Code Issues Proposed changes

Extract OpenID RPC implementation into its own module

Browse Source 
This avoids a dependency on openid4java for users that don't need
OpenID support.

Change-Id: I8dfce1e32f145aebed5e6c1d01c77872528ab43f
This commit is contained in:
Dave Borowitz
2012-01-20 14:05:59 -08:00
committed by Shawn O. Pearce
parent ad3209eebf
commit fb61967081
18 changed files with 467 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,9 @@ import static com.google.inject.Stage.PRODUCTION;
import com.google.gerrit.common.ChangeHookRunner;
import com.google.gerrit.lifecycle.LifecycleManager;
import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.gerrit.httpd.auth.openid.OpenIdModule;
import com.google.gerrit.reviewdb.AuthType;
import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.server.config.AuthConfigModule;
import com.google.gerrit.server.config.CanonicalWebUrlModule;
import com.google.gerrit.server.config.GerritGlobalModule;
@@ -214,6 +217,12 @@ public class WebAppInitializer extends GuiceServletContextListener {
modules.add(sshInjector.getInstance(WebSshGlueModule.class));
modules.add(CacheBasedWebSession.module());
modules.add(HttpContactStoreConnection.module());
AuthConfig authConfig = cfgInjector.getInstance(AuthConfig.class);
if (authConfig.getAuthType() == AuthType.OPENID) {
modules.add(new OpenIdModule());
}
return sysInjector.createChildInjector(modules);
}