You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/04/03 00:41:56 UTC

svn commit: r1463782 - in /hbase/trunk/hbase-common: pom.xml src/main/resources/hbase-default.xml

Author: stack
Date: Tue Apr  2 22:41:55 2013
New Revision: 1463782

URL: http://svn.apache.org/r1463782
Log:
HBASE-8242 Unable to start HBase 0.95.0RC0 out of the box because of ZK trying to access /var/folders/

Modified:
    hbase/trunk/hbase-common/pom.xml
    hbase/trunk/hbase-common/src/main/resources/hbase-default.xml

Modified: hbase/trunk/hbase-common/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/pom.xml?rev=1463782&r1=1463781&r2=1463782&view=diff
==============================================================================
--- hbase/trunk/hbase-common/pom.xml (original)
+++ hbase/trunk/hbase-common/pom.xml Tue Apr  2 22:41:55 2013
@@ -38,7 +38,6 @@
           <includes>
               <include>hbase-default.xml</include>
           </includes>
-          <filtering>true</filtering>
       </resource>
     </resources>
     <plugins>
@@ -60,6 +59,23 @@
         <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <configuration>
+              <target>
+                <replace file="${project.build.outputDirectory}/hbase-default.xml"
+                  token="@@@VERSION@@@" value="${project.version}" />
+                <mkdir dir="${project.build.directory}/nativelib"/>
+                <exec executable="tar" dir="${project.build.directory}/nativelib" failonerror="false">
+                  <arg value="xf"/>
+                  <arg value="hadoop-snappy-nativelibs.tar"/>
+                </exec>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
                 <!-- Generate web app sources -->
                 <execution>
                     <id>generate</id>

Modified: hbase/trunk/hbase-common/src/main/resources/hbase-default.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/resources/hbase-default.xml?rev=1463782&r1=1463781&r2=1463782&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/resources/hbase-default.xml (original)
+++ hbase/trunk/hbase-common/src/main/resources/hbase-default.xml Tue Apr  2 22:41:55 2013
@@ -795,7 +795,7 @@
 
   <property skipInDoc="true">
     <name>hbase.defaults.for.version</name>
-    <value>${pom.version}</value>
+    <value>@@@VERSION@@@</value>
     <description>
     This defaults file was compiled for version ${pom.version}. This variable is used
     to make sure that a user doesn't have an old version of hbase-default.xml on the