From 8be803757874fec2486d685a24236008399d8765 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Sun, 12 Jul 2009 21:37:44 +0000
Subject: [PATCH] Out with commons-io.

---
 etc/libs-incl.xml                                    |  1 -
 .../com/samskivert/depot/tools/GenRecordTask.java    | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
index 9655799..cab29fe 100644
--- a/etc/libs-incl.xml
+++ b/etc/libs-incl.xml
@@ -3,7 +3,6 @@
 <project name="library-dependencies">
   <fileset dir="${libs.dir}" id="depot.libs">
     <include name="ant.jar"/>
-    <include name="commons-io.jar"/>
     <include name="ehcache.jar"/>
     <include name="google-collect.jar"/>
     <include name="junit4.jar"/>
diff --git a/src/java/com/samskivert/depot/tools/GenRecordTask.java b/src/java/com/samskivert/depot/tools/GenRecordTask.java
index eee624c..851a247 100644
--- a/src/java/com/samskivert/depot/tools/GenRecordTask.java
+++ b/src/java/com/samskivert/depot/tools/GenRecordTask.java
@@ -42,8 +42,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
-import org.apache.commons.io.IOUtils;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Task;
@@ -51,13 +49,15 @@ import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.util.ClasspathUtils;
 
+import com.samskivert.io.StreamUtil;
+import com.samskivert.util.ClassUtil;
+import com.samskivert.util.GenUtil;
+import com.samskivert.util.StringUtil;
+
 import com.samskivert.depot.PersistentRecord;
 import com.samskivert.depot.annotation.Id;
 import com.samskivert.depot.annotation.Transient;
 import com.samskivert.depot.impl.DepotUtil;
-import com.samskivert.util.ClassUtil;
-import com.samskivert.util.GenUtil;
-import com.samskivert.util.StringUtil;
 
 /**
  * An ant task that updates the column constants for a persistent record.
@@ -385,7 +385,7 @@ public class GenRecordTask extends Task
     protected String mergeTemplate (String tmpl, Map<String, String> subs)
     {
         try {
-            String text = IOUtils.toString(
+            String text = StreamUtil.toString(
                 getClass().getClassLoader().getResourceAsStream(tmpl), "UTF-8");
             for (Map.Entry<String, String> entry : subs.entrySet()) {
                 text = text.replaceAll("@"+entry.getKey()+"@", entry.getValue());