killbill-memoizeit

diff --git a/catalog/src/main/java/com/ning/billing/catalog/CatalogUserApi.java b/catalog/src/main/java/com/ning/billing/catalog/CatalogUserApi.java
index 744bf5a..fc61853 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/CatalogUserApi.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/CatalogUserApi.java
@@ -20,7 +20,7 @@ import java.io.File;
 
 import com.ning.billing.catalog.api.ICatalog;
 import com.ning.billing.catalog.api.ICatalogUserApi;
-import com.ning.billing.catalog.io.XMLReader;
+import com.ning.billing.catalog.io.CatalogLoader;
 
 public class CatalogUserApi implements ICatalogUserApi {
 
@@ -28,7 +28,7 @@ public class CatalogUserApi implements ICatalogUserApi {
     public ICatalog getCatalog(final String catalogName) {
     	String name = catalogName; 
         try {
-            return XMLReader.getCatalogFromName(new File(name).toURI().toURL());
+            return CatalogLoader.getCatalogFromURI(new File(name).toURI());
         } catch (Exception e) {
             e.printStackTrace();
             return null;

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 fcda9d7..25acae4 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
@@ -49,7 +49,7 @@ public class VersionedCatalogLoader implements ICatalogLoader {
 		List<URL> xmlURLs = findXmlReferences(directoryContents, url);
 		VersionedCatalog result = new VersionedCatalog();
 		for(URL u : xmlURLs) {
-			Catalog catalog = XMLReader.getCatalogFromName(u);
+			Catalog catalog = CatalogLoader.getCatalogFromURL(u);
 			result.add(catalog);
 		}
 		return result;

diff --git a/catalog/src/test/java/com/ning/billing/catalog/io/TestXMLReader.java b/catalog/src/test/java/com/ning/billing/catalog/io/TestXMLReader.java
index 1d08c31..b0d1690 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/io/TestXMLReader.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/io/TestXMLReader.java
@@ -31,8 +31,8 @@ public class TestXMLReader {
 
 	@Test(enabled=true)
 	public void testCatalogLoad() throws IOException, TransformerException, JAXBException, SAXException, InvalidConfigException {
-		XMLReader.getCatalogFromName(Resources.getResource("WeaponsHire.xml"));
-		XMLReader.getCatalogFromName(Resources.getResource("WeaponsHireSmall.xml"));
+		CatalogLoader.getCatalogFromURL(Resources.getResource("WeaponsHire.xml"));
+		CatalogLoader.getCatalogFromURL(Resources.getResource("WeaponsHireSmall.xml"));
 	}
 	
 }