killbill-memoizeit

diff --git a/analytics/pom.xml b/analytics/pom.xml
index de64a5c..21fa1e6 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -26,12 +26,16 @@
     <artifactId>killbill-analytics</artifactId>
     <name>killbill-analytics</name>
     <packaging>jar</packaging>
-    <dependencies>
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <scope>provided</scope>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>org.jdbi</groupId>
+			<artifactId>jdbi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.inject</groupId>
+			<artifactId>guice</artifactId>
+			<scope>provided</scope>
+		</dependency>
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>management</artifactId>
@@ -47,10 +51,6 @@
             <artifactId>killbill-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.ning.jetty</groupId>
-            <artifactId>ning-service-skeleton-utils</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <scope>test</scope>

diff --git a/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java b/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
index efeb970..46e9131 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
@@ -16,19 +16,16 @@
 
 package com.ning.billing.analytics.setup;
 
+
 import com.google.inject.AbstractModule;
 import com.ning.billing.analytics.dao.EventDao;
 import com.ning.billing.analytics.dao.EventDaoProvider;
-import com.ning.jetty.utils.providers.DBIProvider;
-
-import org.skife.jdbi.v2.DBI;
 
 public class AnalyticsModule extends AbstractModule
 {
     @Override
     protected void configure()
     {
-        bind(DBI.class).toProvider(DBIProvider.class).asEagerSingleton();
         bind(EventDao.class).toProvider(EventDaoProvider.class).asEagerSingleton();
     }
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/glue/EntitlementModule.java b/entitlement/src/main/java/com/ning/billing/entitlement/glue/EntitlementModule.java
index 8f927bd..44f5685 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/glue/EntitlementModule.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/glue/EntitlementModule.java
@@ -80,11 +80,6 @@ public class EntitlementModule extends AbstractModule {
         bind(IBillingApi.class).to(BillingApi.class).asEagerSingleton();
     }
 
-    protected void installDBI() {
-        bind(DBI.class).toProvider(DBIProvider.class).asEagerSingleton();
-        final DbiConfig config = new ConfigurationObjectFactory(System.getProperties()).build(DbiConfig.class);
-        bind(DbiConfig.class).toInstance(config);
-    }
 
     @Override
     protected void configure() {
@@ -96,6 +91,5 @@ public class EntitlementModule extends AbstractModule {
         installEntitlementCore();
         installUserApi();
         installBillingApi();
-        installDBI();
     }
 }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/glue/EngineModuleMemoryMock.java b/entitlement/src/test/java/com/ning/billing/entitlement/glue/EngineModuleMemoryMock.java
index 70120e7..36cad9d 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/glue/EngineModuleMemoryMock.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/glue/EngineModuleMemoryMock.java
@@ -17,6 +17,11 @@
 package com.ning.billing.entitlement.glue;
 
 
+import org.skife.config.ConfigurationObjectFactory;
+import org.skife.jdbi.v2.DBI;
+
+import com.ning.billing.dbi.DBIProvider;
+import com.ning.billing.dbi.DbiConfig;
 import com.ning.billing.entitlement.engine.core.ApiEventProcessorMemoryMock;
 import com.ning.billing.entitlement.engine.core.IApiEventProcessor;
 import com.ning.billing.entitlement.engine.dao.EntitlementDaoMemoryMock;
@@ -43,7 +48,15 @@ public class EngineModuleMemoryMock extends EntitlementModule {
         bind(IClock.class).to(ClockMock.class).asEagerSingleton();
     }
 
-    @Override
     protected void installDBI() {
+        bind(DBI.class).toProvider(DBIProvider.class).asEagerSingleton();
+        final DbiConfig config = new ConfigurationObjectFactory(System.getProperties()).build(DbiConfig.class);
+        bind(DbiConfig.class).toInstance(config);
+    }
+
+    @Override
+    protected void configure() {
+        installDBI();
+        super.configure();
     }
 }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/glue/EngineModuleSqlMock.java b/entitlement/src/test/java/com/ning/billing/entitlement/glue/EngineModuleSqlMock.java
index 214ab3e..6fdc8e5 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/glue/EngineModuleSqlMock.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/glue/EngineModuleSqlMock.java
@@ -16,6 +16,11 @@
 
 package com.ning.billing.entitlement.glue;
 
+import org.skife.config.ConfigurationObjectFactory;
+import org.skife.jdbi.v2.DBI;
+
+import com.ning.billing.dbi.DBIProvider;
+import com.ning.billing.dbi.DbiConfig;
 import com.ning.billing.entitlement.engine.dao.EntitlementDaoSqlMock;
 import com.ning.billing.entitlement.engine.dao.IEntitlementDao;
 import com.ning.billing.util.clock.ClockMock;
@@ -23,6 +28,7 @@ import com.ning.billing.util.clock.IClock;
 
 public class EngineModuleSqlMock extends EntitlementModule {
 
+
     @Override
     protected void installEntitlementDao() {
         bind(IEntitlementDao.class).to(EntitlementDaoSqlMock.class).asEagerSingleton();
@@ -32,4 +38,16 @@ public class EngineModuleSqlMock extends EntitlementModule {
     protected void installClock() {
         bind(IClock.class).to(ClockMock.class).asEagerSingleton();
     }
+
+    protected void installDBI() {
+        bind(DBI.class).toProvider(DBIProvider.class).asEagerSingleton();
+        final DbiConfig config = new ConfigurationObjectFactory(System.getProperties()).build(DbiConfig.class);
+        bind(DbiConfig.class).toInstance(config);
+    }
+
+    @Override
+    protected void configure() {
+        installDBI();
+        super.configure();
+    }
 }