Mailing-List: contact hbase-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: hbase-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r619780 - in /hadoop/hbase/branches/0.1: ./ CHANGES.txt
 build.xml src/test/hbase-site.xml
Date: Fri, 08 Feb 2008 06:36:35 -0000
To: hbase-commits@hadoop.apache.org
From: jimk@apache.org
Message-Id: <20080208063636.05B311A9838@eris.apache.org>

Author: jimk
Date: Thu Feb  7 22:36:26 2008
New Revision: 619780

URL: http://svn.apache.org/viewvc?rev=619780&view=rev
Log:
HBase-421   TestRegionServerExit broken - back ported to HBase 0.1

Modified:
    hadoop/hbase/branches/0.1/   (props changed)
    hadoop/hbase/branches/0.1/CHANGES.txt
    hadoop/hbase/branches/0.1/build.xml
    hadoop/hbase/branches/0.1/src/test/hbase-site.xml

Propchange: hadoop/hbase/branches/0.1/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb  7 22:36:26 2008
@@ -1,2 +1,3 @@
-.project
-.classpath
+.project
+.classpath
+build

Modified: hadoop/hbase/branches/0.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.1/CHANGES.txt?rev=619780&r1=619779&r2=619780&view=diff
==============================================================================
--- hadoop/hbase/branches/0.1/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.1/CHANGES.txt Thu Feb  7 22:36:26 2008
@@ -23,6 +23,7 @@
    HADOOP-2773 Master marks region offline when it is recovering from a region
                server death
    HBASE-425   Fix doc. so it accomodates new hbase untethered context
+   HBase-421   TestRegionServerExit broken
 
   IMPROVEMENTS
    HADOOP-2555 Refactor the HTable#get and HTable#getRow methods to avoid

Modified: hadoop/hbase/branches/0.1/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.1/build.xml?rev=619780&r1=619779&r2=619780&view=diff
==============================================================================
--- hadoop/hbase/branches/0.1/build.xml (original)
+++ hadoop/hbase/branches/0.1/build.xml Thu Feb  7 22:36:26 2008
@@ -1,348 +1,352 @@
-<?xml version="1.0"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<project name="hbase" default="jar">
-  <property name="version" value="0.1.0-dev"/>
-  <property name="Name" value="HBase"/>
-  <property name="final.name" value="hbase-${version}"/>
-  <property name="year" value="2008"/>
- 
-  <!-- Load all the default properties, and any the user wants    -->
-  <!-- to contribute (without having to type -D or edit this file -->
-  <property file="${user.home}/${name}.build.properties" />
-  <property file="${basedir}/build.properties" />
-
-  <property name="src.dir"  location="${basedir}/src/java"/>
-  <property name="src.test" location="${basedir}/src/test"/>
-  <property name="src.examples" location="${basedir}/src/examples"/>
-  <property name="src.webapps" location="${basedir}/src/webapps"/>
-
-  <property name="lib.dir" value="${basedir}/lib"/>
-  <property name="conf.dir" value="${basedir}/conf"/>
-  <property name="docs.dir" value="${basedir}/docs"/>
-
-  <property name="test.output" value="no"/>
-  <property name="test.timeout" value="900000"/>
-
-  <property name="build.dir" location="${basedir}/build"/>
-  <property name="build.bin" location="${build.dir}/bin"/>
-  <property name="build.conf" location="${build.dir}/conf"/>
-  <property name="build.webapps" location="${build.dir}/webapps"/>
-  <property name="build.lib" location="${build.dir}/lib"/>
-  <property name="build.classes" location="${build.dir}/classes"/>
-  <property name="build.test" location="${build.dir}/test"/>
-  <property name="build.examples" location="${build.dir}/examples"/>
-  <property name="build.src" value="${build.dir}/src"/>
-  <property name="build.docs" value="${build.dir}/docs"/>
-  <property name="build.javadoc" value="${build.docs}/api"/>
-  <property name="build.encoding" value="ISO-8859-1"/>
-
-  <property name="test.build.dir" value="${build.dir}/test"/>
-  <property name="test.log.dir" value="${test.build.dir}/logs"/>
-  <property name="test.junit.output.format" value="plain"/>
-
-  <property name="dist.dir" value="${build.dir}/${final.name}"/>
-
-  <property name="javac.deprecation" value="off"/>
-  <property name="javac.debug" value="on"/>
-
-  <property name="javadoc.link.java"
-    value="http://java.sun.com/j2se/1.5/docs/api/"/>
-  <property name="javadoc.packages" value="org.apache.hadoop.hbase.*"/>
-
-
-  <!--We need to have the hadoop jars ride in front of the hbase classes or we
-    get the below exceptions:
-
-     [junit] java.io.FileNotFoundException: file:/Users/stack/Documents/checkouts/hbase/trunk/build/webapps/dfs
-
-    When we move off 0.16.0 hadoop, fix HttpStatusServer
-   -->
-  <fileset id="lib.jars" dir="${basedir}" includes="lib/*.jar"/>
-  <path id="classpath">
-    <fileset refid="lib.jars"/>
-    <fileset dir="${lib.dir}/jetty-ext/">
-      <include name="*jar" />
-    </fileset>
-    <pathelement location="${build.classes}"/>
-    <pathelement location="${conf.dir}"/>
-  </path>
-
-  <target name="init">
-    <mkdir dir="${build.dir}"/>
-    <mkdir dir="${build.classes}"/>
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${build.examples}"/>
-
-    <!--Copy webapps over to build dir. Exclude jsp and generated-src java
-      classes -->
-    <mkdir dir="${build.webapps}"/>
-    <copy todir="${build.webapps}">
-      <fileset dir="${src.webapps}">
-        <exclude name="**/*.jsp" />
-        <exclude name="**/.*" />
-        <exclude name="**/*~" />
-      </fileset>
-    </copy>
-    <!--Copy bin, lib, and conf. too-->
-    <mkdir dir="${build.lib}"/>
-    <copy todir="${build.lib}">
-      <fileset dir="${lib.dir}" />
-    </copy>
-    <mkdir dir="${build.conf}"/>
-    <copy todir="${build.conf}">
-      <fileset dir="${basedir}/conf" />
-    </copy>
-    <mkdir dir="${build.bin}"/>
-    <copy todir="${build.bin}">
-      <fileset dir="${basedir}/bin" />
-    </copy>
-    <chmod perm="ugo+x" type="file">
-      <fileset dir="${build.bin}" />
-    </chmod>
-    <exec executable="sh">
-       <arg line="src/saveVersion.sh ${version}"/>
-    </exec>
-  </target>
-
-  <target name="javacc" if="javacc.home">
-      <echo message="javacc.home: ${javacc.home}"/>
-     <property name="hql.src.dir" 
-       value="${src.dir}/org/apache/hadoop/hbase/hql" /> 
-     <mkdir dir="${hql.src.dir}/generated" />
-     <javacc
-       target="${hql.src.dir}/HQLParser.jj"
-       outputdirectory="${hql.src.dir}/generated"
-       javacchome="${javacc.home}"
-     />
-  </target>
-
-  <target name="compile" depends="init,javacc">
-   <!--Compile whats under src and generated java classes made from jsp-->
-   <javac
-    encoding="${build.encoding}"
-    srcdir="${src.dir};${build.src}"
-    includes="**/*.java"
-    destdir="${build.classes}"
-    debug="${javac.debug}"
-    deprecation="${javac.deprecation}">
-     <classpath refid="classpath"/>
-   </javac>
-  </target>
-	
-  <!-- Override jar target to specify main class -->
-  <target name="jar" depends="compile">
-    <jar jarfile="${build.dir}/${final.name}.jar"
-        basedir="${build.classes}" >
-      <fileset file="${basedir}/conf/hbase-default.xml"/>
-      <zipfileset dir="${build.webapps}" prefix="webapps"/>
-    </jar>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Package                                                            -->
-  <!-- ================================================================== -->
-  <target name="package" depends="jar,javadoc,compile-test" 
-      description="Build distribution"> 
-    <mkdir dir="${dist.dir}"/>
-    <copy todir="${dist.dir}" includeEmptyDirs="false" flatten="true">
-      <fileset dir="${build.dir}">
-        <include name="${final.name}.jar" />
-        <include name="${final.name}-test.jar" />
-      </fileset>
-    </copy>
-    <mkdir dir="${dist.dir}/webapps"/>
-    <copy todir="${dist.dir}/webapps">
-      <fileset dir="${build.webapps}" />
-    </copy>
-    <mkdir dir="${dist.dir}/lib"/>
-    <copy todir="${dist.dir}/lib">
-      <fileset dir="${build.lib}" />
-    </copy>
-    <mkdir dir="${dist.dir}/conf" />
-    <copy todir="${dist.dir}/conf">
-      <fileset dir="${build.conf}" />
-    </copy>
-    <mkdir dir="${dist.dir}/bin" />
-    <copy todir="${dist.dir}/bin">
-      <fileset dir="${build.bin}" />
-    </copy>
-    <chmod perm="ugo+x" type="file">
-      <fileset dir="${dist.dir}/bin" />
-    </chmod>
-    <!--Uncomment when we have a docs dir
-    <mkdir dir="${dist.dir}/docs" />
-    <copy todir="${dist.dir}/docs">
-      <fileset dir="${docs.dir}" />
-      <fileset dir="${build.docs}"/>
-    </copy>
-    -->
-    <copy todir="${dist.dir}">
-      <fileset dir=".">
-        <include name="*.txt" />
-      </fileset>
-    </copy>
-    <mkdir dir="${dist.dir}/src" />
-    <copy todir="${dist.dir}/src" includeEmptyDirs="true">
-      <fileset dir="src" excludes="**/*.template **/docs/build/**/*"/>
-    </copy>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Make release tarball                                               -->
-  <!-- ================================================================== -->
-  <macrodef name="macro_tar" description="Worker Macro for tar">
-    <attribute name="param.destfile"/>
-    <element name="param.listofitems"/>
-    <sequential>
-      <tar compression="gzip" longfile="gnu"
-      destfile="@{param.destfile}">
-      <param.listofitems/>
-      </tar>
-    </sequential>
-  </macrodef>
-  <target name="tar" depends="package" description="Make release tarball">
-    <macro_tar param.destfile="${build.dir}/${final.name}.tar.gz">
-      <param.listofitems>
-        <tarfileset dir="${build.dir}" mode="664">
-          <exclude name="${final.name}/bin/*" />
-          <include name="${final.name}/**" />
-        </tarfileset>
-        <tarfileset dir="${build.dir}" mode="755">
-          <include name="${final.name}/bin/*" />
-        </tarfileset>
-      </param.listofitems>
-    </macro_tar>
-  </target>
-
-  <target name="binary" depends="package" description="Make tarball without source and documentation">
-    <macro_tar param.destfile="${build.dir}/${final.name}-bin.tar.gz">
-      <param.listofitems>
-        <tarfileset dir="${build.dir}" mode="664">
-          <exclude name="${final.name}/bin/*" />
-          <exclude name="${final.name}/src/**" />
-          <exclude name="${final.name}/docs/**" />
-          <include name="${final.name}/**" />
-        </tarfileset>
-        <tarfileset dir="${build.dir}" mode="755">
-          <include name="${final.name}/bin/*" />
-        </tarfileset>
-      </param.listofitems>
-    </macro_tar>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Javadoc                                                            -->
-  <!-- ================================================================== -->
-  <target name="javadoc" description="Generate javadoc">
-    <mkdir dir="${build.javadoc}"/>
-    <javadoc
-      overview="${src.dir}/overview.html"
-      packagenames="org.apache.hadoop.hbase.*"
-      destdir="${build.javadoc}"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="${Name} ${version} API"
-      doctitle="${Name} ${version} API"
-      bottom="Copyright &amp;copy; ${year} The Apache Software Foundation"
-      >
-    	<packageset dir="${src.dir}"/>
-        <link href="${javadoc.link.java}"/>
-        <classpath >
-          <path refid="classpath" />
-          <pathelement path="${java.class.path}"/>
-        </classpath>
-    	<group title="${Name}" packages="org.apache.hadoop.hbase.*"/>
-    </javadoc>
-  </target>	
-
-  <!-- ================================================================== -->
-  <!-- Run unit tests                                                     -->
-  <!-- ================================================================== -->
-  <path id="test.classpath">
-    <path refid="classpath"/>
-    <pathelement location="${build.test}" />
-    <pathelement location="${src.test}"/>
-    <pathelement location="${conf.dir}"/>
-    <pathelement location="${build.dir}"/>
-    <pathelement location="${build.webapps}"/>
-  </path>
-
-  <target name="compile-test" depends="compile" > 
-    <javac encoding="${build.encoding}" 
-       srcdir="${src.test}" 
-       includes="**/*.java" 
-       destdir="${build.test}" 
-       debug="${javac.debug}"> 
-    <classpath refid="test.classpath"/> 
-    </javac>
-    <jar jarfile="${build.dir}/${final.name}-test.jar" >
-      <fileset dir="${build.test}" includes="org/**" />
-      <fileset dir="${build.classes}" />
-      <fileset dir="${src.test}" includes="**/*.properties" />
-      <manifest>
-        <attribute name="Main-Class"
-          value="org/apache/hadoop/hbase/PerformanceEvaluation"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="test" depends="compile-test, compile" >
-    <delete dir="${test.log.dir}"/>
-    <mkdir dir="${test.log.dir}"/>
-    <junit
-      printsummary="yes" showoutput="${test.output}" 
-      haltonfailure="no" fork="yes" maxmemory="256m"
-      errorProperty="tests.failed" failureProperty="tests.failed"
-      timeout="${test.timeout}">
-      
-      <sysproperty key="test.build.data" value="${build.test}/data"/>
-      <sysproperty key="build.test" value="${build.test}"/>
-      <sysproperty key="contrib.name" value="${name}"/>
-      
-      <!-- requires fork=yes for: 
-        relative File paths to use the specified user.dir 
-        classpath to use build/contrib/*.jar
-      -->
-      <sysproperty key="user.dir" value="${build.test}/data"/>
-      
-      <sysproperty key="fs.default.name" value="${fs.default.name}"/>
-      <sysproperty key="hadoop.test.localoutputfile" value="${hadoop.test.localoutputfile}"/>
-      <sysproperty key="test.log.dir" value="${hadoop.log.dir}"/> 
-      <classpath refid="test.classpath"/>
-      <formatter type="${test.junit.output.format}" />
-      <batchtest todir="${build.test}" unless="testcase">
-        <fileset dir="${src.test}"
-                 includes="**/Test*.java" excludes="**/${test.exclude}.java" />
-      </batchtest>
-      <batchtest todir="${build.test}" if="testcase">
-        <fileset dir="${src.test}" includes="**/${testcase}.java"/>
-      </batchtest>
-    </junit>
-    <fail if="tests.failed">Tests failed!</fail>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Clean.  Delete the build files, and their directories              -->
-  <!-- ================================================================== -->
-  <target name="clean">
-    <delete dir="${build.dir}"/>
-  </target>
-</project>
+<?xml version="1.0"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<project name="hbase" default="jar">
+  <property name="version" value="0.1.0-dev"/>
+  <property name="Name" value="HBase"/>
+  <property name="final.name" value="hbase-${version}"/>
+  <property name="year" value="2008"/>
+ 
+  <!-- Load all the default properties, and any the user wants    -->
+  <!-- to contribute (without having to type -D or edit this file -->
+  <property file="${user.home}/${name}.build.properties" />
+  <property file="${basedir}/build.properties" />
+
+  <property name="src.dir"  location="${basedir}/src/java"/>
+  <property name="src.test" location="${basedir}/src/test"/>
+  <property name="src.examples" location="${basedir}/src/examples"/>
+  <property name="src.webapps" location="${basedir}/src/webapps"/>
+
+  <property name="lib.dir" value="${basedir}/lib"/>
+  <property name="conf.dir" value="${basedir}/conf"/>
+  <property name="docs.dir" value="${basedir}/docs"/>
+
+  <property name="test.output" value="no"/>
+  <property name="test.timeout" value="900000"/>
+
+  <property name="build.dir" location="${basedir}/build"/>
+  <property name="build.bin" location="${build.dir}/bin"/>
+  <property name="build.conf" location="${build.dir}/conf"/>
+  <property name="build.webapps" location="${build.dir}/webapps"/>
+  <property name="build.lib" location="${build.dir}/lib"/>
+  <property name="build.classes" location="${build.dir}/classes"/>
+  <property name="build.test" location="${build.dir}/test"/>
+  <property name="build.examples" location="${build.dir}/examples"/>
+  <property name="build.src" value="${build.dir}/src"/>
+  <property name="build.docs" value="${build.dir}/docs"/>
+  <property name="build.javadoc" value="${build.docs}/api"/>
+  <property name="build.encoding" value="ISO-8859-1"/>
+
+  <property name="test.build.dir" value="${build.dir}/test"/>
+  <property name="test.log.dir" value="${test.build.dir}/logs"/>
+  <property name="test.junit.output.format" value="plain"/>
+
+  <property name="dist.dir" value="${build.dir}/${final.name}"/>
+
+  <property name="javac.deprecation" value="off"/>
+  <property name="javac.debug" value="on"/>
+
+  <property name="javadoc.link.java"
+    value="http://java.sun.com/j2se/1.5/docs/api/"/>
+  <property name="javadoc.packages" value="org.apache.hadoop.hbase.*"/>
+
+
+  <!--We need to have the hadoop jars ride in front of the hbase classes or we
+    get the below exceptions:
+
+     [junit] java.io.FileNotFoundException: file:/Users/stack/Documents/checkouts/hbase/trunk/build/webapps/dfs
+
+    When we move off 0.16.0 hadoop, fix HttpStatusServer
+   -->
+  <fileset id="lib.jars" dir="${basedir}" includes="lib/*.jar"/>
+  <path id="classpath">
+    <fileset refid="lib.jars"/>
+    <fileset dir="${lib.dir}/jetty-ext/">
+      <include name="*jar" />
+    </fileset>
+    <pathelement location="${build.classes}"/>
+    <pathelement location="${conf.dir}"/>
+  </path>
+
+  <target name="init">
+    <mkdir dir="${build.dir}"/>
+    <mkdir dir="${build.classes}"/>
+    <mkdir dir="${build.test}"/>
+    <mkdir dir="${build.examples}"/>
+
+    <!--Copy webapps over to build dir. Exclude jsp and generated-src java
+      classes -->
+    <mkdir dir="${build.webapps}"/>
+    <copy todir="${build.webapps}">
+      <fileset dir="${src.webapps}">
+        <exclude name="**/*.jsp" />
+        <exclude name="**/.*" />
+        <exclude name="**/*~" />
+      </fileset>
+    </copy>
+    <!--Copy bin, lib, and conf. too-->
+    <mkdir dir="${build.lib}"/>
+    <copy todir="${build.lib}">
+      <fileset dir="${lib.dir}" />
+    </copy>
+    <mkdir dir="${build.conf}"/>
+    <copy todir="${build.conf}">
+      <fileset dir="${basedir}/conf" />
+    </copy>
+    <mkdir dir="${build.bin}"/>
+    <copy todir="${build.bin}">
+      <fileset dir="${basedir}/bin" />
+    </copy>
+    <chmod perm="ugo+x" type="file">
+      <fileset dir="${build.bin}" />
+    </chmod>
+    <exec executable="sh">
+       <arg line="src/saveVersion.sh ${version}"/>
+    </exec>
+  </target>
+
+  <target name="javacc" if="javacc.home">
+      <echo message="javacc.home: ${javacc.home}"/>
+     <property name="hql.src.dir" 
+       value="${src.dir}/org/apache/hadoop/hbase/hql" /> 
+     <mkdir dir="${hql.src.dir}/generated" />
+     <javacc
+       target="${hql.src.dir}/HQLParser.jj"
+       outputdirectory="${hql.src.dir}/generated"
+       javacchome="${javacc.home}"
+     />
+  </target>
+
+  <target name="compile" depends="init,javacc">
+   <!--Compile whats under src and generated java classes made from jsp-->
+   <javac
+    encoding="${build.encoding}"
+    srcdir="${src.dir};${build.src}"
+    includes="**/*.java"
+    destdir="${build.classes}"
+    debug="${javac.debug}"
+    deprecation="${javac.deprecation}">
+     <classpath refid="classpath"/>
+   </javac>
+  </target>
+	
+  <!-- Override jar target to specify main class -->
+  <target name="jar" depends="compile">
+    <jar jarfile="${build.dir}/${final.name}.jar"
+        basedir="${build.classes}" >
+      <fileset file="${basedir}/conf/hbase-default.xml"/>
+      <zipfileset dir="${build.webapps}" prefix="webapps"/>
+    </jar>
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Package                                                            -->
+  <!-- ================================================================== -->
+  <target name="package" depends="jar,javadoc,compile-test" 
+      description="Build distribution"> 
+    <mkdir dir="${dist.dir}"/>
+    <copy todir="${dist.dir}" includeEmptyDirs="false" flatten="true">
+      <fileset dir="${build.dir}">
+        <include name="${final.name}.jar" />
+        <include name="${final.name}-test.jar" />
+      </fileset>
+    </copy>
+    <mkdir dir="${dist.dir}/webapps"/>
+    <copy todir="${dist.dir}/webapps">
+      <fileset dir="${build.webapps}" />
+    </copy>
+    <mkdir dir="${dist.dir}/lib"/>
+    <copy todir="${dist.dir}/lib">
+      <fileset dir="${build.lib}" />
+    </copy>
+    <mkdir dir="${dist.dir}/conf" />
+    <copy todir="${dist.dir}/conf">
+      <fileset dir="${build.conf}" />
+    </copy>
+    <mkdir dir="${dist.dir}/bin" />
+    <copy todir="${dist.dir}/bin">
+      <fileset dir="${build.bin}" />
+    </copy>
+    <chmod perm="ugo+x" type="file">
+      <fileset dir="${dist.dir}/bin" />
+    </chmod>
+    <!--Uncomment when we have a docs dir
+    <mkdir dir="${dist.dir}/docs" />
+    <copy todir="${dist.dir}/docs">
+      <fileset dir="${docs.dir}" />
+      <fileset dir="${build.docs}"/>
+    </copy>
+    -->
+    <copy todir="${dist.dir}">
+      <fileset dir=".">
+        <include name="*.txt" />
+      </fileset>
+    </copy>
+    <mkdir dir="${dist.dir}/src" />
+    <copy todir="${dist.dir}/src" includeEmptyDirs="true">
+      <fileset dir="src" excludes="**/*.template **/docs/build/**/*"/>
+    </copy>
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Make release tarball                                               -->
+  <!-- ================================================================== -->
+  <macrodef name="macro_tar" description="Worker Macro for tar">
+    <attribute name="param.destfile"/>
+    <element name="param.listofitems"/>
+    <sequential>
+      <tar compression="gzip" longfile="gnu"
+      destfile="@{param.destfile}">
+      <param.listofitems/>
+      </tar>
+    </sequential>
+  </macrodef>
+  <target name="tar" depends="package" description="Make release tarball">
+    <macro_tar param.destfile="${build.dir}/${final.name}.tar.gz">
+      <param.listofitems>
+        <tarfileset dir="${build.dir}" mode="664">
+          <exclude name="${final.name}/bin/*" />
+          <include name="${final.name}/**" />
+        </tarfileset>
+        <tarfileset dir="${build.dir}" mode="755">
+          <include name="${final.name}/bin/*" />
+        </tarfileset>
+      </param.listofitems>
+    </macro_tar>
+  </target>
+
+  <target name="binary" depends="package" description="Make tarball without source and documentation">
+    <macro_tar param.destfile="${build.dir}/${final.name}-bin.tar.gz">
+      <param.listofitems>
+        <tarfileset dir="${build.dir}" mode="664">
+          <exclude name="${final.name}/bin/*" />
+          <exclude name="${final.name}/src/**" />
+          <exclude name="${final.name}/docs/**" />
+          <include name="${final.name}/**" />
+        </tarfileset>
+        <tarfileset dir="${build.dir}" mode="755">
+          <include name="${final.name}/bin/*" />
+        </tarfileset>
+      </param.listofitems>
+    </macro_tar>
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Javadoc                                                            -->
+  <!-- ================================================================== -->
+  <target name="javadoc" description="Generate javadoc">
+    <mkdir dir="${build.javadoc}"/>
+    <javadoc
+      overview="${src.dir}/overview.html"
+      packagenames="org.apache.hadoop.hbase.*"
+      destdir="${build.javadoc}"
+      author="true"
+      version="true"
+      use="true"
+      windowtitle="${Name} ${version} API"
+      doctitle="${Name} ${version} API"
+      bottom="Copyright &amp;copy; ${year} The Apache Software Foundation"
+      >
+    	<packageset dir="${src.dir}"/>
+        <link href="${javadoc.link.java}"/>
+        <classpath >
+          <path refid="classpath" />
+          <pathelement path="${java.class.path}"/>
+        </classpath>
+    	<group title="${Name}" packages="org.apache.hadoop.hbase.*"/>
+    </javadoc>
+  </target>	
+
+  <!-- ================================================================== -->
+  <!-- Run unit tests                                                     -->
+  <!-- ================================================================== -->
+  <path id="test.classpath">
+    <pathelement location="${build.test}" />
+    <pathelement location="${src.test}"/>
+    <!-- ============  *  *  *  *  *  N O T E  *  *  *  *  * ============
+           ${src.test} *must* come before rest of class path. Otherwise
+                    the test hbase-site.xml will not be found.
+         ============  *  *  *  *  *  N O T E  *  *  *  *  * ============ -->
+    <path refid="classpath"/>
+    <pathelement location="${conf.dir}"/>
+    <pathelement location="${build.dir}"/>
+    <pathelement location="${build.webapps}"/>
+  </path>
+
+  <target name="compile-test" depends="compile" > 
+    <javac encoding="${build.encoding}" 
+       srcdir="${src.test}" 
+       includes="**/*.java" 
+       destdir="${build.test}" 
+       debug="${javac.debug}"> 
+    <classpath refid="test.classpath"/> 
+    </javac>
+    <jar jarfile="${build.dir}/${final.name}-test.jar" >
+      <fileset dir="${build.test}" includes="org/**" />
+      <fileset dir="${build.classes}" />
+      <fileset dir="${src.test}" includes="**/*.properties" />
+      <manifest>
+        <attribute name="Main-Class"
+          value="org/apache/hadoop/hbase/PerformanceEvaluation"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <target name="test" depends="compile-test, compile" >
+    <delete dir="${test.log.dir}"/>
+    <mkdir dir="${test.log.dir}"/>
+    <junit
+      printsummary="yes" showoutput="${test.output}" 
+      haltonfailure="no" fork="yes" maxmemory="512m"
+      errorProperty="tests.failed" failureProperty="tests.failed"
+      timeout="${test.timeout}">
+      
+      <sysproperty key="test.build.data" value="${build.test}/data"/>
+      <sysproperty key="build.test" value="${build.test}"/>
+      <sysproperty key="contrib.name" value="${name}"/>
+      
+      <!-- requires fork=yes for: 
+        relative File paths to use the specified user.dir 
+        classpath to use build/contrib/*.jar
+      -->
+      <sysproperty key="user.dir" value="${build.test}/data"/>
+      
+      <sysproperty key="fs.default.name" value="${fs.default.name}"/>
+      <sysproperty key="hadoop.test.localoutputfile" value="${hadoop.test.localoutputfile}"/>
+      <sysproperty key="test.log.dir" value="${hadoop.log.dir}"/> 
+      <classpath refid="test.classpath"/>
+      <formatter type="${test.junit.output.format}" />
+      <batchtest todir="${build.test}" unless="testcase">
+        <fileset dir="${src.test}"
+                 includes="**/Test*.java" excludes="**/${test.exclude}.java" />
+      </batchtest>
+      <batchtest todir="${build.test}" if="testcase">
+        <fileset dir="${src.test}" includes="**/${testcase}.java"/>
+      </batchtest>
+    </junit>
+    <fail if="tests.failed">Tests failed!</fail>
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Clean.  Delete the build files, and their directories              -->
+  <!-- ================================================================== -->
+  <target name="clean">
+    <delete dir="${build.dir}"/>
+  </target>
+</project>

Modified: hadoop/hbase/branches/0.1/src/test/hbase-site.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.1/src/test/hbase-site.xml?rev=619780&r1=619779&r2=619780&view=diff
==============================================================================
--- hadoop/hbase/branches/0.1/src/test/hbase-site.xml (original)
+++ hadoop/hbase/branches/0.1/src/test/hbase-site.xml Thu Feb  7 22:36:26 2008
@@ -1,136 +1,122 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Copyright 2007 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<configuration>
-  <property>
-    <name>fs.default.name</name>
-    <value></value>
-    <description>Use hdfs as file system by default. Modify this to run on
-    local file system.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.msginterval</name>
-    <value>1000</value>
-    <description>Interval between messages from the RegionServer to HMaster
-    in milliseconds.  Default is 15. Set this value low if you want unit
-    tests to be responsive.
-    </description>
-  </property>
-  <property>
-    <name>hbase.client.pause</name>
-    <value>5000</value>
-    <description>General client pause value.  Used mostly as value to wait
-    before running a retry of a failed get, region lookup, etc.</description>
-  </property>
-  <property>
-    <name>hbase.master.meta.thread.rescanfrequency</name>
-    <value>10000</value>
-    <description>How long the HMaster sleeps (in milliseconds) between scans of
-    the root and meta tables.
-    </description>
-  </property>
-  <property>
-    <name>hbase.server.thread.wakefrequency</name>
-    <value>1000</value>
-    <description>Time to sleep in between searches for work (in milliseconds).
-    Used as sleep interval by service threads such as META scanner and log roller.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.handler.count</name>
-    <value>5</value>
-    <description>Count of RPC Server instances spun up on RegionServers
-    Same property is used by the HMaster for count of master handlers.
-    Default is 10.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.lease.period</name>
-    <value>6000</value>
-    <description>Length of time the master will wait before timing out a region
-    server lease. Since region servers report in every second (see above), this
-    value has been reduced so that the master will notice a dead region server
-    sooner. The default is 30 seconds.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.info.port</name>
-    <value>-1</value>
-    <description>The port for the hbase master web UI
-    Set to -1 if you do not want the info server to run.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.info.port</name>
-    <value>-1</value>
-    <description>The port for the hbase regionserver web UI
-    Set to -1 if you do not want the info server to run.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.info.port</name>
-    <value>-1</value>
-    <description>The port for the hbase master web UI
-    Set to -1 if you do not want the info server to run.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.info.port</name>
-    <value>-1</value>
-    <description>The port for the hbase regionserver web UI
-    Set to -1 if you do not want the info server to run.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.lease.thread.wakefrequency</name>
-    <value>3000</value>
-    <description>The interval between checks for expired region server leases.
-    This value has been reduced due to the other reduced values above so that
-    the master will notice a dead region server sooner. The default is 15 seconds.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.optionalcacheflushinterval</name>
-    <value>10000</value>
-    <description>
-    Amount of time to wait since the last time a region was flushed before
-    invoking an optional cache flush. Default 60,000.
-    </description>
-  </property>
-  <property>
-  	<name>hbase.rootdir</name>
-  	<value>/hbase</value>
-  	<description>location of HBase instance in dfs</description>
-  </property>
-  <property>
-    <name>hbase.hregion.max.filesize</name>
-    <value>67108864</value>
-    <description>
-    Maximum desired file size for an HRegion.  If filesize exceeds
-    value + (value / 2), the HRegion is split in two.  Default: 256M.
-
-    Keep the maximum filesize small so we split more often in tests.
-    </description>
-  </property>
-</configuration>
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<configuration>
+  <property>
+    <name>fs.default.name</name>
+    <value></value>
+    <description>Use hdfs as file system by default. Modify this to run on
+    local file system.
+    </description>
+  </property>
+  <property>
+    <name>hbase.regionserver.msginterval</name>
+    <value>1000</value>
+    <description>Interval between messages from the RegionServer to HMaster
+    in milliseconds.  Default is 15. Set this value low if you want unit
+    tests to be responsive.
+    </description>
+  </property>
+  <property>
+    <name>hbase.client.pause</name>
+    <value>5000</value>
+    <description>General client pause value.  Used mostly as value to wait
+    before running a retry of a failed get, region lookup, etc.</description>
+  </property>
+  <property>
+    <name>hbase.master.meta.thread.rescanfrequency</name>
+    <value>10000</value>
+    <description>How long the HMaster sleeps (in milliseconds) between scans of
+    the root and meta tables.
+    </description>
+  </property>
+  <property>
+    <name>hbase.server.thread.wakefrequency</name>
+    <value>1000</value>
+    <description>Time to sleep in between searches for work (in milliseconds).
+    Used as sleep interval by service threads such as META scanner and log roller.
+    </description>
+  </property>
+  <property>
+    <name>hbase.regionserver.handler.count</name>
+    <value>5</value>
+    <description>Count of RPC Server instances spun up on RegionServers
+    Same property is used by the HMaster for count of master handlers.
+    Default is 10.
+    </description>
+  </property>
+  <property>
+    <name>hbase.master.lease.period</name>
+    <value>6000</value>
+    <description>Length of time the master will wait before timing out a region
+    server lease. Since region servers report in every second (see above), this
+    value has been reduced so that the master will notice a dead region server
+    sooner. The default is 30 seconds.
+    </description>
+  </property>
+  <property>
+    <name>hbase.master.info.port</name>
+    <value>-1</value>
+    <description>The port for the hbase master web UI
+    Set to -1 if you do not want the info server to run.
+    </description>
+  </property>
+  <property>
+    <name>hbase.regionserver.info.port</name>
+    <value>-1</value>
+    <description>The port for the hbase regionserver web UI
+    Set to -1 if you do not want the info server to run.
+    </description>
+  </property>
+  <property>
+    <name>hbase.master.lease.thread.wakefrequency</name>
+    <value>3000</value>
+    <description>The interval between checks for expired region server leases.
+    This value has been reduced due to the other reduced values above so that
+    the master will notice a dead region server sooner. The default is 15 seconds.
+    </description>
+  </property>
+  <property>
+    <name>hbase.regionserver.optionalcacheflushinterval</name>
+    <value>10000</value>
+    <description>
+    Amount of time to wait since the last time a region was flushed before
+    invoking an optional cache flush. Default 60,000.
+    </description>
+  </property>
+  <property>
+  	<name>hbase.rootdir</name>
+  	<value>/hbase</value>
+  	<description>location of HBase instance in dfs</description>
+  </property>
+  <property>
+    <name>hbase.hregion.max.filesize</name>
+    <value>67108864</value>
+    <description>
+    Maximum desired file size for an HRegion.  If filesize exceeds
+    value + (value / 2), the HRegion is split in two.  Default: 256M.
+
+    Keep the maximum filesize small so we split more often in tests.
+    </description>
+  </property>
+</configuration>