HADOOP-5300. Fix ant javadoc-dev target and the typo in the class name NameNodeActivtyMBean. (szetszwo)

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

CHANGES.txt

@@ -215,6 +215,9 @@ Trunk (unreleased changes)
     HADOOP-5219. Adds a new property io.seqfile.local.dir for use by SequenceFile,
     which earlier used mapred.local.dir. (Sharad Agarwal via ddas)
 
+    HADOOP-5300. Fix ant javadoc-dev target and the typo in the class name
+    NameNodeActivtyMBean.  (szetszwo)
+
 Release 0.20.0 - Unreleased
 
   INCOMPATIBLE CHANGES

build.xml

@@ -921,7 +921,7 @@
     <fail message="'java5.home' is not defined.  Forrest requires Java 5.  Please pass -Djava5.home=&lt;base of Java 5 distribution&gt; to Ant on the command-line." />
   </target>
 	
-  <target name="javadoc-dev" description="Generate javadoc for hadoop developers">
+  <target name="javadoc-dev" depends="compile, ivy-retrieve-javadoc" description="Generate javadoc for hadoop developers">
     <mkdir dir="${build.javadoc.dev}"/>
     <javadoc
       overview="${core.src.dir}/overview.html"
@@ -950,7 +950,9 @@
           <fileset dir="src/contrib/">
             <include name="*/lib/*.jar" />
           </fileset>
+          <path refid="javadoc-classpath"/>
           <pathelement path="${java.class.path}"/>
+          <pathelement location="${build.tools}"/>
         </classpath>
 
     	<group title="Core" packages="org.apache.*"/>

src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java

@@ -288,7 +288,7 @@ public class DistributedFileSystem extends FileSystem {
     return dfs;
   }        
   
-  /** @deprecated Use {@link org.apache.hadoop.fs.FsStatus instead */
+  /** @deprecated Use {@link org.apache.hadoop.fs.FsStatus} instead */
   @Deprecated
   public static class DiskStatus extends FsStatus {
     public DiskStatus(FsStatus stats) {

src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivtyMBean.java → src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivityMBean.java

@@ -52,10 +52,10 @@ import org.apache.hadoop.metrics.util.MetricsRegistry;
  * from the metrics registry passed as an argument to the constructor
  */
 
-public class NameNodeActivtyMBean extends MetricsDynamicMBeanBase {
+public class NameNodeActivityMBean extends MetricsDynamicMBeanBase {
   final private ObjectName mbeanName;
 
-  protected NameNodeActivtyMBean(final MetricsRegistry mr) {
+  protected NameNodeActivityMBean(final MetricsRegistry mr) {
     super(mr, "Activity statistics at the NameNode");
     mbeanName = MBeanUtil.registerMBean("NameNode", "NameNodeActivity", this);
   }

src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java

@@ -46,7 +46,7 @@ public class NameNodeMetrics implements Updater {
     private final MetricsRecord metricsRecord;
     public MetricsRegistry registry = new MetricsRegistry();
     
-    private NameNodeActivtyMBean namenodeActivityMBean;
+    private NameNodeActivityMBean namenodeActivityMBean;
     
     public MetricsTimeVaryingInt numFilesCreated =
                           new MetricsTimeVaryingInt("FilesCreated", registry);
@@ -88,7 +88,7 @@ public class NameNodeMetrics implements Updater {
 
       
       // Now the Mbean for the name node - this alos registers the MBean
-      namenodeActivityMBean = new NameNodeActivtyMBean(registry);
+      namenodeActivityMBean = new NameNodeActivityMBean(registry);
       
       // Create a record for NameNode metrics
       MetricsContext metricsContext = MetricsUtil.getContext("dfs");