Rename GerritServerModule to GerritGlobalModule

This better matches with the GerritRequestModule used for the
per-request state.

Signed-off-by: Shawn O. Pearce <sop@google.com>

4 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/com/google/gerrit/pgm/Daemon.java b/src/main/java/com/google/gerrit/pgm/Daemon.java
index 33a2a4860d..5f326e193c 100644
--- a/src/main/java/com/google/gerrit/pgm/Daemon.java
+++ b/src/main/java/com/google/gerrit/pgm/Daemon.java
@@ -21,7 +21,7 @@ import com.google.gerrit.client.data.GerritConfig;
 import com.google.gerrit.client.rpc.Common;
 import com.google.gerrit.server.config.DatabaseModule;
 import com.google.gerrit.server.config.GerritConfigProvider;
-import com.google.gerrit.server.config.GerritServerModule;
+import com.google.gerrit.server.config.GerritGlobalModule;
 import com.google.gerrit.server.ssh.SshDaemon;
 import com.google.gerrit.server.ssh.SshDaemonModule;
 import com.google.inject.AbstractModule;
@@ -34,7 +34,7 @@ public class Daemon extends AbstractProgram {
   public int run() throws Exception {
     final Injector injector =
         Guice.createInjector(PRODUCTION, new DatabaseModule(),
-            new GerritServerModule(), new SshDaemonModule(),
+            new GerritGlobalModule(), new SshDaemonModule(),
             new AbstractModule() {
               @Override
               protected void configure() {
diff --git a/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java b/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
index 7665be37fd..c8e7300c34 100644
--- a/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
+++ b/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
@@ -23,7 +23,7 @@ import com.google.gerrit.client.reviewdb.ReviewDb;
 import com.google.gerrit.git.PatchSetImporter;
 import com.google.gerrit.server.GerritServer;
 import com.google.gerrit.server.config.DatabaseModule;
-import com.google.gerrit.server.config.GerritServerModule;
+import com.google.gerrit.server.config.GerritGlobalModule;
 import com.google.gwtorm.client.OrmException;
 import com.google.gwtorm.client.SchemaFactory;
 import com.google.inject.Guice;
@@ -71,7 +71,7 @@ public class ReimportPatchSets extends AbstractProgram {
   public int run() throws Exception {
     final Injector injector =
         Guice.createInjector(PRODUCTION, new DatabaseModule(),
-            new GerritServerModule());
+            new GerritGlobalModule());
     injector.injectMembers(this);
 
     final ArrayList<PatchSet.Id> todo = new ArrayList<PatchSet.Id>();
diff --git a/src/main/java/com/google/gerrit/server/config/GerritServerModule.java b/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
index b6c1e75493..58571238a7 100644
--- a/src/main/java/com/google/gerrit/server/config/GerritServerModule.java
+++ b/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -63,8 +63,8 @@ import org.spearce.jgit.lib.Config;
 import java.io.File;
 import java.util.Collection;
 
-/** Starts {@link GerritServer} with standard dependencies. */
-public class GerritServerModule extends FactoryModule {
+/** Starts global state with standard dependencies. */
+public class GerritGlobalModule extends FactoryModule {
   @Override
   protected void configure() {
     bind(File.class).annotatedWith(SitePath.class).toProvider(
diff --git a/src/main/java/com/google/gerrit/server/http/GerritServletConfig.java b/src/main/java/com/google/gerrit/server/http/GerritServletConfig.java
index d4f02ed08f..5dc143eaf8 100644
--- a/src/main/java/com/google/gerrit/server/http/GerritServletConfig.java
+++ b/src/main/java/com/google/gerrit/server/http/GerritServletConfig.java
@@ -22,7 +22,7 @@ import com.google.gerrit.git.WorkQueue;
 import com.google.gerrit.server.config.AuthConfig;
 import com.google.gerrit.server.config.CanonicalWebUrlProvider;
 import com.google.gerrit.server.config.DatabaseModule;
-import com.google.gerrit.server.config.GerritServerModule;
+import com.google.gerrit.server.config.GerritGlobalModule;
 import com.google.gerrit.server.openid.OpenIdModule;
 import com.google.gerrit.server.ssh.SshDaemon;
 import com.google.gerrit.server.ssh.SshDaemonModule;
@@ -86,7 +86,7 @@ public class GerritServletConfig extends GuiceServletContextListener {
         throw new CreationException(Collections.singleton(first));
       }
 
-      sysInjector = dbInjector.createChildInjector(new GerritServerModule());
+      sysInjector = dbInjector.createChildInjector(new GerritGlobalModule());
       sshInjector = createSshInjector();
       webInjector = createWebInjector();