killbill-uncached

diff --git a/api/src/main/java/com/ning/billing/config/CatalogConfig.java b/api/src/main/java/com/ning/billing/config/CatalogConfig.java
index 73ffd9a..554dcea 100644
--- a/api/src/main/java/com/ning/billing/config/CatalogConfig.java
+++ b/api/src/main/java/com/ning/billing/config/CatalogConfig.java
@@ -20,7 +20,6 @@ import org.skife.config.Config;
 import org.skife.config.Default;
 
 public interface CatalogConfig extends KillbillConfig {
-
     @Config("killbill.catalog.uri")
     @Default("jar:///com/ning/billing/irs/catalog/Catalog.xml")
     String getCatalogURI();

diff --git a/api/src/main/java/com/ning/billing/config/EntitlementConfig.java b/api/src/main/java/com/ning/billing/config/EntitlementConfig.java
index 1f68e5c..088fc45 100644
--- a/api/src/main/java/com/ning/billing/config/EntitlementConfig.java
+++ b/api/src/main/java/com/ning/billing/config/EntitlementConfig.java
@@ -20,14 +20,13 @@ import org.skife.config.Config;
 import org.skife.config.Default;
 
 public interface EntitlementConfig extends NotificationConfig, KillbillConfig {
-
     @Override
     @Config("killbill.entitlement.engine.notifications.sleep")
     @Default("500")
     public long getSleepTimeMs();
 
     @Override
-    @Config("killbill.notifications.off")
+    @Config("killbill.entitlement.engine.notifications.off")
     @Default("false")
     public boolean isNotificationProcessingOff();
 }

diff --git a/api/src/main/java/com/ning/billing/config/InvoiceConfig.java b/api/src/main/java/com/ning/billing/config/InvoiceConfig.java
index 02f7d6e..a8b11df 100644
--- a/api/src/main/java/com/ning/billing/config/InvoiceConfig.java
+++ b/api/src/main/java/com/ning/billing/config/InvoiceConfig.java
@@ -26,7 +26,7 @@ public interface InvoiceConfig extends NotificationConfig, KillbillConfig {
     public long getSleepTimeMs();
 
     @Override
-    @Config("killbill.notifications.off")
+    @Config("killbill.invoice.engine.notifications.off")
     @Default("false")
     public boolean isNotificationProcessingOff();
 

diff --git a/api/src/main/java/com/ning/billing/config/KillbillConfig.java b/api/src/main/java/com/ning/billing/config/KillbillConfig.java
index 336f806..f577d2c 100644
--- a/api/src/main/java/com/ning/billing/config/KillbillConfig.java
+++ b/api/src/main/java/com/ning/billing/config/KillbillConfig.java
@@ -1,5 +1,5 @@
-/* 
- * Copyright 2010-2011 Ning, Inc.
+/*
+ * Copyright 2010-2012 Ning, Inc.
  *
  * Ning licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the

diff --git a/api/src/main/java/com/ning/billing/config/NotificationConfig.java b/api/src/main/java/com/ning/billing/config/NotificationConfig.java
index 630a2d6..6da8821 100644
--- a/api/src/main/java/com/ning/billing/config/NotificationConfig.java
+++ b/api/src/main/java/com/ning/billing/config/NotificationConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 Ning, Inc.
+ * Copyright 2010-2012 Ning, Inc.
  *
  * Ning licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the

diff --git a/api/src/main/java/com/ning/billing/config/PaymentConfig.java b/api/src/main/java/com/ning/billing/config/PaymentConfig.java
index 9da471d..efd012e 100644
--- a/api/src/main/java/com/ning/billing/config/PaymentConfig.java
+++ b/api/src/main/java/com/ning/billing/config/PaymentConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 Ning, Inc.
+ * Copyright 2010-2012 Ning, Inc.
  *
  * Ning licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
@@ -23,8 +23,6 @@ import org.skife.config.Default;
 
 
 public interface PaymentConfig extends NotificationConfig, KillbillConfig {
-
-
     @Config("killbill.payment.provider.default")
     @Default("noop")
     public String getDefaultPaymentProvider();
@@ -51,7 +49,7 @@ public interface PaymentConfig extends NotificationConfig, KillbillConfig {
     public long getSleepTimeMs();
 
     @Override
-    @Config("killbill.payment.engine.events.off")
+    @Config("killbill.payment.engine.notifications.off")
     @Default("false")
     public boolean isNotificationProcessingOff();
 

diff --git a/api/src/main/java/com/ning/billing/config/PersistentQueueConfig.java b/api/src/main/java/com/ning/billing/config/PersistentQueueConfig.java
index c7e1515..13a9dcb 100644
--- a/api/src/main/java/com/ning/billing/config/PersistentQueueConfig.java
+++ b/api/src/main/java/com/ning/billing/config/PersistentQueueConfig.java
@@ -1,5 +1,5 @@
-/* 
- * Copyright 2010-2011 Ning, Inc.
+/*
+ * Copyright 2010-2012 Ning, Inc.
  *
  * Ning licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the

diff --git a/overdue/src/main/java/com/ning/billing/overdue/OverdueProperties.java b/overdue/src/main/java/com/ning/billing/overdue/OverdueProperties.java
index 65927e5..fb949e4 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/OverdueProperties.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/OverdueProperties.java
@@ -24,14 +24,13 @@ import com.ning.billing.config.NotificationConfig;
 
 
 public interface OverdueProperties extends NotificationConfig, KillbillConfig {
-
     @Override
     @Config("killbill.overdue.engine.notifications.sleep")
     @Default("500")
     public long getSleepTimeMs();
 
     @Override
-    @Config("killbill.notifications.off")
+    @Config("killbill.overdue.engine.notifications.off")
     @Default("false")
     public boolean isNotificationProcessingOff();