svn commit: r578249 - in /lucene/hadoop/trunk/src/contrib/hbase: CHANGES.txt build.xml

[st...@apache.org]

Author: stack
Date: Fri Sep 21 13:03:54 2007
New Revision: 578249

URL: http://svn.apache.org/viewvc?rev=578249&view=rev
Log:
HADOOP-1929 Add hbase-default.xml to hbase jar

Modified:
    lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
    lucene/hadoop/trunk/src/contrib/hbase/build.xml

Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=578249&r1=578248&r2=578249&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Fri Sep 21 13:03:54 2007
@@ -56,6 +56,7 @@
                 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

Modified: lucene/hadoop/trunk/src/contrib/hbase/build.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/build.xml?rev=578249&r1=578248&r2=578249&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/build.xml (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/build.xml Fri Sep 21 13:03:54 2007
@@ -54,10 +54,10 @@
 	
   <!-- 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