killbill-memoizeit

diff --git a/catalog/pom.xml b/catalog/pom.xml
index 6186126..d290c6c 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -44,28 +44,5 @@
         </dependency>
     </dependencies>
     
-    <build> <!--  
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <mainClass>com.ning.billing.util.config.XMLSchemaGenerator</mainClass>
-                            <arguments>
-                                <argument>${project.basedir}/src/test/resources</argument>
-                                <argument>com.ning.billing.catalog.Catalog</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>-->
-        </plugins>
-    </build>
+
 </project>

diff --git a/pom.xml b/pom.xml
index 1bc3b7c..e41f61f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,6 +315,7 @@
                                 <exclude>**/*.properties</exclude>
                                 <exclude>**/*.dont-let-git-remove-this-directory</exclude>
                                 <exclude>**/test-output/**</exclude>
+                                <exclude>**/bin/**</exclude>
                             </excludes>
                         </configuration>
                     </execution>

diff --git a/util/src/main/java/com/ning/billing/util/config/XMLLoader.java b/util/src/main/java/com/ning/billing/util/config/XMLLoader.java
index 74334e8..707d00c 100644
--- a/util/src/main/java/com/ning/billing/util/config/XMLLoader.java
+++ b/util/src/main/java/com/ning/billing/util/config/XMLLoader.java
@@ -28,6 +28,7 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.TransformerException;
+import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
@@ -101,7 +102,7 @@ public class XMLLoader {
          SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI );
          Unmarshaller um = context.createUnmarshaller();
 
-         Schema schema = factory.newSchema(XMLSchemaGenerator.xmlSchema(clazz));
+         Schema schema = factory.newSchema(new StreamSource(XMLSchemaGenerator.xmlSchema(clazz)));
          um.setSchema(schema);
          
          return um;

diff --git a/util/src/main/java/com/ning/billing/util/config/XMLSchemaGenerator.java b/util/src/main/java/com/ning/billing/util/config/XMLSchemaGenerator.java
index 8c921d8..a1c9749 100644
--- a/util/src/main/java/com/ning/billing/util/config/XMLSchemaGenerator.java
+++ b/util/src/main/java/com/ning/billing/util/config/XMLSchemaGenerator.java
@@ -20,6 +20,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -65,12 +66,11 @@ public class XMLSchemaGenerator {
 		
 	}
 
-	public static StreamSource xmlSchema(Class<?> clazz) throws IOException, TransformerException, JAXBException {
+	public static InputStream xmlSchema(Class<?> clazz) throws IOException, TransformerException, JAXBException {
 		ByteArrayOutputStream output = new ByteArrayOutputStream(MAX_SCHEMA_SIZE_IN_BYTES);
 		JAXBContext context =JAXBContext.newInstance(clazz);
 		pojoToXSD(context, output);
-		StreamSource source = new StreamSource(new ByteArrayInputStream(output.toByteArray()));
-		return source;
+		return new ByteArrayInputStream(output.toByteArray());
 	}
 
 	public static void pojoToXSD(JAXBContext context, OutputStream out)