hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r946530 - in /hbase/trunk: ./ core/src/ core/src/main/ core/src/test/ src/ src/assembly/ src/main/ src/test/ src/test/java/org/apache/hadoop/hbase/ src/test/java/org/apache/hadoop/hbase/regionserver/
Date Thu, 20 May 2010 05:24:33 GMT
Author: stack
Date: Thu May 20 05:24:32 2010
New Revision: 946530

URL: http://svn.apache.org/viewvc?rev=946530&view=rev
Log:
HBASE-2577 Remove 'core' maven module; move core up a level

Added:
    hbase/trunk/src/main/
      - copied from r946529, hbase/trunk/core/src/main/
    hbase/trunk/src/saveVersion.sh
      - copied unchanged from r946529, hbase/trunk/core/src/saveVersion.sh
    hbase/trunk/src/test/
      - copied from r946529, hbase/trunk/core/src/test/
Removed:
    hbase/trunk/core/src/main/
    hbase/trunk/core/src/saveVersion.sh
    hbase/trunk/core/src/test/
Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/pom.xml
    hbase/trunk/src/assembly/bin.xml
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=946530&r1=946529&r2=946530&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu May 20 05:24:32 2010
@@ -620,6 +620,7 @@ Release 0.21.0 - Unreleased
    HBASE-2566  Remove 'lib' dir; it only has libthrift and that is being
                pulled from http://people.apache.org/~rawson/repo/....
    HBASE-2534  Recursive deletes and misc improvements to ZKW
+   HBASE-2577  Remove 'core' maven module; move core up a level
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts

Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=946530&r1=946529&r2=946530&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Thu May 20 05:24:32 2010
@@ -2,21 +2,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
   <groupId>org.apache.hbase</groupId>
   <artifactId>hbase</artifactId>
-  <packaging>pom</packaging>
+  <packaging>jar</packaging>
   <version>0.21.0-SNAPSHOT</version>
   <name>HBase</name>
   <description>HBase is the Hadoop database. Use it when you need random, realtime
read/write access to your Big Data.
     This project's goal is the hosting of very large tables -- billions of rows X millions
of columns -- atop clusters
     of commodity hardware.
   </description>
-  <url>http://hadoop.apache.org/hbase</url>
-
-  <modules>
-    <module>core</module>
-  </modules>
+  <url>http://hbase.apache.org</url>
 
   <licenses>
     <license>
@@ -28,9 +23,9 @@
   </licenses>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/hadoop/hbase/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/hadoop/hbase/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/hadoop/hbase/trunk</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/hbase/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/hbase/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/hbase/trunk</url>
   </scm>
 
   <issueManagement>
@@ -46,35 +41,35 @@
   <mailingLists>
     <mailingList>
       <name>User List</name>
-      <subscribe>hbase-user-subscribe@hadoop.apache.org</subscribe>
-      <unsubscribe>hbase-user-unsubscribe@hadoop.apache.org</unsubscribe>
-      <post>hbase-user@hadoop.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/hadoop-hbase-user/</archive>
+      <subscribe>user-subscribe@hbase.apache.org</subscribe>
+      <unsubscribe>user-unsubscribe@hbase.apache.org</unsubscribe>
+      <post>user@hbase.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/hbase-user/</archive>
       <otherArchives>
-        <otherArchive>http://dir.gmane.org/gmane.comp.java.hadoop.hbase.user</otherArchive>
+        <otherArchive>http://dir.gmane.org/gmane.comp.java.hbase.user</otherArchive>
       </otherArchives>
     </mailingList>
     <mailingList>
       <name>Developer List</name>
-      <subscribe>hbase-dev-subscribe@hadoop.apache.org</subscribe>
-      <unsubscribe>hbase-dev-unsubscribe@hadoop.apache.org</unsubscribe>
-      <post>hbase-dev@hadoop.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/hadoop-hbase-dev/</archive>
+      <subscribe>dev-subscribe@hbase.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@hbase.apache.org</unsubscribe>
+      <post>dev@hbase.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/hbase-dev/</archive>
       <otherArchives>
-        <otherArchive>http://dir.gmane.org/gmane.comp.java.hadoop.hbase.devel</otherArchive>
+        <otherArchive>http://dir.gmane.org/gmane.comp.java.hbase.devel</otherArchive>
       </otherArchives>
     </mailingList>
     <mailingList>
       <name>Commits List</name>
-      <subscribe>hbase-commits-subscribe@hadoop.apache.org</subscribe>
-      <unsubscribe>hbase-commits-unsubscribe@hadoop.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/hadoop-hbase-commits/</archive>
+      <subscribe>commits-subscribe@hbase.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@hbase.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/hbase-commits/</archive>
     </mailingList>
     <mailingList>
       <name>Issues List</name>
-      <subscribe>hbase-issues-subscribe@hadoop.apache.org</subscribe>
-      <unsubscribe>hbase-issues-unsubscribe@hadoop.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/hadoop-hbase-issues/</archive>
+      <subscribe>issues-subscribe@hbase.apache.org</subscribe>
+      <unsubscribe>issues-unsubscribe@hbase.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/hbase-issues/</archive>
     </mailingList>
   </mailingLists>
 
@@ -88,14 +83,6 @@
       <organizationUrl>http://www.trendmicro.com</organizationUrl>
     </developer>
     <developer>
-      <id>bryanduxbury</id>
-      <name>Bryan Duxbury</name>
-      <email>bryan@rapleaf.com</email>
-      <timezone>-8</timezone>
-      <organization>Rapleaf</organization>
-      <organizationUrl>http://www.rapleaf.com</organizationUrl>
-    </developer>
-    <developer>
       <id>jdcryans</id>
       <name>Jean-Daniel Cryans</name>
       <email>jdcryans@apache.org</email>
@@ -112,14 +99,6 @@
       <organizationUrl>http://www.streamy.com</organizationUrl>
     </developer>
     <developer>
-      <id>jimk</id>
-      <name>Jim Kellerman</name>
-      <email>jimk@apache.org</email>
-      <timezone>-8</timezone>
-      <organization>Powerset</organization>
-      <organizationUrl>http://www.powerset.com/</organizationUrl>
-    </developer>
-    <developer>
       <id>larsgeorge</id>
       <name>Lars George</name>
       <email>larsgeorge@apache.org</email>
@@ -128,14 +107,6 @@
       <organizationUrl>http://www.worldlingo.com/</organizationUrl>
     </developer>
     <developer>
-      <id>nitay</id>
-      <name>Nitay Joffe</name>
-      <email>nitay@apache.org</email>
-      <timezone>-8</timezone>
-      <organization>Powerset</organization>
-      <organizationUrl>http://www.powerset.com/</organizationUrl>
-    </developer>
-    <developer>
       <id>rawson</id>
       <name>Ryan Rawson</name>
       <email>rawson@apache.org</email>
@@ -211,6 +182,7 @@
     </repository>
   </repositories>
 
+
   <build>
     <!-- Some plugins (javadoc for example) can be used in the normal build- and the site
phase.
          These plugins inherit their options from the <reporting> section below. These
settings
@@ -263,6 +235,21 @@
       </plugins>
     </pluginManagement>
 
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/webapps</directory>
+        <includes>
+          <include>*/.gif</include>
+          <include>*/.css</include>
+          <include>*/.html</include>
+          <include>*/.xml</include>
+        </includes>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -283,6 +270,124 @@
           </descriptors>
         </configuration>
       </plugin>
+
+      <!-- Run with -Dmaven.test.skip.exec=true to build -tests.jar without running tests
(this is needed for upstream projects whose tests need this jar simply for compilation)-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>org/apache/hadoop/hbase/mapreduce/Driver</mainClass>
+            </manifest>
+          </archive>
+          <!-- Exclude these 2 packages, because their dependency _binary_ files include
the sources, and Maven 2.2 appears to add them to the sources to compile, weird-->
+          <excludes>
+            <exclude>org/apache/jute/**</exclude>
+            <exclude>org/apache/zookeeper/**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>always</forkMode>
+          <excludes>
+            <exclude>**/SoftValueSortedMapTest.java</exclude>
+            <exclude>**/*$*</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>JSPC</id>
+            <phase>generate-sources</phase>
+            <configuration>
+              <tasks>
+                <taskdef classname="org.apache.jasper.JspC" name="jspcompiler" classpathref="maven.compile.classpath"/>
+                <jspcompiler uriroot="${basedir}/src/main/resources/webapps/master"
+                             outputdir="${project.build.directory}/jspc"
+                             package="org.apache.hadoop.hbase.generated.master"
+                             webxml="${basedir}/src/main/resources/webapps/master/WEB-INF/web.xml"/>
+                <jspcompiler uriroot="${basedir}/src/main/resources/webapps/regionserver"
+                             outputdir="${project.build.directory}/jspc"
+                             package="org.apache.hadoop.hbase.generated.regionserver"
+                             webxml="${basedir}/src/main/resources/webapps/regionserver/WEB-INF/web.xml"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>package-info</id>
+            <phase>generate-sources</phase>
+            <configuration>
+              <tasks>
+                <exec executable="sh">
+                  <arg line="${basedir}/src/saveVersion.sh ${project.version} ${project.build.directory}/generated-sources"/>
+                </exec>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-jspc-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${basedir}/target/jspc</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-package-info</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -298,6 +403,19 @@
     <junit.version>4.8.1</junit.version>
     <log4j.version>1.2.15</log4j.version>
     <zookeeper.version>3.3.1</zookeeper.version>
+
+    <commons-httpclient.version>3.1</commons-httpclient.version>
+    <commons-lang.version>2.5</commons-lang.version>
+    <commons-math.version>2.1</commons-math.version>
+    <jasper.version>5.5.23</jasper.version>
+    <jaxb-api.version>2.1</jaxb-api.version>
+    <jersey.version>1.1.5.1</jersey.version>
+    <jruby.version>1.4.0</jruby.version>
+    <jsr311.version>1.1.1</jsr311.version>
+    <protobuf.version>2.3.0</protobuf.version>
+    <slf4j.version>1.5.8</slf4j.version>
+    <stax-api>1.0.1</stax-api>
+    <thrift.version>0.2.0</thrift.version>
   </properties>
 
   <dependencyManagement>
@@ -344,12 +462,12 @@
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>hbase-core</artifactId>
+        <artifactId>hbase</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>hbase-core</artifactId>
+        <artifactId>hbase</artifactId>
         <version>${project.version}</version>
         <classifier>tests</classifier>
         <scope>test</scope>
@@ -381,6 +499,166 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>${commons-lang.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+
+    <!--
+      This is highly dubious!
+
+      We need SLF4J >= 1.5.6 and Thrift depends on that version.
+      hadoop-core on the other hand depends on SLF4J 1.4.3 (even though it is optional)
+      and Mavens dependency resolution mechanism choses the 'nearest' dependency in case
+      of a conflict of dependencies on the same level. The nearest is always the one
+      that was defined first in the pom:
+      http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html
+
+      That's why we've added an explicit dependency to SFL4J-API even though we don't need
it.
+      Make sure to check the version of SLF4J Hadoop and Thrift depend on when you upgrade
+      one of them.
+    -->
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>thrift</artifactId>
+      <version>${thrift.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>zookeeper</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>servlet-api-2.5</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-2.1</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-runtime</artifactId>
+      <version>${jasper.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby-complete</artifactId>
+      <version>${jruby.version}</version>
+    </dependency>
+
+    <!-- REST dependencies -->
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-json</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>jsr311-api</artifactId>
+      <version>${jsr311.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-math</artifactId>
+      <version>${commons-math.version}</version>
+      <scope>test</scope>
+    </dependency>
+        <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-test</artifactId>
+    </dependency>
+  </dependencies>
 
   <!--
   To publish, use the following settings.xml file ( placed in ~/.m2/settings.xml )

Modified: hbase/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/assembly/bin.xml?rev=946530&r1=946529&r2=946530&view=diff
==============================================================================
--- hbase/trunk/src/assembly/bin.xml (original)
+++ hbase/trunk/src/assembly/bin.xml Thu May 20 05:24:32 2010
@@ -6,36 +6,6 @@
   <formats>
     <format>tar.gz</format>
   </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
-  <moduleSets>
-    <moduleSet>
-      <includes>
-        <include>org.apache.hbase:hbase-core</include>
-      </includes>
-      <binaries>
-        <outputDirectory>/</outputDirectory>
-        <unpack>false</unpack>
-        <outputFileNameMapping>hbase-${version}.jar</outputFileNameMapping>
-        <dependencySets>
-          <dependencySet>
-            <outputDirectory>lib</outputDirectory>
-          </dependencySet>
-        </dependencySets>
-      </binaries>
-    </moduleSet>
-    <!-- This ensures that the source jars are added-->
-    <moduleSet>
-      <includes>
-        <include>org.apache.hbase:hbase-core</include>
-      </includes>
-      <binaries>
-        <attachmentClassifier>sources</attachmentClassifier>
-        <outputFileNameMapping>hbase-${version}${dashClassifier}.jar</outputFileNameMapping>
-        <outputDirectory>/</outputDirectory>
-        <unpack>false</unpack>
-      </binaries>
-    </moduleSet>
-  </moduleSets>
   <fileSets>
     <fileSet>
       <includes>
@@ -53,23 +23,22 @@
       <fileMode>755</fileMode>
     </fileSet>
     <fileSet>
-      <directory>contrib/ec2</directory>
-      <outputDirectory>contrib/ec2</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>bin/**</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>core/src/main/ruby</directory>
+      <directory>src/main/ruby</directory>
       <outputDirectory>lib/ruby</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>contrib/transactional</directory>
-      <outputDirectory>contrib/transactional</outputDirectory>
+      <directory>target</directory>
+      <outputDirectory>/</outputDirectory>
       <includes>
-        <include>README*</include>
+        <include>*.jar</include>
       </includes>
     </fileSet>
   </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
 </assembly>

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java?rev=946530&r1=946529&r2=946530&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java Thu May 20 05:24:32
2010
@@ -148,7 +148,7 @@ public abstract class HBaseTestCase exte
 
   protected Path getUnitTestdir(String testName) {
     return new Path(
-        conf.get(TEST_DIRECTORY_KEY, "test/build/data"), testName);
+        conf.get(TEST_DIRECTORY_KEY, "target/test/data"), testName);
   }
 
   protected HRegion createNewHRegion(HTableDescriptor desc, byte [] startKey,

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=946530&r1=946529&r2=946530&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Thu May 20
05:24:32 2010
@@ -93,8 +93,8 @@ public class HBaseTestingUtility {
   /**
    * @return Where to write test data on local filesystem; usually build/test/data
    */
-  public Path getTestDir() {
-    return new Path(System.getProperty(TEST_DIRECTORY_KEY, "build/test/data"));
+  public static Path getTestDir() {
+    return new Path(System.getProperty(TEST_DIRECTORY_KEY, "target/test/data"));
   }
 
   /**

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java?rev=946530&r1=946529&r2=946530&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Thu May
20 05:24:32 2010
@@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.HConstant
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.Put;
@@ -66,7 +67,8 @@ public class TestHRegion extends HBaseTe
   static final Log LOG = LogFactory.getLog(TestHRegion.class);
 
   HRegion region = null;
-  private final String DIR = "test/build/data/TestHRegion/";
+  private final String DIR = HBaseTestingUtility.getTestDir() +
+    "/TestHRegion/";
 
   private final int MAX_VERSIONS = 2;
 

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java?rev=946530&r1=946529&r2=946530&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java Thu May
20 05:24:32 2010
@@ -27,6 +27,7 @@ import org.apache.hadoop.hbase.HBaseConf
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.Get;
@@ -69,7 +70,7 @@ public class TestStore extends TestCase 
   long id = System.currentTimeMillis();
   Get get = new Get(row);
 
-  private static final String DIR = "test/build/data/TestStore/";
+  private static final String DIR = HBaseTestingUtility.getTestDir() + "/TestStore/";
 
   /**
    * Setup
@@ -317,4 +318,4 @@ public class TestStore extends TestCase 
     storeFlusher.flushCache();
     storeFlusher.commit();
   }
-}
\ No newline at end of file
+}



Mime
View raw message