killbill-uncached

payment: merge system properties from resource file Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Merge branch 'new-paymentpluginapi' Conflicts: .gitignore

Add synchronize in the mock

Merge branch 'new-paymentpluginapi' of github.com:killbill/killbill …

into new-paymentpluginapi

Merge branch 'changes-for-docs' into new-paymentpluginapi Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Conflicts:
	payment/src/test/java/com/ning/billing/payment/PaymentTestSuiteNoDB.java
	payment/src/test/java/com/ning/billing/payment/PaymentTestSuiteWithEmbeddedDB.java
	payment/src/test/java/com/ning/billing/payment/glue/TestPaymentModule.java
	server/src/main/resources/killbill-server.properties
	util/src/main/java/com/ning/billing/util/config/PaymentConfig.java

Merge branch 'new-paymentpluginapi' into changes-for-docs

server: fix rat checks * Add missing copyright headers * …

Make RAT understand the MIT license

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

server: add better looking index page Signed-off-by: Pierre-Alexandre …

Meyer <pierre@ning.com>

server: fix Jersey URI pattern The plugin servlets are not …

under /1.0/kb but under /plugins.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

server: various fixes * Fix the wiring to handle only REST …

APIs via Jersey
* Add welcome page and favicon
* Fix the jetty:run goal configuration to use the jetty xml config

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>