killbill-memoizeit

Fix minor pom issues

.idea: import shared settings Signed-off-by: Pierre-Alexandre …

Meyer <pierre@mouraf.org>

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

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

Fix copyright missing issues

Add latest commons by switching to oss-parent 0.3.2

Merge branch 'master' into queue Conflicts: payment/src/main/java/com/ning/billing/payment/bus/InvoiceHandler.java payment/src/main/java/com/ning/billing/payment/core/PaymentProcessor.java

payment: validate invoice balance early Make sure we don't …

fail a payment before making sure there is something to pay.
This fixes payment error events associated with $0 invoices for accounts without
a default payment method.

* Fix test in beatrix which was now expecting an extra payment error event
* In PaymentProcessor, we need to handle external payment methods separately, to
avoid a potential deadlock

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

Change config property name for claimed bus events

Merge remote-tracking branch 'origin/master' into queue Conflicts: invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java osgi-bundles/bundles/meter/pom.xml osgi-bundles/bundles/meter/src/main/java/com/ning/billing/meter/jaxrs/resources/MeterResource.java osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/MeterTestSuite.java osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/TestDateTimeUtils.java osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/TestInMemoryEventHandler.java osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/TestTimelineEventHandler.java osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/TestTimelineSourceEventAccumulator.java osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/TimelineLoadGenerator.java osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/aggregator/TestTimelineAggregator.java osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/chunks/TestTimelineChunk.java osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/consumer/TestAccumulatorSampleConsumer.java osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/persistent/TestFileBackedBuffer.java osgi-bundles/bundles/meter/src/test/java/com/ning/billing/meter/timeline/persistent/TestSamplesReplayer.java payment/src/main/java/com/ning/billing/payment/core/ProcessorBase.java pom.xml