killbill-aplcache

Rewrote one more time the createPayment routine to handle various …

failure from Plugin failures, Timeout issues and PaymeneError
along with all the correct retry logics. Need additional testting for Plugin failures and timeout issues.

Rework retry framework for payment Add account locking and …

timeout for calls handled in plugin
Unit tests for API
Units tests for payment failure retry

More ongoing payment rework

Payment rework (check-in only for backup; tests don't even …

pass yet)

Merge branch 'integration' into server Conflicts: jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonNoSubscriptions.java jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java jaxrs/src/main/java/com/ning/billing/jaxrs/resources/PaymentResource.java payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentInfoEvent.java server/src/test/java/com/ning/billing/jaxrs/TestAccount.java server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java

Merge branch 'master' into integration Conflicts: analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java api/src/main/java/com/ning/billing/payment/api/Either.java api/src/main/java/com/ning/billing/payment/api/PaymentInfoEvent.java overdue/src/main/java/com/ning/billing/overdue/api/DefaultOverdueUserApi.java payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentInfoEvent.java payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java payment/src/main/resources/com/ning/billing/payment/dao/PaymentSqlDao.sql.stg payment/src/test/java/com/ning/billing/payment/api/TestEventJson.java payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java

updated tag and custom field api for killbill 1.0

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release killbill-0.1.12

updates to remove codehaus.jackson; add external payment …

id to paymentInfo; change entitlement_events table to subscription_events