svn commit: r790869 - in /hadoop/mapreduce/trunk: CHANGES.txt src/contrib/eclipse-plugin/build.xml

[gk...@apache.org]

Author: gkesavan
Date: Fri Jul  3 11:43:59 2009
New Revision: 790869

URL: http://svn.apache.org/viewvc?rev=790869&view=rev
Log:
MAPREDUCE-702. Fix eclipse-plugin jar target

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/contrib/eclipse-plugin/build.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=790869&r1=790868&r2=790869&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Jul  3 11:43:59 2009
@@ -108,3 +108,5 @@
 
     MAPREDUCE-690. Sqoop's test "hive" script needs to be executable.
     (Aaron Kimball via tomwhite)
+    
+    MAPREDUCE-702. Fix eclipse-plugin jar target (Giridharan Kesavan) 

Modified: hadoop/mapreduce/trunk/src/contrib/eclipse-plugin/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin/build.xml?rev=790869&r1=790868&r2=790869&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/eclipse-plugin/build.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/eclipse-plugin/build.xml Fri Jul  3 11:43:59 2009
@@ -52,7 +52,7 @@
   </target>
 
  <target name="compile" depends="init, ivy-retrieve-common" unless="skip.contrib">
-    <echo message="contrib: ${name} ${hadoop-core.version}"/>
+    <echo message="contrib: ${name} "/>
     <javac
      encoding="${build.encoding}"
      srcdir="${src.dir}"
@@ -67,7 +67,9 @@
   <!-- Override jar target to specify manifest -->
   <target name="jar" depends="compile" unless="skip.contrib">
     <mkdir dir="${build.dir}/lib"/>
-    <copy file="${hadoop.root}/lib/hadoop-core-${hadoop-core.version}.jar" tofile="${build.dir}/lib/hadoop-core.jar" verbose="true"/>
+    <copy tofile="${build.dir}/lib/hadoop-core.jar">
+      <fileset dir="${hadoop.root}/lib" includes="hadoop-core-*.jar" excludes="hadoop-core-test-*.jar"/>
+    </copy> 
     <copy file="${hadoop.root}/build/ivy/lib/Hadoop/common/commons-cli-${commons-cli.version}.jar"  todir="${build.dir}/lib" verbose="true"/>
     <copy file="${hadoop.root}/build/ivy/lib/Hadoop/common/commons-cli-${commons-cli2.version}.jar"  todir="${build.dir}/lib" verbose="true"/>
     <jar