You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by li...@apache.org on 2014/05/14 02:27:04 UTC
svn commit: r1594423 [1/17] - in /hbase/branches/0.89-fb: ./ bin/
src/main/java/org/apache/hadoop/hbase/rest/
src/main/java/org/apache/hadoop/hbase/rest/client/
src/main/java/org/apache/hadoop/hbase/rest/metrics/
src/main/java/org/apache/hadoop/hbase/r...
Author: liyin
Date: Wed May 14 00:26:57 2014
New Revision: 1594423
URL: http://svn.apache.org/r1594423
Log:
master] Pom cleanup and remove rest server.
Summary:
Clean up the pom removing cruft.
Added JUnit 4.11
Moved to new surefire
Added Categories to test to allow faster local test runs.
Removed all of REST dependencies
Removed REST server and tests.
Test Plan:
mvn clean test
mvn clean test -PunstableTests
mvn clean test -PallStableTests
Reviewers: manukranthk, arjen, liyintang
Reviewed By: liyintang
Modified:
hbase/branches/0.89-fb/bin/hbase
hbase/branches/0.89-fb/pom.xml
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/Constants.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ExistsResource.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/Main.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ProtobufMessageHandler.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RegionsResource.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ResourceBase.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ResourceConfig.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ResultGenerator.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RootResource.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RowSpec.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ScannerInstanceResource.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterStatusResource.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterVersionResource.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/VersionResource.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/client/Cluster.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/metrics/RESTMetrics.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/metrics/RESTStatistics.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/CellSetModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/RowModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/TableInfoModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/TableListModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/TableModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/TableRegionModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/model/VersionModel.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellMessage.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellSetMessage.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/ColumnSchemaMessage.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/ScannerMessage.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableInfoMessage.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableListMessage.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableSchemaMessage.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/VersionMessage.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/provider/JAXBContextResolver.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/provider/consumer/ProtobufMessageBodyConsumer.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/provider/producer/PlainTextMessageBodyProducer.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/provider/producer/ProtobufMessageBodyProducer.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/MultiRegionTable.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluationCommons.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestCompare.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestDuplicateNotifications.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestEmptyMetaInfo.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestHMsg.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestHServerAddress.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestHServerInfo.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestMergeMeta.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestMergeTable.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestMultiClusters.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestMultiParallelPut.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestPerColumnFamilyFlush.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestScanMultipleVersions.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TimestampTestBase.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/UnstableTestSuite.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/benchmarks/ScanBenchmark.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestBatchedUpload.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestBlacklistRegionServer.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestBloomFilterSchema.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestClientLocalScanner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestClientLocalScanner2.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestCreateTableOnServers.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestDelColBloomFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestDelete.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide2.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide4.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestGetRowVersions.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHBaseFsck.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHFileHistogramE2E.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHRegionLocation.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHTable.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHTableClientScanner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestIntegerOrResultOrException.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestMaxResponseSize.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestMetaCache.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestMultiAction.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestMultiPut.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestMultiPutResponse.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestParallelScanner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestPut.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestResult.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestScanRetries.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestServerConfigFromClient.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestTMultiResponse.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestTimestamp.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/conf/TestConfigurationManager.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/coprocessor/endpoints/TestEndpoint.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/coprocessor/endpoints/TestEndpointBytesCodec.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/coprocessor/endpoints/TestEndpointReload.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/coprocessor/endpoints/TestLongAggregator.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/coprocessor/observers/TestHRegionObserverBypassCoprocessor.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPaginationFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestCompoundRowPrefixFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestInclusiveStopFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestPageFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestPrefixFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueExcludeFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/TestHbaseObjectWritable.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/TestImmutableBytesWritable.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/encoding/TestBufferedDataBlockEncoder.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheColumnFamilySummary.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCompression.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestForceCacheImportantBlocks.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestIncrementalEncoding.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestL2BucketCache.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestByteBufferIOEngine.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/histogram/TestConversionUtils.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/histogram/TestHiveBasedNumericHistogram.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/ipc/TestPerRequestProfiling.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/ipc/TestRPCCompression.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/loadtest/ColumnFamilyProperties.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/loadtest/LoadTester.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapred/TestLegacyTableMapReduce.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRPCCallOptimization.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatNMappersPerRegion.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatWithHFileOutputFormat.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestAlterTableLocking.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestClusterStartupDetection.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestKillingServersFromMaster.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestLogSplitOnMasterFailover.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterWithDisabling.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMinimumServerCount.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMultiRegionServerShutDown.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestROOTAssignment.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRSLivenessOnMasterFailover.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionChecker.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionManager.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacementDestructive.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionServerOperationQueue.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionStateOnMasterFailure.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestSchemaModificationLocks.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestServerLoadMap.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestServerManager.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedCloseRegion.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedReopenRegion.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsMBeanBase.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/CreateRandomStoreFile.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/DisabledTestRegionServerExit.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestCachingOnCompaction.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompoundBloomFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompoundConfiguration.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultCompactSelection.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestExplicitColumnTracker.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlashBackQuery.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlashBackQueryCompaction.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetRegionLocation.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionClose.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionCloseRetry.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionSeqidTransition.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerFileSystemFailure.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueSkipListSet.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestLeases.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterOnlineConfigChange.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreFlusher.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestNumReadsWritesPerRs.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestQOS.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestReadWriteConsistencyControl.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestReconnectOnRSDeath.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerOnlineConfigChange.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerShutdown.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerResets.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileBlockCacheSummary.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestSyncFileRangeThrottling.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestTierCompactSelection.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/compactionhook/TestLowerToUpperCompactionHook.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/compactionhook/TestSkipCompactionHook.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/kvaggregator/TestKeyValueAggregator.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestRpcMetricWrapper.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestThriftMetrics.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogFiltering.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogMethods.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogActionsListener.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestMultipleHLogs.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTClusterTestBase.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/PerformanceEvaluation.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/TestRowResource.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdmin.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestHBCpp.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestHeaderSendReceive.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestHsHaServerCmdLine.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestMutationWriteToWAL.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestNativeThriftClient.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestNonblockingServerCmdLine.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThreadPoolServerFramedCmdLine.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThreadPoolServerUnframedCmdLine.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThreadedSelectorServerCmdLine.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftMutationAPI.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftResultSerializer.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerLegacy.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/ThriftServerCmdLineTestBase.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestHRegionInterfaceSimpleFunctions.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestJVMCrash.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestMasterToRSUseThrift.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestServerSideException.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleOperations.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleRowMutations.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleScan.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSocksProxy.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSwiftSerDe.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestThriftExceptions.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestThriftMultiRSScenario.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/SoftValueSortedMapTest.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TagRunner.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDrainRegionServer.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDrainableQueue.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestKeying.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMunkresAssignment.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestParamFormatter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestSizeBasedThrottler.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestStringBytes.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TitanUserInfo.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/coprocessor/TestSortedCopyOnWriteSet.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperWrapper.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/lock/TestHReadWriteLockImpl.java
Modified: hbase/branches/0.89-fb/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/bin/hbase?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/bin/hbase (original)
+++ hbase/branches/0.89-fb/bin/hbase Wed May 14 00:26:57 2014
@@ -72,7 +72,6 @@ if [ $# = 0 ]; then
echo " master run an HBase HMaster node"
echo " regionserver run an HBase HRegionServer node"
echo " zookeeper run a Zookeeper server"
- echo " rest run an HBase REST server"
echo " thrift run an HBase Thrift server"
echo " migrate upgrade an hbase.rootdir"
echo " hbck run the hbase 'fsck' tool"
@@ -254,11 +253,6 @@ elif [ "$COMMAND" = "thrift" ] ; then
if [ "$1" != "stop" ] ; then
HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS"
fi
-elif [ "$COMMAND" = "rest" ] ; then
- CLASS='org.apache.hadoop.hbase.rest.Main'
- if [ "$1" != "stop" ] ; then
- HBASE_OPTS="$HBASE_OPTS $HBASE_REST_OPTS"
- fi
elif [ "$COMMAND" = "migrate" ] ; then
CLASS='org.apache.hadoop.hbase.util.Migrate'
elif [ "$COMMAND" = "hbck" ] ; then
Modified: hbase/branches/0.89-fb/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/pom.xml?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/pom.xml (original)
+++ hbase/branches/0.89-fb/pom.xml Wed May 14 00:26:57 2014
@@ -168,7 +168,7 @@
<jdk>/usr/local/jdk-7u6-64</jdk>
</properties>
</profile>
- <profile>
+ <profile>
<id>usingJDK7</id>
<activation>
<jdk>1.7</jdk>
@@ -178,7 +178,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <!-- <version>0.6.4-SNAPSHOT</version> -->
<version>${jacoco.version}</version>
<executions>
<execution>
@@ -207,19 +206,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkMode>always</forkMode>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- <excludes>
- <exclude>**/mapred/*.java</exclude>
- <exclude>**/replication/*.java</exclude>
- <exclude>**/rest/*.java</exclude>
- <exclude>**/rest/*/*.java</exclude>
- <exclude>**/*$*</exclude>
- </excludes>
- <argLine>${surefire.argLine}</argLine>
- <parallel>classes</parallel>
<systemPropertyVariables>
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
</systemPropertyVariables>
@@ -228,7 +214,7 @@
</plugins>
</build>
</profile>
- <profile>
+ <profile>
<id>usingJDK8</id>
<activation>
<jdk>1.8</jdk>
@@ -238,25 +224,30 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>always</forkMode>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- <excludes>
- <exclude>**/mapred/*.java</exclude>
- <exclude>**/replication/*.java</exclude>
- <exclude>**/rest/*.java</exclude>
- <exclude>**/rest/*/*.java</exclude>
- <exclude>**/*$*</exclude>
- </excludes>
- <argLine>${surefire.argLine}</argLine>
- <parallel>classes</parallel>
- </configuration>
</plugin>
</plugins>
</build>
</profile>
+ <profile>
+ <id>unstableTests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <surefire.skipFirstPart>true</surefire.skipFirstPart>
+ <surefire.excludedGroups></surefire.excludedGroups>
+ <surefire.secondPartGroups>org.apache.hadoop.hbase.UnstableTests</surefire.secondPartGroups>
+ </properties>
+ </profile>
+ <profile>
+ <id>allStableTests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <surefire.secondPartGroups>org.apache.hadoop.hbase.MediumTests,org.apache.hadoop.hbase.LargeTests</surefire.secondPartGroups>
+ </properties>
+ </profile>
</profiles>
<repositories>
@@ -371,23 +362,60 @@
<artifactId>maven-source-plugin</artifactId>
<version>2.1.1</version>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
- <argLine>${surefire.argLine}</argLine>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <parallel>classes</parallel>
- </configuration>
- </plugin>
+ <dependencies>
+ <!-- by default surefire selects dynamically the connector to the unit tests
+ tool. We want to use always the same as the different connectors can have different
+ bugs and behaviour. -->
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>${surefire.provider}</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ <!-- Generic testing configuration for all packages -->
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ <skip>${surefire.skipFirstPart}</skip>
+ <!-- surefire hack, if not we're
+ using method parallelization class ! -->
+ <testFailureIgnore>${surefire.testFailureIgnore}</testFailureIgnore>
+ <forkedProcessTimeoutInSeconds>${surefire.timeout}</forkedProcessTimeoutInSeconds>
+ <argLine>${surefire.argLine}</argLine>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <groups>${surefire.firstPartGroups}</groups>
+ <excludedGroups>${surefire.excludedGroups}</excludedGroups>
+ <forkMode>always</forkMode>
+ <forkCount>2</forkCount>
+ <threadCount>2</threadCount>
+ <parallel>classes</parallel>
+ </configuration>
+ <executions>
+ <execution>
+ <id>secondPartTestsExecution</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <forkMode>always</forkMode>
+ <forkCount>1</forkCount>
+ <threadCount>1</threadCount>
+ <parallel>classes</parallel>
+ <skip>${surefire.skipSecondPart}</skip>
+ <testFailureIgnore>${surefire.testFailureIgnore}</testFailureIgnore>
+ <forkMode>always</forkMode>
+ <groups>${surefire.secondPartGroups}</groups>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version>
@@ -411,7 +439,6 @@
</plugin>
</plugins>
</pluginManagement>
-
<resources>
<resource>
<directory>src/main/resources/</directory>
@@ -604,20 +631,18 @@
<compileSource>1.7</compileSource>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hbase.version>0.21.0-SNAPSHOT</hbase.version>
- <hadoop.version>0.20</hadoop.version>
+ <hadoop.version>4.41819</hadoop.version>
<swift.version>0.12.0</swift.version>
-
<commons-cli.version>1.2</commons-cli.version>
<commons-io.version>2.1</commons-io.version>
<commons-logging.version>1.1.1</commons-logging.version>
<jetty.version>6.1.24</jetty.version>
<jetty.jspapi.version>6.1.14</jetty.jspapi.version>
<netty.version>3.7.0.Final</netty.version>
- <junit.version>4.8.1</junit.version>
+ <junit.version>4.11</junit.version>
<mockito-all.version>1.9.5</mockito-all.version>
<log4j.version>1.2.17</log4j.version>
<zookeeper.version>3.4.3</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>
@@ -628,59 +653,33 @@
<jsr311.version>1.1.1</jsr311.version>
<protobuf.version>2.3.0</protobuf.version>
<slf4j.version>1.7.5</slf4j.version>
- <stax-api>1.0.1</stax-api>
<thrift.version>0.9.1</thrift.version>
<guava.version>16.0.1</guava.version>
- <jackson.version>1.8.3</jackson.version>
+ <jackson.version>1.9.5</jackson.version>
+ <commons-pool.version>1.6</commons-pool.version>
<hbase.skip-jacoco>false</hbase.skip-jacoco>
+ <jacoco.version>0.6.2.201302030002</jacoco.version>
<surefire.version>2.15</surefire.version>
- <jacoco.version>0.6.2.201302030002</jacoco.version>
- <surefire.argLine>-enableassertions -Xmx2g -Djava.security.egd=file:/dev/./urandom
- -Djava.awt.headless=true -Djava.library.path=${basedir}/lib/native/Linux-amd64-64/
+ <surefire.provider>surefire-junit47</surefire.provider>
+ <surefire.argLine>-enableassertions -Xmx4g -Djava.security.egd=file:/dev/./urandom
+ -Djava.awt.headless=true -Djava.library.path=${basedir}/lib/native/Linux-amd64-64/
</surefire.argLine>
-
+ <surefire.skipFirstPart>false</surefire.skipFirstPart>
+ <surefire.skipSecondPart>false</surefire.skipSecondPart>
+ <surefire.firstPartGroups>org.apache.hadoop.hbase.SmallTests</surefire.firstPartGroups>
+ <surefire.secondPartGroups>org.apache.hadoop.hbase.MediumTests</surefire.secondPartGroups>
+ <surefire.testFailureIgnore>true</surefire.testFailureIgnore>
+ <test.output.tofile>true</test.output.tofile>
+ <surefire.timeout>900</surefire.timeout>
+ <surefire.excludedGroups>org.apache.hadoop.hbase.UnstableTests</surefire.excludedGroups>
</properties>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>${commons-cli.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <swift.version>0.12.0</swift.version>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
+ <groupId>com.facebook.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoop.version}</version>
<exclusions>
@@ -692,18 +691,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>hbase</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>hbase</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
@@ -716,35 +703,169 @@
</exclusions>
</dependency>
+ <!-- Info server dependencies -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
<version>${jetty.jspapi.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ <version>${jetty.jspapi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
+ <version>${jetty.jspapi.version}</version>
+ </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>
+ <!-- Common Deps -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons-pool.version}</version>
+ </dependency>
+
+ <!-- Swift/Nifty dependencies -->
<dependency>
<groupId>com.facebook.swift</groupId>
<artifactId>swift-root</artifactId>
<version>${swift.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.facebook.swift</groupId>
+ <artifactId>swift-codec</artifactId>
+ <version>${swift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.facebook.swift</groupId>
+ <artifactId>swift-service</artifactId>
+ <version>${swift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.facebook.swift</groupId>
+ <artifactId>swift-annotations</artifactId>
+ <version>${swift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.facebook.nifty</groupId>
+ <artifactId>nifty-header-protocol</artifactId>
+ <version>${swift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${netty.version}</version>
+ </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>libthrift</artifactId>
+ <version>${thrift.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Shell deps -->
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ <version>${jruby.version}</version>
+ </dependency>
+
+ <!-- Logging dependencies -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
+ <groupId>com.facebook.hadoop</groupId>
+ <artifactId>hadoop-core-test</artifactId>
<version>${hadoop.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${mockito-all.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -752,24 +873,21 @@
<version>1.6</version>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.1.0.Final</version>
</dependency>
+
+
<dependency>
- <groupId>com.facebook.swift</groupId>
- <artifactId>swift-annotations</artifactId>
- <version>0.12.0</version>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.5</version>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -778,6 +896,7 @@
<groupId>com.facebook.titan.prometheus</groupId>
<artifactId>compactionhook</artifactId>
<version>2014-02-26T19.17.36-bac5a85</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -805,81 +924,42 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.6</version>
</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>libthrift</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>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
+ <groupId>com.facebook.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- </exclusions>
</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>
@@ -888,189 +968,75 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1</artifactId>
- <version>${jetty.jspapi.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
- <version>${jetty.jspapi.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>${jasper.version}</version>
- </dependency>
- <dependency>
- <!--If this is not in the runtime lib, we get odd
- "2009-02-27 11:38:39.504::WARN: failed jsp
- java.lang.NoSuchFieldError: IS_SECURITY_ENABLED"
- exceptions out of jetty deploying webapps.
- St.Ack Thu May 20 01:04:41 PDT 2010
- -->
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</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>
- <exclusions>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- </exclusions>
- </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>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.version}</version>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>com.facebook.swift</groupId>
+ <artifactId>swift-codec</artifactId>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <groupId>com.facebook.swift</groupId>
+ <artifactId>swift-service</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- <version>${commons-math.version}</version>
- <scope>test</scope>
+ <groupId>com.facebook.nifty</groupId>
+ <artifactId>nifty-header-protocol</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
+
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.facebook.swift</groupId>
- <artifactId>swift-codec</artifactId>
- <version>0.12.0</version>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.facebook.swift</groupId>
- <artifactId>swift-service</artifactId>
- <version>${swift.version}</version>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>${commons-math.version}</version>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.facebook.nifty</groupId>
- <artifactId>nifty-header-protocol</artifactId>
- <version>${swift.version}</version>
+ <dependency>
+ <groupId>com.facebook.hadoop</groupId>
+ <artifactId>hadoop-core-test</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
- <!--
- To publish, use the following settings.xml file ( placed in ~/.m2/settings.xml )
-
- <settings>
- <servers>
- <server>
- <id>apache.releases.https</id>
- <username>hbase_committer</username>
- <password>********</password>
- </server>
-
- <server>
- <id>apache.snapshots.https</id>
- <username>hbase_committer</username>
- <password>********</password>
- </server>
-
- </servers>
- </settings>
-
- $ mvn deploy
-(or)
- $ mvn -s /my/path/settings.xml deploy
-
- -->
<distributionManagement>
- <repository>
- <id>apache.releases.https</id>
- <name>Apache Release Distribution Repository</name>
- <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>Apache Development Snapshot Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- </snapshotRepository>
- <!-- Private Site Repository -->
- <site>
- <id>HBase Site</id>
- <url>scp://people.apache.org/home/psmith/public_html/hbase/sandbox/hbase/</url>
- </site>
</distributionManagement>
+
<!-- See http://jira.codehaus.org/browse/MSITE-443 why the settings need to be here and not in pluginManagement. -->
<reporting>
<plugins>
@@ -1127,11 +1093,6 @@
</reports>
</reportSet>
</reportSets>
- <!--
- This is probably not needed, given the smallness of the HBase source code, but left here in case
- <minmemory>128m</minmemory>
- <maxmemory>1024m</maxmemory>
- -->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/Constants.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/Constants.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/Constants.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/Constants.java Wed May 14 00:26:57 2014
@@ -1,37 +0,0 @@
-/*
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.rest;
-
-/**
- * Common constants for org.apache.hadoop.hbase.rest
- */
-public interface Constants {
- public static final String VERSION_STRING = "0.0.2";
-
- public static final int DEFAULT_MAX_AGE = 60 * 60 * 4; // 4 hours
-
- public static final String MIMETYPE_TEXT = "text/plain";
- public static final String MIMETYPE_HTML = "text/html";
- public static final String MIMETYPE_XML = "text/xml";
- public static final String MIMETYPE_BINARY = "application/octet-stream";
- public static final String MIMETYPE_PROTOBUF = "application/x-protobuf";
- public static final String MIMETYPE_JSON = "application/json";
-}
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ExistsResource.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ExistsResource.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ExistsResource.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ExistsResource.java Wed May 14 00:26:57 2014
@@ -1,73 +0,0 @@
-/*
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.rest;
-
-import java.io.IOException;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response.ResponseBuilder;
-
-import org.apache.hadoop.hbase.client.HBaseAdmin;
-
-public class ExistsResource extends ResourceBase {
-
- static CacheControl cacheControl;
- static {
- cacheControl = new CacheControl();
- cacheControl.setNoCache(true);
- cacheControl.setNoTransform(false);
- }
-
- String tableName;
-
- /**
- * Constructor
- * @param table
- * @throws IOException
- */
- public ExistsResource(String table) throws IOException {
- super();
- this.tableName = table;
- }
-
- @GET
- @Produces({MIMETYPE_TEXT, MIMETYPE_XML, MIMETYPE_JSON, MIMETYPE_PROTOBUF,
- MIMETYPE_BINARY})
- public Response get(final @Context UriInfo uriInfo) {
- try {
- HBaseAdmin admin = new HBaseAdmin(servlet.getConfiguration());
- if (!admin.tableExists(tableName)) {
- throw new WebApplicationException(Response.Status.NOT_FOUND);
- }
- } catch (IOException e) {
- throw new WebApplicationException(Response.Status.SERVICE_UNAVAILABLE);
- }
- ResponseBuilder response = Response.ok();
- response.cacheControl(cacheControl);
- return response.build();
- }
-}
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/Main.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/Main.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/Main.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/Main.java Wed May 14 00:26:57 2014
@@ -1,114 +0,0 @@
-/*
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.rest;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
-
-import com.sun.jersey.spi.container.servlet.ServletContainer;
-
-/**
- * Main class for launching REST gateway as a servlet hosted by Jetty.
- * <p>
- * The following options are supported:
- * <ul>
- * <li>-p: service port</li>
- * </ul>
- */
-public class Main implements Constants {
- private static final String DEFAULT_LISTEN_PORT = "8080";
-
- private static void printUsageAndExit(Options options, int exitCode) {
- HelpFormatter formatter = new HelpFormatter();
- formatter.printHelp("REST", null, options,
- "To start the REST server run 'bin/hbase-daemon.sh start rest'\n" +
- "To shutdown the REST server run 'bin/hbase-daemon.sh stop rest' or" +
- " send a kill signal to the rest server pid",
- true);
- System.exit(exitCode);
- }
-
- public static void main(String[] args) throws Exception {
- Log LOG = LogFactory.getLog("RESTServer");
- Options options = new Options();
- options.addOption("p", "port", true, "Port to bind to [default:" +
- DEFAULT_LISTEN_PORT + "]");
- CommandLineParser parser = new PosixParser();
- CommandLine cmd = parser.parse(options, args);
- /**
- * This is so complicated to please both bin/hbase and bin/hbase-daemon.
- * hbase-daemon provides "start" and "stop" arguments
- * hbase should print the help if no argument is provided
- */
- List<String> commandLine = Arrays.asList(args);
- boolean stop = commandLine.contains("stop");
- boolean start = commandLine.contains("start");
- if (cmd.hasOption("help") || !start || stop) {
- printUsageAndExit(options, 1);
- }
- // Get port to bind to
- int port = 0;
- try {
- port = Integer.parseInt(cmd.getOptionValue("port", DEFAULT_LISTEN_PORT));
- } catch (NumberFormatException e) {
- LOG.error("Could not parse the value provided for the port option", e);
- printUsageAndExit(options, -1);
- }
-
- // set up the Jersey servlet container for Jetty
-
- ServletHolder sh = new ServletHolder(ServletContainer.class);
- sh.setInitParameter(
- "com.sun.jersey.config.property.resourceConfigClass",
- ResourceConfig.class.getCanonicalName());
- sh.setInitParameter("com.sun.jersey.config.property.packages",
- "jetty");
-
- // set up Jetty and run the embedded server
-
- RESTServlet servlet = RESTServlet.getInstance();
- port = servlet.getConfiguration().getInt("hbase.rest.port", port);
-
- Server server = new Server(port);
- server.setSendServerVersion(false);
- server.setSendDateHeader(false);
- server.setStopAtShutdown(true);
- // set up context
- Context context = new Context(server, "/", Context.SESSIONS);
- context.addServlet(sh, "/*");
-
- server.start();
- server.join();
- }
-}
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ProtobufMessageHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ProtobufMessageHandler.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ProtobufMessageHandler.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/ProtobufMessageHandler.java Wed May 14 00:26:57 2014
@@ -1,44 +0,0 @@
-/*
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.rest;
-
-import java.io.IOException;
-
-/**
- * Common interface for models capable of supporting protobuf marshalling
- * and unmarshalling. Hooks up to the ProtobufMessageBodyConsumer and
- * ProtobufMessageBodyProducer adapters.
- */
-public abstract interface ProtobufMessageHandler {
- /**
- * @return the protobuf represention of the model
- */
- public byte[] createProtobufOutput();
-
- /**
- * Initialize the model from a protobuf representation.
- * @param message the raw bytes of the protobuf message
- * @return reference to self for convenience
- * @throws IOException
- */
- public ProtobufMessageHandler getObjectFromMessage(byte[] message)
- throws IOException;
-}
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java Wed May 14 00:26:57 2014
@@ -1,121 +0,0 @@
-/*
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.rest;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.client.HTableInterface;
-import org.apache.hadoop.hbase.client.HTablePool;
-import org.apache.hadoop.hbase.rest.metrics.RESTMetrics;
-
-/**
- * Singleton class encapsulating global REST servlet state and functions.
- */
-public class RESTServlet implements Constants {
-
- private static RESTServlet instance;
-
- Configuration conf;
- HTablePool pool;
- AtomicBoolean stopping = new AtomicBoolean(false);
- Map<String,Integer> maxAgeMap =
- Collections.synchronizedMap(new HashMap<String,Integer>());
- RESTMetrics metrics = new RESTMetrics();
-
- /**
- * @return the RESTServlet singleton instance
- * @throws IOException
- */
- public synchronized static RESTServlet getInstance() throws IOException {
- if (instance == null) {
- instance = new RESTServlet();
- }
- return instance;
- }
-
- /**
- * Constructor
- * @throws IOException
- */
- public RESTServlet() throws IOException {
- this.conf = HBaseConfiguration.create();
- this.pool = new HTablePool(conf, 10);
- }
-
- HTablePool getTablePool() {
- return pool;
- }
-
- Configuration getConfiguration() {
- return conf;
- }
-
- RESTMetrics getMetrics() {
- return metrics;
- }
-
- /**
- * @param tableName the table name
- * @return the maximum cache age suitable for use with this table, in
- * seconds
- * @throws IOException
- */
- public int getMaxAge(String tableName) throws IOException {
- Integer i = maxAgeMap.get(tableName);
- if (i != null) {
- return i.intValue();
- }
- HTableInterface table = pool.getTable(tableName);
- try {
- int maxAge = DEFAULT_MAX_AGE;
- for (HColumnDescriptor family :
- table.getTableDescriptor().getFamilies()) {
- int ttl = family.getTimeToLive();
- if (ttl < 0) {
- continue;
- }
- if (ttl < maxAge) {
- maxAge = ttl;
- }
- }
- maxAgeMap.put(tableName, maxAge);
- return maxAge;
- } finally {
- pool.putTable(table);
- }
- }
-
- /**
- * Signal that a previously calculated maximum cache age has been
- * invalidated by a schema change.
- * @param tableName the table name
- */
- public void invalidateMaxAge(String tableName) {
- maxAgeMap.remove(tableName);
- }
-}
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RegionsResource.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RegionsResource.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RegionsResource.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/rest/RegionsResource.java Wed May 14 00:26:57 2014
@@ -1,105 +0,0 @@
-/*
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.rest;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.Map;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response.ResponseBuilder;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HServerAddress;
-import org.apache.hadoop.hbase.TableNotFoundException;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.HTableInterface;
-import org.apache.hadoop.hbase.client.HTablePool;
-import org.apache.hadoop.hbase.rest.model.TableInfoModel;
-import org.apache.hadoop.hbase.rest.model.TableRegionModel;
-
-public class RegionsResource extends ResourceBase {
- private static final Log LOG = LogFactory.getLog(RegionsResource.class);
-
- static CacheControl cacheControl;
- static {
- cacheControl = new CacheControl();
- cacheControl.setNoCache(true);
- cacheControl.setNoTransform(false);
- }
-
- String tableName;
-
- public RegionsResource(String table) throws IOException {
- super();
- this.tableName = table;
- }
-
- private Map<HRegionInfo,HServerAddress> getTableRegions()
- throws IOException {
- HTablePool pool = servlet.getTablePool();
- HTableInterface table = pool.getTable(tableName);
- try {
- return ((HTable)table).getRegionsInfo();
- } finally {
- pool.putTable(table);
- }
- }
-
- @GET
- @Produces({MIMETYPE_TEXT, MIMETYPE_XML, MIMETYPE_JSON, MIMETYPE_PROTOBUF})
- public Response get(final @Context UriInfo uriInfo) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("GET " + uriInfo.getAbsolutePath());
- }
- servlet.getMetrics().incrementRequests(1);
- try {
- TableInfoModel model = new TableInfoModel(tableName);
- Map<HRegionInfo,HServerAddress> regions = getTableRegions();
- for (Map.Entry<HRegionInfo,HServerAddress> e: regions.entrySet()) {
- HRegionInfo hri = e.getKey();
- HServerAddress addr = e.getValue();
- InetSocketAddress sa = addr.getInetSocketAddress();
- model.add(
- new TableRegionModel(tableName, hri.getRegionId(),
- hri.getStartKey(), hri.getEndKey(),
- sa.getHostName() + ":" + Integer.valueOf(sa.getPort())));
- }
- ResponseBuilder response = Response.ok(model);
- response.cacheControl(cacheControl);
- return response.build();
- } catch (TableNotFoundException e) {
- throw new WebApplicationException(Response.Status.NOT_FOUND);
- } catch (IOException e) {
- throw new WebApplicationException(e,
- Response.Status.SERVICE_UNAVAILABLE);
- }
- }
-}