Index: src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java (revision 1069021) +++ src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java (working copy) @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.util.VersionInfo; /** * Adds HBase configuration files to a Configuration @@ -58,9 +59,21 @@ } } + private static void checkDefaultsVersion(Configuration conf) { + String defaultsVersion = conf.get("hbase.defaults.for.version"); + String thisVersion = VersionInfo.getVersion(); + if (!thisVersion.equals(defaultsVersion)) { + throw new RuntimeException( + "hbase-default.xml file seems to be for and old version of HBase (" + + defaultsVersion + "), this version is " + thisVersion); + } + } + public static Configuration addHbaseResources(Configuration conf) { conf.addResource("hbase-default.xml"); conf.addResource("hbase-site.xml"); + + checkDefaultsVersion(conf); return conf; } Index: src/main/resources/hbase-default.xml =================================================================== --- src/main/resources/hbase-default.xml (revision 1069021) +++ src/main/resources/hbase-default.xml (working copy) @@ -609,4 +609,14 @@ true: Only the GET method is permitted. + + + hbase.defaults.for.version + @@@VERSION@@@ + + This defaults file was compiled for version @@@VERSION@@@. This variable is used + to make sure that a user doesn't have an old version of hbase-default.xml on the + classpath. + + Index: src/main/xslt/configuration_to_docbook_section.xsl =================================================================== --- src/main/xslt/configuration_to_docbook_section.xsl (revision 1069021) +++ src/main/xslt/configuration_to_docbook_section.xsl (working copy) @@ -45,6 +45,7 @@ + @@ -57,6 +58,7 @@ Default: + Index: pom.xml =================================================================== --- pom.xml (revision 1069021) +++ pom.xml (working copy) @@ -423,6 +423,18 @@ run + + process-resources + + + + + + + run + +