killbill-developers

<< < 97 98 99 100 101 > >>

Merge remote-tracking branch 'origin/svcsapi' into svcapi-progress Conflicts: invoice/src/main/java/com/ning/billing/invoice/InvoiceDispatcher.java invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java invoice/src/main/java/com/ning/billing/invoice/dao/AuditedInvoiceDao.java invoice/src/test/java/com/ning/billing/invoice/api/invoice/TestDefaultInvoicePaymentApi.java invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java invoice/src/test/java/com/ning/billing/invoice/dao/TestDefaultInvoiceDao.java invoice/src/test/java/com/ning/billing/invoice/tests/TestChargeBacks.java junction/src/test/java/com/ning/billing/junction/api/blocking/TestDefaultBlockingApi.java overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueStateApplicator.java payment/src/main/java/com/ning/billing/payment/core/PaymentMethodProcessor.java payment/src/main/java/com/ning/billing/payment/core/PaymentProcessor.java payment/src/main/java/com/ning/billing/payment/core/ProcessorBase.java payment/src/main/java/com/ning/billing/payment/core/RefundProcessor.java payment/src/test/java/com/ning/billing/payment/core/TestPaymentMethodProcessor.java

10/5/2012 9:47:00 PM

stephane brossier

Commit: 1a5fd8e

Tree: 3656d6c

Parents: c08a623
6d03324

Add default implementation for internal APIs

10/5/2012 9:35:17 PM

stephane brossier

Commit: c08a623

Tree: c53ad31

Parents: 8f2c83e

Merge remote-tracking branch 'origin/svcsapi' into svcapi-progress Conflicts: entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultChargeThruApi.java

10/5/2012 7:57:54 PM

stephane brossier

Commit: 8f2c83e

Tree: 25c0a7f

Parents: abff2c7
6014158

Merge remote-tracking branch 'origin/svcsapi' into svcapi-progress Conflicts: entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultChargeThruApi.java invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java invoice/src/main/java/com/ning/billing/invoice/dao/AuditedInvoiceDao.java invoice/src/test/java/com/ning/billing/invoice/dao/TestDefaultInvoiceDao.java invoice/src/test/java/com/ning/billing/invoice/dao/TestInvoiceDao.java junction/src/main/java/com/ning/billing/junction/api/blocking/DefaultBlockingApi.java overdue/src/main/java/com/ning/billing/overdue/api/DefaultOverdueUserApi.java overdue/src/test/java/com/ning/billing/overdue/applicator/TestOverdueStateApplicator.java

10/5/2012 7:56:44 PM

stephane brossier

Commit: abff2c7

Tree: 894bd3c

Parents: a1e038c
12806d9

Second pass on remove user api from killbill code

10/5/2012 7:01:28 PM

stephane brossier

Commit: a1e038c

Tree: 8a47524

Parents: b66d291

Initial pass toi refactor internal/external APIs

10/5/2012 5:14:09 PM

stephane brossier

Commit: b66d291

Tree: f15860b

Parents: f4e40c5

util: make sure to not drop context information in InternalCallContextFactory This …

10/6/2012 1:50:03 AM

is important for audits.

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

Pierre-Alexandre Meyer

Commit: bd64c88

Tree: ffd8ac9

Parents: 82ca1c0

invoice: fix test setup Signed-off-by: Pierre-Alexandre …

10/6/2012 1:13:54 AM

Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 82ca1c0

Tree: 0eedd49

Parents: 57d1d55

util: refactor InternalCallContextFactory Signed-off-by: …

10/6/2012 12:56:03 AM

Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 57d1d55

Tree: 5170ba5

Parents: 6316841

svcsapi: More account_record_id/tenant_record_id work * …

10/5/2012 11:38:30 PM

Fix missing account_record_id in account audits
* Pass tenant_record_id and account_record_id to NotificationQueueHandlers
* Don't pass accountId when creating InternalTenantContexts - it's not needed
* Store account_record_id and tenant_record_id in db-backed queues

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

Pierre-Alexandre Meyer

Commit: 6316841

Tree: 6711bdc

Parents: 6d03324