Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-403 Fix build after move of hbase in svn 

Make tests actually succeed
M  src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
  Throw exception w/ better message when we can't find conf files.
M  build.xml
    (lib.dir, conf.dir): Add defines.  Add conf to CLASSPATH


git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@618471 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2008-02-04 22:30:08 +00:00
parent 24a864704d
commit d20233e87b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.xml
View File

@ -28,6 +28,9 @@
<property name="src.examples" location="${basedir}/src/examples"/> <property name="src.examples" location="${basedir}/src/examples"/>
<property name="src.webapps" location="${basedir}/src/webapps"/> <property name="src.webapps" location="${basedir}/src/webapps"/>
<property name="lib.dir" value="${basedir}/lib"/>
<property name="conf.dir" value="${basedir}/conf"/>
<property name="test.output" value="no"/> <property name="test.output" value="no"/>
<property name="test.timeout" value="900000"/> <property name="test.timeout" value="900000"/>
@ -44,6 +47,7 @@
<property name="test.log.dir" value="${test.build.dir}/logs"/> <property name="test.log.dir" value="${test.build.dir}/logs"/>
<property name="test.junit.output.format" value="plain"/> <property name="test.junit.output.format" value="plain"/>
<!-- all jars together --> <!-- all jars together -->
<property name="javac.deprecation" value="off"/> <property name="javac.deprecation" value="off"/>
<property name="javac.debug" value="on"/> <property name="javac.debug" value="on"/>
@ -62,6 +66,7 @@
<fileset dir="${basedir}/lib/jetty-ext/"> <fileset dir="${basedir}/lib/jetty-ext/">
<include name="*jar" /> <include name="*jar" />
</fileset> </fileset>
<pathelement location="${conf.dir}"/>
</path> </path>
<target name="init"> <target name="init">
@ -195,7 +200,7 @@
debug="${javac.debug}"> debug="${javac.debug}">
<classpath refid="test.classpath"/> <classpath refid="test.classpath"/>
</javac> </javac>
<jar jarfile="${build.dir}/hadoop-${version}-${name}-test.jar" > <jar jarfile="${build.dir}/hbase-${version}-test.jar" >
<fileset dir="${build.test}" includes="org/**" /> <fileset dir="${build.test}" includes="org/**" />
<fileset dir="${build.classes}" /> <fileset dir="${build.classes}" />
<fileset dir="${src.test}" includes="**/*.properties" /> <fileset dir="${src.test}" includes="**/*.properties" />

3
src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
View File

@ -274,6 +274,9 @@ public class LocalHBaseCluster implements HConstants {
} }
// Need to rewrite address in Configuration if not done already. // Need to rewrite address in Configuration if not done already.
String address = c.get(MASTER_ADDRESS); String address = c.get(MASTER_ADDRESS);
if (address == null) {
throw new NullPointerException("Address is null for " + MASTER_ADDRESS);
}
String port = address.startsWith(LOCAL_COLON)? String port = address.startsWith(LOCAL_COLON)?
address.substring(LOCAL_COLON.length()): address.substring(LOCAL_COLON.length()):
Integer.toString(DEFAULT_MASTER_PORT); Integer.toString(DEFAULT_MASTER_PORT);