killbill-aplcache

<< < 417 418 419 420 421 > >>

PaymentMethod integration with Account (default PaymentMethod)

6/8/2012 10:11:22 PM

stephane brossier

Commit: 54423f4

Tree: 268bf21

Parents: d250f3a

Fix broken test in overdue caused by changed in mock payment

6/8/2012 3:30:49 PM

stephane brossier

Commit: d250f3a

Tree: bd79b7b

Parents: b70bd3b

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

6/8/2012 12:29:18 AM

stephane brossier

Commit: b70bd3b

Tree: 983b6bd

Parents: 3399067
3a5b948

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

6/7/2012 10:12:07 PM

Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 3a5b948

Tree: 38edcbd

Parents: 512635c

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

6/7/2012 6:35:44 PM

No functional change.

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

Pierre-Alexandre Meyer

Commit: 512635c

Tree: e465336

Parents: 67890fa

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

6/7/2012 2:58:28 AM

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>

Pierre-Alexandre Meyer

Commit: 67890fa

Tree: 46d90f8

Parents: 962d1a0

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

6/7/2012 10:31:06 PM

stephane brossier

Commit: 3399067

Tree: 5d4fbe6

Parents: 36e2874
962d1a0

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

6/6/2012 4:43:37 PM

into integration

Pierre-Alexandre Meyer

Commit: 962d1a0

Tree: be7007c

Parents: 3354e18
7cca117

First pass at Catalog endpoints - tests still needed and output …

6/6/2012 12:13:31 PM

of add on availability endpoint needs adjusting

Martin Westhead

Commit: 7cca117

Tree: 2afbc29

Parents: 7b04b41

First pass at Catalog endpoints - tests still needed and output …

6/6/2012 12:13:18 PM

of add on availability endpoint needs adjusting

Martin Westhead

Commit: 7b04b41

Tree: 7c723a7

Parents: b35b582