killbill-uncached

diff --git a/catalog/src/main/java/com/ning/billing/catalog/glue/CatalogModule.java b/catalog/src/main/java/com/ning/billing/catalog/glue/CatalogModule.java
index deb2305..3d02d70 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/glue/CatalogModule.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/glue/CatalogModule.java
@@ -23,6 +23,8 @@ import com.ning.billing.catalog.CatalogService;
 import com.ning.billing.catalog.CatalogUserApi;
 import com.ning.billing.catalog.api.ICatalogService;
 import com.ning.billing.catalog.api.ICatalogUserApi;
+import com.ning.billing.catalog.io.ICatalogLoader;
+import com.ning.billing.catalog.io.VersionedCatalogLoader;
 import com.ning.billing.config.ICatalogConfig;
 
 public class CatalogModule extends AbstractModule {
@@ -35,6 +37,7 @@ public class CatalogModule extends AbstractModule {
     protected void installCatalog() {
         bind(ICatalogUserApi.class).to(CatalogUserApi.class).asEagerSingleton();
         bind(ICatalogService.class).to(CatalogService.class).asEagerSingleton();
+        bind(ICatalogLoader.class).to(VersionedCatalogLoader.class).asEagerSingleton();
     }
 
     @Override

diff --git a/catalog/src/main/java/com/ning/billing/catalog/io/ICatalogLoader.java b/catalog/src/main/java/com/ning/billing/catalog/io/ICatalogLoader.java
new file mode 100644
index 0000000..6daa7b6
--- /dev/null
+++ b/catalog/src/main/java/com/ning/billing/catalog/io/ICatalogLoader.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010-2011 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
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.catalog.io;
+
+import com.ning.billing.catalog.VersionedCatalog;
+import com.ning.billing.lifecycle.IService.ServiceException;
+
+public interface ICatalogLoader {
+
+	public abstract VersionedCatalog load(String urlString)
+			throws ServiceException;
+
+}
\ No newline at end of file

diff --git a/catalog/src/main/java/com/ning/billing/catalog/io/VersionedCatalogLoader.java b/catalog/src/main/java/com/ning/billing/catalog/io/VersionedCatalogLoader.java
index d51c486..2085567 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/io/VersionedCatalogLoader.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/io/VersionedCatalogLoader.java
@@ -41,7 +41,7 @@ import com.ning.billing.lifecycle.IService.ServiceException;
 import com.ning.billing.util.clock.IClock;
 import com.ning.billing.util.config.XMLLoader;
 
-public class VersionedCatalogLoader  {
+public class VersionedCatalogLoader implements ICatalogLoader  {
 	private static final Object PROTOCOL_FOR_FILE = "file";
 	private  final String XML_EXTENSION = ".xml";
 	private  final String HREF_LOW_START = "href=\""; 
@@ -54,6 +54,10 @@ public class VersionedCatalogLoader  {
 		this.clock = clock;
 	}
 	
+	/* (non-Javadoc)
+	 * @see com.ning.billing.catalog.io.ICatalogLoader#load(java.lang.String)
+	 */
+	@Override
 	public  VersionedCatalog load(String urlString) throws ServiceException{
 		try {
 			return load(new URL(urlString));