killbill-memoizeit

diff --git a/beatrix/src/test/resources/beatrix.properties b/beatrix/src/test/resources/beatrix.properties
index ad6d9fb..0804587 100644
--- a/beatrix/src/test/resources/beatrix.properties
+++ b/beatrix/src/test/resources/beatrix.properties
@@ -1,25 +1,25 @@
-killbill.catalog.uri=file:src/test/resources/catalogSample.xml
+org.killbill.catalog.uri=file:src/test/resources/catalogSample.xml
 
-killbill.billing.notificationq.main.sleep=100
-killbill.billing.notificationq.main.nbThreads=1
-killbill.billing.notificationq.main.useInFlightQ=false
-killbill.billing.notificationq.main.prefetch=1
-killbill.billing.notificationq.main.claimed=1
+org.killbill.notificationq.main.sleep=100
+org.killbill.notificationq.main.nbThreads=1
+org.killbill.notificationq.main.useInFlightQ=false
+org.killbill.notificationq.main.prefetch=1
+org.killbill.notificationq.main.claimed=1
 
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.prefetch=1
-killbill.billing.persistent.bus.main.claimed=1
-killbill.billing.persistent.bus.main.useInFlightQ=false
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.prefetch=1
+org.killbill.persistent.bus.main.claimed=1
+org.killbill.persistent.bus.main.useInFlightQ=false
 
-killbill.billing.persistent.bus.external.sleep=100
-killbill.billing.persistent.bus.external.nbThreads=1
-killbill.billing.persistent.bus.external.prefetch=1
-killbill.billing.persistent.bus.external.claimed=1
-killbill.billing.persistent.bus.external.useInFlightQ=false
+org.killbill.persistent.bus.external.sleep=100
+org.killbill.persistent.bus.external.nbThreads=1
+org.killbill.persistent.bus.external.prefetch=1
+org.killbill.persistent.bus.external.claimed=1
+org.killbill.persistent.bus.external.useInFlightQ=false
 
-killbill.billing.persistent.bus.external.tableName=bus_ext_events
-killbill.billing.persistent.bus.external.historyTableName=bus_ext_events_history
+org.killbill.persistent.bus.external.tableName=bus_ext_events
+org.killbill.persistent.bus.external.historyTableName=bus_ext_events_history
 
 user.timezone=UTC
 killbill.payment.retry.days=8,8,8,8,8,8,8,8

diff --git a/beatrix/src/test/resources/Catalog-Entitlement-Testplan.txt b/beatrix/src/test/resources/Catalog-Entitlement-Testplan.txt
index 6d5867f..7c0ddf6 100644
--- a/beatrix/src/test/resources/Catalog-Entitlement-Testplan.txt
+++ b/beatrix/src/test/resources/Catalog-Entitlement-Testplan.txt
@@ -109,4 +109,4 @@ ADD-ON TESTS
     * Add-on creation alignment
     * Add-on cancel with base plan
     
-    
\ No newline at end of file
+    

diff --git a/entitlement/src/test/resources/entitlement.properties b/entitlement/src/test/resources/entitlement.properties
index 87d47cb..11f0313 100644
--- a/entitlement/src/test/resources/entitlement.properties
+++ b/entitlement/src/test/resources/entitlement.properties
@@ -1,5 +1,5 @@
-killbill.catalog.uri=file:src/test/resources/catalog.xml
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.catalog.uri=file:src/test/resources/catalog.xml
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
 user.timezone=UTC

diff --git a/invoice/src/test/java/org/killbill/billing/invoice/template/formatters/TestDefaultInvoiceFormatter.java b/invoice/src/test/java/org/killbill/billing/invoice/template/formatters/TestDefaultInvoiceFormatter.java
index 8b0aee7..7256586 100644
--- a/invoice/src/test/java/org/killbill/billing/invoice/template/formatters/TestDefaultInvoiceFormatter.java
+++ b/invoice/src/test/java/org/killbill/billing/invoice/template/formatters/TestDefaultInvoiceFormatter.java
@@ -333,7 +333,7 @@ public class TestDefaultInvoiceFormatter extends InvoiceTestSuiteNoDB {
 
             @Override
             public String getInvoiceTemplateBundlePath() {
-                return "org.killbill/billing/util/template/translation/InvoiceTranslation";
+                return "org/killbill/billing/util/template/translation/InvoiceTranslation";
             }
 
             @Override

diff --git a/junction/src/test/resources/junction.properties b/junction/src/test/resources/junction.properties
index 87d47cb..11f0313 100644
--- a/junction/src/test/resources/junction.properties
+++ b/junction/src/test/resources/junction.properties
@@ -1,5 +1,5 @@
-killbill.catalog.uri=file:src/test/resources/catalog.xml
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.catalog.uri=file:src/test/resources/catalog.xml
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
 user.timezone=UTC

diff --git a/overdue/src/test/resources/resource.properties b/overdue/src/test/resources/resource.properties
index a7e225e..23ed0f6 100644
--- a/overdue/src/test/resources/resource.properties
+++ b/overdue/src/test/resources/resource.properties
@@ -1,5 +1,5 @@
-killbill.catalog.uri=file:src/test/resources/catalogSample.xml
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.catalog.uri=file:src/test/resources/catalogSample.xml
+org.killbill.persistent.bus.main.claimed=1
 user.timezone=UTC
 
 

diff --git a/payment/src/test/resources/payment.properties b/payment/src/test/resources/payment.properties
index 5841e2e..41775d7 100644
--- a/payment/src/test/resources/payment.properties
+++ b/payment/src/test/resources/payment.properties
@@ -1,4 +1,4 @@
 killbill.payment.failure.retry.start.sec=3600
 killbill.payment.failure.retry.multiplier=1
 killbill.payment.failure.retry.max.attempts=3
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.persistent.bus.main.claimed=1

diff --git a/server/src/deb/support/killbill.properties b/server/src/deb/support/killbill.properties
index 666b7b2..ed16d9b 100644
--- a/server/src/deb/support/killbill.properties
+++ b/server/src/deb/support/killbill.properties
@@ -22,7 +22,7 @@ org.killbill.jetty.jdbi.user=root
 org.killbill.jetty.jdbi.password=root
 
 # Use the SpyCarAdvanced.xml catalog
-killbill.catalog.uri=SpyCarAdvanced.xml
+org.killbill.catalog.uri=SpyCarAdvanced.xml
 
 # Set default timezone to UTC
 user.timezone=UTC
@@ -30,14 +30,14 @@ user.timezone=UTC
 # For bundles that use antlr (string template)
 ANTLR_USE_DIRECT_CLASS_LOADING=true
 
-killbill.billing.notificationq.main.sleep=100
+org.killbill.notificationq.main.sleep=100
 
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
 
-killbill.billing.persistent.bus.external.sleep=100
-killbill.billing.persistent.bus.external.nbThreads=1
-killbill.billing.persistent.bus.external.claimed=1
-killbill.billing.persistent.bus.external.tableName=bus_ext_events
-killbill.billing.persistent.bus.external.historyTableName=bus_ext_events_history
+org.killbill.persistent.bus.external.sleep=100
+org.killbill.persistent.bus.external.nbThreads=1
+org.killbill.persistent.bus.external.claimed=1
+org.killbill.persistent.bus.external.tableName=bus_ext_events
+org.killbill.persistent.bus.external.historyTableName=bus_ext_events_history

diff --git a/server/src/main/java/org/killbill/billing/server/config/KillbillServerConfig.java b/server/src/main/java/org/killbill/billing/server/config/KillbillServerConfig.java
index 4035f3a..883984d 100644
--- a/server/src/main/java/org/killbill/billing/server/config/KillbillServerConfig.java
+++ b/server/src/main/java/org/killbill/billing/server/config/KillbillServerConfig.java
@@ -24,12 +24,12 @@ import org.killbill.billing.util.config.KillbillConfig;
 
 public interface KillbillServerConfig extends KillbillConfig {
 
-    @Config("killbill.server.multitenant")
+    @Config("org.killbill.server.multitenant")
     @Default("true")
     @Description("Whether multi-tenancy is enabled")
     public boolean isMultiTenancyEnabled();
 
-    @Config("killbill.server.test.mode")
+    @Config("org.killbill.server.test.mode")
     @Default("false")
     @Description("Whether to start in test mode")
     public boolean isTestModeEnabled();

diff --git a/server/src/main/java/org/killbill/billing/server/updatechecker/ProductInfo.java b/server/src/main/java/org/killbill/billing/server/updatechecker/ProductInfo.java
index 9eff8df..ce16651 100644
--- a/server/src/main/java/org/killbill/billing/server/updatechecker/ProductInfo.java
+++ b/server/src/main/java/org/killbill/billing/server/updatechecker/ProductInfo.java
@@ -38,7 +38,7 @@ public class ProductInfo {
 
     private static final Logger log = LoggerFactory.getLogger(ProductInfo.class);
 
-    private static final String KILLBILL_SERVER_VERSION_RESOURCE = "/org.killbill/billing/server/version.properties";
+    private static final String KILLBILL_SERVER_VERSION_RESOURCE = "/org/killbill/billing/server/version.properties";
 
     private static final String UNKNOWN = "UNKNOWN";
 

diff --git a/server/src/main/resources/killbill-server.properties b/server/src/main/resources/killbill-server.properties
index 0a9ec96..0295406 100644
--- a/server/src/main/resources/killbill-server.properties
+++ b/server/src/main/resources/killbill-server.properties
@@ -16,12 +16,12 @@
 
 
 # Use skeleton properties for server and configure killbill database
-org.killbill.jetty.jdbi.url=jdbc:mysql://127.0.0.1:3306/killbill
-org.killbill.jetty.jdbi.user=root
-org.killbill.jetty.jdbi.password=root
+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
 
 # Use the SpyCarAdvanced.xml catalog
-killbill.catalog.uri=SpyCarAdvanced.xml
+org.killbill.catalog.uri=SpyCarAdvanced.xml
 
 # Set default timezone to UTC
 user.timezone=UTC
@@ -30,20 +30,20 @@ user.timezone=UTC
 ANTLR_USE_DIRECT_CLASS_LOADING=true
 
 # To enable test endpoint and have Kill Bill run with a ClockMock
-killbill.server.test.mode=true
+org.killbill.server.test.mode=true
 
 
-killbill.billing.notificationq.main.sleep=100
+org.killbill.notificationq.main.sleep=100
 
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
 
-killbill.billing.persistent.bus.external.sleep=100
-killbill.billing.persistent.bus.external.nbThreads=1
-killbill.billing.persistent.bus.external.claimed=1
-killbill.billing.persistent.bus.external.tableName=bus_ext_events
-killbill.billing.persistent.bus.external.historyTableName=bus_ext_events_history
+org.killbill.persistent.bus.external.sleep=100
+org.killbill.persistent.bus.external.nbThreads=1
+org.killbill.persistent.bus.external.claimed=1
+org.killbill.persistent.bus.external.tableName=bus_ext_events
+org.killbill.persistent.bus.external.historyTableName=bus_ext_events_history
 
-killbill.server.multitenant=false
+org.killbill.server.multitenant=false
 

diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
index 11d2ce7..80448bb 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>org.killbill.jetty.core.listeners.SetupJULBridge</listener-class>
+        <listener-class>com.ning.jetty.core.listeners.SetupJULBridge</listener-class>
     </listener>
     <listener>
         <!-- Context listener: called at startup time and creates the injector -->

diff --git a/server/src/test/resources/killbill.properties b/server/src/test/resources/killbill.properties
index 4c14642..96cfddc 100644
--- a/server/src/test/resources/killbill.properties
+++ b/server/src/test/resources/killbill.properties
@@ -17,7 +17,7 @@
 # Use killbill util test properties (DbiProvider/MysqltestingHelper) on the test side configured with killbill
 org.killbill.billing.dbi.jdbc.url=jdbc:mysql://127.0.0.1:3306/killbill
 
-killbill.catalog.uri=catalog-weapons.xml
+org.killbill.catalog.uri=catalog-weapons.xml
 killbill.overdue.uri=overdue.xml
 
 killbill.payment.engine.events.off=false
@@ -29,21 +29,21 @@ org.killbill.core.server.jetty.logPath=/var/tmp/.logs
 
 killbill.payment.engine.notifications.sleep=100
 killbill.invoice.engine.notifications.sleep=100
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
-killbill.billing.persistent.bus.external.sleep=100
-killbill.billing.persistent.bus.external.nbThreads=1
-killbill.billing.persistent.bus.external.claimed=1
-killbill.billing.persistent.bus.external.tableName=bus_ext_events
-killbill.billing.persistent.bus.external.historyTableName=bus_ext_events_history
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
+org.killbill.persistent.bus.external.sleep=100
+org.killbill.persistent.bus.external.nbThreads=1
+org.killbill.persistent.bus.external.claimed=1
+org.killbill.persistent.bus.external.tableName=bus_ext_events
+org.killbill.persistent.bus.external.historyTableName=bus_ext_events_history
 # Local DB
 #org.killbill.billing.dbi.test.useLocalDb=true
 
 killbill.osgi.bundle.install.dir=/var/tmp/somethingthatdoesnotexist
 
 # Speed up from the (more secure) default
-killbill.server.multitenant.hash_iterations=10
+org.killbill.server.multitenant.hash_iterations=10
 
 ANTLR_USE_DIRECT_CLASS_LOADING=true
 

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java b/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
index fbc2e91..927afd9 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
@@ -63,7 +63,7 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
         super.beforeClass();
         final VersionedCatalogLoader versionedCatalogLoader = new VersionedCatalogLoader(clock);
         final CatalogConfig config = new ConfigurationObjectFactory(new ConfigSource() {
-            final Map<String, String> properties = ImmutableMap.<String, String>of("killbill.catalog.uri", "file:src/test/resources/testInput.xml");
+            final Map<String, String> properties = ImmutableMap.<String, String>of("org.killbill.catalog.uri", "file:src/test/resources/testInput.xml");
 
             @Override
             public String getString(final String propertyName) {

diff --git a/subscription/src/test/resources/subscription.properties b/subscription/src/test/resources/subscription.properties
index b1d5ad6..9695ca4 100644
--- a/subscription/src/test/resources/subscription.properties
+++ b/subscription/src/test/resources/subscription.properties
@@ -1,5 +1,5 @@
-killbill.catalog.uri=file:src/test/resources/testInput.xml
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.catalog.uri=file:src/test/resources/testInput.xml
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
 user.timezone=UTC

diff --git a/tenant/src/main/java/org/killbill/billing/tenant/security/KillbillCredentialsMatcher.java b/tenant/src/main/java/org/killbill/billing/tenant/security/KillbillCredentialsMatcher.java
index ed134d5..f1ce2a2 100644
--- a/tenant/src/main/java/org/killbill/billing/tenant/security/KillbillCredentialsMatcher.java
+++ b/tenant/src/main/java/org/killbill/billing/tenant/security/KillbillCredentialsMatcher.java
@@ -22,7 +22,7 @@ import org.apache.shiro.crypto.hash.Sha512Hash;
 
 public class KillbillCredentialsMatcher {
 
-    public static final String KILLBILL_TENANT_HASH_ITERATIONS_PROPERTY = "killbill.server.multitenant.hash_iterations";
+    public static final String KILLBILL_TENANT_HASH_ITERATIONS_PROPERTY = "org.killbill.server.multitenant.hash_iterations";
 
     // See http://www.stormpath.com/blog/strong-password-hashing-apache-shiro and https://issues.apache.org/jira/browse/SHIRO-290
     public static final String HASH_ALGORITHM_NAME = Sha512Hash.ALGORITHM_NAME;

diff --git a/util/src/main/java/org/killbill/billing/util/config/CatalogConfig.java b/util/src/main/java/org/killbill/billing/util/config/CatalogConfig.java
index e00ea01..28c09ef 100644
--- a/util/src/main/java/org/killbill/billing/util/config/CatalogConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/config/CatalogConfig.java
@@ -22,7 +22,7 @@ import org.skife.config.Description;
 
 public interface CatalogConfig extends KillbillConfig {
 
-    @Config("killbill.catalog.uri")
+    @Config("org.killbill.catalog.uri")
     @Default("SpyCarBasic.xml")
     @Description("Catalog location. Either in the classpath or in the filesystem")
     String getCatalogURI();

diff --git a/util/src/test/java/org/killbill/billing/KillbillConfigSource.java b/util/src/test/java/org/killbill/billing/KillbillConfigSource.java
index f5da140..65789a2 100644
--- a/util/src/test/java/org/killbill/billing/KillbillConfigSource.java
+++ b/util/src/test/java/org/killbill/billing/KillbillConfigSource.java
@@ -35,10 +35,10 @@ public class KillbillConfigSource implements ConfigSource {
         this.properties.put("user.timezone", "UTC");
 
         // Speed up the notification queue
-        this.properties.put("killbill.billing.notificationq.main.sleep", "100");
+        this.properties.put("org.killbill.notificationq.main.sleep", "100");
         // Speed up the bus
-        this.properties.put("killbill.billing.persistent.bus.main.sleep", "100");
-        this.properties.put("killbill.billing.persistent.bus.main.nbThreads", "1");
+        this.properties.put("org.killbill.persistent.bus.main.sleep", "100");
+        this.properties.put("org.killbill.persistent.bus.main.nbThreads", "1");
     }
 
     public String getString(final String propertyName) {