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.
Moving the payment event posting deeper in the stack so that it (hopefully) occurs for all payments, howver initiated
Another fix to get the conditional logic for the state calculation correct
Payment work (ongoing)
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
Fix unit tests after dreadfl merge operation
Setting up for Overdue NUTS tests
Merging with integration
Another overdue test
More Overdue tests
Fix build issues after payment changes
Merge remote branch 'origin/integration' into server

Conflicts:
	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/provider/NoOpPaymentProviderPlugin.java
	payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java
Started changes to support AutoInvoiceOff Tag
Merge from master - tests failing but pushing to unblock Stephane
Payment cleanup-- follow up
Merge remote branch 'origin/integration' into server

Conflicts:
	analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java
	beatrix/src/test/java/com/ning/billing/beatrix/integration/payment/TestNotifyInvoicePaymentApi.java
Remove unused Jackson views
Fixing failing overdue tests
Added /1.0 payment endpoints-- need to clarify exact Json for payment