killbill-aplcache

osgi-bundles: fix NPE in test bundle Now that the LogService …

is not installed in the System bundle anymore,
don't rely on it in the test bundle.

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

server: fix TestPlugin failures The path info has changed …

as seen by the plugins.

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

jaxrs: fix HEAD request handling in PluginResource The request …

and response weren't wrapped like the other calls.

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

server: fix Guice injection failure in TestJaxrsBase Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Merge branch 'master' into new-paymentpluginapi Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Conflicts:
	analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
	server/src/test/java/com/ning/billing/jaxrs/TestAccount.java

Merge branch 'osgi-felix-webconsole' into new-paymentpluginapi Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Conflicts:
	.gitignore
	osgi-bundles/pom.xml
	pom.xml

osgi-bundles: fix dependency versions conflicts Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Update osgi-bundles/jruby/README.md

util: use a more sensible name for the JRuby bundle Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

osgi-bundles: track the LogService using a ServiceTracker Don't …

assume the LogService is always available - it won't be,
especially at startup, depending on the start sequence of the bundles.
Instead, rely on a ServiceTracker to find it.

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