diff --git a/pom.xml b/pom.xml index 374eeea..0e8d919 100644 --- a/pom.xml +++ b/pom.xml @@ -5,18 +5,14 @@ org.apache.hbase hbase - pom + jar 0.21.0-SNAPSHOT HBase 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. - http://hadoop.apache.org/hbase - - - core - + http://hbase.apache.org @@ -28,9 +24,9 @@ - scm:svn:http://svn.apache.org/repos/asf/hadoop/hbase/trunk - scm:svn:https://svn.apache.org/repos/asf/hadoop/hbase/trunk - http://svn.apache.org/viewvc/hadoop/hbase/trunk + scm:svn:http://svn.apache.org/repos/asf/hbase/trunk + scm:svn:https://svn.apache.org/repos/asf/hbase/trunk + http://svn.apache.org/viewvc/hbase/trunk @@ -46,35 +42,35 @@ User List - hbase-user-subscribe@hadoop.apache.org - hbase-user-unsubscribe@hadoop.apache.org - hbase-user@hadoop.apache.org - http://mail-archives.apache.org/mod_mbox/hadoop-hbase-user/ + user-subscribe@hbase.apache.org + user-unsubscribe@hbase.apache.org + user@hbase.apache.org + http://mail-archives.apache.org/mod_mbox/hbase-user/ - http://dir.gmane.org/gmane.comp.java.hadoop.hbase.user + http://dir.gmane.org/gmane.comp.java.hbase.user Developer List - hbase-dev-subscribe@hadoop.apache.org - hbase-dev-unsubscribe@hadoop.apache.org - hbase-dev@hadoop.apache.org - http://mail-archives.apache.org/mod_mbox/hadoop-hbase-dev/ + dev-subscribe@hbase.apache.org + dev-unsubscribe@hbase.apache.org + dev@hbase.apache.org + http://mail-archives.apache.org/mod_mbox/hbase-dev/ - http://dir.gmane.org/gmane.comp.java.hadoop.hbase.devel + http://dir.gmane.org/gmane.comp.java.hbase.devel Commits List - hbase-commits-subscribe@hadoop.apache.org - hbase-commits-unsubscribe@hadoop.apache.org - http://mail-archives.apache.org/mod_mbox/hadoop-hbase-commits/ + commits-subscribe@hbase.apache.org + commits-unsubscribe@hbase.apache.org + http://mail-archives.apache.org/mod_mbox/hbase-commits/ Issues List - hbase-issues-subscribe@hadoop.apache.org - hbase-issues-unsubscribe@hadoop.apache.org - http://mail-archives.apache.org/mod_mbox/hadoop-hbase-issues/ + issues-subscribe@hbase.apache.org + issues-unsubscribe@hbase.apache.org + http://mail-archives.apache.org/mod_mbox/hbase-issues/ @@ -88,14 +84,6 @@ http://www.trendmicro.com - bryanduxbury - Bryan Duxbury - bryan@rapleaf.com - -8 - Rapleaf - http://www.rapleaf.com - - jdcryans Jean-Daniel Cryans jdcryans@apache.org @@ -112,14 +100,6 @@ http://www.streamy.com - jimk - Jim Kellerman - jimk@apache.org - -8 - Powerset - http://www.powerset.com/ - - larsgeorge Lars George larsgeorge@apache.org @@ -128,14 +108,6 @@ http://www.worldlingo.com/ - nitay - Nitay Joffe - nitay@apache.org - -8 - Powerset - http://www.powerset.com/ - - rawson Ryan Rawson rawson@apache.org @@ -211,6 +183,7 @@ + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + + org/apache/hadoop/hbase/mapreduce/Driver + + + + + org/apache/jute/** + org/apache/zookeeper/** + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + package + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + always + + **/SoftValueSortedMapTest.java + **/*$* + + + + + maven-antrun-plugin + + + JSPC + generate-sources + + + + + + + + + run + + + + package-info + generate-sources + + + + + + + + + run + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-jspc-source + generate-sources + + add-source + + + + ${basedir}/target/jspc + + + + + add-package-info + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources + + + + + @@ -298,6 +404,19 @@ 4.8.1 1.2.15 3.3.1 + + 3.1 + 2.5 + 2.1 + 5.5.23 + 2.1 + 1.1.5.1 + 1.4.0 + 1.1.1 + 2.3.0 + 1.5.8 + 1.0.1 + 0.2.0 @@ -344,12 +463,12 @@ ${project.groupId} - hbase-core + hbase ${project.version} ${project.groupId} - hbase-core + hbase ${project.version} tests test @@ -381,6 +500,166 @@ + + + commons-cli + commons-cli + + + commons-httpclient + commons-httpclient + ${commons-httpclient.version} + + + commons-lang + commons-lang + ${commons-lang.version} + + + commons-logging + commons-logging + + + log4j + log4j + + + + + org.apache.thrift + thrift + ${thrift.version} + + + org.slf4j + slf4j-simple + + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + runtime + + + + org.apache.hadoop + hadoop-core + + + + org.apache.hadoop + zookeeper + + + + org.mortbay.jetty + jetty + ${jetty.version} + + + org.mortbay.jetty + jetty-util + ${jetty.version} + + + org.mortbay.jetty + servlet-api-2.5 + + + org.mortbay.jetty + jsp-2.1 + ${jetty.version} + + + org.mortbay.jetty + jsp-api-2.1 + ${jetty.version} + + + tomcat + jasper-runtime + ${jasper.version} + + + + org.jruby + jruby-complete + ${jruby.version} + + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + com.sun.jersey + jersey-core + ${jersey.version} + + + com.sun.jersey + jersey-json + ${jersey.version} + + + com.sun.jersey + jersey-server + ${jersey.version} + + + javax.xml.bind + jaxb-api + ${jaxb-api.version} + + + javax.ws.rs + jsr311-api + ${jsr311.version} + + + stax + stax-api + 1.0.1 + + + + + junit + junit + + + org.apache.commons + commons-math + ${commons-math.version} + test + + + org.apache.hadoop + hadoop-test + + - org.apache.hbase:hbase-core + org.apache.hbase:hbase sources @@ -53,23 +53,8 @@ 755 - contrib/ec2 - contrib/ec2 - - README* - bin/** - - - - core/src/main/ruby + src/main/ruby lib/ruby - - contrib/transactional - contrib/transactional - - README* - - diff --git a/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java b/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java index e8c1d0c..dbb21d4 100644 --- a/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java +++ b/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java @@ -148,7 +148,7 @@ public abstract class HBaseTestCase extends TestCase { 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, diff --git a/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index f600104..3feaedd 100644 --- a/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -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")); } /** diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index 482caa9..e51a02e 100644 --- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.HConstants; 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 HBaseTestCase { 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; diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java index d14a27f..4595e6e 100644 --- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java +++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java @@ -27,6 +27,7 @@ import org.apache.hadoop.hbase.HBaseConfiguration; 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 +}