Author: szetszwo
Date: Mon Feb 23 19:50:28 2009
New Revision: 747113
URL: http://svn.apache.org/viewvc?rev=747113&view=rev
Log:
HADOOP-5300. Fix ant javadoc-dev target and the typo in the class name
NameNodeActivtyMBean. (szetszwo)
Added:
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivityMBean.java
- copied, changed from r747099,
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivtyMBean.java
Removed:
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivtyMBean.java
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/build.xml
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=747113&r1=747112&r2=747113&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon Feb 23 19:50:28 2009
@@ -215,6 +215,9 @@
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
Modified: hadoop/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/build.xml?rev=747113&r1=747112&r2=747113&view=diff
==============================================================================
--- hadoop/core/trunk/build.xml (original)
+++ hadoop/core/trunk/build.xml Mon Feb 23 19:50:28 2009
@@ -921,7 +921,7 @@
<fail message="'java5.home' is not defined. Forrest requires Java 5.
Please pass -Djava5.home=<base of Java 5 distribution> 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.*"/>
Modified:
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java?rev=747113&r1=747112&r2=747113&view=diff
==============================================================================
---
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java
(original)
+++
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java
Mon Feb 23 19:50:28 2009
@@ -288,7 +288,7 @@
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) {
Copied:
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivityMBean.java
(from r747099,
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivtyMBean.java)
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivityMBean.java?p2=hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivityMBean.java&p1=hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivtyMBean.java&r1=747099&r2=747113&rev=747113&view=diff
==============================================================================
---
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivtyMBean.java
(original)
+++
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeActivityMBean.java
Mon Feb 23 19:50:28 2009
@@ -52,10 +52,10 @@
* 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);
}
Modified:
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java?rev=747113&r1=747112&r2=747113&view=diff
==============================================================================
---
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java
(original)
+++
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java
Mon Feb 23 19:50:28 2009
@@ -46,7 +46,7 @@
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 @@
// 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");
