diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
index b7465693c..2ff6960f1 100644
--- a/etc/libs-incl.xml
+++ b/etc/libs-incl.xml
@@ -8,9 +8,6 @@
-
-
-
diff --git a/src/java/com/threerings/presents/tools/GenActionScriptTask.java b/src/java/com/threerings/presents/tools/GenActionScriptTask.java
index eb7fdbe4d..6ad4abdd1 100644
--- a/src/java/com/threerings/presents/tools/GenActionScriptTask.java
+++ b/src/java/com/threerings/presents/tools/GenActionScriptTask.java
@@ -33,7 +33,6 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.commons.io.IOUtils;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
@@ -42,6 +41,7 @@ import org.apache.velocity.app.VelocityEngine;
import com.google.common.collect.Lists;
+import com.samskivert.io.StreamUtil;
import com.samskivert.velocity.VelocityUtil;
import com.threerings.io.Streamable;
@@ -79,7 +79,7 @@ public class GenActionScriptTask extends Task
public void setHeader (File header)
{
try {
- _header = IOUtils.toString(new FileReader(header));
+ _header = StreamUtil.toString(new FileReader(header));
} catch (IOException ioe) {
System.err.println("Unabled to load header '" + header + ": " + ioe.getMessage());
}
diff --git a/src/java/com/threerings/presents/tools/GenDObjectTask.java b/src/java/com/threerings/presents/tools/GenDObjectTask.java
index 119806b17..845a96b66 100644
--- a/src/java/com/threerings/presents/tools/GenDObjectTask.java
+++ b/src/java/com/threerings/presents/tools/GenDObjectTask.java
@@ -32,7 +32,6 @@ import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
-import org.apache.commons.lang.StringUtils;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
@@ -190,7 +189,7 @@ public class GenDObjectTask extends Task
ctx.put("wrapofield", GenUtil.boxArgument(ftype, "ovalue"));
ctx.put("clonefield", GenUtil.cloneArgument(_dsclass, f, "value"));
ctx.put("capfield", StringUtil.unStudlyName(fname).toUpperCase());
- ctx.put("upfield", StringUtils.capitalize(fname));
+ ctx.put("upfield", StringUtil.capitalize(fname));
// determine the type of transport
TransportHint hint = f.getAnnotation(TransportHint.class);
diff --git a/src/java/com/threerings/presents/tools/InvocationTask.java b/src/java/com/threerings/presents/tools/InvocationTask.java
index 7994ca01a..4266d9796 100644
--- a/src/java/com/threerings/presents/tools/InvocationTask.java
+++ b/src/java/com/threerings/presents/tools/InvocationTask.java
@@ -33,9 +33,8 @@ import java.util.List;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
+import java.io.PrintWriter;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
@@ -49,9 +48,9 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
+import com.samskivert.io.StreamUtil;
import com.samskivert.util.Logger;
import com.samskivert.util.StringUtil;
-
import com.samskivert.velocity.VelocityUtil;
import com.threerings.presents.annotation.TransportHint;
@@ -345,7 +344,7 @@ public abstract class InvocationTask extends Task
public void setHeader (File header)
{
try {
- _header = IOUtils.toString(new FileReader(header));
+ _header = StreamUtil.toString(new FileReader(header));
} catch (IOException ioe) {
System.err.println("Unabled to load header '" + header + ": " +
ioe.getMessage());
@@ -442,7 +441,7 @@ public abstract class InvocationTask extends Task
if (_header != null) {
data = _header + data;
}
- FileUtils.writeStringToFile(new File(path), data, "UTF-8");
+ new PrintWriter(new File(path), "UTF-8").append(data).close();
}
protected static void checkedAdd (List list, T value)