hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r673857 [1/6] - in /hadoop/core/trunk: ./ bin/ conf/ docs/ src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/ src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/ src/contrib/index/src/java/org/apache/hadoop/contri...
Date Thu, 03 Jul 2008 22:55:18 GMT
Author: omalley
Date: Thu Jul  3 15:55:06 2008
New Revision: 673857

URL: http://svn.apache.org/viewvc?rev=673857&view=rev
Log:
HADOOP-2885. Break the hadoop.dfs package into separate packages under
hadoop.hdfs that reflect whether they are client, server, protocol, 
etc. DistributedFileSystem and DFSClient have moved and are now 
considered package private. Contributed by Sanjay Radia.

Added:
    hadoop/core/trunk/src/core/org/apache/hadoop/util/DataChecksum.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DataChecksum.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/ChecksumDistributedFileSystem.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ChecksumDistributedFileSystem.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DFSClient.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DFSUtil.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DistributedFileSystem.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/HftpFileSystem.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/HsftpFileSystem.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/HsftpFileSystem.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/package.html
      - copied unchanged from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/package.html
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/AlreadyBeingCreatedException.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/AlreadyBeingCreatedException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/Block.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/Block.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/BlockListAsLongs.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlockListAsLongs.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/BlocksWithLocations.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlocksWithLocations.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/ClientDatanodeProtocol.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ClientDatanodeProtocol.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ClientProtocol.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/DFSFileInfo.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DFSFileInfo.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/DatanodeID.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeID.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeInfo.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/FSConstants.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSConstants.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/LocatedBlock.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/LocatedBlock.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/LocatedBlocks.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/LocatedBlocks.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/QuotaExceededException.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/QuotaExceededException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/protocol/UnregisteredDatanodeException.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UnregisteredDatanodeException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/balancer/
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/Balancer.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/GenerationStamp.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/GenerationStamp.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/GenerationStampStatsUpgradeCommand.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/GenerationStampStatsUpgradeCommand.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/InconsistentFSStateException.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/InconsistentFSStateException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/IncorrectVersionException.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/IncorrectVersionException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/Storage.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/Storage.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/StorageInfo.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/UpgradeManager.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeManager.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/UpgradeObject.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeObject.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/UpgradeObjectCollection.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeObjectCollection.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/UpgradeStatusReport.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeStatusReport.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/Upgradeable.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/Upgradeable.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/common/Util.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/
      - copied from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/datanode/
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockMetadataHeader.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlockMetadataHeader.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DataBlockScanner.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DataNode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DataStorage.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DatanodeBlockInfo.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeBlockInfo.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSDataset.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSDatasetInterface.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/GenerationStampUpgradeDatanode.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/GenerationStampUpgradeDatanode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/UpgradeManagerDatanode.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/UpgradeObjectDatanode.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeObjectDatanode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/
      - copied from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/namenode/
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/BlocksMap.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlocksMap.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/CheckpointSignature.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/CheckpointSignature.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/CorruptReplicasMap.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/CorruptReplicasMap.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeDescriptor.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DfsServlet.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSDirectory.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSEditLog.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImage.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSImage.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileDataServlet.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FileDataServlet.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FsckServlet.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FsckServlet.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/GenerationStampUpgradeNamenode.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/GenerationStampUpgradeNamenode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/GetImageServlet.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/Host2NodesMap.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/Host2NodesMap.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INode.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/INode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JspHelper.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/JspHelper.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseExpiredException.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/LeaseExpiredException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/LeaseManager.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ListPathsServlet.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NameNode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NamenodeFsck.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NotReplicatedYetException.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NotReplicatedYetException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/PendingReplicationBlocks.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/PendingReplicationBlocks.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/PermissionChecker.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/PermissionChecker.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ReplicationTargetChooser.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ReplicationTargetChooser.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SafeModeException.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/SafeModeException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/SecondaryNameNode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SerialNumberManager.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/SerialNumberManager.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/StreamFile.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StringBytesWritable.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/StringBytesWritable.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/TransferFsImage.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UnderReplicatedBlocks.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UnderReplicatedBlocks.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeManagerNamenode.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerNamenode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/UpgradeObjectNamenode.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeObjectNamenode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/FSNamesystemMetrics.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSNamesystemMetrics.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NameNodeMetrics.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/protocol/
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/protocol/BlockCommand.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlockCommand.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/protocol/BlockMetaDataInfo.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlockMetaDataInfo.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/protocol/DatanodeCommand.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeProtocol.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/protocol/DatanodeRegistration.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeRegistration.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/protocol/DisallowedDatanodeException.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DisallowedDatanodeException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/protocol/InterDatanodeProtocol.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/InterDatanodeProtocol.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NamenodeProtocol.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NamespaceInfo.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/protocol/UpgradeCommand.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeCommand.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/tools/
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/tools/DFSAdmin.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DFSAdmin.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java
      - copied, changed from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DFSck.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/BenchmarkThroughput.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/BenchmarkThroughput.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/ClusterTestDFS.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/ClusterTestDFS.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/ClusterTestDFSNamespaceLogging.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/ClusterTestDFSNamespaceLogging.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/CreateEditsLog.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/DFSTestUtil.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/DFSTestUtil.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/DataNodeCluster.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/DataNodeCluster.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/NNBench.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNBench.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/NNBenchWithoutMR.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNBenchWithoutMR.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/NNThroughputBenchmark.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNThroughputBenchmark.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestAbandonBlock.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestAbandonBlock.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestBlockReplacement.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestBlockReplacement.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestCrcCorruption.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestCrcCorruption.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSFinalize.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSFinalize.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSMkdirs.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSMkdirs.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSPermission.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSPermission.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSRename.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSRename.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSRollback.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSRollback.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSShell.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSShell.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSShellGenericOptions.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSStartupVersions.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSStartupVersions.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSStorageStateRecovery.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSUpgrade.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSUpgrade.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSUpgradeFromImage.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDataTransferProtocol.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDataTransferProtocol.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDatanodeBlockScanner.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDatanodeDeath.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDatanodeDeath.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDatanodeReport.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDatanodeReport.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDecommission.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDecommission.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDefaultNameNodePort.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDefaultNameNodePort.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDistributedFileSystem.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestFSInputChecker.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFSInputChecker.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestFSOutputSummer.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFSOutputSummer.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestFileAppend.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileAppend.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestFileCorruption.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileCorruption.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestFileCreation.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileCreation.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestFileCreationDelete.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileCreationDelete.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestFileCreationNamenodeRestart.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileCreationNamenodeRestart.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestFileStatus.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileStatus.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestGetBlocks.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestGetBlocks.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestHDFSFileSystemContract.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestHDFSServerPorts.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestHDFSServerPorts.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestInjectionForSimulatedStorage.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestInjectionForSimulatedStorage.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestInterDatanodeProtocol.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestInterDatanodeProtocol.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLease.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLease.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLeaseRecovery.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery2.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLeaseRecovery2.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLocalDFS.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLocalDFS.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestModTime.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestModTime.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestNNThroughputBenchmark.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestNNThroughputBenchmark.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestPread.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestPread.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestQuota.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestQuota.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestReplication.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestReplication.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestRestartDFS.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestRestartDFS.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSeekBug.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSeekBug.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSetrepDecreasing.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSetrepDecreasing.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSetrepIncreasing.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSetrepIncreasing.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSmallBlock.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSmallBlock.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestTrash.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestTrash.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/UpgradeUtilities.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/UpgradeUtilities.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/hadoop-14-dfs-dir.tgz
      - copied unchanged from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/hadoop-14-dfs-dir.tgz
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/hadoop-dfs-dir.txt
      - copied unchanged from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/hadoop-dfs-dir.txt
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/balancer/
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestBalancer.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/common/
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/common/TestDistributedUpgrade.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDistributedUpgrade.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/datanode/
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/SimulatedFSDataset.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/datanode/TestSimulatedFSDataset.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSimulatedFSDataset.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestCheckpoint.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestEditLog.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestFileLimit.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileLimit.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestHost2NodesMap.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestPendingReplication.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestPendingReplication.java
    hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestReplicationPolicy.java
      - copied, changed from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestReplicationPolicy.java
Removed:
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/AlreadyBeingCreatedException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/Balancer.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/Block.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlockCommand.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlockListAsLongs.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlockMetaDataInfo.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlockMetadataHeader.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlocksMap.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/BlocksWithLocations.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/CheckpointSignature.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ChecksumDistributedFileSystem.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ClientDatanodeProtocol.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ClientProtocol.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/CorruptReplicasMap.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DFSAdmin.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DFSClient.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DFSFileInfo.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DFSck.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DataBlockScanner.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DataChecksum.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DataNode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DataStorage.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeBlockInfo.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeDescriptor.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeID.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeInfo.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeProtocol.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DatanodeRegistration.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DfsServlet.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DisallowedDatanodeException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DistributedFileSystem.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSConstants.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSDataset.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSDatasetInterface.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSDirectory.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSEditLog.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSImage.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSNamesystemMetrics.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FileDataServlet.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FsckServlet.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/GenerationStamp.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/GenerationStampStatsUpgradeCommand.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/GenerationStampUpgradeDatanode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/GenerationStampUpgradeNamenode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/GetImageServlet.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/HftpFileSystem.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/Host2NodesMap.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/HsftpFileSystem.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/INode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/InconsistentFSStateException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/IncorrectVersionException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/InterDatanodeProtocol.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/JspHelper.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/LeaseExpiredException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/LeaseManager.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ListPathsServlet.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/LocatedBlock.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/LocatedBlocks.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NameNode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NameNodeMetrics.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NamenodeFsck.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NamenodeProtocol.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NamespaceInfo.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/NotReplicatedYetException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/PendingReplicationBlocks.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/PermissionChecker.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/QuotaExceededException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ReplicationTargetChooser.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/SafeModeException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/SecondaryNameNode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/SerialNumberManager.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/Storage.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/StreamFile.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/StringBytesWritable.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/TransferFsImage.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UnderReplicatedBlocks.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UnregisteredDatanodeException.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeCommand.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeManager.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerDatanode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeManagerNamenode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeObject.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeObjectCollection.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeObjectDatanode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeObjectNamenode.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/UpgradeStatusReport.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/Upgradeable.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/datanode/
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/namenode/
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/package.html
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/BenchmarkThroughput.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/ClusterTestDFS.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/ClusterTestDFSNamespaceLogging.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/CreateEditsLog.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/DFSTestUtil.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/DataNodeCluster.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNBench.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNBenchWithoutMR.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNThroughputBenchmark.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/SimulatedFSDataset.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestAbandonBlock.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestBalancer.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestBlockReplacement.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestCheckpoint.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestCrcCorruption.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSFinalize.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSMkdirs.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSPermission.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSRename.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSRollback.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSShell.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSShellGenericOptions.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSStartupVersions.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSStorageStateRecovery.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSUpgrade.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDataTransferProtocol.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDatanodeBlockScanner.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDatanodeDeath.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDatanodeReport.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDecommission.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDefaultNameNodePort.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDistributedFileSystem.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDistributedUpgrade.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestEditLog.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFSInputChecker.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFSOutputSummer.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileAppend.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileCorruption.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileCreation.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileCreationDelete.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileCreationNamenodeRestart.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileLimit.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileStatus.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestGetBlocks.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestHDFSFileSystemContract.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestHDFSServerPorts.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestHost2NodesMap.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestInjectionForSimulatedStorage.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestInterDatanodeProtocol.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLease.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLeaseRecovery.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLeaseRecovery2.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLocalDFS.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestModTime.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestNNThroughputBenchmark.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestPendingReplication.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestPread.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestQuota.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestReplication.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestReplicationPolicy.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestRestartDFS.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSeekBug.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSetrepDecreasing.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSetrepIncreasing.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSimulatedFSDataset.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSmallBlock.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestTrash.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/UpgradeUtilities.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/hadoop-14-dfs-dir.tgz
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/hadoop-dfs-dir.txt
Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/bin/hadoop
    hadoop/core/trunk/build.xml
    hadoop/core/trunk/conf/hadoop-default.xml
    hadoop/core/trunk/docs/changes.html
    hadoop/core/trunk/docs/hadoop-default.html
    hadoop/core/trunk/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/NewDriverWizardPage.java
    hadoop/core/trunk/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSPath.java
    hadoop/core/trunk/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdater.java
    hadoop/core/trunk/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestDistributionPolicy.java
    hadoop/core/trunk/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestIndexUpdater.java
    hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleArchiveFiles.java
    hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleCachefiles.java
    hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamedMerge.java
    hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java
    hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/FileSystem.java
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/FsShell.java
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/Syncable.java
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/permission/AccessControlException.java
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/permission/FsAction.java
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3/FileSystemStore.java
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/Command.java
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/CommandFormat.java
    hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/CommandUtils.java
    hadoop/core/trunk/src/core/org/apache/hadoop/io/MultipleIOException.java
    hadoop/core/trunk/src/core/org/apache/hadoop/log/LogLevel.java
    hadoop/core/trunk/src/core/org/apache/hadoop/metrics/MetricsUtil.java
    hadoop/core/trunk/src/core/overview.html
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeMetrics.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeStatistics.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeStatisticsMBean.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/metrics/FSDatasetMBean.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/FSNamesystemMBean.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeStatistics.java
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeStatisticsMBean.java
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobID.java
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/Task.java
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskAttemptID.java
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskID.java
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/lib/aggregate/ValueAggregator.java
    hadoop/core/trunk/src/test/org/apache/hadoop/cli/TestCLI.java
    hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestCopyFiles.java
    hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestFileSystem.java
    hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestGlobPaths.java
    hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestHarFileSystem.java
    hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestUrlStreamHandler.java
    hadoop/core/trunk/src/test/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
    hadoop/core/trunk/src/test/org/apache/hadoop/fs/permission/TestFsPermission.java
    hadoop/core/trunk/src/test/org/apache/hadoop/ipc/TestSocketFactory.java
    hadoop/core/trunk/src/test/org/apache/hadoop/log/TestLogLevel.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/ClusterMapReduceTestCase.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/HadoopTestCase.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestEmptyJobWithDFS.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestFileInputFormat.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestKillCompletedJob.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMRServerPorts.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRDFSSort.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRMapRedDebugScript.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRTaskTempDir.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFS.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMultipleLevelCaching.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/join/TestDatamerge.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/pipes/TestPipes.java
    hadoop/core/trunk/src/test/org/apache/hadoop/net/TestNetworkTopology.java
    hadoop/core/trunk/src/test/org/apache/hadoop/security/TestPermission.java
    hadoop/core/trunk/src/test/org/apache/hadoop/security/TestUnixUserGroupInformation.java
    hadoop/core/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java
    hadoop/core/trunk/src/test/org/apache/hadoop/util/TestStringUtils.java
    hadoop/core/trunk/src/webapps/datanode/browseBlock.jsp
    hadoop/core/trunk/src/webapps/datanode/browseDirectory.jsp
    hadoop/core/trunk/src/webapps/datanode/tail.jsp
    hadoop/core/trunk/src/webapps/dfs/dfshealth.jsp
    hadoop/core/trunk/src/webapps/dfs/nn_browsedfscontent.jsp
    hadoop/core/trunk/src/webapps/job/jobdetails.jsp
    hadoop/core/trunk/src/webapps/job/jobtasks.jsp
    hadoop/core/trunk/src/webapps/job/jobtracker.jsp
    hadoop/core/trunk/src/webapps/job/taskdetails.jsp

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Jul  3 15:55:06 2008
@@ -22,6 +22,11 @@
     HADOOP-3652. Remove deprecated class OutputFormatBase.
     (Amareshwari Sriramadasu via cdouglas)
 
+    HADOOP-2885. Break the hadoop.dfs package into separate packages under
+    hadoop.hdfs that reflect whether they are client, server, protocol, 
+    etc. DistributedFileSystem and DFSClient have moved and are now 
+    considered package private. (Sanjay Radia via omalley)
+
   NEW FEATURES
 
     HADOOP-3341. Allow streaming jobs to specify the field separator for map

Modified: hadoop/core/trunk/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/bin/hadoop?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/bin/hadoop (original)
+++ hadoop/core/trunk/bin/hadoop Thu Jul  3 15:55:06 2008
@@ -197,13 +197,13 @@
 
 # figure out which class to run
 if [ "$COMMAND" = "namenode" ] ; then
-  CLASS='org.apache.hadoop.dfs.NameNode'
+  CLASS='org.apache.hadoop.hdfs.server.namenode.NameNode'
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_NAMENODE_OPTS"
 elif [ "$COMMAND" = "secondarynamenode" ] ; then
-  CLASS='org.apache.hadoop.dfs.SecondaryNameNode'
+  CLASS='org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode'
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_SECONDARYNAMENODE_OPTS"
 elif [ "$COMMAND" = "datanode" ] ; then
-  CLASS='org.apache.hadoop.dfs.DataNode'
+  CLASS='org.apache.hadoop.hdfs.server.datanode.DataNode'
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_DATANODE_OPTS"
 elif [ "$COMMAND" = "fs" ] ; then
   CLASS=org.apache.hadoop.fs.FsShell
@@ -212,13 +212,13 @@
   CLASS=org.apache.hadoop.fs.FsShell
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "dfsadmin" ] ; then
-  CLASS=org.apache.hadoop.dfs.DFSAdmin
+  CLASS=org.apache.hadoop.hdfs.tools.DFSAdmin
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "fsck" ] ; then
-  CLASS=org.apache.hadoop.dfs.DFSck
+  CLASS=org.apache.hadoop.hdfs.tools.DFSck
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "balancer" ] ; then
-  CLASS=org.apache.hadoop.dfs.Balancer
+  CLASS=org.apache.hadoop.hdfs.server.balancer.Balancer
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_BALANCER_OPTS"
 elif [ "$COMMAND" = "jobtracker" ] ; then
   CLASS=org.apache.hadoop.mapred.JobTracker

Modified: hadoop/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/build.xml?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/build.xml (original)
+++ hadoop/core/trunk/build.xml Thu Jul  3 15:55:06 2008
@@ -584,8 +584,8 @@
     <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.tar" todir="${test.cache.data}"/>
     <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.tgz" todir="${test.cache.data}"/>
     <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.tar.gz" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/dfs/hadoop-14-dfs-dir.tgz" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/dfs/hadoop-dfs-dir.txt" todir="${test.cache.data}"/>
+    <copy file="${test.src.dir}/org/apache/hadoop/hdfs/hadoop-14-dfs-dir.tgz" todir="${test.cache.data}"/>
+    <copy file="${test.src.dir}/org/apache/hadoop/hdfs/hadoop-dfs-dir.txt" todir="${test.cache.data}"/>
     <copy file="${test.src.dir}/org/apache/hadoop/cli/testConf.xml" todir="${test.cache.data}"/>
     <copy file="${test.src.dir}/org/apache/hadoop/cli/clitest_data/data15bytes" todir="${test.cache.data}"/>
     <copy file="${test.src.dir}/org/apache/hadoop/cli/clitest_data/data30bytes" todir="${test.cache.data}"/>

Modified: hadoop/core/trunk/conf/hadoop-default.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/conf/hadoop-default.xml?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/conf/hadoop-default.xml (original)
+++ hadoop/core/trunk/conf/hadoop-default.xml Thu Jul  3 15:55:06 2008
@@ -171,7 +171,7 @@
 
 <property>
   <name>fs.hdfs.impl</name>
-  <value>org.apache.hadoop.dfs.DistributedFileSystem</value>
+  <value>org.apache.hadoop.hdfs.DistributedFileSystem</value>
   <description>The FileSystem for hdfs: uris.</description>
 </property>
 
@@ -195,12 +195,12 @@
 
 <property>
   <name>fs.hftp.impl</name>
-  <value>org.apache.hadoop.dfs.HftpFileSystem</value>
+  <value>org.apache.hadoop.hdfs.HftpFileSystem</value>
 </property>
 
 <property>
   <name>fs.hsftp.impl</name>
-  <value>org.apache.hadoop.dfs.HsftpFileSystem</value>
+  <value>org.apache.hadoop.hdfs.HsftpFileSystem</value>
 </property>
 
 <property>

Modified: hadoop/core/trunk/docs/changes.html
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/docs/changes.html?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/docs/changes.html (original)
+++ hadoop/core/trunk/docs/changes.html Thu Jul  3 15:55:06 2008
@@ -86,7 +86,7 @@
     </ol>
   </li>
   <li><a href="javascript:toggleList('trunk_(unreleased_changes)_._improvements_')">  IMPROVEMENTS
-</a>&nbsp;&nbsp;&nbsp;(4)
+</a>&nbsp;&nbsp;&nbsp;(6)
     <ol id="trunk_(unreleased_changes)_._improvements_">
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-3577">HADOOP-3577</a>. Tools to inject blocks into name node and simulated
 data nodes for testing.<br />(Sanjay Radia via hairong)</li>
@@ -95,6 +95,8 @@
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-3655">HADOOP-3655</a>. Add additional ant properties to control junit.<br />(Steve
 Loughran via omalley)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-3543">HADOOP-3543</a>. Update the copyright year to 2008.<br />(cdouglas via omalley)</li>
+      <li><a href="http://issues.apache.org/jira/browse/HADOOP-3587">HADOOP-3587</a>. Add a unit test for the contrib/data_join framework.<br />(cdouglas)</li>
+      <li><a href="http://issues.apache.org/jira/browse/HADOOP-3402">HADOOP-3402</a>. Add terasort example program<br />(omalley)</li>
     </ol>
   </li>
   <li><a href="javascript:toggleList('trunk_(unreleased_changes)_._optimizations_')">  OPTIMIZATIONS
@@ -201,8 +203,7 @@
 via omalley)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-3317">HADOOP-3317</a>. Add default port for HDFS namenode.  The port in
 "hdfs:" URIs now defaults to 8020, so that one may simply use URIs
-of the form "hdfs://example.com/dir/file".
-</li>
+of the form "hdfs://example.com/dir/file".<br />(cutting)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-2019">HADOOP-2019</a>. Adds support for .tar, .tgz and .tar.gz files in
 DistributedCache<br />(Amareshwari Sriramadasu via ddas)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-3058">HADOOP-3058</a>. Add FSNamesystem status metrics.<br />(Lohit Vjayarenu via rangadi)</li>
@@ -362,7 +363,7 @@
     </ol>
   </li>
   <li><a href="javascript:toggleList('release_0.18.0_-_unreleased_._bug_fixes_')">  BUG FIXES
-</a>&nbsp;&nbsp;&nbsp;(108)
+</a>&nbsp;&nbsp;&nbsp;(109)
     <ol id="release_0.18.0_-_unreleased_._bug_fixes_">
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-2905">HADOOP-2905</a>. 'fsck -move' triggers NPE in NameNode.<br />(Lohit Vjayarenu via rangadi)</li>
       <li>Increment ClientProtocol.versionID missed by <a href="http://issues.apache.org/jira/browse/HADOOP-2585">HADOOP-2585</a>.<br />(shv)</li>
@@ -577,6 +578,8 @@
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-3604">HADOOP-3604</a>. Work around a JVM synchronization problem observed while
 retrieving the address of direct buffers from compression code by obtaining
 a lock during this call.<br />(Arun C Murthy via cdouglas)</li>
+      <li><a href="http://issues.apache.org/jira/browse/HADOOP-3678">HADOOP-3678</a>. Avoid spurious exceptions logged at DataNode when clients
+read from DFS.<br />(rangadi)</li>
     </ol>
   </li>
 </ul>

Modified: hadoop/core/trunk/docs/hadoop-default.html
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/docs/hadoop-default.html?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/docs/hadoop-default.html (original)
+++ hadoop/core/trunk/docs/hadoop-default.html Thu Jul  3 15:55:06 2008
@@ -99,7 +99,7 @@
 <td><a name="fs.file.impl">fs.file.impl</a></td><td>org.apache.hadoop.fs.LocalFileSystem</td><td>The FileSystem for file: uris.</td>
 </tr>
 <tr>
-<td><a name="fs.hdfs.impl">fs.hdfs.impl</a></td><td>org.apache.hadoop.dfs.DistributedFileSystem</td><td>The FileSystem for hdfs: uris.</td>
+<td><a name="fs.hdfs.impl">fs.hdfs.impl</a></td><td>org.apache.hadoop.hdfs.DistributedFileSystem</td><td>The FileSystem for hdfs: uris.</td>
 </tr>
 <tr>
 <td><a name="fs.s3.impl">fs.s3.impl</a></td><td>org.apache.hadoop.fs.s3.S3FileSystem</td><td>The FileSystem for s3: uris.</td>
@@ -111,10 +111,10 @@
 <td><a name="fs.kfs.impl">fs.kfs.impl</a></td><td>org.apache.hadoop.fs.kfs.KosmosFileSystem</td><td>The FileSystem for kfs: uris.</td>
 </tr>
 <tr>
-<td><a name="fs.hftp.impl">fs.hftp.impl</a></td><td>org.apache.hadoop.dfs.HftpFileSystem</td><td></td>
+<td><a name="fs.hftp.impl">fs.hftp.impl</a></td><td>org.apache.hadoop.hdfs.HftpFileSystem</td><td></td>
 </tr>
 <tr>
-<td><a name="fs.hsftp.impl">fs.hsftp.impl</a></td><td>org.apache.hadoop.dfs.HsftpFileSystem</td><td></td>
+<td><a name="fs.hsftp.impl">fs.hsftp.impl</a></td><td>org.apache.hadoop.hdfs.HsftpFileSystem</td><td></td>
 </tr>
 <tr>
 <td><a name="fs.ftp.impl">fs.ftp.impl</a></td><td>org.apache.hadoop.fs.ftp.FTPFileSystem</td><td>The FileSystem for ftp: uris.</td>

Modified: hadoop/core/trunk/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/NewDriverWizardPage.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/NewDriverWizardPage.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/NewDriverWizardPage.java (original)
+++ hadoop/core/trunk/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/NewDriverWizardPage.java Thu Jul  3 15:55:06 2008
@@ -260,4 +260,4 @@
 
     return text;
   }
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSPath.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSPath.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSPath.java (original)
+++ hadoop/core/trunk/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSPath.java Thu Jul  3 15:55:06 2008
@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import org.apache.hadoop.dfs.DistributedFileSystem;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.eclipse.ErrorMessageDialog;
 import org.apache.hadoop.eclipse.server.ConfProp;
 import org.apache.hadoop.eclipse.server.HadoopServer;

Modified: hadoop/core/trunk/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdater.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdater.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdater.java (original)
+++ hadoop/core/trunk/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdater.java Thu Jul  3 15:55:06 2008
@@ -147,4 +147,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestDistributionPolicy.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestDistributionPolicy.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestDistributionPolicy.java (original)
+++ hadoop/core/trunk/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestDistributionPolicy.java Thu Jul  3 15:55:06 2008
@@ -26,7 +26,7 @@
 import org.apache.hadoop.contrib.index.example.HashingDistributionPolicy;
 import org.apache.hadoop.contrib.index.example.RoundRobinDistributionPolicy;
 import org.apache.hadoop.contrib.index.lucene.FileSystemDirectory;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.MiniMRCluster;

Modified: hadoop/core/trunk/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestIndexUpdater.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestIndexUpdater.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestIndexUpdater.java (original)
+++ hadoop/core/trunk/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestIndexUpdater.java Thu Jul  3 15:55:06 2008
@@ -24,7 +24,7 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.contrib.index.lucene.FileSystemDirectory;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;

Modified: hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleArchiveFiles.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleArchiveFiles.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleArchiveFiles.java (original)
+++ hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleArchiveFiles.java Thu Jul  3 15:55:06 2008
@@ -32,7 +32,7 @@
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.*;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 
 /**
  * This class tests cacheArchive option of streaming 

Modified: hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleCachefiles.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleCachefiles.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleCachefiles.java (original)
+++ hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleCachefiles.java Thu Jul  3 15:55:06 2008
@@ -26,7 +26,7 @@
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.*;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 /**
  * This test case tests the symlink creation
  * utility provided by distributed caching 

Modified: hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamedMerge.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamedMerge.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamedMerge.java (original)
+++ hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamedMerge.java Thu Jul  3 15:55:06 2008
@@ -31,7 +31,7 @@
 import junit.framework.TestCase;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FsShell;
 import org.apache.hadoop.fs.Path;

Modified: hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java (original)
+++ hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java Thu Jul  3 15:55:06 2008
@@ -26,7 +26,7 @@
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.*;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 /**
  * This test case tests the symlink creation
  * utility provided by distributed caching 

Modified: hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java (original)
+++ hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java Thu Jul  3 15:55:06 2008
@@ -23,7 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/FileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/FileSystem.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/FileSystem.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/FileSystem.java Thu Jul  3 15:55:06 2008
@@ -27,11 +27,11 @@
 
 import org.apache.commons.logging.*;
 
-import org.apache.hadoop.dfs.*;
 import org.apache.hadoop.conf.*;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.*;
 import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.io.MultipleIOException;
 import org.apache.hadoop.security.UserGroupInformation;
 

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/FsShell.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/FsShell.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/FsShell.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/FsShell.java Thu Jul  3 15:55:06 2008
@@ -43,7 +43,7 @@
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
-import org.apache.hadoop.dfs.DistributedFileSystem;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
 
 /** Provide command line access to a FileSystem. */
 public class FsShell extends Configured implements Tool {

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/Syncable.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/Syncable.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/Syncable.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/Syncable.java Thu Jul  3 15:55:06 2008
@@ -27,4 +27,4 @@
    * @throws IOException
    */
   public void sync() throws IOException;
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/permission/AccessControlException.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/permission/AccessControlException.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/permission/AccessControlException.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/permission/AccessControlException.java Thu Jul  3 15:55:06 2008
@@ -38,4 +38,4 @@
    * @param s the detail message.
    */
   public AccessControlException(String s) {super(s);}
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/permission/FsAction.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/permission/FsAction.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/permission/FsAction.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/permission/FsAction.java Thu Jul  3 15:55:06 2008
@@ -65,4 +65,4 @@
   public FsAction not() {
     return values()[7 - INDEX];
   }
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3/FileSystemStore.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3/FileSystemStore.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3/FileSystemStore.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3/FileSystemStore.java Thu Jul  3 15:55:06 2008
@@ -60,4 +60,4 @@
    * @throws IOException
    */
   void dump() throws IOException;
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java Thu Jul  3 15:55:06 2008
@@ -242,4 +242,4 @@
     System.out.println(sb);
   }
   
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/Command.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/Command.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/Command.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/Command.java Thu Jul  3 15:55:06 2008
@@ -81,4 +81,4 @@
     }
     return exitCode;
   }
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/CommandFormat.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/CommandFormat.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/CommandFormat.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/CommandFormat.java Thu Jul  3 15:55:06 2008
@@ -72,4 +72,4 @@
   public boolean getOpt(String option) {
     return options.get(option);
   }
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/CommandUtils.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/CommandUtils.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/CommandUtils.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/shell/CommandUtils.java Thu Jul  3 15:55:06 2008
@@ -25,4 +25,4 @@
     }
     return b.toString();
   }
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/io/MultipleIOException.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/io/MultipleIOException.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/io/MultipleIOException.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/io/MultipleIOException.java Thu Jul  3 15:55:06 2008
@@ -46,4 +46,4 @@
     }
     return new MultipleIOException(exceptions);
   }
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/log/LogLevel.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/log/LogLevel.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/log/LogLevel.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/log/LogLevel.java Thu Jul  3 15:55:06 2008
@@ -148,4 +148,4 @@
       out.println(MARKER + "Effective level: <b>" + lev + "</b><br />");
     }
   }
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/metrics/MetricsUtil.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/metrics/MetricsUtil.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/metrics/MetricsUtil.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/metrics/MetricsUtil.java Thu Jul  3 15:55:06 2008
@@ -26,7 +26,7 @@
 /**
  * Utility class to simplify creation and reporting of hadoop metrics.
  *
- * For examples of usage, see {@link org.apache.hadoop.dfs.DataNode}.
+ * For examples of usage, see {@link org.apache.hadoop.hdfs.server.namenode.metrics.NameNodeMetrics}.
  * @see org.apache.hadoop.metrics.MetricsRecord
  * @see org.apache.hadoop.metrics.MetricsContext
  * @see org.apache.hadoop.metrics.ContextFactory

Copied: hadoop/core/trunk/src/core/org/apache/hadoop/util/DataChecksum.java (from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DataChecksum.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/util/DataChecksum.java?p2=hadoop/core/trunk/src/core/org/apache/hadoop/util/DataChecksum.java&p1=hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DataChecksum.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DataChecksum.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/util/DataChecksum.java Thu Jul  3 15:55:06 2008
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.dfs;
+package org.apache.hadoop.util;
 
 import java.util.zip.Checksum;
 import java.util.zip.CRC32;
@@ -205,8 +205,10 @@
   public int getNumBytesInSum() {
     return inSum;
   }
+  
+  public static final int SIZE_OF_INTEGER = Integer.SIZE / Byte.SIZE;
   static public int getChecksumHeaderSize() {
-    return 1 + FSConstants.SIZE_OF_INTEGER; // type byte, bytesPerChecksum int
+    return 1 + SIZE_OF_INTEGER; // type byte, bytesPerChecksum int
   }
   //Checksum Interface. Just a wrapper around member summer.
   public long getValue() {

Modified: hadoop/core/trunk/src/core/overview.html
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/overview.html?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/overview.html (original)
+++ hadoop/core/trunk/src/core/overview.html Thu Jul  3 15:55:06 2008
@@ -132,7 +132,7 @@
 
 <ol>
 
-<li>The {@link org.apache.hadoop.dfs.NameNode} (Distributed Filesystem
+<li>The {@link org.apache.hadoop.hdfs.server.namenode.NameNode} (Distributed Filesystem
 master) host.  This is specified with the configuration
 property <tt><a
 href="../hadoop-default.html#fs.default.name">fs.default.name</a></tt>.

Copied: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/ChecksumDistributedFileSystem.java (from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ChecksumDistributedFileSystem.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/ChecksumDistributedFileSystem.java?p2=hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/ChecksumDistributedFileSystem.java&p1=hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ChecksumDistributedFileSystem.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/ChecksumDistributedFileSystem.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/ChecksumDistributedFileSystem.java Thu Jul  3 15:55:06 2008
@@ -16,13 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.dfs;
+package org.apache.hadoop.hdfs;
 
 import java.io.*;
 import java.net.*;
 
 import org.apache.hadoop.fs.*;
-import org.apache.hadoop.dfs.FSConstants.UpgradeAction;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.protocol.FSConstants.UpgradeAction;
+import org.apache.hadoop.hdfs.server.common.UpgradeStatusReport;
 import org.apache.hadoop.conf.Configuration;
 
 /**
@@ -69,7 +72,7 @@
   /**
    * Enter, leave or get safe mode.
    *  
-   * @see org.apache.hadoop.dfs.ClientProtocol#setSafeMode(FSConstants.SafeModeAction)
+   * @see org.apache.hadoop.hdfs.protocol.ClientProtocol#setSafeMode(FSConstants.SafeModeAction)
    */
   public boolean setSafeMode(FSConstants.SafeModeAction action) 
     throws IOException {

Copied: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java (from r673837, hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DFSClient.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?p2=hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java&p1=hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DFSClient.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/DFSClient.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java Thu Jul  3 15:55:06 2008
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.dfs;
+package org.apache.hadoop.hdfs;
 
 import org.apache.hadoop.io.*;
 import org.apache.hadoop.io.retry.RetryPolicies;
@@ -27,7 +27,12 @@
 import org.apache.hadoop.ipc.*;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.conf.*;
-import org.apache.hadoop.dfs.DistributedFileSystem.DiskStatus;
+import org.apache.hadoop.hdfs.DistributedFileSystem.DiskStatus;
+import org.apache.hadoop.hdfs.protocol.*;
+import org.apache.hadoop.hdfs.server.common.UpgradeStatusReport;
+import org.apache.hadoop.hdfs.server.datanode.DataNode;
+import org.apache.hadoop.hdfs.server.namenode.NameNode;
+import org.apache.hadoop.hdfs.server.namenode.NotReplicatedYetException;
 import org.apache.hadoop.security.UnixUserGroupInformation;
 import org.apache.hadoop.util.*;
 
@@ -56,11 +61,11 @@
  * filesystem tasks.
  *
  ********************************************************/
-class DFSClient implements FSConstants {
+public class DFSClient implements FSConstants {
   public static final Log LOG = LogFactory.getLog(DFSClient.class);
-  static final int MAX_BLOCK_ACQUIRE_FAILURES = 3;
+  public static final int MAX_BLOCK_ACQUIRE_FAILURES = 3;
   private static final int TCP_WINDOW_SIZE = 128 * 1024; // 128 KB
-  final ClientProtocol namenode;
+  public final ClientProtocol namenode;
   final private ClientProtocol rpcNamenode;
   final UnixUserGroupInformation ugi;
   volatile boolean clientRunning = true;
@@ -83,11 +88,11 @@
   private TreeMap<String, OutputStream> pendingCreates =
     new TreeMap<String, OutputStream>();
  
-  static ClientProtocol createNamenode(Configuration conf) throws IOException {
+  public static ClientProtocol createNamenode(Configuration conf) throws IOException {
     return createNamenode(NameNode.getAddress(conf), conf);
   }
 
-  static ClientProtocol createNamenode( InetSocketAddress nameNodeAddr,
+  public static ClientProtocol createNamenode( InetSocketAddress nameNodeAddr,
       Configuration conf) throws IOException {
     try {
       return createNamenode(createRPCNamenode(nameNodeAddr, conf,
@@ -809,7 +814,7 @@
   /** This is a wrapper around connection to datadone
    * and understands checksum, offset etc
    */
-  static class BlockReader extends FSInputChecker {
+  public static class BlockReader extends FSInputChecker {
 
     private Socket dnSock; //for now just sending checksumOk.
     private DataInputStream in;
@@ -1034,14 +1039,14 @@
       checksumSize = this.checksum.getChecksumSize();
     }
 
-    static BlockReader newBlockReader(Socket sock, String file, long blockId, 
+    public static BlockReader newBlockReader(Socket sock, String file, long blockId, 
         long genStamp, long startOffset, long len, int bufferSize) throws IOException {
       return newBlockReader(sock, file, blockId, genStamp, startOffset, len, bufferSize,
           true);
     }
 
     /** Java Doc required */
-    static BlockReader newBlockReader( Socket sock, String file, long blockId, 
+    public static BlockReader newBlockReader( Socket sock, String file, long blockId, 
                                        long genStamp,
                                        long startOffset, long len,
                                        int bufferSize, boolean verifyChecksum)
@@ -1099,7 +1104,7 @@
     /** kind of like readFully(). Only reads as much as possible.
      * And allows use of protected readFully().
      */
-    int readAll(byte[] buf, int offset, int len) throws IOException {
+    public int readAll(byte[] buf, int offset, int len) throws IOException {
       return readFully(this, buf, offset, len);
     }
     



Mime
View raw message