Index: hbase-client/pom.xml =================================================================== --- hbase-client/pom.xml (revision 1501883) +++ hbase-client/pom.xml (working copy) @@ -1,46 +1,47 @@ - - - 4.0.0 - - hbase - org.apache.hbase - 0.95.2-SNAPSHOT - .. - + + + 4.0.0 + + hbase + org.apache.hbase + 0.95.2-SNAPSHOT + .. + - hbase-client - HBase - Client - Client of HBase + hbase-client + HBase - Client + Client of HBase - - - - org.apache.maven.plugins - maven-site-plugin - - true - - + + + org.apache.maven.plugins + maven-site-plugin + + true + + + maven-assembly-plugin ${maven.assembly.version} @@ -48,141 +49,170 @@ true - - maven-surefire-plugin - - - - secondPartTestsExecution - test - + + maven-surefire-plugin + + + + secondPartTestsExecution + test + test - - + + true - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + - - + + + + org.apache.hbase + hbase-common + + + org.apache.hbase + hbase-common + test-jar + + + org.apache.hbase + hbase-protocol + + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-lang + commons-lang + + + commons-logging + commons-logging + + + com.google.guava + guava + + + com.google.protobuf + protobuf-java + + + org.apache.zookeeper + zookeeper + + + org.cloudera.htrace + htrace + + + org.codehaus.jackson + jackson-mapper-asl + + + io.netty + netty + + + log4j + log4j + test + + + + + + + skipClientTests + + + skipClientTests + + + + true + + + + + hadoop-1.0 + + + !hadoop.profile + + + - org.apache.hbase - hbase-common + org.apache.hadoop + hadoop-core + + + + + + hadoop-2.0 + + + hadoop.profile + 2.0 + + + - org.apache.hbase - hbase-common - test-jar + org.apache.hadoop + hadoop-client - org.apache.hbase - hbase-protocol + org.apache.hadoop + hadoop-annotations - + + + + + + hadoop-3.0 + + + hadoop.profile + 3.0 + + + + 3.0-SNAPSHOT + + - com.google.protobuf - protobuf-java + org.apache.hadoop + hadoop-common - - org.apache.zookeeper - zookeeper - - - org.cloudera.htrace - htrace - - - io.netty - netty - - - - - - - skipClientTests - - - skipClientTests - - - - true - - - - - hadoop-1.0 - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-core - - - - - - - hadoop-2.0 - - - hadoop.profile - 2.0 - - - - - org.apache.hadoop - hadoop-client - - - org.apache.hadoop - hadoop-annotations - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - - + + + Index: hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java =================================================================== --- hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java (revision 1501883) +++ hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java (working copy) @@ -24,6 +24,9 @@ import java.util.Arrays; import org.apache.commons.lang.time.StopWatch; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; @@ -39,15 +42,16 @@ import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.io.compress.DefaultCodec; import org.apache.hadoop.io.compress.GzipCodec; +import org.apache.log4j.Level; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.mortbay.log.Log; -import org.apache.commons.logging.impl.Log4JLogger; -import org.apache.log4j.Level; @Category(SmallTests.class) public class TestIPCUtil { + + public static final Log LOG = LogFactory.getLog(IPCUtil.class); + IPCUtil util; @Before public void before() { @@ -148,7 +152,7 @@ timerTest(util, timer, count, size, codec, compressor, false); } timer.stop(); - Log.info("Codec=" + codec + ", compression=" + compressor + ", sized=" + false + + LOG.info("Codec=" + codec + ", compression=" + compressor + ", sized=" + false + ", count=" + count + ", size=" + size + ", + took=" + timer.getTime() + "ms"); timer.reset(); timer.start(); @@ -156,7 +160,7 @@ timerTest(util, timer, count, size, codec, compressor, true); } timer.stop(); - Log.info("Codec=" + codec + ", compression=" + compressor + ", sized=" + true + + LOG.info("Codec=" + codec + ", compression=" + compressor + ", sized=" + true + ", count=" + count + ", size=" + size + ", + took=" + timer.getTime() + "ms"); } @@ -189,4 +193,4 @@ timerTests(util, count, size, new KeyValueCodec(), new DefaultCodec()); timerTests(util, count, size, new KeyValueCodec(), new GzipCodec()); } -} \ No newline at end of file +}