killbill-aplcache

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionEvent.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionEvent.java
index e9d5f39..ea310f9 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionEvent.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultSubscriptionEvent.java
@@ -203,6 +203,7 @@ public class DefaultSubscriptionEvent implements SubscriptionEvent {
         return transitionType;
     }
     
+    @JsonProperty("startDate")
     @Override
     public DateTime getSubscriptionStartDate() {
         return startDate;

diff --git a/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java b/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
index 7c5835a..df3d108 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
@@ -52,6 +52,7 @@ import org.skife.jdbi.v2.TransactionStatus;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import com.google.inject.AbstractModule;
@@ -63,6 +64,8 @@ import com.ning.billing.catalog.DefaultCatalogService;
 import com.ning.billing.catalog.api.CatalogService;
 import com.ning.billing.config.CatalogConfig;
 import com.ning.billing.config.InvoiceConfig;
+import com.ning.billing.dbi.DBIProvider;
+import com.ning.billing.dbi.DbiConfig;
 import com.ning.billing.dbi.MysqlTestingHelper;
 
 import com.ning.billing.entitlement.api.billing.ChargeThruApi;
@@ -132,6 +135,10 @@ public class TestNextBillingDateNotifier {
 
 	}
 
+	@BeforeMethod(groups={"slow"})
+	public void cleanup() {
+	    helper.cleanupAllTables();
+	}
 
 	@BeforeClass(groups={"slow"})
 	public void setup() throws ServiceException, IOException, ClassNotFoundException, SQLException {
@@ -148,10 +155,18 @@ public class TestNextBillingDateNotifier {
                 final CatalogConfig catalogConfig = new ConfigurationObjectFactory(System.getProperties()).build(CatalogConfig.class);
                 bind(CatalogConfig.class).toInstance(catalogConfig);
                 bind(CatalogService.class).to(DefaultCatalogService.class).asEagerSingleton();
+                
                 final MysqlTestingHelper helper = new MysqlTestingHelper();
                 bind(MysqlTestingHelper.class).toInstance(helper);
-                IDBI dbi = helper.getDBI();
-                bind(IDBI.class).toInstance(dbi);
+                if (helper.isUsingLocalInstance()) {
+                    bind(IDBI.class).toProvider(DBIProvider.class).asEagerSingleton();
+                    final DbiConfig config = new ConfigurationObjectFactory(System.getProperties()).build(DbiConfig.class);
+                    bind(DbiConfig.class).toInstance(config);
+                } else {
+                    final IDBI dbi = helper.getDBI();
+                    bind(IDBI.class).toInstance(dbi);
+                }
+                
                 bind(TagDao.class).to(AuditedTagDao.class).asEagerSingleton();
                 bind(EntitlementDao.class).to(EntitlementSqlDao.class).asEagerSingleton();
                 bind(EntitlementDao.class).annotatedWith(Names.named(EntitlementModule.REPAIR_NAMED)).to(RepairEntitlementDao.class);

diff --git a/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionService.java b/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionService.java
index d24ac9a..5865540 100644
--- a/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionService.java
+++ b/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionService.java
@@ -21,6 +21,7 @@ import com.ning.billing.util.api.TagDefinitionService;
 import com.ning.billing.util.api.TagUserApi;
 
 public class DefaultTagDefinitionService implements TagDefinitionService {
+    
     private static final String TAG_DEFINITION_SERVICE_NAME = "tag-service";
     private final TagUserApi api;
 

diff --git a/util/src/test/java/com/ning/billing/util/bus/TestEventBus.java b/util/src/test/java/com/ning/billing/util/bus/TestEventBus.java
index dffd01a..84c7767 100644
--- a/util/src/test/java/com/ning/billing/util/bus/TestEventBus.java
+++ b/util/src/test/java/com/ning/billing/util/bus/TestEventBus.java
@@ -28,4 +28,14 @@ public class TestEventBus extends TestEventBusBase {
         eventBus = new InMemoryBus();
         super.setup();
     }
+    
+    @Test(groups = "slow")
+    public void testSimple() {
+        super.testSimple();
+    }
+
+    @Test(groups = "slow")
+    public void testDifferentType() {
+        super.testDifferentType();
+    }
 }

diff --git a/util/src/test/java/com/ning/billing/util/bus/TestEventBusBase.java b/util/src/test/java/com/ning/billing/util/bus/TestEventBusBase.java
index 8d1cd81..1e659ca 100644
--- a/util/src/test/java/com/ning/billing/util/bus/TestEventBusBase.java
+++ b/util/src/test/java/com/ning/billing/util/bus/TestEventBusBase.java
@@ -176,7 +176,6 @@ public class TestEventBusBase {
         }
     }
 
-    @Test(groups = "slow")
     public void testSimple() {
         try {
 
@@ -195,7 +194,6 @@ public class TestEventBusBase {
         }
     }
 
-    @Test(groups = "slow")
     public void testDifferentType() {
         try {
 

diff --git a/util/src/test/java/com/ning/billing/util/bus/TestPersistentEventBus.java b/util/src/test/java/com/ning/billing/util/bus/TestPersistentEventBus.java
index eab9185..bf8dc4d 100644
--- a/util/src/test/java/com/ning/billing/util/bus/TestPersistentEventBus.java
+++ b/util/src/test/java/com/ning/billing/util/bus/TestPersistentEventBus.java
@@ -15,7 +15,7 @@
  */
 package com.ning.billing.util.bus;
 
-import org.codehaus.jackson.map.ObjectMapper;
+
 import org.skife.config.ConfigurationObjectFactory;
 import org.skife.jdbi.v2.IDBI;
 import org.testng.annotations.AfterClass;
@@ -26,7 +26,6 @@ import org.testng.annotations.Test;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Inject;
-import com.ning.billing.account.api.AccountChangeEvent;
 import com.ning.billing.dbi.DBIProvider;
 import com.ning.billing.dbi.DbiConfig;
 import com.ning.billing.dbi.MysqlTestingHelper;
@@ -58,7 +57,7 @@ public class TestPersistentEventBus extends TestEventBusBase {
         @Override
         protected void configure() {
             
-            System.setProperty("com.ning.billing.dbi.test.useLocalDb", "true");
+            //System.setProperty("com.ning.billing.dbi.test.useLocalDb", "true");
 
             bind(Clock.class).to(ClockMock.class).asEagerSingleton();
             bind(ClockMock.class).asEagerSingleton();