opendev/gerrit
Code Issues Proposed changes

Merge "Expand submodule subscription support"

Browse Source
This commit is contained in:
Martin Fick
2012-12-07 09:36:55 -08:00
committed by Gerrit Code Review
parent 083e3e899c 333676bd1b
commit af17ea96dd
8 changed files with 210 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
View File

@@ -42,6 +42,8 @@ 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.CanonicalWebUrlProvider;
import com.google.gerrit.server.config.SshdListenAddressModule;
import com.google.gerrit.server.config.SshdListenAddressProvider;
import com.google.gerrit.server.config.GerritGlobalModule;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.MasterNodeStartup;
@@ -295,6 +297,16 @@ public class Daemon extends SiteProgram {
modules.add(new SmtpEmailSender.Module());
modules.add(new SignedTokenEmailTokenVerifier.Module());
modules.add(new PluginModule());
if (sshd) {
modules.add(new SshdListenAddressModule() {
@Override
protected Class<? extends Provider<String>> provider() {
return SshdListenAddressProvider.class;
}
});
}
if (httpd) {
modules.add(new CanonicalWebUrlModule() {
@Override