killbill-aplcache

Various fixes to overdue to get a beatrix test working end-to-end. …

5/12/2012 3:25:08 PM

Last piece still to do - recovery after payment goes through.

Martin Westhead

Commit: 9527678

Tree: 48daaf5

Parents: b9f7e1b

Various fixes to overdue to get a beatrix test working end-to-end. …

5/12/2012 3:24:53 PM

Last piece still to do - recovery after payment goes through.

Martin Westhead

Commit: b9f7e1b

Tree: a6fda5e

Parents: 2e1778e

Fix build issues after payment changes

5/22/2012 3:34:05 PM

stephane brossier

Commit: 5bd7ec7

Tree: 89bca64

Parents: 5ac8a83

Fix unit tests after dreadfl merge operation

5/16/2012 8:04:53 PM

stephane brossier

Commit: 5ac8a83

Tree: e716182

Parents: 6933c5b

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 api/src/main/java/com/ning/billing/payment/api/PaymentApi.java api/src/main/java/com/ning/billing/payment/api/PaymentAttempt.java api/src/main/java/com/ning/billing/payment/api/PaymentInfoEvent.java beatrix/src/test/java/com/ning/billing/beatrix/integration/payment/TestNotifyInvoicePaymentApi.java payment/src/main/java/com/ning/billing/payment/RequestProcessor.java payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentInfoEvent.java payment/src/main/java/com/ning/billing/payment/dao/AuditedPaymentDao.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/main/java/com/ning/billing/payment/retry/TimedoutPaymentRetryService.java payment/src/main/resources/com/ning/billing/payment/dao/PaymentSqlDao.sql.stg payment/src/main/resources/com/ning/billing/payment/ddl.sql payment/src/test/java/com/ning/billing/payment/TestRetryService.java payment/src/test/java/com/ning/billing/payment/api/TestEventJson.java payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java payment/src/test/java/com/ning/billing/payment/dao/MockPaymentDao.java payment/src/test/java/com/ning/billing/payment/dao/TestPaymentDao.java payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java

5/16/2012 2:08:26 PM

stephane brossier

Commit: 6933c5b

Tree: 28a1c94

Parents: 3be9e53
6bc860a

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

5/15/2012 8:39:46 PM

into integration

Conflicts:
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
	server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
	util/src/main/java/com/ning/billing/util/bus/dao/PersistentBusSqlDao.java
	util/src/main/java/com/ning/billing/util/notificationq/DefaultNotification.java
	util/src/main/java/com/ning/billing/util/notificationq/Notification.java
	util/src/main/java/com/ning/billing/util/notificationq/dao/NotificationSqlDao.java
	util/src/test/java/com/ning/billing/util/notificationq/MockNotificationQueue.java

Jeff Certain

Commit: 6bc860a

Tree: 72a854f

Parents: 6b6da75

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

5/15/2012 1:22:06 PM

into integration

Jeff Certain

Commit: 6b6da75

Tree: f77c25b

Parents: 912713a
6cbb6bf

Missing an include

5/14/2012 10:59:00 PM

Martin Westhead

Commit: 6cbb6bf

Tree: 1da78be

Parents: 696dc22

Better fix for NPE

5/14/2012 10:54:59 PM

Martin Westhead

Commit: 696dc22

Tree: 73e88c4

Parents: 61924d9

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

5/15/2012 1:21:43 PM

into integration

Conflicts:
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
	server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
	util/src/main/java/com/ning/billing/util/bus/dao/PersistentBusSqlDao.java
	util/src/main/java/com/ning/billing/util/notificationq/DefaultNotification.java
	util/src/main/java/com/ning/billing/util/notificationq/Notification.java
	util/src/main/java/com/ning/billing/util/notificationq/dao/NotificationSqlDao.java
	util/src/test/java/com/ning/billing/util/notificationq/MockNotificationQueue.java

Jeff Certain

Commit: 912713a

Tree: 0539f97

Parents: eda667f