killbill-aplcache

Fix various tests which were broken because of PaymentMethod …

rewrok
Start adding /1.0 Apis for PaymentMethod -- minimum needed in order to get server tests that pass (more coming on that side)

Fixing broken tests... more coming

PaymentMethod integration with Account (default PaymentMethod)

Fix broken test in overdue caused by changed in mock payment

Merge remote branch 'origin/integration' into server Conflicts: jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJsonSimple.java

jaxrs: add test for AccountJsonSimple Signed-off-by: Pierre-Alexandre …

Meyer <pierre@ning.com>

jaxrs: add test for AccountJson Change also tabs to spaces. …

No functional change.

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

catalog: make CatalogModule more flexible Don't rely on …

System properties but allow the user to specify its own
ConfigSource. This is handy in tests.

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

Merge remote branch 'origin/integration' into server Conflicts: analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java api/src/main/java/com/ning/billing/ErrorCode.java api/src/main/java/com/ning/billing/payment/api/PaymentApi.java api/src/main/java/com/ning/billing/payment/api/PaymentMethodInfo.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceJsonSimple.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/resources/InvoiceResource.java jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxrsResource.java payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java payment/src/main/java/com/ning/billing/payment/dao/AuditedPaymentDao.java payment/src/main/java/com/ning/billing/payment/dao/PaymentAttemptSqlDao.java payment/src/main/java/com/ning/billing/payment/dao/PaymentDao.java payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java payment/src/main/java/com/ning/billing/payment/provider/NoOpPaymentProviderPlugin.java payment/src/test/java/com/ning/billing/payment/dao/MockPaymentDao.java server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java

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

into integration