HADOOP-3903. Change the package name for the servlets to be hdfs instead of

dfs. (Tsz Wo (Nicholas) Sze via omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@684141 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -247,6 +247,9 @@ Trunk (unreleased changes)
     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

build.xml

@@ -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}"/>

src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

@@ -343,7 +343,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean {
     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));