killbill-uncached

diff --git a/server/src/main/java/org/killbill/billing/server/config/DaoConfig.java b/server/src/main/java/org/killbill/billing/server/config/DaoConfig.java
index 5aa4234..8198f9e 100644
--- a/server/src/main/java/org/killbill/billing/server/config/DaoConfig.java
+++ b/server/src/main/java/org/killbill/billing/server/config/DaoConfig.java
@@ -79,7 +79,7 @@ public interface DaoConfig extends KillbillConfig {
 
     @Description("The TransactionHandler to use for all Handle instances")
     @Config("org.killbill.dao.transactionHandler")
-    @Default("com.ning.billing.commons.jdbi.transaction.RestartTransactionRunner")
+    @Default("org.killbill.commons.jdbi.transaction.RestartTransactionRunner")
     String getTransactionHandlerClass();
 
     @Description("Connection pooling type")

diff --git a/server/src/main/java/org/killbill/billing/server/listeners/KillbillGuiceListener.java b/server/src/main/java/org/killbill/billing/server/listeners/KillbillGuiceListener.java
index d44184d..7a53514 100644
--- a/server/src/main/java/org/killbill/billing/server/listeners/KillbillGuiceListener.java
+++ b/server/src/main/java/org/killbill/billing/server/listeners/KillbillGuiceListener.java
@@ -82,8 +82,8 @@ public class KillbillGuiceListener extends GuiceServletContextListener {
         // Don't filter all requests through Jersey, only the JAX-RS APIs (otherwise,
         // things like static resources, favicon, etc. are 404'ed)
         final BaseServerModuleBuilder builder = new BaseServerModuleBuilder().setJaxrsUriPattern("(" + JaxRsResourceBase.PREFIX + "|" + JaxRsResourceBase.PLUGINS_PATH + ")" + "/.*")
-                                                                             .addJaxrsResource("com.ning.billing.jaxrs.mappers")
-                                                                             .addJaxrsResource("com.ning.billing.jaxrs.resources");
+                                                                             .addJaxrsResource("org.killbill.billing.jaxrs.mappers")
+                                                                             .addJaxrsResource("org.killbill.billing.jaxrs.resources");
 
         if (config.isMultiTenancyEnabled()) {
             builder.addFilter("/*", TenantFilter.class);

diff --git a/server/src/main/resources/killbill-server.properties b/server/src/main/resources/killbill-server.properties
index 0295406..3d85b58 100644
--- a/server/src/main/resources/killbill-server.properties
+++ b/server/src/main/resources/killbill-server.properties
@@ -16,9 +16,9 @@
 
 
 # Use skeleton properties for server and configure killbill database
-com.ning.jetty.jdbi.url=jdbc:mysql://127.0.0.1:3306/killbill
-com.ning.jetty.jdbi.user=root
-com.ning.jetty.jdbi.password=root
+org.killbill.dao.url=jdbc:mysql://127.0.0.1:3306/killbill
+org.killbill.dao.user=root
+org.killbill.dao.password=root
 
 # Use the SpyCarAdvanced.xml catalog
 org.killbill.catalog.uri=SpyCarAdvanced.xml

diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
index 80448bb..f941220 100644
--- a/server/src/main/webapp/WEB-INF/web.xml
+++ b/server/src/main/webapp/WEB-INF/web.xml
@@ -46,7 +46,7 @@
     </filter-mapping>
     <listener>
         <!-- Jersey insists on using java.util.logging (JUL) -->
-        <listener-class>com.ning.jetty.core.listeners.SetupJULBridge</listener-class>
+        <listener-class>org.killbill.commons.skeleton.listeners.JULServletContextListener</listener-class>
     </listener>
     <listener>
         <!-- Context listener: called at startup time and creates the injector -->

diff --git a/server/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java b/server/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
index 600a728..62f9b5e 100644
--- a/server/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
+++ b/server/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
@@ -299,9 +299,9 @@ public class TestJaxrsBase extends KillbillClient {
         }
 
         // For shiro (outside of Guice control)
-        System.setProperty("com.ning.jetty.jdbi.url", DBTestingHelper.get().getJdbcConnectionString());
-        System.setProperty("com.ning.jetty.jdbi.user", DBTestingHelper.get().getUsername());
-        System.setProperty("com.ning.jetty.jdbi.password", DBTestingHelper.get().getPassword());
+        System.setProperty("org.killbill.dao.url", DBTestingHelper.get().getJdbcConnectionString());
+        System.setProperty("org.killbill.dao.user", DBTestingHelper.get().getUsername());
+        System.setProperty("org.killbill.dao.password", DBTestingHelper.get().getPassword());
     }
 
     @BeforeSuite(groups = "slow")