killbill-memoizeit

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/http/AnalyticsServlet.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/http/AnalyticsServlet.java
index 9947d93..8f0032b 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/http/AnalyticsServlet.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/http/AnalyticsServlet.java
@@ -52,6 +52,8 @@ import com.google.common.io.Resources;
 
 public class AnalyticsServlet extends HttpServlet {
 
+    public static final String SERVER_IP = System.getProperty("com.ning.core.server.ip", "127.0.0.1");
+    public static final String SERVER_PORT = System.getProperty("com.ning.core.server.port", "8080");
     public static DateTimeFormatter DATE_FORMAT = DateTimeFormat.forPattern("yyyy-MM-dd");
 
 
@@ -277,9 +279,8 @@ public class AnalyticsServlet extends HttpServlet {
             Resources.copy(resourceUrl, out);
             String inputHtml = new String(out.toByteArray());
 
-            // TODO STEPH we need to extract real ip port on which http sever is listening to
-            String tmp1 = inputHtml.replace("$VAR_SERVER", "\"127.0.0.1\"");
-            String tmp2 = tmp1.replace("$VAR_PORT", "\"8080\"");
+            String tmp1 = inputHtml.replace("$VAR_SERVER", "\"" + SERVER_IP + "\"");
+            String tmp2 = tmp1.replace("$VAR_PORT", "\"" + SERVER_PORT + "\"");
             resp.getOutputStream().write(tmp2.getBytes());
             resp.setContentType("text/html");
         }

diff --git a/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java b/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
index 7690c01..c567342 100644
--- a/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
+++ b/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
@@ -30,7 +30,9 @@ import com.ning.billing.invoice.glue.DefaultInvoiceModule;
 import com.ning.billing.jaxrs.resources.AccountResource;
 import com.ning.billing.jaxrs.resources.BundleResource;
 import com.ning.billing.jaxrs.resources.CatalogResource;
+import com.ning.billing.jaxrs.resources.ExportResource;
 import com.ning.billing.jaxrs.resources.InvoiceResource;
+import com.ning.billing.jaxrs.resources.OverdueResource;
 import com.ning.billing.jaxrs.resources.PaymentMethodResource;
 import com.ning.billing.jaxrs.resources.PaymentResource;
 import com.ning.billing.jaxrs.resources.PluginResource;
@@ -102,6 +104,10 @@ public class KillbillServerModule extends AbstractModule {
         bind(PluginResource.class).asEagerSingleton();
         bind(RefundResource.class).asEagerSingleton();
         bind(TenantResource.class).asEagerSingleton();
+        bind(ExportResource.class).asEagerSingleton();
+        bind(OverdueResource.class).asEagerSingleton();
+        bind(PluginResource.class).asEagerSingleton();
+        bind(TenantResource.class).asEagerSingleton();
         bind(KillbillEventHandler.class).asEagerSingleton();
     }
 

diff --git a/server/src/test/resources/killbill.properties b/server/src/test/resources/killbill.properties
index 73a833d..74606df 100644
--- a/server/src/test/resources/killbill.properties
+++ b/server/src/test/resources/killbill.properties
@@ -36,5 +36,7 @@ killbill.billing.util.persistent.bus.prefetch=1
 # Local DB 
 #com.ning.billing.dbi.test.useLocalDb=true
 
+killbill.osgi.bundle.install.dir=/var/tmp/somethingthatdoesnotexist
 
+ANTLR_USE_DIRECT_CLASS_LOADING=true