killbill-aplcache

Merge from integration; Reworked merge in AuditedCollectionDaoBase …

-> saveEntitiesFromTransaction with the same merge logic for now; Added accountId to CreditJson

Added accountId to CreditJson

account: remove the ability to create tags during account creation/migration We …

currently don't have a use case for it and the code is broken anyways
as it doesn't check if the tag definition was already created.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

account: add a simple test that creates an account with tags Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Fix broken tests after merge

Merge remote branch 'origin/integration' into server Conflicts: analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonNoSubscriptions.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonSimple.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonWithSubscriptions.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleTimelineJson.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonWithBundleKeys.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonNoEvents.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonSimple.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonWithEvents.java jaxrs/src/main/java/com/ning/billing/jaxrs/resources/ChargebackResource.java payment/src/main/java/com/ning/billing/payment/bus/TagHandler.java

server: enable most tests in TestChargeback Disable only …

the POST test which requires the payment resources.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

server: fix test failure Signed-off-by: Pierre-Alexandre …

Meyer <pierre@ning.com>

jaxrs: use compareTo to compare BigDecimal objects Reported-by: …

Stephane Brossier <stephane@ning.com>
Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

server: update Credit tests to latest CreditJson Tests now …

pass.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>