killbill-developers

Fixing test that did not set up the junction db

Merge branch 'integration' into server Conflicts: analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionRecorder.java analytics/src/test/java/com/ning/billing/analytics/MockSubscription.java api/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java junction/src/main/java/com/ning/billing/junction/plumbing/billing/DefaultBillingApi.java junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestDefaultEntitlementBillingApi.java payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java

Adding fix for notifier tests that run into each other

Merge with repair changes and fix tests

Temporarily disabling a couple of tests that may have been fixed …

by others - to be re-enabled after merging

Fixing more test issues - starting to address some of the test …

modularity concerns

Resolving test issues following replumb of entitlement user …

api

Resolving test issues following replumb of entitlement user …

api

Adding rerouting of entitlement API through Junction

Putting the plumbing in place to intercept entitlement and …

account calls