HADOOP-1731. Add Hadoop's version number to contrib jar file names.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@568706 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -75,6 +75,9 @@ Trunk (unreleased changes)
     class, with specialized subclasses for directories and files, to
     save memory on the namenode.  (Konstantin Shvachko via cutting)
 
+    HADOOP-1731.  Add Hadoop's version to contrib jar file names.
+    (cutting)
+
 
 Release 0.14.0 - 2007-08-17
 

build.xml

@@ -302,6 +302,7 @@
 
   <target name="compile-contrib" depends="compile-core">
      <subant target="deploy">
+        <property name="version" value="${version}"/>
         <fileset file="${contrib.dir}/build.xml"/>
      </subant>  	
   </target>
@@ -568,7 +569,7 @@
       <sourcePath path="${basedir}/src/contrib/streaming/src/java" />
       <class location="${basedir}/build/hadoop-${version}-core.jar" />
       <class location="${basedir}/build/hadoop-${version}-examples.jar" />
-      <class location="${basedir}/build/hadoop-streaming.jar" />
+      <class location="${basedir}/build/hadoop-${version}-streaming.jar" />
     </findbugs>
   	
   	<xslt style="${findbugs.home}/src/xsl/default.xsl"

src/contrib/abacus/build.xml

@@ -11,7 +11,7 @@ to call at top-level: ant deploy-contrib compile-core-test
   <!-- Override jar target to specify main class -->
   <target name="jar" depends="compile">
     <jar
-      jarfile="${build.dir}/hadoop-${name}.jar"
+      jarfile="${build.dir}/hadoop-${version}-${name}.jar"
       basedir="${build.classes}"      
     >
   	<manifest>

src/contrib/build-contrib.xml

@@ -136,7 +136,7 @@
   <target name="jar" depends="compile" unless="skip.contrib">
     <echo message="contrib: ${name}"/>
     <jar
-      jarfile="${build.dir}/hadoop-${name}.jar"
+      jarfile="${build.dir}/hadoop-${version}-${name}.jar"
       basedir="${build.classes}"      
     />
   </target>
@@ -148,7 +148,7 @@
   <target name="jar-examples" depends="compile-examples"
           if="examples.available" unless="skip.contrib">
     <echo message="contrib: ${name}"/>
-    <jar jarfile="${build.dir}/hadoop-${name}-examples.jar">
+    <jar jarfile="${build.dir}/hadoop-${version}-${name}-examples.jar">
       <fileset dir="${build.classes}">
       </fileset>
       <fileset dir="${build.examples}">
@@ -159,7 +159,8 @@
   <target name="deploy" depends="jar, jar-examples" unless="skip.contrib">
     <echo message="contrib: ${name}"/>
     <mkdir dir="${deploy.dir}"/>
-    <copy file="${build.dir}/hadoop-${name}.jar" todir="${deploy.dir}"/>
+    <copy file="${build.dir}/hadoop-${version}-${name}.jar"
+          todir="${deploy.dir}"/>
     <!-- <copy todir="${deploy.dir}" flatten="true">
       <fileset refid="lib.jars"/>
     </copy> -->

src/contrib/data_join/build.xml

@@ -11,7 +11,7 @@ to call at top-level: ant deploy-contrib compile-core-test
   <!-- Override jar target to specify main class -->
   <target name="jar" depends="compile">
     <jar
-      jarfile="${build.dir}/hadoop-${name}.jar"
+      jarfile="${build.dir}/hadoop-${version}-${name}.jar"
       basedir="${build.classes}"      
     >
   	<manifest>

src/contrib/eclipse-plugin/build.xml

@@ -35,7 +35,7 @@
   <!-- Override jar target to specify manifest -->
   <target name="jar" depends="compile" unless="skip.contrib">
     <jar
-      jarfile="${build.dir}/hadoop-${name}.jar"
+      jarfile="${build.dir}/hadoop-${version}-${name}.jar"
       manifest="${root}/META-INF/MANIFEST.MF">
       <fileset dir="${build.dir}" includes="classes/"/>
       <fileset dir="${root}" includes="resources/ plugin.xml"/>

src/contrib/hbase/build.xml

@@ -55,7 +55,7 @@ to call at top-level: ant deploy-contrib compile-core-test
   <!-- Override jar target to specify main class -->
   <target name="jar" depends="compile">
     <jar
-      jarfile="${build.dir}/hadoop-${name}.jar"
+      jarfile="${build.dir}/hadoop-${version}-${name}.jar"
       basedir="${build.classes}"      
     />
   </target>
@@ -73,7 +73,7 @@ to call at top-level: ant deploy-contrib compile-core-test
      debug="${javac.debug}"> 
       <classpath refid="test.classpath"/> 
     </javac>
-    <jar jarfile="${build.dir}/hadoop-${name}-test.jar" >
+    <jar jarfile="${build.dir}/hadoop-${version}-${name}-test.jar" >
       <fileset dir="${build.test}" includes="org/**" />
       <fileset dir="${build.classes}" />
       <fileset dir="${src.test}" includes="**/*.properties" />

src/contrib/streaming/build.xml

@@ -11,7 +11,7 @@ to call at top-level: ant deploy-contrib compile-core-test
   <!-- Override jar target to specify main class -->
   <target name="jar" depends="compile">
     <jar
-      jarfile="${build.dir}/hadoop-${name}.jar"
+      jarfile="${build.dir}/hadoop-${version}-${name}.jar"
       basedir="${build.classes}"      
     >
   	<manifest>