killbill-aplcache

Merge branch 'master' of github.com:ning/killbill into fixed-price

Revert beatrix catalog to use fixed price

Merge branch 'master' of github.com:ning/killbill into fixed-price Conflicts: invoice/src/main/java/com/ning/billing/invoice/InvoiceListener.java invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java invoice/src/main/java/com/ning/billing/invoice/dao/RecurringInvoiceItemSqlDao.java invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceItemSqlDao.sql.stg

Merge branch 'master' of github.com:ning/killbill

Created payment service for event bus registration

Add global locking (account) for invoice subsystem

Merge branch 'inv-ent-integration' Not so trivial merge Conflicts: analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java api/src/main/java/com/ning/billing/payment/api/PaymentAttempt.java entitlement/src/main/java/com/ning/billing/entitlement/glue/EntitlementModule.java entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadMockEntitlementDao.java entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModuleSql.java invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java util/src/main/java/com/ning/billing/util/notificationq/DefaultNotificationQueue.java util/src/main/java/com/ning/billing/util/notificationq/DefaultNotificationQueueService.java util/src/test/java/com/ning/billing/util/notificationq/MockNotificationQueue.java

Move to latest and greatest JDBI version

Merge branch 'inv-ent-integration' of github.com:ning/killbill …

into inv-ent-integration

Fix unstable branch to to a bad usage of JDBI batch functunality …

(from within a transaction)
=> Beatrix test 'testBasePlanCompleteWithBillingDayPresent' now passes reliably but set to disabled since it uses local database

Reafactored Notification queue and simplified the queries for easier debuging is needed, although there were no issue on that side -- red herring.