incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tra...@apache.org
Subject svn commit: r1383152 [1/27] - in /incubator/hcatalog/trunk: ./ hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/ hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/drivers/ hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/ s...
Date Mon, 10 Sep 2012 23:29:03 GMT
Author: travis
Date: Mon Sep 10 23:28:55 2012
New Revision: 1383152

URL: http://svn.apache.org/viewvc?rev=1383152&view=rev
Log:
HCAT-493 Convert classes with 2 space indentation to 4 space indentation for consistent style

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/build.xml
    incubator/hcatalog/trunk/coding_style.xml
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatBaseLoader.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatBaseStorer.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatLoader.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatStorer.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/PigHCatUtil.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/drivers/LoadFuncBasedInputFormat.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/drivers/StoreFuncBasedOutputFormat.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/MockLoader.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/MyPigStorage.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatLoader.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatLoaderComplexSchema.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatLoaderStorer.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatStorer.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatStorerMulti.java
    incubator/hcatalog/trunk/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestPigHCatUtil.java
    incubator/hcatalog/trunk/shims/src/20/java/org/apache/hcatalog/shims/HCatHadoopShims20S.java
    incubator/hcatalog/trunk/shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/HCatCli.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/HCatDriver.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateDatabaseHook.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzerBase.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/common/HCatConstants.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/common/HCatContext.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/common/HCatException.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/common/HCatUtil.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/common/HiveClientCache.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/DataType.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/DefaultHCatRecord.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/HCatRecord.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/HCatRecordObjectInspector.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/HCatRecordObjectInspectorFactory.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/HCatRecordSerDe.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/HCatRecordable.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/JsonSerDe.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/LazyHCatRecord.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/Pair.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/ReaderWriter.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/schema/HCatFieldSchema.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/schema/HCatSchema.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/schema/HCatSchemaUtils.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/DataTransferFactory.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/EntityBase.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/HCatReader.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/HCatWriter.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/ReadEntity.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/ReaderContext.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/WriteEntity.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/WriterContext.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/impl/HCatInputFormatReader.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/impl/HCatOutputFormatWriter.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/state/DefaultStateProvider.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/transfer/state/StateProvider.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/har/HarOutputCommitterPostProcessor.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/listener/NotificationListener.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/DefaultOutputCommitterContainer.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/DefaultOutputFormatContainer.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/DefaultRecordWriterContainer.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileOutputCommitterContainer.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileOutputFormatContainer.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileRecordWriterContainer.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FosterStorageHandler.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatBaseInputFormat.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatBaseOutputFormat.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatInputFormat.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatRecordReader.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatSplit.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatStorageHandler.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatTableInfo.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InitializeInput.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InputJobInfo.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InternalUtil.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/MultiOutputFormat.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/OutputFormatContainer.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/OutputJobInfo.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/PartInfo.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/ProgressReporter.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/Security.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/StorerInfo.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/oozie/JavaAction.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/rcfile/RCFileMapReduceInputFormat.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/rcfile/RCFileMapReduceOutputFormat.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/rcfile/RCFileMapReduceRecordReader.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/security/HdfsAuthorizationProvider.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/security/StorageDelegationAuthorizationProvider.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/shims/HCatHadoopShims.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/storagehandler/DummyHCatAuthProvider.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/build.xml
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/java/build.xml
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/java/org/apache/hadoop/hive/tools/generate/RCFileGenerator.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/build.xml
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataReaderMaster.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataReaderSlave.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataWriterMaster.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/DataWriterSlave.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/GroupByAge.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HBaseReadWrite.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HCatTestDriver.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HCatTypeCheck.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HCatTypeCheckHive.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadJson.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadRC.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadText.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/ReadWrite.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/SimpleRead.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/StoreComplex.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/StoreDemo.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/StoreNumbers.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/SumNumbers.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/TypeDataCheck.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/Util.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteJson.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteRC.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteText.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/WriteTextPartitioned.java
    incubator/hcatalog/trunk/src/test/e2e/templeton/build.xml
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/ExitException.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/HcatTestUtils.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/MiniCluster.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/NoExitSecurityManager.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/cli/DummyStorageHandler.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/cli/TestPermsGrp.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/cli/TestSemanticAnalysis.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/cli/TestUseDatabase.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/common/TestHCatUtil.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/common/TestHiveClientCache.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/data/HCatDataCheckUtil.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/data/TestDefaultHCatRecord.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/data/TestHCatRecordSerDe.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/data/TestJsonSerDe.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/data/TestLazyHCatRecord.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/data/TestReaderWriter.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/data/schema/TestHCatSchema.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/data/schema/TestHCatSchemaUtils.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/listener/TestMsgBusConnection.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/listener/TestNotificationListener.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/HCatBaseTest.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/HCatMapReduceTest.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/TestHCatDynamicPartitioned.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/TestHCatHiveCompatibility.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/TestHCatInputFormat.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/TestHCatMultiOutputFormat.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/TestHCatNonPartitioned.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/TestHCatOutputFormat.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/TestHCatPartitioned.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/TestMultiOutputFormat.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/TestPassProperties.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/TestSequenceFileReadWrite.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/security/TestHdfsAuthorizationProvider.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/gen-java/org/apache/hcatalog/hbase/snapshot/transaction/thrift/StoreFamilyRevision.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/gen-java/org/apache/hcatalog/hbase/snapshot/transaction/thrift/StoreFamilyRevisionList.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseAuthorizationProvider.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseBaseOutputFormat.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseBulkOutputFormat.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseDirectOutputFormat.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseInputFormat.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseUtil.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HCatTableSnapshot.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/PathUtil.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RMConstants.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManager.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerConfiguration.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerEndpoint.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerEndpointClient.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManagerFactory.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/TableSnapshot.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/Transaction.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/SkeletonHBaseTest.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseDirectOutputFormat.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseInputFormat.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestSnapshots.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestIDGenerator.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManager.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestRevisionManagerEndpoint.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestThriftSerialization.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/TestZNodeSetUp.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/WriteLockTest.java
    incubator/hcatalog/trunk/webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatAddPartitionDesc.java
    incubator/hcatalog/trunk/webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatClient.java
    incubator/hcatalog/trunk/webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatClientHMSImpl.java
    incubator/hcatalog/trunk/webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatCreateDBDesc.java
    incubator/hcatalog/trunk/webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatCreateTableDesc.java
    incubator/hcatalog/trunk/webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatDatabase.java
    incubator/hcatalog/trunk/webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatPartition.java
    incubator/hcatalog/trunk/webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatTable.java
    incubator/hcatalog/trunk/webhcat/java-client/src/test/java/org/apache/hcatalog/api/TestHCatClient.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hadoop/mapred/TempletonJobTracker.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CatchallExceptionMapper.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CompleteDelegator.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecServiceImpl.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatDelegator.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatException.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JarDelegator.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JsonBuilder.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ListDelegator.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Main.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/PigDelegator.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/QueueStatusBean.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SecureProxySupport.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Server.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleExceptionMapper.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleWebException.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StatusDelegator.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StreamingDelegator.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableDesc.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableLikeDesc.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/UgiFactory.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/WadlConfig.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/HDFSStorage.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobState.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobStateTracker.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NullRecordReader.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/SingleInputFormat.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonControllerJob.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonUtils.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TrivialExecService.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperCleanup.java
    incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperStorage.java
    incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockServer.java
    incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTempletonUtils.java
    incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTrivialExecService.java

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1383152&r1=1383151&r2=1383152&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Mon Sep 10 23:28:55 2012
@@ -38,6 +38,8 @@ Trunk (unreleased changes)
   HCAT-427 Document storage-based authorization (lefty via gates)
 
   IMPROVEMENTS
+  HCAT-493 Convert classes with 2 space indentation to 4 space indentation for consistent style (amalakar via traviscrawford)
+
   HCAT-489 HCatalog style cleanups and readd javac debug option (traviscrawford)
 
   HCAT-431 document hcat type to java class/pig type mapping (lefty via khorgath)

Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1383152&r1=1383151&r2=1383152&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Mon Sep 10 23:28:55 2012
@@ -21,451 +21,452 @@
          xmlns:ivy="antlib:org.apache.ivy.ant"
          xmlns:artifact="artifact:org.apache.maven.artifact.ant">
 
-  <property name="path.to.basedir" location="${basedir}"/>
+    <property name="path.to.basedir" location="${basedir}"/>
 
-  <loadproperties srcfile="${basedir}/build.properties"/>
+    <loadproperties srcfile="${basedir}/build.properties"/>
 
-  <!--  
-  ================================================================================
-  Imports
-  ================================================================================ -->
-
-  <!--
-  ================================================================================
-  Properties and Classpaths Section
-  ================================================================================
-  -->
-
-  <condition property="staging">
-    <equals arg1="${repo}" arg2="staging"/>
-  </condition>
-
-  <!-- e2e test properties -->
-  <property name="test.e2e.dir" value="${basedir}/src/test/e2e/hcatalog"/>
-
-  <!-- ivy properties set here -->
-  <property name="ivy.repo.dir" value="${user.home}/ivyrepo" />
-  <property name="ivy.dir" location="ivy" />
-  <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
-  <property name="asfrepo" value="https://repository.apache.org"/>
-  <property name="asfsnapshotrepo" value="${asfrepo}/content/repositories/snapshots"/>
-  <property name="mvnrepo" value="http://repo2.maven.org/maven2"/>
-  <property name="asfstagingrepo" value="${asfrepo}/service/local/staging/deploy/maven2"/>
-  <property name="ivy.jar" location="${ivy.dir}/ivy-${ivy.version}.jar"/>
-  <property name="ant_task.jar" location="${ivy.dir}/maven-ant-tasks-${ant-task.version}.jar"/>
-  <property name="ant_task_repo_url"
-    value="${mvnrepo}/org/apache/maven/maven-ant-tasks/${ant-task.version}/maven-ant-tasks-${ant-task.version}.jar"/>
-  <property name="ivy_repo_url" value="${mvnrepo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
-  <property name="ivy.xml" location="${basedir}/ivy.xml"/>
-  <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml" />
-  <property name="build.ivy.dir" location="${build.dir}/ivy" />
-  <property name="pom.file" location="${build.ivy.dir}/${ant.project.name}-${hcatalog.version}.pom"/>
-  <property name="build.ivy.lib.dir" location="${build.ivy.dir}/lib" />
-  <property name="ivy.lib.dir" location="${build.ivy.lib.dir}/${ant.project.name}"/>
-  <property name="build.ivy.report.dir" location="${build.ivy.dir}/report" />
-
-  <!-- packaging properties -->
-  <property name="package.prefix" value="/usr"/>
-  <property name="package.conf.dir" value="/etc/hcatalog"/>
-  <property name="package.log.dir" value="/var/log/hcatalog"/>
-  <property name="package.pid.dir" value="/var/run/hcatalog"/>
-  <property name="package.var.dir" value="/var/lib/hcatalog"/>
-  <property name="package.share.dir" value="/share/hcatalog/${module}"/>
-  <property name="package.buildroot" value="${build.dir}/rpm/hcatalog_package_build_${user.name}"/>
-  <property name="package.build.dir" value="${build.dir}/rpm/hcatalog_package_build_${user.name}/BUILD"/>
-
-  <!-- rats properties -->
-  <property name="rat.reporting.classname" value="rat.Report"/>
-
-  <path id="compile.classpath">
-    <fileset dir="${build.dir}/ivy/lib/default">
-      <include name="**/*.jar"/>
-    </fileset>
-  </path>
-
-  <path id="test.class.path">
-    <pathelement location="${test.classes}"/>
-    <pathelement location="${build.classes}"/>
-    <pathelement location="conf"/>
-    <fileset dir="${build.dir}/ivy/lib/test">
-      <include name="**/*.jar"/>
-    </fileset>
-    <pathelement location="${basedir}/hcatalog-pig-adapter/build/hcatalog-pig-adapter-${hcatalog.version}.jar"/>
-  </path>
-
-  <!-- Classpath that includes all sub packages, used for things like Java docs -->
-  <path id="uber.classpath">
-    <fileset dir="${basedir}">
-      <include name="**/build/ivy/lib/default/*.jar"/>
-    </fileset>
-  </path>
-
-  <!-- This is a little janky because hcatalog-core.jar is not yet a submodule. -->
-  <target name="ivy-report" depends="ivy-retrieve">
-    <antcall target="_ivy-report"/>
-    <ant target="_ivy-report" dir="hcatalog-pig-adapter" inheritAll="false" useNativeBasedir="true"/>
-    <ant target="ivy-report" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
-  </target>
-
-  <target name="ivy-download" description="To download ivy" unless="offline">
-    <echo message="${ant.project.name}"/>
-    <get src="${ivy_repo_url}" dest="${ivy.jar}" usetimestamp="true" skipexisting="true"/>
-    <typedef uri="antlib:org.apache.ivy.ant" onerror="fail" loaderRef="ivyLoader">
-      <classpath>
-        <pathelement location="${ivy.jar}"/>
-      </classpath>
-    </typedef>
-  </target>
-
-  <target name="ivy-init" depends="ivy-download,_ivy-init">
-    <!-- HCatalog started as a single source tree that produced multiple artifacts.
-    Currently its going through a transition to subprojects. During this transition
-    we jank together pom files for artifacts produced in the existing source tree until
-    they are correctly generated from per-subproject ivy.xml files. -->
-    <copy file="${pom.file}" tofile="${build.ivy.dir}/hcatalog-core-${hcatalog.version}.pom"
-          overwrite="true"/>
-    <replace file="${build.ivy.dir}/hcatalog-core-${hcatalog.version}.pom"
-             token="artifactId>hcatalog"
-             value="artifactId>hcatalog-core"/>
-
-    <copy file="${pom.file}" overwrite="true"
-          tofile="${build.ivy.dir}/hcatalog-server-extensions-${hcatalog.version}.pom"/>
-    <replace file="${build.ivy.dir}/hcatalog-server-extensions-${hcatalog.version}.pom"
-             token="artifactId>hcatalog"
-             value="artifactId>hcatalog-server-extensions"/>
-  </target>
-
-  <target name="init" depends="ivy-retrieve,mvn-init">
-    <mkdir dir="${dist.dir}" />
-    <mkdir dir="${build.classes}" />
-    <mkdir dir="${test.classes}" />
-  </target>
-
-  <!--
-  ================================================================================
-  Main Build and Jar Section
-  ================================================================================
-  -->
-  <!-- Build HCatalog src files -->
-  <target name="compile-src" depends="init">
-    <javac encoding="${build.encoding}" srcdir="${src.dir}" excludes="${excludes}"
-        includes="**/*.java" destdir="${build.classes}" debug="${javac.debug}"
-        optimize="${javac.optimize}" target="${javac.version}"
-        source="${javac.version}" deprecation="${javac.deprecation}"
-        includeantruntime="false">
-      <compilerarg line="${javac.args}"/>
-      <classpath refid="compile.classpath"/>
-    </javac>
-  </target>
- 
-  <!-- Build the hcatalog client jar -->
-  <target name="clientjar" depends="compile-src">
-    <jar jarfile="${build.dir}/${ant.project.name}/${hcatalog.core.jar}"
-         basedir="${build.classes}"/>
-    <artifact:install file="${build.dir}/${ant.project.name}/${hcatalog.core.jar}">
-      <artifact:pom file="${build.ivy.dir}/hcatalog-core-${hcatalog.version}.pom"/>
-    </artifact:install>
-  </target>
-
-  <!--
-  ================================================================================
-  Build server side code, mainly listener.
-  ================================================================================
-  -->
-  <target name="server-extensions" depends="compile-src">
-    <jar jarfile="${build.dir}/${ant.project.name}/${ant.project.name}-server-extensions-${hcatalog.version}.jar"
-         basedir="${build.classes}"
-         includes="org/apache/hcatalog/listener/**,org/apache/hcatalog/metadata/**"/>
-    <artifact:install file="${build.dir}/${ant.project.name}/${ant.project.name}-server-extensions-${hcatalog.version}.jar">
-      <artifact:pom file="${build.ivy.dir}/hcatalog-server-extensions-${hcatalog.version}.pom"/>
-    </artifact:install>
-  </target>
-
-  <!--
-  ================================================================================
-  Build both clientjar and server-extensions
-  ================================================================================
-  -->
-  <target name="jar" depends="checkstyle,shims,clientjar,server-extensions,jar-storage-handlers">
-    <ant target="jar" dir="hcatalog-pig-adapter" inheritAll="false"/>
-    <ant target="jar" dir="webhcat/svr" inheritAll="false"/>
-    <ant target="jar" dir="webhcat/java-client" inheritAll="false"/>
-
-    <!-- Build hcatalog.jar, bundling the pig adapter. Our intention is to stop producing this
-         fat jar after some migration period. -->
-    <jar jarfile="${build.dir}/${ant.project.name}/${hcatalog.jar}">
-      <zipfileset src="${build.dir}/${ant.project.name}/${hcatalog.core.jar}"/>
-      <zipfileset src="hcatalog-pig-adapter/build/hcatalog-pig-adapter-${hcatalog.version}.jar"/>
-    </jar>
-  </target>
-
-  <!--
-  ================================================================================
-  Build shims
-  ================================================================================
-  -->
-
-  <target name="shims" depends="compile-src">
-    <ant antfile="shims/build.xml" target="jar" inheritAll="false" useNativeBasedir="true"/>
-  </target>
-
-  <!--
-  ================================================================================
-  Build storage handlers
-  ================================================================================
-  -->
-
-  <target name="jar-storage-handlers">        
-    <ant target="jar" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
-  </target>
-
-  <!--
-  ================================================================================
-  Test Section
-  ================================================================================
-  -->
-  <!-- Build HCatalog test files -->
-  <target name="compile-test" depends="jar">
-    <javac
-        encoding="${build.encoding}"
-        srcdir="${test.src.dir}"
-        excludes="${test.excludes}"
-        includes="**/*.java"
-        destdir="${test.classes}"
-        debug="${javac.debug}"
-        optimize="${javac.optimize}"
-        target="${javac.version}"
-        source="${javac.version}"
-        deprecation="${javac.deprecation}"
-        includeantruntime="false">
-      <compilerarg line="${javac.args}"/>
-      <classpath refid="test.class.path"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile-test" description="run unit tests">
-    <_junit srcDir="${basedir}/src/test"/>
-    <ant target="test" dir="hcatalog-pig-adapter" inheritAll="false"/>
-    <ant target="test" dir="webhcat/svr" inheritAll="false"/>
-    <ant target="test" dir="webhcat/java-client" inheritAll="false"/>
-    <ant target="test" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
-  </target>
-
-  <target name="test-with-clover" depends="clover-init, compile-test"
-          description="run unit tests and generate code coverage reports">
-    <_junit srcDir="${basedir}/src/test"/>
-    <ant target="_test-with-clover" dir="hcatalog-pig-adapter" inheritAll="false"/>
-    <ant target="_test-with-clover" dir="webhcat/svr" inheritAll="false"/>
-    <ant target="_test-with-clover" dir="webhcat/java-client" inheritAll="false"/>
-    <!-- storage-handlers do not have coverage as they have not
-         yet been migrated to the new build files. -->
-    <ant target="test" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
-  </target>
-
-
-  <!--
-  ================================================================================
-  Findbugs Section
-  ================================================================================
-  -->
-
-  <target name="findbugs" depends="init-findbugs,jar">
-    <property name="findbugs.out.dir" value="${test.dir}/findbugs"/>
-    <property name="findbugs.exclude.file" value="${test.src.dir}/findbugsExcludeFile.xml"/>
-    <property name="findbugs.report.htmlfile"
-      value="${findbugs.out.dir}/hcat-findbugs-report.html"/>
-    <property name="findbugs.report.xmlfile"
-      value="${findbugs.out.dir}/hcat-findbugs-report.xml"/>
-
-    <_findbugs outputDir="${findbugs.out.dir}"
-               outputFile="${findbugs.report.xmlfile}"
-               excludeFilter="${findbugs.exclude.file}"
-               findbugsReportXmlFile="${findbugs.report.xmlfile}"
-               findbugsReportHtmlFile="${findbugs.report.htmlfile}"
-               sourceDir="${src.dir}"
-               jarDir="${build.dir}/${ant.project.name}"
-               classPathRef="compile.classpath"/>
-
-    <ant target="findbugs" dir="hcatalog-pig-adapter" inheritAll="false"/>
-    <ant target="findbugs" dir="webhcat/svr" inheritAll="false"/>
-    <ant target="findbugs" dir="webhcat/java-client" inheritAll="false"/>
-  </target>
-
-  <!--
-  ================================================================================
-  Clean Section
-  ================================================================================
-  -->
-  <!-- Clean up children -->
-  <target name="clean" description="Cleanup all build artifacts">
-    <echo message="${ant.project.name}"/>
-    <delete dir="${build.dir}" />
-    <delete dir="${test.warehouse.dir}"/>
-    <ant target="clean" dir="hcatalog-pig-adapter" inheritAll="false"/>
-    <ant target="clean" dir="webhcat/svr" inheritAll="false"/>
-    <ant target="clean" dir="webhcat/java-client" inheritAll="false"/>
-    <ant target="clean" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
-    <ant target="clean" dir="shims" inheritAll="false" useNativeBasedir="true"/>
-  </target>
- 
-  <!--
-  ================================================================================
-  Docs Section
-  ================================================================================
-  -->
-  <target name="docs" depends="forrest, javadoc"
-          description="Generate Javadoc and Forrest documentation">
-  </target>
-
-  <target name="forrest" if="forrest.home"
-          description="Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line.">
-    <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
-          failonerror="true">
-    </exec>
-    <copy todir="${build.docs}/">
-      <fileset dir="${docs.src}/build/site/" />
-    </copy>
-  </target>
-
-  <target name="javadoc" depends="jar" description="Generate Javadoc documentation">
-    <mkdir dir="${build.javadoc}" />
-    <javadoc overview="${src.dir}/../docs/overview.html"
-             packagenames="org.apache.hcatalog.*"
-             destdir="${build.javadoc}"
-             author="true"
-             version="true"
-             use="true"
-             noqualifier="all"
-             windowtitle="HCatalog ${hcatalog.version} API"
-             doctitle="HCatalog ${hcatalog.version} API"
-             failonerror="true">
-      <packageset dir="${src.dir}" />
-      <packageset dir="hcatalog-pig-adapter/src/main/java" />
-      <packageset dir="webhcat/svr/src/main/java" />
-      <packageset dir="webhcat/java-client/src/main/java" />
-      <classpath>
-        <path refid="uber.classpath"/>
-      </classpath>
-      <group title="hcatalog" packages="org.apache.hcatalog.*"/>
-    </javadoc>
-  </target>
-
-  <!--
-  ===============================================================================
-  Distribution Section
-  ===============================================================================
-  -->
-  <target name="package-storage-handlers">
-    <property name="handlers.dir" value="${dist.dir}/share/hcatalog/storage-handlers"/>
-    <mkdir dir="${handlers.dir}"/>
-    <ant target="package" dir="storage-handlers" inheritAll="false" useNativeBasedir="true">     
-        <property name="dist.handlers.dir" value="${handlers.dir}"/>
-    </ant>
-    <copy todir="${dist.dir}/share/${ant.project.name}/lib" includeEmptyDirs="false" flatten="true">
-      <fileset dir="${dist.dir}/share/${ant.project.name}/storage-handlers">
-        <include name="*/lib/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="package" depends="jar, docs" description="Create an HCatalog release">
-    <mkdir dir="${dist.dir}" />
-    <mkdir dir="${dist.dir}/share/${ant.project.name}/lib" />
-    <mkdir dir="${dist.dir}/etc/hcatalog" />
-    <mkdir dir="${dist.dir}/bin" />
-    <mkdir dir="${dist.dir}/sbin" />
-    <mkdir dir="${dist.dir}/share/${ant.project.name}/scripts" />
-    <mkdir dir="${dist.dir}/share/${ant.project.name}/templates/conf" />
-    <mkdir dir="${dist.dir}/share/doc/${ant.project.name}" />
-    <mkdir dir="${dist.dir}/share/doc/${ant.project.name}/api" />
-    <mkdir dir="${dist.dir}/share/doc/${ant.project.name}/jdiff"/>
-    <mkdir dir="${dist.dir}/share/doc/${ant.project.name}/license" />
-
-    <copy todir="${dist.dir}/share/${ant.project.name}" includeEmptyDirs="false">
-      <fileset dir="${build.dir}/${ant.project.name}/">
-        <include name="hcatalog-*.jar"/>
-      </fileset>
-      <fileset dir="hcatalog-pig-adapter/build">
-        <include name="hcatalog-*.jar"/>
-      </fileset>
-      <fileset dir="webhcat/svr/build">
-        <include name="webhcat-*.jar"/>
-      </fileset>
-      <fileset dir="webhcat/java-client/build">
-        <include name="webhcat-java-client*.jar"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/bin">
-      <fileset dir="bin/">
-        <include name="hcat"/>
-      </fileset>
-
-    </copy>
-    <copy todir="${dist.dir}/libexec">
-      <fileset dir="bin">
-        <include name="hcat-config.sh"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/sbin">
-      <fileset dir="${package.dir}">
-        <include name="*.sh"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/etc/${ant.project.name}">
-      <fileset dir="conf" />
-    </copy>
-
-    <copy todir="${dist.dir}/share/${ant.project.name}/scripts">
-       <fileset dir="scripts">
-         <include name="*.sh"/>
-       </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/share/${ant.project.name}/templates/conf">
-      <fileset dir="src/packages/templates/conf">
-        <include name="*"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/sbin">
-      <fileset dir="${package.dir}">
-        <include name="*.sh"/>
-      </fileset>
-      <fileset dir="webhcat/svr/src/main/bin">
-        <include name="*.sh"/>
-      </fileset>
-      <fileset dir="bin">
-        <include name="hcat_server.sh"/>
-      </fileset>
-    </copy>
-
-	<!-- Copy the licenses and such -->
-    <copy todir="${dist.dir}/share/doc/${ant.project.name}">
-      <fileset dir=".">
-        <include name="*.txt" />
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/share/doc/${ant.project.name}/license">
-      <fileset dir="license" />
-    </copy>
-
-    <chmod perm="ugo+x" type="file">
-      <fileset dir="${dist.dir}/bin" />
-      <fileset dir="${dist.dir}/sbin" />
-    </chmod>
-       <!--package storage-handlers -->
-      <antcall target="package-storage-handlers"/>
+    <!--
+   ================================================================================
+   Imports
+   ================================================================================ -->
+
+    <!--
+    ================================================================================
+    Properties and Classpaths Section
+    ================================================================================
+    -->
+
+    <condition property="staging">
+        <equals arg1="${repo}" arg2="staging"/>
+    </condition>
+
+    <!-- e2e test properties -->
+    <property name="test.e2e.dir" value="${basedir}/src/test/e2e/hcatalog"/>
+
+    <!-- ivy properties set here -->
+    <property name="ivy.repo.dir" value="${user.home}/ivyrepo"/>
+    <property name="ivy.dir" location="ivy"/>
+    <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
+    <property name="asfrepo" value="https://repository.apache.org"/>
+    <property name="asfsnapshotrepo" value="${asfrepo}/content/repositories/snapshots"/>
+    <property name="mvnrepo" value="http://repo2.maven.org/maven2"/>
+    <property name="asfstagingrepo" value="${asfrepo}/service/local/staging/deploy/maven2"/>
+    <property name="ivy.jar" location="${ivy.dir}/ivy-${ivy.version}.jar"/>
+    <property name="ant_task.jar" location="${ivy.dir}/maven-ant-tasks-${ant-task.version}.jar"/>
+    <property name="ant_task_repo_url"
+              value="${mvnrepo}/org/apache/maven/maven-ant-tasks/${ant-task.version}/maven-ant-tasks-${ant-task.version}.jar"/>
+    <property name="ivy_repo_url" value="${mvnrepo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
+    <property name="ivy.xml" location="${basedir}/ivy.xml"/>
+    <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml"/>
+    <property name="build.ivy.dir" location="${build.dir}/ivy"/>
+    <property name="pom.file" location="${build.ivy.dir}/${ant.project.name}-${hcatalog.version}.pom"/>
+    <property name="build.ivy.lib.dir" location="${build.ivy.dir}/lib"/>
+    <property name="ivy.lib.dir" location="${build.ivy.lib.dir}/${ant.project.name}"/>
+    <property name="build.ivy.report.dir" location="${build.ivy.dir}/report"/>
+
+    <!-- packaging properties -->
+    <property name="package.prefix" value="/usr"/>
+    <property name="package.conf.dir" value="/etc/hcatalog"/>
+    <property name="package.log.dir" value="/var/log/hcatalog"/>
+    <property name="package.pid.dir" value="/var/run/hcatalog"/>
+    <property name="package.var.dir" value="/var/lib/hcatalog"/>
+    <property name="package.share.dir" value="/share/hcatalog/${module}"/>
+    <property name="package.buildroot" value="${build.dir}/rpm/hcatalog_package_build_${user.name}"/>
+    <property name="package.build.dir" value="${build.dir}/rpm/hcatalog_package_build_${user.name}/BUILD"/>
+
+    <!-- rats properties -->
+    <property name="rat.reporting.classname" value="rat.Report"/>
+
+    <path id="compile.classpath">
+        <fileset dir="${build.dir}/ivy/lib/default">
+            <include name="**/*.jar"/>
+        </fileset>
+    </path>
+
+    <path id="test.class.path">
+        <pathelement location="${test.classes}"/>
+        <pathelement location="${build.classes}"/>
+        <pathelement location="conf"/>
+        <fileset dir="${build.dir}/ivy/lib/test">
+            <include name="**/*.jar"/>
+        </fileset>
+        <pathelement location="${basedir}/hcatalog-pig-adapter/build/hcatalog-pig-adapter-${hcatalog.version}.jar"/>
+    </path>
+
+    <!-- Classpath that includes all sub packages, used for things like Java docs -->
+    <path id="uber.classpath">
+        <fileset dir="${basedir}">
+            <include name="**/build/ivy/lib/default/*.jar"/>
+        </fileset>
+    </path>
+
+    <!-- This is a little janky because hcatalog-core.jar is not yet a submodule. -->
+    <target name="ivy-report" depends="ivy-retrieve">
+        <antcall target="_ivy-report"/>
+        <ant target="_ivy-report" dir="hcatalog-pig-adapter" inheritAll="false" useNativeBasedir="true"/>
+        <ant target="ivy-report" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
+    </target>
+
+    <target name="ivy-download" description="To download ivy" unless="offline">
+        <echo message="${ant.project.name}"/>
+        <get src="${ivy_repo_url}" dest="${ivy.jar}" usetimestamp="true" skipexisting="true"/>
+        <typedef uri="antlib:org.apache.ivy.ant" onerror="fail" loaderRef="ivyLoader">
+            <classpath>
+                <pathelement location="${ivy.jar}"/>
+            </classpath>
+        </typedef>
+    </target>
+
+    <target name="ivy-init" depends="ivy-download,_ivy-init">
+        <!-- HCatalog started as a single source tree that produced multiple artifacts.
+        Currently its going through a transition to subprojects. During this transition
+        we jank together pom files for artifacts produced in the existing source tree until
+        they are correctly generated from per-subproject ivy.xml files. -->
+        <copy file="${pom.file}" tofile="${build.ivy.dir}/hcatalog-core-${hcatalog.version}.pom"
+              overwrite="true"/>
+        <replace file="${build.ivy.dir}/hcatalog-core-${hcatalog.version}.pom"
+                 token="artifactId>hcatalog"
+                 value="artifactId>hcatalog-core"/>
+
+        <copy file="${pom.file}" overwrite="true"
+              tofile="${build.ivy.dir}/hcatalog-server-extensions-${hcatalog.version}.pom"/>
+        <replace file="${build.ivy.dir}/hcatalog-server-extensions-${hcatalog.version}.pom"
+                 token="artifactId>hcatalog"
+                 value="artifactId>hcatalog-server-extensions"/>
+    </target>
+
+    <target name="init" depends="ivy-retrieve,mvn-init">
+        <mkdir dir="${dist.dir}"/>
+        <mkdir dir="${build.classes}"/>
+        <mkdir dir="${test.classes}"/>
+    </target>
+
+    <!--
+    ================================================================================
+    Main Build and Jar Section
+    ================================================================================
+    -->
+    <!-- Build HCatalog src files -->
+    <target name="compile-src" depends="init">
+        <javac encoding="${build.encoding}" srcdir="${src.dir}" excludes="${excludes}"
+               includes="**/*.java" destdir="${build.classes}" debug="${javac.debug}"
+               optimize="${javac.optimize}" target="${javac.version}"
+               source="${javac.version}" deprecation="${javac.deprecation}"
+               includeantruntime="false">
+            <compilerarg line="${javac.args}"/>
+            <classpath refid="compile.classpath"/>
+        </javac>
+    </target>
+
+    <!-- Build the hcatalog client jar -->
+    <target name="clientjar" depends="compile-src">
+        <jar jarfile="${build.dir}/${ant.project.name}/${hcatalog.core.jar}"
+             basedir="${build.classes}"/>
+        <artifact:install file="${build.dir}/${ant.project.name}/${hcatalog.core.jar}">
+            <artifact:pom file="${build.ivy.dir}/hcatalog-core-${hcatalog.version}.pom"/>
+        </artifact:install>
+    </target>
+
+    <!--
+    ================================================================================
+    Build server side code, mainly listener.
+    ================================================================================
+    -->
+    <target name="server-extensions" depends="compile-src">
+        <jar jarfile="${build.dir}/${ant.project.name}/${ant.project.name}-server-extensions-${hcatalog.version}.jar"
+             basedir="${build.classes}"
+             includes="org/apache/hcatalog/listener/**,org/apache/hcatalog/metadata/**"/>
+        <artifact:install
+                file="${build.dir}/${ant.project.name}/${ant.project.name}-server-extensions-${hcatalog.version}.jar">
+            <artifact:pom file="${build.ivy.dir}/hcatalog-server-extensions-${hcatalog.version}.pom"/>
+        </artifact:install>
+    </target>
+
+    <!--
+    ================================================================================
+    Build both clientjar and server-extensions
+    ================================================================================
+    -->
+    <target name="jar" depends="checkstyle,shims,clientjar,server-extensions,jar-storage-handlers">
+        <ant target="jar" dir="hcatalog-pig-adapter" inheritAll="false"/>
+        <ant target="jar" dir="webhcat/svr" inheritAll="false"/>
+        <ant target="jar" dir="webhcat/java-client" inheritAll="false"/>
+
+        <!-- Build hcatalog.jar, bundling the pig adapter. Our intention is to stop producing this
+             fat jar after some migration period. -->
+        <jar jarfile="${build.dir}/${ant.project.name}/${hcatalog.jar}">
+            <zipfileset src="${build.dir}/${ant.project.name}/${hcatalog.core.jar}"/>
+            <zipfileset src="hcatalog-pig-adapter/build/hcatalog-pig-adapter-${hcatalog.version}.jar"/>
+        </jar>
+    </target>
+
+    <!--
+    ================================================================================
+    Build shims
+    ================================================================================
+    -->
+
+    <target name="shims" depends="compile-src">
+        <ant antfile="shims/build.xml" target="jar" inheritAll="false" useNativeBasedir="true"/>
+    </target>
+
+    <!--
+    ================================================================================
+    Build storage handlers
+    ================================================================================
+    -->
+
+    <target name="jar-storage-handlers">
+        <ant target="jar" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
+    </target>
+
+    <!--
+    ================================================================================
+    Test Section
+    ================================================================================
+    -->
+    <!-- Build HCatalog test files -->
+    <target name="compile-test" depends="jar">
+        <javac
+                encoding="${build.encoding}"
+                srcdir="${test.src.dir}"
+                excludes="${test.excludes}"
+                includes="**/*.java"
+                destdir="${test.classes}"
+                debug="${javac.debug}"
+                optimize="${javac.optimize}"
+                target="${javac.version}"
+                source="${javac.version}"
+                deprecation="${javac.deprecation}"
+                includeantruntime="false">
+            <compilerarg line="${javac.args}"/>
+            <classpath refid="test.class.path"/>
+        </javac>
+    </target>
+
+    <target name="test" depends="compile-test" description="run unit tests">
+        <_junit srcDir="${basedir}/src/test"/>
+        <ant target="test" dir="hcatalog-pig-adapter" inheritAll="false"/>
+        <ant target="test" dir="webhcat/svr" inheritAll="false"/>
+        <ant target="test" dir="webhcat/java-client" inheritAll="false"/>
+        <ant target="test" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
+    </target>
+
+    <target name="test-with-clover" depends="clover-init, compile-test"
+            description="run unit tests and generate code coverage reports">
+        <_junit srcDir="${basedir}/src/test"/>
+        <ant target="_test-with-clover" dir="hcatalog-pig-adapter" inheritAll="false"/>
+        <ant target="_test-with-clover" dir="webhcat/svr" inheritAll="false"/>
+        <ant target="_test-with-clover" dir="webhcat/java-client" inheritAll="false"/>
+        <!-- storage-handlers do not have coverage as they have not
+             yet been migrated to the new build files. -->
+        <ant target="test" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
+    </target>
+
+
+    <!--
+    ================================================================================
+    Findbugs Section
+    ================================================================================
+    -->
+
+    <target name="findbugs" depends="init-findbugs,jar">
+        <property name="findbugs.out.dir" value="${test.dir}/findbugs"/>
+        <property name="findbugs.exclude.file" value="${test.src.dir}/findbugsExcludeFile.xml"/>
+        <property name="findbugs.report.htmlfile"
+                  value="${findbugs.out.dir}/hcat-findbugs-report.html"/>
+        <property name="findbugs.report.xmlfile"
+                  value="${findbugs.out.dir}/hcat-findbugs-report.xml"/>
+
+        <_findbugs outputDir="${findbugs.out.dir}"
+                   outputFile="${findbugs.report.xmlfile}"
+                   excludeFilter="${findbugs.exclude.file}"
+                   findbugsReportXmlFile="${findbugs.report.xmlfile}"
+                   findbugsReportHtmlFile="${findbugs.report.htmlfile}"
+                   sourceDir="${src.dir}"
+                   jarDir="${build.dir}/${ant.project.name}"
+                   classPathRef="compile.classpath"/>
+
+        <ant target="findbugs" dir="hcatalog-pig-adapter" inheritAll="false"/>
+        <ant target="findbugs" dir="webhcat/svr" inheritAll="false"/>
+        <ant target="findbugs" dir="webhcat/java-client" inheritAll="false"/>
+    </target>
+
+    <!--
+    ================================================================================
+    Clean Section
+    ================================================================================
+    -->
+    <!-- Clean up children -->
+    <target name="clean" description="Cleanup all build artifacts">
+        <echo message="${ant.project.name}"/>
+        <delete dir="${build.dir}"/>
+        <delete dir="${test.warehouse.dir}"/>
+        <ant target="clean" dir="hcatalog-pig-adapter" inheritAll="false"/>
+        <ant target="clean" dir="webhcat/svr" inheritAll="false"/>
+        <ant target="clean" dir="webhcat/java-client" inheritAll="false"/>
+        <ant target="clean" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
+        <ant target="clean" dir="shims" inheritAll="false" useNativeBasedir="true"/>
+    </target>
+
+    <!--
+    ================================================================================
+    Docs Section
+    ================================================================================
+    -->
+    <target name="docs" depends="forrest, javadoc"
+            description="Generate Javadoc and Forrest documentation">
+    </target>
+
+    <target name="forrest" if="forrest.home"
+            description="Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line.">
+        <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
+              failonerror="true">
+        </exec>
+        <copy todir="${build.docs}/">
+            <fileset dir="${docs.src}/build/site/"/>
+        </copy>
+    </target>
+
+    <target name="javadoc" depends="jar" description="Generate Javadoc documentation">
+        <mkdir dir="${build.javadoc}"/>
+        <javadoc overview="${src.dir}/../docs/overview.html"
+                 packagenames="org.apache.hcatalog.*"
+                 destdir="${build.javadoc}"
+                 author="true"
+                 version="true"
+                 use="true"
+                 noqualifier="all"
+                 windowtitle="HCatalog ${hcatalog.version} API"
+                 doctitle="HCatalog ${hcatalog.version} API"
+                 failonerror="true">
+            <packageset dir="${src.dir}"/>
+            <packageset dir="hcatalog-pig-adapter/src/main/java"/>
+            <packageset dir="webhcat/svr/src/main/java"/>
+            <packageset dir="webhcat/java-client/src/main/java"/>
+            <classpath>
+                <path refid="uber.classpath"/>
+            </classpath>
+            <group title="hcatalog" packages="org.apache.hcatalog.*"/>
+        </javadoc>
+    </target>
+
+    <!--
+    ===============================================================================
+    Distribution Section
+    ===============================================================================
+    -->
+    <target name="package-storage-handlers">
+        <property name="handlers.dir" value="${dist.dir}/share/hcatalog/storage-handlers"/>
+        <mkdir dir="${handlers.dir}"/>
+        <ant target="package" dir="storage-handlers" inheritAll="false" useNativeBasedir="true">
+            <property name="dist.handlers.dir" value="${handlers.dir}"/>
+        </ant>
+        <copy todir="${dist.dir}/share/${ant.project.name}/lib" includeEmptyDirs="false" flatten="true">
+            <fileset dir="${dist.dir}/share/${ant.project.name}/storage-handlers">
+                <include name="*/lib/*"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="package" depends="jar, docs" description="Create an HCatalog release">
+        <mkdir dir="${dist.dir}"/>
+        <mkdir dir="${dist.dir}/share/${ant.project.name}/lib"/>
+        <mkdir dir="${dist.dir}/etc/hcatalog"/>
+        <mkdir dir="${dist.dir}/bin"/>
+        <mkdir dir="${dist.dir}/sbin"/>
+        <mkdir dir="${dist.dir}/share/${ant.project.name}/scripts"/>
+        <mkdir dir="${dist.dir}/share/${ant.project.name}/templates/conf"/>
+        <mkdir dir="${dist.dir}/share/doc/${ant.project.name}"/>
+        <mkdir dir="${dist.dir}/share/doc/${ant.project.name}/api"/>
+        <mkdir dir="${dist.dir}/share/doc/${ant.project.name}/jdiff"/>
+        <mkdir dir="${dist.dir}/share/doc/${ant.project.name}/license"/>
+
+        <copy todir="${dist.dir}/share/${ant.project.name}" includeEmptyDirs="false">
+            <fileset dir="${build.dir}/${ant.project.name}/">
+                <include name="hcatalog-*.jar"/>
+            </fileset>
+            <fileset dir="hcatalog-pig-adapter/build">
+                <include name="hcatalog-*.jar"/>
+            </fileset>
+            <fileset dir="webhcat/svr/build">
+                <include name="webhcat-*.jar"/>
+            </fileset>
+            <fileset dir="webhcat/java-client/build">
+                <include name="webhcat-java-client*.jar"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${dist.dir}/bin">
+            <fileset dir="bin/">
+                <include name="hcat"/>
+            </fileset>
+
+        </copy>
+        <copy todir="${dist.dir}/libexec">
+            <fileset dir="bin">
+                <include name="hcat-config.sh"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${dist.dir}/sbin">
+            <fileset dir="${package.dir}">
+                <include name="*.sh"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${dist.dir}/etc/${ant.project.name}">
+            <fileset dir="conf"/>
+        </copy>
+
+        <copy todir="${dist.dir}/share/${ant.project.name}/scripts">
+            <fileset dir="scripts">
+                <include name="*.sh"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${dist.dir}/share/${ant.project.name}/templates/conf">
+            <fileset dir="src/packages/templates/conf">
+                <include name="*"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${dist.dir}/sbin">
+            <fileset dir="${package.dir}">
+                <include name="*.sh"/>
+            </fileset>
+            <fileset dir="webhcat/svr/src/main/bin">
+                <include name="*.sh"/>
+            </fileset>
+            <fileset dir="bin">
+                <include name="hcat_server.sh"/>
+            </fileset>
+        </copy>
+
+        <!-- Copy the licenses and such -->
+        <copy todir="${dist.dir}/share/doc/${ant.project.name}">
+            <fileset dir=".">
+                <include name="*.txt"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${dist.dir}/share/doc/${ant.project.name}/license">
+            <fileset dir="license"/>
+        </copy>
+
+        <chmod perm="ugo+x" type="file">
+            <fileset dir="${dist.dir}/bin"/>
+            <fileset dir="${dist.dir}/sbin"/>
+        </chmod>
+        <!--package storage-handlers -->
+        <antcall target="package-storage-handlers"/>
     </target>
 
     <target name="releaseaudit" depends="ivy-retrieve" description="Release Audit activities">
-      <java classname="${rat.reporting.classname}" fork="true">
-        <classpath refid="releaseaudit.classpath"/>
-        <arg value="${basedir}/src"/>
-      </java>
+        <java classname="${rat.reporting.classname}" fork="true">
+            <classpath refid="releaseaudit.classpath"/>
+            <arg value="${basedir}/src"/>
+        </java>
     </target>
 
     <!-- ================================================================== -->
@@ -473,7 +474,8 @@
     <!-- ================================================================== -->
     <target name="src-release" depends="clean" description="Source distribution">
         <mkdir dir="${build.dir}"/>
-        <tar compression="gzip" longfile="gnu" destfile="${build.dir}/${ant.project.name}-src-${hcatalog.version}.tar.gz">
+        <tar compression="gzip" longfile="gnu"
+             destfile="${build.dir}/${ant.project.name}-src-${hcatalog.version}.tar.gz">
             <tarfileset dir="${basedir}" mode="644" prefix="${ant.project.name}-src-${hcatalog.version}">
                 <include name="conf/**"/>
                 <include name="hcatalog-pig-adapter/**"/>
@@ -493,7 +495,7 @@
                 <include name="bin/**"/>
             </tarfileset>
         </tar>
-    </target> 
+    </target>
 
     <!-- ================================================================== -->
     <!-- Make release binary packages                                       -->
@@ -501,15 +503,15 @@
     <target name="tar" depends="package" description="Create release tarball">
         <tar compression="gzip" longfile="gnu" destfile="${build.dir}/${final.name}.tar.gz">
             <tarfileset dir="${build.dir}" mode="664">
-                <include name="${final.name}/**" />
-                <exclude name="${final.name}/bin/*" />
-                <exclude name="${final.name}/sbin/*" />
-                <exclude name="${final.name}/share/hcatalog/scripts/*" />
+                <include name="${final.name}/**"/>
+                <exclude name="${final.name}/bin/*"/>
+                <exclude name="${final.name}/sbin/*"/>
+                <exclude name="${final.name}/share/hcatalog/scripts/*"/>
             </tarfileset>
             <tarfileset dir="${build.dir}" mode="755">
-                <include name="${final.name}/bin/*" />
-                <include name="${final.name}/sbin/*" />
-                <include name="${final.name}/share/hcatalog/scripts/*" />
+                <include name="${final.name}/bin/*"/>
+                <include name="${final.name}/sbin/*"/>
+                <include name="${final.name}/share/hcatalog/scripts/*"/>
             </tarfileset>
         </tar>
     </target>
@@ -530,10 +532,10 @@
         <ant dir="${test.e2e.dir}" target="deploy"/>
     </target>
 
-  <import file="ant/checkstyle.xml"/>
-  <import file="ant/dependencies.xml"/>
-  <import file="ant/deploy.xml"/>
-  <import file="ant/findbugs.xml"/>
-  <import file="ant/test.xml"/>
+    <import file="ant/checkstyle.xml"/>
+    <import file="ant/dependencies.xml"/>
+    <import file="ant/deploy.xml"/>
+    <import file="ant/findbugs.xml"/>
+    <import file="ant/test.xml"/>
 
 </project>

Modified: incubator/hcatalog/trunk/coding_style.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/coding_style.xml?rev=1383152&r1=1383151&r2=1383152&view=diff
==============================================================================
--- incubator/hcatalog/trunk/coding_style.xml (original)
+++ incubator/hcatalog/trunk/coding_style.xml Mon Sep 10 23:28:55 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-  "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-  "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 
 <!-- Checkstyle rules required by HCatalog.
 
@@ -12,28 +12,32 @@ imposed on others.
 
 <module name="Checker">
 
-  <!-- Checks whether files end with a new line.                        -->
-  <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-  <module name="NewlineAtEndOfFile"/>
-
-  <!-- Checks for Size Violations.                    -->
-  <!-- See http://checkstyle.sf.net/config_sizes.html -->
-  <module name="FileLength"/>
-
-  <module name="Header">
-    <property name="headerFile" value="apache_header_java.txt"/>
-    <property name="fileExtensions" value="java"/>
-  </module>
-
-  <module name="TreeWalker">
-
-    <!-- Checks for imports                              -->
-    <!-- See http://checkstyle.sf.net/config_import.html -->
-    <module name="AvoidStarImport"/>
-    <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-    <module name="RedundantImport"/>
-    <module name="UnusedImports"/>
+    <!-- Checks whether files end with a new line.                        -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+    <module name="NewlineAtEndOfFile"/>
+
+    <!-- Checks for Size Violations.                    -->
+    <!-- See http://checkstyle.sf.net/config_sizes.html -->
+    <module name="FileLength"/>
+
+    <module name="Header">
+        <property name="headerFile" value="apache_header_java.txt"/>
+        <property name="fileExtensions" value="java"/>
+    </module>
+
+    <module name="TreeWalker">
+
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+        <module name="Indentation">
+            <property name="caseIndent" value="0"/>
+        </module>
 
-  </module>
+    </module>
 
 </module>

Modified: incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatBaseLoader.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatBaseLoader.java?rev=1383152&r1=1383151&r2=1383152&view=diff
==============================================================================
--- incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatBaseLoader.java (original)
+++ incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatBaseLoader.java Mon Sep 10 23:28:55 2012
@@ -48,102 +48,102 @@ import org.apache.pig.impl.util.UDFConte
 
 public abstract class HCatBaseLoader extends LoadFunc implements LoadMetadata, LoadPushDown {
 
-  protected static final String PRUNE_PROJECTION_INFO = "prune.projection.info";
+    protected static final String PRUNE_PROJECTION_INFO = "prune.projection.info";
 
-  private RecordReader<?, ?> reader;
-  protected String signature;
+    private RecordReader<?, ?> reader;
+    protected String signature;
 
-  HCatSchema outputSchema = null;
+    HCatSchema outputSchema = null;
 
 
-  @Override
-  public Tuple getNext() throws IOException {
-    try {
-      HCatRecord hr =  (HCatRecord) (reader.nextKeyValue() ? reader.getCurrentValue() : null);
-      Tuple t = PigHCatUtil.transformToTuple(hr,outputSchema);
-      // TODO : we were discussing an iter interface, and also a LazyTuple
-      // change this when plans for that solidifies.
-      return t;
-    } catch (ExecException e) {
-      int errCode = 6018;
-      String errMsg = "Error while reading input";
-      throw new ExecException(errMsg, errCode,
-          PigException.REMOTE_ENVIRONMENT, e);
-    } catch (Exception eOther){
-      int errCode = 6018;
-      String errMsg = "Error converting read value to tuple";
-      throw new ExecException(errMsg, errCode,
-          PigException.REMOTE_ENVIRONMENT, eOther);
-    }
-
-  }
-
-  @Override
-  public void prepareToRead(RecordReader reader, PigSplit arg1) throws IOException {
-    this.reader = reader;
-  }
-
-  @Override
-  public ResourceStatistics getStatistics(String location, Job job) throws IOException {
-    // statistics not implemented currently
-    return null;
-  }
-
-  @Override
-  public List<OperatorSet> getFeatures() {
-    return Arrays.asList(LoadPushDown.OperatorSet.PROJECTION);
-  }
-
-  @Override
-  public RequiredFieldResponse pushProjection(RequiredFieldList requiredFieldsInfo) throws FrontendException {
-    // Store the required fields information in the UDFContext so that we
-    // can retrieve it later.
-    storeInUDFContext(signature, PRUNE_PROJECTION_INFO, requiredFieldsInfo);
-
-    // HCat will always prune columns based on what we ask of it - so the
-    // response is true
-    return new RequiredFieldResponse(true);
-  }
-
-  @Override
-  public void setUDFContextSignature(String signature) {
-    this.signature = signature;
-  }
-
-
-  // helper methods
-  protected void storeInUDFContext(String signature, String key, Object value) {
-    UDFContext udfContext = UDFContext.getUDFContext();
-    Properties props = udfContext.getUDFProperties(
-        this.getClass(), new String[] {signature});
-    props.put(key, value);
-  }
-
-  /**
-   * A utility method to get the size of inputs. This is accomplished by summing the
-   * size of all input paths on supported FileSystems. Locations whose size cannot be
-   * determined are ignored. Note non-FileSystem and unpartitioned locations will not
-   * report their input size by default.
-   */
-  protected static long getSizeInBytes(InputJobInfo inputJobInfo) throws IOException {
-    Configuration conf = new Configuration();
-    long sizeInBytes = 0;
-
-    for (PartInfo partInfo : inputJobInfo.getPartitions()) {
-      try {
-        Path p = new Path(partInfo.getLocation());
-        if (p.getFileSystem(conf).isFile(p)) {
-          sizeInBytes += p.getFileSystem(conf).getFileStatus(p).getLen();
-        } else {
-          for (FileStatus child : p.getFileSystem(conf).listStatus(p)) {
-            sizeInBytes += child.getLen();
-          }
+    @Override
+    public Tuple getNext() throws IOException {
+        try {
+            HCatRecord hr = (HCatRecord) (reader.nextKeyValue() ? reader.getCurrentValue() : null);
+            Tuple t = PigHCatUtil.transformToTuple(hr, outputSchema);
+            // TODO : we were discussing an iter interface, and also a LazyTuple
+            // change this when plans for that solidifies.
+            return t;
+        } catch (ExecException e) {
+            int errCode = 6018;
+            String errMsg = "Error while reading input";
+            throw new ExecException(errMsg, errCode,
+                PigException.REMOTE_ENVIRONMENT, e);
+        } catch (Exception eOther) {
+            int errCode = 6018;
+            String errMsg = "Error converting read value to tuple";
+            throw new ExecException(errMsg, errCode,
+                PigException.REMOTE_ENVIRONMENT, eOther);
         }
-      } catch (IOException e) {
-        // Report size to the extent possible.
-      }
+
+    }
+
+    @Override
+    public void prepareToRead(RecordReader reader, PigSplit arg1) throws IOException {
+        this.reader = reader;
+    }
+
+    @Override
+    public ResourceStatistics getStatistics(String location, Job job) throws IOException {
+        // statistics not implemented currently
+        return null;
+    }
+
+    @Override
+    public List<OperatorSet> getFeatures() {
+        return Arrays.asList(LoadPushDown.OperatorSet.PROJECTION);
+    }
+
+    @Override
+    public RequiredFieldResponse pushProjection(RequiredFieldList requiredFieldsInfo) throws FrontendException {
+        // Store the required fields information in the UDFContext so that we
+        // can retrieve it later.
+        storeInUDFContext(signature, PRUNE_PROJECTION_INFO, requiredFieldsInfo);
+
+        // HCat will always prune columns based on what we ask of it - so the
+        // response is true
+        return new RequiredFieldResponse(true);
     }
 
-    return sizeInBytes;
-  }
+    @Override
+    public void setUDFContextSignature(String signature) {
+        this.signature = signature;
+    }
+
+
+    // helper methods
+    protected void storeInUDFContext(String signature, String key, Object value) {
+        UDFContext udfContext = UDFContext.getUDFContext();
+        Properties props = udfContext.getUDFProperties(
+            this.getClass(), new String[]{signature});
+        props.put(key, value);
+    }
+
+    /**
+     * A utility method to get the size of inputs. This is accomplished by summing the
+     * size of all input paths on supported FileSystems. Locations whose size cannot be
+     * determined are ignored. Note non-FileSystem and unpartitioned locations will not
+     * report their input size by default.
+     */
+    protected static long getSizeInBytes(InputJobInfo inputJobInfo) throws IOException {
+        Configuration conf = new Configuration();
+        long sizeInBytes = 0;
+
+        for (PartInfo partInfo : inputJobInfo.getPartitions()) {
+            try {
+                Path p = new Path(partInfo.getLocation());
+                if (p.getFileSystem(conf).isFile(p)) {
+                    sizeInBytes += p.getFileSystem(conf).getFileStatus(p).getLen();
+                } else {
+                    for (FileStatus child : p.getFileSystem(conf).listStatus(p)) {
+                        sizeInBytes += child.getLen();
+                    }
+                }
+            } catch (IOException e) {
+                // Report size to the extent possible.
+            }
+        }
+
+        return sizeInBytes;
+    }
 }



Mime
View raw message