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

HBASE-3560 the hbase-default entry of "hbase.defaults.for.version" causes tests not to run via not-maven 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1074405 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan Rawson 2011-02-25 06:03:20 +00:00
parent c1fe9b1698
commit 0b1af71c74
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -80,6 +80,8 @@ Release 0.91.0 - Unreleased
(rpc version 43)
HBASE-3563 [site] Add one-page-only version of hbase doc
HBASE-3564 DemoClient.pl - a demo client in Perl
HBASE-3560 the hbase-default entry of "hbase.defaults.for.version"
causes tests not to run via not-maven
NEW FEATURES

1
src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
View File

@ -60,6 +60,7 @@ public class HBaseConfiguration extends Configuration {
}
private static void checkDefaultsVersion(Configuration conf) {
if (conf.getBoolean("hbase.defaults.for.version.skip", Boolean.FALSE)) return;
String defaultsVersion = conf.get("hbase.defaults.for.version");
String thisVersion = VersionInfo.getVersion();
if (!thisVersion.equals(defaultsVersion)) {

13
src/main/resources/hbase-default.xml
View File

@ -619,4 +619,17 @@
classpath.
</description>
</property>
<property>
<name>hbase.defaults.for.version.skip</name>
<value>false</value>
<description>
Set to true to skip the 'hbase.defaults.for.version' check.
Setting this to true can be useful in contexts other than
the other side of a maven generation; i.e. running in an
ide. You'll want to set this boolean to true to avoid
seeing the RuntimException complaint: "hbase-default.xml file
seems to be for and old version of HBase (@@@VERSION@@@), this
version is X.X.X-SNAPSHOT"
</description>
</property>
</configuration>

13
src/test/resources/hbase-site.xml
View File

@ -127,4 +127,17 @@
The port at which the clients will connect.
</description>
</property>
<property>
<name>hbase.defaults.for.version.skip</name>
<value>true</value>
<description>
Set to true to skip the 'hbase.defaults.for.version'.
Setting this to true can be useful in contexts other than
the other side of a maven generation; i.e. running in an
ide. You'll want to set this boolean to true to avoid
seeing the RuntimException complaint: "hbase-default.xml file
seems to be for and old version of HBase (@@@VERSION@@@), this
version is X.X.X-SNAPSHOT"
</description>
</property>
</configuration>