killbill-memoizeit

Moving the payment event posting deeper in the stack so that …

it (hopefully) occurs for all payments, howver initiated

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

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

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

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

Fix build issues after payment changes

Fix unit tests after dreadfl merge operation

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

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

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

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

into integration

Missing an include

Better fix for NPE