killbill-aplcache

diff --git a/invoice/src/main/java/com/ning/billing/invoice/InvoiceListener.java b/invoice/src/main/java/com/ning/billing/invoice/InvoiceListener.java
index dd44e0c..de018be 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/InvoiceListener.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/InvoiceListener.java
@@ -21,14 +21,10 @@ import java.util.List;
 import java.util.SortedSet;
 import java.util.UUID;
 
-import com.ning.billing.invoice.model.BillingEventSet;
-import com.ning.billing.invoice.notification.NextBillingDateEvent;
-import com.ning.billing.util.globallocker.GlobalLock;
-import com.ning.billing.util.globallocker.GlobalLocker;
-import com.sun.istack.internal.FinalArrayList;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.ning.billing.ErrorCode;
@@ -42,9 +38,10 @@ import com.ning.billing.invoice.api.Invoice;
 import com.ning.billing.invoice.api.InvoiceApiException;
 import com.ning.billing.invoice.api.InvoiceItem;
 import com.ning.billing.invoice.dao.InvoiceDao;
+import com.ning.billing.invoice.model.BillingEventSet;
 import com.ning.billing.invoice.model.InvoiceGenerator;
 import com.ning.billing.invoice.model.InvoiceItemList;
-import com.ning.billing.util.clock.Clock;
+import com.ning.billing.invoice.notification.NextBillingDateEvent;
 
 public class InvoiceListener {
     private final static Logger log = LoggerFactory.getLogger(InvoiceListener.class);

diff --git a/util/src/main/java/com/ning/billing/util/globalLocker/GlobalLock.java b/util/src/main/java/com/ning/billing/util/globalLocker/GlobalLock.java
index 12ebc0d..62a61a5 100644
--- a/util/src/main/java/com/ning/billing/util/globalLocker/GlobalLock.java
+++ b/util/src/main/java/com/ning/billing/util/globalLocker/GlobalLock.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.ning.billing.util.globallocker;
+package com.ning.billing.util.globalLocker;
 
 public interface GlobalLock
 {

diff --git a/util/src/main/java/com/ning/billing/util/globalLocker/GlobalLocker.java b/util/src/main/java/com/ning/billing/util/globalLocker/GlobalLocker.java
index 38a7d16..59adb44 100644
--- a/util/src/main/java/com/ning/billing/util/globalLocker/GlobalLocker.java
+++ b/util/src/main/java/com/ning/billing/util/globalLocker/GlobalLocker.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.ning.billing.util.globallocker;
+package com.ning.billing.util.globalLocker;
 
 public interface GlobalLocker {
     GlobalLock lockWithNumberOfTries(String lockName, int i);

diff --git a/util/src/main/java/com/ning/billing/util/globalLocker/LockFailedException.java b/util/src/main/java/com/ning/billing/util/globalLocker/LockFailedException.java
index 67f83a4..341edc3 100644
--- a/util/src/main/java/com/ning/billing/util/globalLocker/LockFailedException.java
+++ b/util/src/main/java/com/ning/billing/util/globalLocker/LockFailedException.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.ning.billing.util.globallocker;
+package com.ning.billing.util.globalLocker;
 
 public class LockFailedException extends RuntimeException
 {

diff --git a/util/src/main/java/com/ning/billing/util/globalLocker/MySqlGlobalLocker.java b/util/src/main/java/com/ning/billing/util/globalLocker/MySqlGlobalLocker.java
index 4b36c99..43a1993 100644
--- a/util/src/main/java/com/ning/billing/util/globalLocker/MySqlGlobalLocker.java
+++ b/util/src/main/java/com/ning/billing/util/globalLocker/MySqlGlobalLocker.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.ning.billing.util.globallocker;
+package com.ning.billing.util.globalLocker;
 
 import com.google.inject.Inject;
 import org.skife.jdbi.v2.Handle;

diff --git a/util/src/main/java/com/ning/billing/util/globalLocker/MySqlGlobalLockerDao.java b/util/src/main/java/com/ning/billing/util/globalLocker/MySqlGlobalLockerDao.java
index deafb5c..d9ff452 100644
--- a/util/src/main/java/com/ning/billing/util/globalLocker/MySqlGlobalLockerDao.java
+++ b/util/src/main/java/com/ning/billing/util/globalLocker/MySqlGlobalLockerDao.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.ning.billing.util.globallocker;
+package com.ning.billing.util.globalLocker;
 
 import org.skife.jdbi.v2.StatementContext;
 import org.skife.jdbi.v2.sqlobject.Bind;

diff --git a/util/src/main/java/com/ning/billing/util/glue/GlobalLockerModule.java b/util/src/main/java/com/ning/billing/util/glue/GlobalLockerModule.java
index a6e6f66..93d31e0 100644
--- a/util/src/main/java/com/ning/billing/util/glue/GlobalLockerModule.java
+++ b/util/src/main/java/com/ning/billing/util/glue/GlobalLockerModule.java
@@ -17,8 +17,8 @@
 package com.ning.billing.util.glue;
 
 import com.google.inject.AbstractModule;
-import com.ning.billing.util.globallocker.GlobalLocker;
-import com.ning.billing.util.globallocker.MySqlGlobalLocker;
+import com.ning.billing.util.globalLocker.GlobalLocker;
+import com.ning.billing.util.globalLocker.MySqlGlobalLocker;
 
 public class GlobalLockerModule extends AbstractModule {
     @Override