Author: cutting
Date: Wed Sep 5 14:48:12 2007
New Revision: 573079
URL: http://svn.apache.org/viewvc?rev=573079&view=rev
Log:
HADOOP-1806. Fix ant task to compile again. Contributed by Chris Douglas.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/build.xml
lucene/hadoop/trunk/src/ant/org/apache/hadoop/ant/DfsTask.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=573079&r1=573078&r2=573079&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Sep 5 14:48:12 2007
@@ -86,6 +86,9 @@
HADOOP-1810. Fix incorrect value type in MRBench (SmallJobs)
(Devaraj Das via tomwhite)
+ HADOOP-1806. Fix ant task to compile again, also fix default
+ builds to compile ant tasks. (Chris Douglas via cutting)
+
IMPROVEMENTS
HADOOP-1779. Replace INodeDirectory.getINode() by a getExistingPathINodes()
Modified: lucene/hadoop/trunk/build.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/build.xml?rev=573079&r1=573078&r2=573079&view=diff
==============================================================================
--- lucene/hadoop/trunk/build.xml (original)
+++ lucene/hadoop/trunk/build.xml Wed Sep 5 14:48:12 2007
@@ -307,7 +307,7 @@
</subant>
</target>
- <target name="compile" depends="compile-core, compile-contrib">
+ <target name="compile" depends="compile-core, compile-contrib,
compile-ant-tasks">
</target>
<target name="compile-examples"
@@ -638,7 +638,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="jar, javadoc, examples, compile-core-test,
deploy-contrib">
+ <target name="package" depends="jar, javadoc, examples, compile-core-test,
deploy-contrib, ant-tasks">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/lib"/>
<mkdir dir="${dist.dir}/contrib"/>
Modified: lucene/hadoop/trunk/src/ant/org/apache/hadoop/ant/DfsTask.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/ant/org/apache/hadoop/ant/DfsTask.java?rev=573079&r1=573078&r2=573079&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/ant/org/apache/hadoop/ant/DfsTask.java (original)
+++ lucene/hadoop/trunk/src/ant/org/apache/hadoop/ant/DfsTask.java Wed Sep 5
14:48:12 2007
@@ -32,6 +32,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path;
+import org.apache.hadoop.util.ToolRunner;
/**
* [EMAIL PROTECTED] org.apache.hadoop.fs.FsShell FsShell} wrapper for ant
Task.
@@ -46,6 +47,7 @@
public void write(int b) { /* ignore */ }
public String toString() { return ""; }
};
+ private static final FsShell shell = new FsShell();
protected AntClassLoader confloader;
protected OutputStream out = nullOut;
@@ -180,7 +182,8 @@
Configuration conf = new Configuration();
conf.setClassLoader(confloader);
- exit_code = new FsShell().doMain(conf, argv.toArray(new
String[argv.size()]));
+ exit_code = ToolRunner.run(conf, shell,
+ argv.toArray(new String[argv.size()]));
exit_code = postCmd(exit_code);
if (0 > exit_code) {
