svn commit: r684141 - in /hadoop/core/trunk: CHANGES.txt build.xml src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java src/webapps/dfs/ src/webapps/hdfs/

[om...@apache.org]

Author: omalley
Date: Fri Aug  8 16:29:18 2008
New Revision: 684141

URL: http://svn.apache.org/viewvc?rev=684141&view=rev
Log:
HADOOP-3903. Change the package name for the servlets to be hdfs instead of
dfs. (Tsz Wo (Nicholas) Sze via omalley)

Added:
    hadoop/core/trunk/src/webapps/hdfs/
      - copied from r684140, hadoop/core/trunk/src/webapps/dfs/
Removed:
    hadoop/core/trunk/src/webapps/dfs/
Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/build.xml
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=684141&r1=684140&r2=684141&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri Aug  8 16:29:18 2008
@@ -247,6 +247,9 @@
     HADOOP-3919. Fix attribute name in hadoop-default for 
     mapred.jobtracker.instrumentation. (Ari Rabkin via omalley)
 
+    HADOOP-3903. Change the package name for the servlets to be hdfs instead of
+    dfs. (Tsz Wo (Nicholas) Sze via omalley)
+
 Release 0.18.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/build.xml?rev=684141&r1=684140&r2=684141&view=diff
==============================================================================
--- hadoop/core/trunk/build.xml (original)
+++ hadoop/core/trunk/build.xml Fri Aug  8 16:29:18 2008
@@ -206,7 +206,7 @@
     <mkdir dir="${build.src}"/>
     <mkdir dir="${build.webapps}/task/WEB-INF"/>
     <mkdir dir="${build.webapps}/job/WEB-INF"/>
-    <mkdir dir="${build.webapps}/dfs/WEB-INF"/>
+    <mkdir dir="${build.webapps}/hdfs/WEB-INF"/>
     <mkdir dir="${build.webapps}/datanode/WEB-INF"/>
     <mkdir dir="${build.webapps}/secondary/WEB-INF"/>
     <mkdir dir="${build.examples}"/>
@@ -297,16 +297,16 @@
     </jsp-compile>
 
     <jsp-compile
-     uriroot="${src.webapps}/dfs"
+     uriroot="${src.webapps}/hdfs"
      outputdir="${build.src}"
-     package="org.apache.hadoop.dfs"
-     webxml="${build.webapps}/dfs/WEB-INF/web.xml">
+     package="org.apache.hadoop.hdfs.server.namenode"
+     webxml="${build.webapps}/hdfs/WEB-INF/web.xml">
     </jsp-compile>
 
     <jsp-compile
      uriroot="${src.webapps}/datanode"
      outputdir="${build.src}"
-     package="org.apache.hadoop.dfs"
+     package="org.apache.hadoop.hdfs.server.datanode"
      webxml="${build.webapps}/datanode/WEB-INF/web.xml">
     </jsp-compile>
 
@@ -1039,7 +1039,7 @@
     <delete dir="${libhdfs.test.dir}"/>
     <mkdir dir="${libhdfs.test.dir}"/>
     <mkdir dir="${libhdfs.test.dir}/logs"/>
-    <mkdir dir="${libhdfs.test.dir}/dfs/name"/>
+    <mkdir dir="${libhdfs.test.dir}/hdfs/name"/>
 
     <exec dir="${libhdfs.src}" executable="${make.cmd}" failonerror="true">
         <env key="OS_NAME" value="${os.name}"/>

Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=684141&r1=684140&r2=684141&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Fri Aug  8 16:29:18 2008
@@ -343,7 +343,7 @@
     InetSocketAddress infoSocAddr = NetUtils.createSocketAddr(infoAddr);
     String infoHost = infoSocAddr.getHostName();
     int tmpInfoPort = infoSocAddr.getPort();
-    this.infoServer = new HttpServer("dfs", infoHost, tmpInfoPort, 
+    this.infoServer = new HttpServer("hdfs", infoHost, tmpInfoPort, 
                                             tmpInfoPort == 0);
     InetSocketAddress secInfoSocAddr = NetUtils.createSocketAddr(
         conf.get("dfs.https.address", infoHost + ":" + 0));