AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nix commons dependencies.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5860 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2009-07-12 21:14:37 +00:00
parent 83ce3f004e
commit e9f3d53a76
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc/libs-incl.xml
-3
View File
@@ -8,9 +8,6 @@
<include name="depot.jar"/>
<include name="ehcache.jar"/>
<include name="flexTasks.jar"/>
<include name="commons-collections.jar"/>
<include name="commons-io.jar"/>
<include name="commons-lang.jar"/>
<include name="guice.jar"/>
<include name="google-collect.jar"/>
<include name="javassist.jar"/>
src/java/com/threerings/presents/tools/GenActionScriptTask.java
+2 -2
View File
@@ -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());
}
src/java/com/threerings/presents/tools/GenDObjectTask.java
+1 -2
View File
@@ -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);
src/java/com/threerings/presents/tools/InvocationTask.java
+4 -5
View File
@@ -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 <T> void checkedAdd (List<T> list, T value)