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 [6/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
Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestInjectionForSimulatedStorage.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestInjectionForSimulatedStorage.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestInjectionForSimulatedStorage.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestInjectionForSimulatedStorage.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestInjectionForSimulatedStorage.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestInjectionForSimulatedStorage.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestInjectionForSimulatedStorage.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 junit.framework.TestCase;
 import java.io.*;
@@ -30,6 +30,11 @@
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.ClientProtocol;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
 
 
 /**
@@ -42,7 +47,7 @@
   private int filesize = blockSize*numBlocks;
   private int numDataNodes = 4;
   private static final Log LOG = LogFactory.getLog(
-      "org.apache.hadoop.dfs.TestInjectionForSimulatedStorage");
+      "org.apache.hadoop.hdfs.TestInjectionForSimulatedStorage");
 
   
   private void writeFile(FileSystem fileSys, Path name, int repl)

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestInterDatanodeProtocol.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestInterDatanodeProtocol.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestInterDatanodeProtocol.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestInterDatanodeProtocol.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestInterDatanodeProtocol.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestInterDatanodeProtocol.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestInterDatanodeProtocol.java Thu Jul  3 15:55:06 2008
@@ -15,13 +15,22 @@
  * 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 java.io.IOException;
 import java.util.List;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.*;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.ClientProtocol;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.server.datanode.DataBlockScanner;
+import org.apache.hadoop.hdfs.server.datanode.DataNode;
+import org.apache.hadoop.hdfs.server.protocol.BlockMetaDataInfo;
+import org.apache.hadoop.hdfs.server.protocol.InterDatanodeProtocol;
 
 /**
  * This tests InterDataNodeProtocol for block handling. 

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLease.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLease.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLease.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLease.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLease.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLease.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLease.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 java.io.*;
 

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLeaseRecovery.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLeaseRecovery.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLeaseRecovery.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery.java Thu Jul  3 15:55:06 2008
@@ -15,13 +15,19 @@
  * 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 java.io.IOException;
 import java.util.*;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.*;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.server.datanode.DataNode;
+import org.apache.hadoop.hdfs.server.protocol.BlockMetaDataInfo;
+import org.apache.hadoop.hdfs.server.protocol.InterDatanodeProtocol;
 
 public class TestLeaseRecovery extends junit.framework.TestCase {
   static final int BLOCK_SIZE = 1024;
@@ -117,7 +123,7 @@
       BlockMetaDataInfo[] updatedmetainfo = new BlockMetaDataInfo[REPLICATION_NUM];
       int minsize = min(newblocksizes);
       long currentGS = cluster.getNameNode().namesystem.getGenerationStamp();
-      lastblock.generationStamp = currentGS;
+      lastblock.setGenerationStamp(currentGS);
       for(int i = 0; i < REPLICATION_NUM; i++) {
         updatedmetainfo[i] = idps[i].getBlockMetaDataInfo(lastblock);
         assertEquals(lastblock.getBlockId(), updatedmetainfo[i].getBlockId());

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery2.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLeaseRecovery2.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery2.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery2.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLeaseRecovery2.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLeaseRecovery2.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLeaseRecovery2.java Thu Jul  3 15:55:06 2008
@@ -15,13 +15,15 @@
  * 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 java.io.IOException;
 import java.util.*;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.*;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.server.protocol.InterDatanodeProtocol;
 
 public class TestLeaseRecovery2 extends junit.framework.TestCase {
   static final int BLOCK_SIZE = 64;

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLocalDFS.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLocalDFS.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLocalDFS.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLocalDFS.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLocalDFS.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestLocalDFS.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestLocalDFS.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 junit.framework.TestCase;
 import java.io.*;

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestModTime.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestModTime.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestModTime.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestModTime.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestModTime.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestModTime.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestModTime.java Thu Jul  3 15:55:06 2008
@@ -15,14 +15,15 @@
  * 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 junit.framework.TestCase;
 import java.io.*;
 import java.util.Random;
 import java.net.*;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestNNThroughputBenchmark.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestNNThroughputBenchmark.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestNNThroughputBenchmark.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestNNThroughputBenchmark.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestNNThroughputBenchmark.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestNNThroughputBenchmark.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestNNThroughputBenchmark.java Thu Jul  3 15:55:06 2008
@@ -15,11 +15,12 @@
  * 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 junit.framework.TestCase;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.hdfs.server.namenode.NameNode;
 
 public class TestNNThroughputBenchmark extends TestCase {
 

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestPread.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestPread.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestPread.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestPread.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestPread.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestPread.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestPread.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 junit.framework.TestCase;
 import java.io.*;
@@ -24,6 +24,7 @@
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
 
 /**
  * This class tests the DFS positional read functionality in a single node

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestQuota.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestQuota.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestQuota.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestQuota.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestQuota.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestQuota.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestQuota.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 java.io.OutputStream;
 
@@ -23,6 +23,8 @@
 import org.apache.hadoop.fs.ContentSummary;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.protocol.QuotaExceededException;
+import org.apache.hadoop.hdfs.tools.DFSAdmin;
 import org.apache.hadoop.security.UnixUserGroupInformation;
 
 import junit.framework.TestCase;

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestReplication.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestReplication.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestReplication.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestReplication.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestReplication.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestReplication.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestReplication.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 junit.framework.TestCase;
 import java.io.*;
@@ -26,7 +26,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.protocol.ClientProtocol;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -45,7 +50,7 @@
   };
   private static final int numDatanodes = racks.length;
   private static final Log LOG = LogFactory.getLog(
-                                       "org.apache.hadoop.dfs.TestReplication");
+                                       "org.apache.hadoop.hdfs.TestReplication");
 
   private void writeFile(FileSystem fileSys, Path name, int repl)
     throws IOException {

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestRestartDFS.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestRestartDFS.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestRestartDFS.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestRestartDFS.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestRestartDFS.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestRestartDFS.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestRestartDFS.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.hdfs;
 
 import java.io.IOException;
 import java.util.Random;

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSeekBug.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSeekBug.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSeekBug.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSeekBug.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSeekBug.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSeekBug.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSeekBug.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 junit.framework.TestCase;
 import java.io.*;

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSetrepDecreasing.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSetrepDecreasing.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSetrepDecreasing.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSetrepDecreasing.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSetrepDecreasing.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSetrepDecreasing.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSetrepDecreasing.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 java.io.IOException;
 
@@ -25,4 +25,4 @@
   public void testSetrepDecreasing() throws IOException {
     TestSetrepIncreasing.setrep(5, 3, false);
   }
-}
\ No newline at end of file
+}

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSetrepIncreasing.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSetrepIncreasing.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSetrepIncreasing.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSetrepIncreasing.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSetrepIncreasing.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSetrepIncreasing.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSetrepIncreasing.java Thu Jul  3 15:55:06 2008
@@ -15,14 +15,14 @@
  * 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 junit.framework.TestCase;
 import java.io.*;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.*;
-import org.apache.hadoop.fs.BlockLocation;
+import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
 
 public class TestSetrepIncreasing extends TestCase {
   static void setrep(int fromREP, int toREP, boolean simulatedStorage) throws IOException {

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSmallBlock.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSmallBlock.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSmallBlock.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSmallBlock.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSmallBlock.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSmallBlock.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestSmallBlock.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 junit.framework.TestCase;
 import java.io.*;
@@ -26,6 +26,7 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.BlockLocation;
+import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
 
 /**
  * This class tests the creation of files with block-size

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestTrash.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestTrash.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestTrash.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestTrash.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestTrash.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestTrash.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestTrash.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 junit.framework.TestCase;
 import java.io.*;

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/UpgradeUtilities.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/UpgradeUtilities.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/UpgradeUtilities.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/UpgradeUtilities.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/UpgradeUtilities.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/UpgradeUtilities.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/UpgradeUtilities.java Thu Jul  3 15:55:06 2008
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.dfs;
+package org.apache.hadoop.hdfs;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,11 +33,17 @@
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.dfs.FSConstants.NodeType;
-import static org.apache.hadoop.dfs.FSConstants.NodeType.NAME_NODE;
-import static org.apache.hadoop.dfs.FSConstants.NodeType.DATA_NODE;
-import org.apache.hadoop.dfs.FSConstants.StartupOption;
-import org.apache.hadoop.dfs.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.protocol.FSConstants.NodeType;
+import static org.apache.hadoop.hdfs.protocol.FSConstants.NodeType.NAME_NODE;
+import static org.apache.hadoop.hdfs.protocol.FSConstants.NodeType.DATA_NODE;
+import org.apache.hadoop.hdfs.protocol.FSConstants.StartupOption;
+import org.apache.hadoop.hdfs.server.common.Storage;
+import org.apache.hadoop.hdfs.server.common.StorageInfo;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
+import org.apache.hadoop.hdfs.server.datanode.DataStorage;
+import org.apache.hadoop.hdfs.server.namenode.FSImage;
+import org.apache.hadoop.hdfs.server.namenode.NameNode;
 
 /**
  * This class defines a number of static helper methods used by the

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestBalancer.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestBalancer.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestBalancer.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/balancer/TestBalancer.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.server.balancer;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,7 +23,15 @@
 import java.util.Random;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.ClientProtocol;
+import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+import org.apache.hadoop.hdfs.protocol.LocatedBlock;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/common/TestDistributedUpgrade.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDistributedUpgrade.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/common/TestDistributedUpgrade.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/common/TestDistributedUpgrade.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDistributedUpgrade.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDistributedUpgrade.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/common/TestDistributedUpgrade.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.server.common;
 
 import java.io.IOException;
 import junit.framework.TestCase;
@@ -23,8 +23,15 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 
-import static org.apache.hadoop.dfs.FSConstants.LAYOUT_VERSION;
-import org.apache.hadoop.dfs.FSConstants.StartupOption;
+import static org.apache.hadoop.hdfs.protocol.FSConstants.LAYOUT_VERSION;
+
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.TestDFSUpgradeFromImage;
+import org.apache.hadoop.hdfs.protocol.FSConstants.StartupOption;
+import org.apache.hadoop.hdfs.server.datanode.UpgradeObjectDatanode;
+import org.apache.hadoop.hdfs.server.namenode.UpgradeObjectNamenode;
+import org.apache.hadoop.hdfs.server.protocol.UpgradeCommand;
+import org.apache.hadoop.hdfs.tools.DFSAdmin;
 
 /**
  */
@@ -51,7 +58,11 @@
    */
   void startNameNodeShouldFail(StartupOption operation) {
     try {
-      cluster = new MiniDFSCluster(conf, 0, operation); // should fail
+      //cluster = new MiniDFSCluster(conf, 0, operation); // should fail
+      // we set manage dirs to true as NN has to start from untar'ed image with 
+      // nn dirs set to name1 and name2
+      cluster = new MiniDFSCluster(0, conf, 0, false, true,
+          operation, null); // Should fail
       throw new AssertionError("NameNode should have failed to start");
     } catch (Exception expected) {
       expected = null;
@@ -91,6 +102,9 @@
     UpgradeObjectCollection.registerUpgrade(new UO_Namenode3());
 
     conf = new Configuration();
+    if (System.getProperty("test.build.data") == null) { // to test to be run outside of ant
+      System.setProperty("test.build.data", "build/test/data");
+    }
     conf.setInt("dfs.datanode.scan.period.hours", -1); // block scanning off
 
     log("NameNode start in regular mode when dustributed upgrade is required", numDirs);

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/SimulatedFSDataset.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/SimulatedFSDataset.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/SimulatedFSDataset.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.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.server.datanode;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,8 +29,11 @@
 
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.datanode.metrics.FSDatasetMBean;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.server.datanode.metrics.FSDatasetMBean;
 import org.apache.hadoop.metrics.util.MBeanUtil;
+import org.apache.hadoop.util.DataChecksum;
 import org.apache.hadoop.util.DiskChecker.DiskErrorException;
 
 /**
@@ -80,10 +83,10 @@
     SimulatedOutputStream oStream = null;
     BInfo(Block b, boolean forWriting) throws IOException {
       theBlock = new Block(b);
-      if (theBlock.len < 0) {
-        theBlock.len = 0;
+      if (theBlock.getNumBytes() < 0) {
+        theBlock.setNumBytes(0);
       }
-      if (!storage.alloc(theBlock.len)) { // expected length - actual length may
+      if (!storage.alloc(theBlock.getNumBytes())) { // expected length - actual length may
                                           // be more - we find out at finalize
         DataNode.LOG.warn("Lack of free storage on a block alloc");
         throw new IOException("Creating block, no free space available");
@@ -103,15 +106,15 @@
     }
 
     synchronized void updateBlock(Block b) {
-      theBlock.generationStamp = b.generationStamp;
-      setlength(b.len);
+      theBlock.setGenerationStamp(b.getGenerationStamp());
+      setlength(b.getNumBytes());
     }
     
     synchronized long getlength() {
       if (!finalized) {
          return oStream.getLength();
       } else {
-        return theBlock.len;
+        return theBlock.getNumBytes();
       }
     }
 
@@ -119,7 +122,7 @@
       if (!finalized) {
          oStream.setLength(length);
       } else {
-        theBlock.len = length;
+        theBlock.setNumBytes(length);
       }
     }
     
@@ -128,7 +131,7 @@
         // throw new IOException("Trying to read an unfinalized block");
          return new SimulatedInputStream(oStream.getLength(), DEFAULT_DATABYTE);
       } else {
-        return new SimulatedInputStream(theBlock.len, DEFAULT_DATABYTE);
+        return new SimulatedInputStream(theBlock.getNumBytes(), DEFAULT_DATABYTE);
       }
     }
     
@@ -136,7 +139,7 @@
       if (finalized) {
         throw new IOException(
             "Finalizing a block that has already been finalized" + 
-            theBlock.blkid);
+            theBlock.getBlockId());
       }
       if (oStream == null) {
         DataNode.LOG.error("Null oStream on unfinalized block - bug");
@@ -151,7 +154,7 @@
       }
       // We had allocated the expected length when block was created; 
       // adjust if necessary
-      long extraLen = finalSize - theBlock.len;
+      long extraLen = finalSize - theBlock.getNumBytes();
       if (extraLen > 0) {
         if (!storage.alloc(extraLen)) {
           DataNode.LOG.warn("Lack of free storage on a block alloc");
@@ -160,7 +163,7 @@
       } else {
         storage.free(-extraLen);
       }
-      theBlock.len = finalSize;  
+      theBlock.setNumBytes(finalSize);  
 
       finalized = true;
       oStream = null;
@@ -310,8 +313,8 @@
     if (binfo == null) {
       return null;
     }
-    b.generationStamp = binfo.getGenerationStamp();
-    b.len = binfo.getlength();
+    b.setGenerationStamp(binfo.getGenerationStamp());
+    b.setNumBytes(binfo.getlength());
     return b;
   }
 

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/datanode/TestSimulatedFSDataset.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSimulatedFSDataset.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/datanode/TestSimulatedFSDataset.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/datanode/TestSimulatedFSDataset.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSimulatedFSDataset.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestSimulatedFSDataset.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/datanode/TestSimulatedFSDataset.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.server.datanode;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -24,8 +24,10 @@
 import junit.framework.TestCase;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.FSDatasetInterface;
-import org.apache.hadoop.dfs.SimulatedFSDataset;
+import org.apache.hadoop.hdfs.protocol.Block;
+import org.apache.hadoop.hdfs.server.datanode.FSDatasetInterface;
+import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
+import org.apache.hadoop.util.DataChecksum;
 
 /**
  * this class tests the methods of the  SimulatedFSDataset.
@@ -145,7 +147,7 @@
     assertEquals(NUMBLOCKS, blockReport.length);
     for (Block b: blockReport) {
       assertNotNull(b);
-      assertEquals(blockIdToLen(b.blkid), b.len);
+      assertEquals(blockIdToLen(b.getBlockId()), b.getNumBytes());
     }
   }
   public void testInjectionEmpty() throws IOException {
@@ -157,7 +159,7 @@
     assertEquals(NUMBLOCKS, blockReport.length);
     for (Block b: blockReport) {
       assertNotNull(b);
-      assertEquals(blockIdToLen(b.blkid), b.len);
+      assertEquals(blockIdToLen(b.getBlockId()), b.getNumBytes());
     }
     
     // Inject blocks into an empty fsdataset
@@ -170,8 +172,8 @@
     assertEquals(NUMBLOCKS, blockReport.length);
     for (Block b: blockReport) {
       assertNotNull(b);
-      assertEquals(blockIdToLen(b.blkid), b.len);
-      assertEquals(blockIdToLen(b.blkid), sfsdataset.getLength(b));
+      assertEquals(blockIdToLen(b.getBlockId()), b.getNumBytes());
+      assertEquals(blockIdToLen(b.getBlockId()), sfsdataset.getLength(b));
     }
     assertEquals(bytesAdded, sfsdataset.getDfsUsed());
     assertEquals(sfsdataset.getCapacity()-bytesAdded, sfsdataset.getRemaining());
@@ -187,7 +189,7 @@
     assertEquals(NUMBLOCKS, blockReport.length);
     for (Block b: blockReport) {
       assertNotNull(b);
-      assertEquals(blockIdToLen(b.blkid), b.len);
+      assertEquals(blockIdToLen(b.getBlockId()), b.getNumBytes());
     }
     fsdataset = null;
     
@@ -208,8 +210,8 @@
     assertEquals(NUMBLOCKS*2, blockReport.length);
     for (Block b: blockReport) {
       assertNotNull(b);
-      assertEquals(blockIdToLen(b.blkid), b.len);
-      assertEquals(blockIdToLen(b.blkid), sfsdataset.getLength(b));
+      assertEquals(blockIdToLen(b.getBlockId()), b.getNumBytes());
+      assertEquals(blockIdToLen(b.getBlockId()), sfsdataset.getLength(b));
     }
     assertEquals(bytesAdded, sfsdataset.getDfsUsed());
     assertEquals(sfsdataset.getCapacity()-bytesAdded,  sfsdataset.getRemaining());

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestCheckpoint.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestCheckpoint.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestCheckpoint.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.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.server.namenode;
 
 import junit.framework.TestCase;
 import java.io.*;
@@ -23,9 +23,11 @@
 import java.util.List;
 import java.util.Random;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.FSConstants.StartupOption;
-import org.apache.hadoop.dfs.FSImage.NameNodeFile;
-import org.apache.hadoop.dfs.SecondaryNameNode.ErrorSimulator;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.FSConstants.StartupOption;
+import org.apache.hadoop.hdfs.server.common.Storage;
+import org.apache.hadoop.hdfs.server.namenode.FSImage.NameNodeFile;
+import org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.ErrorSimulator;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestEditLog.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestEditLog.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestEditLog.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLog.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.server.namenode;
 
 import junit.framework.TestCase;
 import java.io.*;
@@ -26,6 +26,7 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.permission.*;
 
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.io.ArrayWritable;
 import org.apache.hadoop.io.UTF8;
 import org.apache.hadoop.io.Writable;

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestFileLimit.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileLimit.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestFileLimit.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestFileLimit.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileLimit.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFileLimit.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestFileLimit.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.server.namenode;
 
 import junit.framework.TestCase;
 import java.io.*;
@@ -29,7 +29,9 @@
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.dfs.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
+import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
 
 
 /**

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.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.hdfs.server.namenode;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -38,6 +38,11 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.hadoop.hdfs.tools.DFSck;
 import org.apache.hadoop.io.IOUtils;
 
 /**

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestHost2NodesMap.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestHost2NodesMap.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestHost2NodesMap.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java Thu Jul  3 15:55:06 2008
@@ -16,7 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.dfs;
+package org.apache.hadoop.hdfs.server.namenode;
+
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
 
 import junit.framework.TestCase;
 

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestPendingReplication.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestPendingReplication.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestPendingReplication.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestPendingReplication.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestPendingReplication.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestPendingReplication.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestPendingReplication.java Thu Jul  3 15:55:06 2008
@@ -15,11 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.dfs;
+package org.apache.hadoop.hdfs.server.namenode;
 
 import junit.framework.TestCase;
 import java.lang.System;
 
+import org.apache.hadoop.hdfs.protocol.Block;
+
 /**
  * This class tests the internals of PendingReplicationBlocks.java
  */

Copied: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestReplicationPolicy.java (from r673837, hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestReplicationPolicy.java)
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestReplicationPolicy.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestReplicationPolicy.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestReplicationPolicy.java&r1=673837&r2=673857&rev=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestReplicationPolicy.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestReplicationPolicy.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.hdfs.server.namenode;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,6 +26,8 @@
 import org.apache.hadoop.net.NetworkTopology;
 import org.apache.hadoop.net.Node;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
 
 import junit.framework.TestCase;
 

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

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/log/TestLogLevel.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/log/TestLogLevel.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/log/TestLogLevel.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/log/TestLogLevel.java Thu Jul  3 15:55:06 2008
@@ -76,4 +76,4 @@
       out.println(testlog.getClass() + " not tested.");
     }
   }
-}
\ No newline at end of file
+}

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

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

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java Thu Jul  3 15:55:06 2008
@@ -24,7 +24,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.*;
 import org.apache.hadoop.util.ToolRunner;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 
 /**
  * check for the job submission  options of 

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestEmptyJobWithDFS.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestEmptyJobWithDFS.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestEmptyJobWithDFS.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestEmptyJobWithDFS.java Thu Jul  3 15:55:06 2008
@@ -25,7 +25,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.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.IntWritable;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestFileInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestFileInputFormat.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestFileInputFormat.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestFileInputFormat.java Thu Jul  3 15:55:06 2008
@@ -19,7 +19,7 @@
 
 import java.io.DataOutputStream;
 
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;

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

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestKillCompletedJob.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestKillCompletedJob.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestKillCompletedJob.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestKillCompletedJob.java Thu Jul  3 15:55:06 2008
@@ -22,7 +22,7 @@
 import java.net.*;
 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.Path;
 import org.apache.hadoop.io.IntWritable;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMRServerPorts.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMRServerPorts.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMRServerPorts.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMRServerPorts.java Thu Jul  3 15:55:06 2008
@@ -19,8 +19,8 @@
 
 import java.io.IOException;
 import junit.framework.TestCase;
-import org.apache.hadoop.dfs.TestHDFSServerPorts;
-import org.apache.hadoop.dfs.NameNode;
+import org.apache.hadoop.hdfs.TestHDFSServerPorts;
+import org.apache.hadoop.hdfs.server.namenode.NameNode;
 import org.apache.hadoop.fs.FileSystem;
 
 /**

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java Thu Jul  3 15:55:06 2008
@@ -21,7 +21,7 @@
 import java.io.*;
 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.FileUtil;
 import org.apache.hadoop.fs.Path;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java Thu Jul  3 15:55:06 2008
@@ -20,7 +20,7 @@
 
 import java.io.*;
 import junit.framework.TestCase;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.mapred.MRCaching.TestResult;
 
@@ -37,7 +37,7 @@
     try {
       JobConf conf = new JobConf();
       conf.set("fs.hdfs.impl",
-               "org.apache.hadoop.dfs.ChecksumDistributedFileSystem");      
+               "org.apache.hadoop.hdfs.ChecksumDistributedFileSystem");      
       dfs = new MiniDFSCluster(conf, 1, true, null);
       fileSys = dfs.getFileSystem();
       mr = new MiniMRCluster(2, fileSys.getName(), 4);

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRDFSSort.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRDFSSort.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRDFSSort.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRDFSSort.java Thu Jul  3 15:55:06 2008
@@ -21,7 +21,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.Path;
 import org.apache.hadoop.util.ToolRunner;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRMapRedDebugScript.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRMapRedDebugScript.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRMapRedDebugScript.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRMapRedDebugScript.java Thu Jul  3 15:55:06 2008
@@ -28,7 +28,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.filecache.DistributedCache;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRTaskTempDir.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRTaskTempDir.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRTaskTempDir.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRTaskTempDir.java Thu Jul  3 15:55:06 2008
@@ -29,7 +29,7 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.lib.IdentityReducer;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 
 /**
  * Class to test mapred task's temp directory

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFS.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFS.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFS.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFS.java Thu Jul  3 15:55:06 2008
@@ -32,7 +32,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.examples.WordCount;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java Thu Jul  3 15:55:06 2008
@@ -22,7 +22,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.Path;
 import org.apache.hadoop.fs.permission.FsPermission;

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

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java Thu Jul  3 15:55:06 2008
@@ -22,10 +22,11 @@
 import junit.framework.TestCase;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.*;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.namenode.NameNode;
 import org.apache.hadoop.io.BytesWritable;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.io.SequenceFile.CompressionType;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java Thu Jul  3 15:55:06 2008
@@ -26,7 +26,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.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/join/TestDatamerge.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/join/TestDatamerge.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/join/TestDatamerge.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/join/TestDatamerge.java Thu Jul  3 15:55:06 2008
@@ -26,7 +26,7 @@
 import junit.extensions.TestSetup;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.IntWritable;
 import org.apache.hadoop.io.SequenceFile;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/pipes/TestPipes.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/pipes/TestPipes.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/pipes/TestPipes.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/pipes/TestPipes.java Thu Jul  3 15:55:06 2008
@@ -26,7 +26,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/test/org/apache/hadoop/net/TestNetworkTopology.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/net/TestNetworkTopology.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/net/TestNetworkTopology.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/net/TestNetworkTopology.java Thu Jul  3 15:55:06 2008
@@ -24,8 +24,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.hadoop.dfs.DatanodeDescriptor;
-import org.apache.hadoop.dfs.DatanodeID;
+import org.apache.hadoop.hdfs.server.namenode.DatanodeDescriptor;
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
 
 public class TestNetworkTopology extends TestCase {
   private final static NetworkTopology cluster = new NetworkTopology();

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/security/TestPermission.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/security/TestPermission.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/security/TestPermission.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/security/TestPermission.java Thu Jul  3 15:55:06 2008
@@ -24,7 +24,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.dfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.fs.*;
 import org.apache.hadoop.fs.permission.*;
 import org.apache.hadoop.util.StringUtils;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/security/TestUnixUserGroupInformation.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/security/TestUnixUserGroupInformation.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/security/TestUnixUserGroupInformation.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/security/TestUnixUserGroupInformation.java Thu Jul  3 15:55:06 2008
@@ -100,4 +100,4 @@
         USER_NAME, GROUP_NAMES);
     TestWritable.testWritable(ugi, new Configuration());
   }
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java Thu Jul  3 15:55:06 2008
@@ -26,9 +26,9 @@
 import org.apache.hadoop.mapred.TestMapRed;
 import org.apache.hadoop.mapred.TestSequenceFileInputFormat;
 import org.apache.hadoop.mapred.TestTextInputFormat;
-import org.apache.hadoop.dfs.BenchmarkThroughput;
-import org.apache.hadoop.dfs.ClusterTestDFS;
-import org.apache.hadoop.dfs.NNBench;
+import org.apache.hadoop.hdfs.BenchmarkThroughput;
+import org.apache.hadoop.hdfs.ClusterTestDFS;
+import org.apache.hadoop.hdfs.NNBench;
 import org.apache.hadoop.fs.DistributedFSCheck;
 import org.apache.hadoop.fs.TestDFSIO;
 import org.apache.hadoop.fs.DFSCIOTest;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/util/TestStringUtils.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/util/TestStringUtils.java?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/util/TestStringUtils.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/util/TestStringUtils.java Thu Jul  3 15:55:06 2008
@@ -104,4 +104,4 @@
     assertEquals(STR_WITH_BOTH2,
         StringUtils.unEscapeString(ESCAPED_STR_WITH_BOTH2));
   }
-}
\ No newline at end of file
+}

Modified: hadoop/core/trunk/src/webapps/datanode/browseBlock.jsp
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/webapps/datanode/browseBlock.jsp?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/webapps/datanode/browseBlock.jsp (original)
+++ hadoop/core/trunk/src/webapps/datanode/browseBlock.jsp Thu Jul  3 15:55:06 2008
@@ -5,7 +5,10 @@
   import="java.io.*"
   import="java.util.*"
   import="java.net.*"
-  import="org.apache.hadoop.dfs.*"
+  import="org.apache.hadoop.hdfs.*"
+  import="org.apache.hadoop.hdfs.server.namenode.*"
+  import="org.apache.hadoop.hdfs.server.datanode.*"
+  import="org.apache.hadoop.hdfs.protocol.*"
   import="org.apache.hadoop.io.*"
   import="org.apache.hadoop.conf.*"
   import="org.apache.hadoop.net.DNS"

Modified: hadoop/core/trunk/src/webapps/datanode/browseDirectory.jsp
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/webapps/datanode/browseDirectory.jsp?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/webapps/datanode/browseDirectory.jsp (original)
+++ hadoop/core/trunk/src/webapps/datanode/browseDirectory.jsp Thu Jul  3 15:55:06 2008
@@ -6,7 +6,10 @@
   import="java.util.*"
   import="java.net.*"
   import="org.apache.hadoop.fs.*"
-  import="org.apache.hadoop.dfs.*"
+  import="org.apache.hadoop.hdfs.*"
+  import="org.apache.hadoop.hdfs.server.namenode.*"
+  import="org.apache.hadoop.hdfs.server.datanode.*"
+  import="org.apache.hadoop.hdfs.protocol.*"
   import="org.apache.hadoop.io.*"
   import="org.apache.hadoop.conf.*"
   import="org.apache.hadoop.net.DNS"

Modified: hadoop/core/trunk/src/webapps/datanode/tail.jsp
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/webapps/datanode/tail.jsp?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/webapps/datanode/tail.jsp (original)
+++ hadoop/core/trunk/src/webapps/datanode/tail.jsp Thu Jul  3 15:55:06 2008
@@ -5,7 +5,10 @@
   import="java.io.*"
   import="java.util.*"
   import="java.net.*"
-  import="org.apache.hadoop.dfs.*"
+  import="org.apache.hadoop.hdfs.*"
+  import="org.apache.hadoop.hdfs.server.namenode.*"
+  import="org.apache.hadoop.hdfs.server.datanode.*"
+  import="org.apache.hadoop.hdfs.protocol.*"
   import="org.apache.hadoop.io.*"
   import="org.apache.hadoop.conf.*"
   import="org.apache.hadoop.net.DNS"

Modified: hadoop/core/trunk/src/webapps/dfs/dfshealth.jsp
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/webapps/dfs/dfshealth.jsp?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/webapps/dfs/dfshealth.jsp (original)
+++ hadoop/core/trunk/src/webapps/dfs/dfshealth.jsp Thu Jul  3 15:55:06 2008
@@ -5,7 +5,10 @@
   import="java.io.*"
   import="java.util.*"
   import="org.apache.hadoop.fs.*"
-  import="org.apache.hadoop.dfs.*"
+  import="org.apache.hadoop.hdfs.*"
+  import="org.apache.hadoop.hdfs.server.namenode.*"
+  import="org.apache.hadoop.hdfs.server.datanode.*"
+  import="org.apache.hadoop.hdfs.protocol.*"
   import="org.apache.hadoop.util.*"
   import="java.text.DateFormat"
   import="java.lang.Math"

Modified: hadoop/core/trunk/src/webapps/dfs/nn_browsedfscontent.jsp
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/webapps/dfs/nn_browsedfscontent.jsp?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/webapps/dfs/nn_browsedfscontent.jsp (original)
+++ hadoop/core/trunk/src/webapps/dfs/nn_browsedfscontent.jsp Thu Jul  3 15:55:06 2008
@@ -4,7 +4,10 @@
   import="javax.servlet.http.*"
   import="java.io.*"
   import="java.util.*"
-  import="org.apache.hadoop.dfs.*"
+  import="org.apache.hadoop.hdfs.*"
+  import="org.apache.hadoop.hdfs.server.namenode.*"
+  import="org.apache.hadoop.hdfs.server.datanode.*"
+  import="org.apache.hadoop.hdfs.protocol.*"
   import="org.apache.hadoop.util.*"
   import="java.text.DateFormat"
   import="java.net.InetAddress"

Modified: hadoop/core/trunk/src/webapps/job/jobdetails.jsp
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/webapps/job/jobdetails.jsp?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/webapps/job/jobdetails.jsp (original)
+++ hadoop/core/trunk/src/webapps/job/jobdetails.jsp Thu Jul  3 15:55:06 2008
@@ -8,7 +8,7 @@
   import="java.text.DecimalFormat"
   import="org.apache.hadoop.mapred.*"
   import="org.apache.hadoop.util.*"
-  import="org.apache.hadoop.dfs.JspHelper"
+  import="org.apache.hadoop.hdfs.server.namenode.JspHelper"
 %>
 
 <%

Modified: hadoop/core/trunk/src/webapps/job/jobtasks.jsp
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/webapps/job/jobtasks.jsp?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/webapps/job/jobtasks.jsp (original)
+++ hadoop/core/trunk/src/webapps/job/jobtasks.jsp Thu Jul  3 15:55:06 2008
@@ -45,7 +45,7 @@
   }
 %>
 
-<%@page import="org.apache.hadoop.dfs.JspHelper"%>
+<%@page import="org.apache.hadoop.hdfs.server.namenode.JspHelper"%>
 <html>
   <head>
     <title>Hadoop <%=type%> task list for <%=jobid%> on <%=trackerName%></title>

Modified: hadoop/core/trunk/src/webapps/job/jobtracker.jsp
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/webapps/job/jobtracker.jsp?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/webapps/job/jobtracker.jsp (original)
+++ hadoop/core/trunk/src/webapps/job/jobtracker.jsp Thu Jul  3 15:55:06 2008
@@ -87,7 +87,7 @@
               "</td></tr></table>\n");
   }%>
 
-<%@page import="org.apache.hadoop.dfs.JspHelper"%>
+<%@page import="org.apache.hadoop.hdfs.server.namenode.JspHelper"%>
 <html>
 <head>
 <title><%= trackerName %> Hadoop Map/Reduce Administration</title>

Modified: hadoop/core/trunk/src/webapps/job/taskdetails.jsp
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/webapps/job/taskdetails.jsp?rev=673857&r1=673856&r2=673857&view=diff
==============================================================================
--- hadoop/core/trunk/src/webapps/job/taskdetails.jsp (original)
+++ hadoop/core/trunk/src/webapps/job/taskdetails.jsp Thu Jul  3 15:55:06 2008
@@ -9,7 +9,7 @@
   import="org.apache.hadoop.util.*"
   import="java.text.SimpleDateFormat"  
   import="org.apache.hadoop.util.*"
-  import="org.apache.hadoop.dfs.JspHelper"
+  import="org.apache.hadoop.hdfs.server.namenode.JspHelper"
 %>
 <%!static SimpleDateFormat dateFormat = new SimpleDateFormat(
       "d-MMM-yyyy HH:mm:ss");
@@ -66,7 +66,7 @@
         : null;
 %>
 
-<%@page import="org.apache.hadoop.dfs.JspHelper"%>
+<%@page import="org.apache.hadoop.hdfs.server.namenode.JspHelper"%>
 <html>
 <head>
   <link rel="stylesheet" type="text/css" href="/static/hadoop.css">



Mime
View raw message