You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ra...@apache.org on 2011/02/25 07:03:21 UTC
svn commit: r1074405 - in /hbase/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
src/main/resources/hbase-default.xml src/test/resources/hbase-site.xml
Author: rawson
Date: Fri Feb 25 06:03:20 2011
New Revision: 1074405
URL: http://svn.apache.org/viewvc?rev=1074405&view=rev
Log:
HBASE-3560 the hbase-default entry of "hbase.defaults.for.version" causes tests not to run via not-maven
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
hbase/trunk/src/main/resources/hbase-default.xml
hbase/trunk/src/test/resources/hbase-site.xml
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1074405&r1=1074404&r2=1074405&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Feb 25 06:03:20 2011
@@ -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
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java?rev=1074405&r1=1074404&r2=1074405&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java Fri Feb 25 06:03:20 2011
@@ -60,6 +60,7 @@ public class HBaseConfiguration extends
}
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)) {
Modified: hbase/trunk/src/main/resources/hbase-default.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/resources/hbase-default.xml?rev=1074405&r1=1074404&r2=1074405&view=diff
==============================================================================
--- hbase/trunk/src/main/resources/hbase-default.xml (original)
+++ hbase/trunk/src/main/resources/hbase-default.xml Fri Feb 25 06:03:20 2011
@@ -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>
Modified: hbase/trunk/src/test/resources/hbase-site.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/resources/hbase-site.xml?rev=1074405&r1=1074404&r2=1074405&view=diff
==============================================================================
--- hbase/trunk/src/test/resources/hbase-site.xml (original)
+++ hbase/trunk/src/test/resources/hbase-site.xml Fri Feb 25 06:03:20 2011
@@ -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>