killbill-aplcache

Merge with Pierre skeleton changes Merge with integration …

(CallContext)

Merge branch 'server' of https://github.com/pierre/killbill …

into server

server: bump skeleton to released version Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

server: update to skeleton 0.1.0-SNAPSHOT Modernize the …

pom.xml:
* Update jmxutils to 1.12
* Update metrics to 2.1.1
* Update Jetty to 8.1.2.v20120308 and servlet api 3.0.1
* Update slf4j to 1.6.4
* Update Jersey to 1.12
* Update Guava to 11.0.2

Get rid of log4j dependency and use logback instead.
I've replaced the log4j.xml with a logback.xml.

The healthcheck has been updated to Metrics 2.x.x APIs.

I have also simplified the Guice listeners by using the
skeleton 0.1.0-SNAPSHOT builder, which simplifies most of
the glue code.

Tested via the Jetty plugin:

mvn -Dcom.ning.jetty.jdbi.url=jdbc:mysql://127.0.0.1:3306/killbill \ -Dcom.ning.jetty.jdbi.user=killbill \ -Dcom.ning.jetty.jdbi.password=killbill \ jetty:run

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

Merge branch 'integration' into server

Minor change for tests to pass in localtest settings

added check for created and updated dates for account migration

invoice audit

Merge branch 'integration' of github.com:ning/killbill …

into integration

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
	analytics/src/test/java/com/ning/billing/analytics/MockAccount.java
	api/src/main/java/com/ning/billing/account/api/Account.java
	api/src/main/java/com/ning/billing/account/api/AccountUserApi.java
	api/src/main/java/com/ning/billing/util/api/TagUserApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccount.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/TestDefaultEntitlementBillingApi.java
	invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
	invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithEmbeddedDb.java
	invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
	util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionUserApi.java
	util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java
	util/src/test/java/com/ning/billing/util/tag/TestTagStore.java

Merge branch 'integration' of github.com:ning/killbill …

into integration