You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2009/07/01 00:41:37 UTC

svn commit: r789995 - in /hadoop/hbase/trunk: CHANGES.txt build.xml

Author: stack
Date: Tue Jun 30 22:41:37 2009
New Revision: 789995

URL: http://svn.apache.org/viewvc?rev=789995&view=rev
Log:
HBASE-1595 hadoop-default.xml and zoo.cfg in hbase jar

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/build.xml

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=789995&r1=789994&r2=789995&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Jun 30 22:41:37 2009
@@ -236,6 +236,7 @@
    HBASE-1582  Translate ColumnValueFilter and RowFilterSet to the new Filter
                interface
    HBASE-1594  Fix scan addcolumns after hbase-1385 commit (broken hudson build)
+   HBASE-1595  hadoop-default.xml and zoo.cfg in hbase jar
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage

Modified: hadoop/hbase/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/build.xml?rev=789995&r1=789994&r2=789995&view=diff
==============================================================================
--- hadoop/hbase/trunk/build.xml (original)
+++ hadoop/hbase/trunk/build.xml Tue Jun 30 22:41:37 2009
@@ -182,10 +182,13 @@
       </fileset>
     </copy>
     <jar jarfile="${jarfile}" basedir="${build.classes}" >
+      <fileset dir="${conf.dir}" >
+        <include name="hbase-default.xml" />
+      </fileset>
       <zipfileset dir="conf" prefix="conf" includes="zoo.cfg,hbase-default.xml" />
       <zipfileset dir="${build.webapps}" prefix="webapps"/>
    		<manifest>
-            <attribute name="Main-Class" value="org/apache/hadoop/hbase/mapred/Driver" />
+            <attribute name="Main-Class" value="org/apache/hadoop/hbase/mapreduce/Driver" />
     	</manifest>
     </jar>
   </target>