From 468da399b3de3ec7b6f1e38ec4725ddee9ad6d07 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <sop@google.com>
Date: Mon, 20 Jun 2011 15:22:38 -0700
Subject: [PATCH] Revert "Move RulesCache binding to PrologModule"

This reverts commit 445657266f5da26dbeea3a127f0540c3e474496a.

Moving this binding breaks the unit tests, so lets just revert
that...

Change-Id: Ie49f8c87aba4152da6aa438c2f5f69a58286f65d
---
 .../src/main/java/com/google/gerrit/rules/PrologModule.java     | 1 -
 .../com/google/gerrit/server/config/GerritGlobalModule.java     | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologModule.java b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologModule.java
index 4a3cf26859..d3617908f8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologModule.java
@@ -19,7 +19,6 @@ import com.google.gerrit.server.config.FactoryModule;
 public class PrologModule extends FactoryModule {
   @Override
   protected void configure() {
-    bind(RulesCache.class);
     factory(PrologEnvironment.Factory.class);
   }
 }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
index 732f8c7c30..37e62b95cc 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -21,6 +21,7 @@ import com.google.gerrit.lifecycle.LifecycleListener;
 import com.google.gerrit.lifecycle.LifecycleModule;
 import com.google.gerrit.reviewdb.AuthType;
 import com.google.gerrit.rules.PrologModule;
+import com.google.gerrit.rules.RulesCache;
 import com.google.gerrit.server.FileTypeRegistry;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.MimeUtilFileTypeRegistry;
@@ -138,6 +139,7 @@ public class GerritGlobalModule extends FactoryModule {
 
     bind(IdGenerator.class);
     bind(CachePool.class);
+    bind(RulesCache.class);
     install(AccountByEmailCacheImpl.module());
     install(AccountCacheImpl.module());
     install(GroupCacheImpl.module());