HADOOP-1929 Add hbase-default.xml to hbase jar

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

src/contrib/hbase/CHANGES.txt

@@ -56,6 +56,7 @@ Trunk (unreleased changes)
                 another
     HADOOP-1923, HADOOP-1924 a) tests fail sporadically because set up and tear
                  down is inconsistent b) TestDFSAbort failed in nightly #242
+    HADOOP-1929 Add hbase-default.xml to hbase jar
 
   IMPROVEMENTS
     HADOOP-1737 Make HColumnDescriptor data publically members settable

src/contrib/hbase/build.xml

@@ -54,10 +54,10 @@ 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-${version}-${name}.jar"
-      basedir="${build.classes}"      
-    />
+    <jar jarfile="${build.dir}/hadoop-${version}-${name}.jar"
+        basedir="${build.classes}" >
+      <fileset file="${root}/conf/hbase-default.xml"/>
+    </jar>
   </target>
 
   <!-- Override compile-test  target so can generate a hbase