killbill-uncached

Ongoing work for payment/invoicePayment APIs * Remove RefundJson …

model and use new model DirectTransactionJson
* Simplify InvoicePaymentApi
* Fix glitches in payment/invoicePayment APIs

Intermediary steps towards fixing the jaxrs API to fit the new …

model imposed by (direct) payments
This is incomplete, some APIs still seem broken, and as a result some tests under killbill profile still don't pass.

Fix Payment tests (only one disabled because behavior changed, …

so failure expected, probably test should be removed)

Fix wrong initial state in RetryLeavingStateCallback causing …

TestRetryService to fail sporadically

First pass at fixing JAXRS resources for Payment rework

Rework payment search (attempts/payments/transactions..) …

to rely more on id than externalKey whenever possible
Add unique constraint for transactionExternalKey (based on SUCCESS)
Add PaymentApiException for API arguments
Fix tests after those changes

Merge branch 'master' of github.com:killbill/killbill

Merge remote-tracking branch 'origin/master' into iKentoo-master

Merge branch 'master' of github.com:iKentoo/killbill into …

iKentoo-master

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

Conflicts:
	beatrix/pom.xml
	invoice/src/main/java/org/killbill/billing/invoice/glue/DefaultInvoiceModule.java
	invoice/src/test/java/org/killbill/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java
	invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceHelper.java
	osgi-bundles/bundles/jruby/pom.xml
	osgi-bundles/bundles/logger/pom.xml
	osgi-bundles/libs/killbill/src/main/java/org/killbill/killbill/osgi/libs/killbill/OSGIKillbillAPI.java
	osgi/pom.xml
	osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIKillbill.java
	osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java
	util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java

Merge remote-tracking branch 'upstream/osgi-shiro'