killbill-aplcache

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

into integration

Conflicts:
	account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
	account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java
	analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
	api/src/main/java/com/ning/billing/util/api/TagDefinitionUserApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/SubscriptionSqlDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
	invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoice.java
	invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
	invoice/src/main/resources/com/ning/billing/invoice/ddl.sql
	invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
	util/src/main/java/com/ning/billing/util/tag/DefaultControlTag.java
	util/src/main/java/com/ning/billing/util/tag/dao/DefaultTagDefinitionDao.java
	util/src/test/java/com/ning/billing/util/globallocker/TestMysqlGlobalLocker.java
	util/src/test/java/com/ning/billing/util/tag/TestTagStore.java

auditing rework

Add cleanup/dump for db-helper script

Bug fixes for jaxrs and scripts for starting server

Initial jaxrs/server implementation

Merge branch 'master' into integration Non trivial merge-- …

continuation of cleanup started by Pierre
(To be reviewed by team)

Conflicts:
	entitlement/pom.xml
	invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
	pom.xml
	util/pom.xml
	util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java
	util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
	util/src/test/java/com/ning/billing/util/validation/TestValidationManager.java

invoice: fix group name in TestNextBillingDateNotifier Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

analytics: add missing group in TestAnalyticsDao annotations Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

pom.xml: only run fast and slow tests for now The account module …

defines others groups (e.g. account-dao
for TestSimpleAccountDao) but they don't pass.

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

util: add missing group in TestEventBus annotations Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>