Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 64949 invoked from network); 8 Aug 2006 22:14:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Aug 2006 22:14:27 -0000 Received: (qmail 98019 invoked by uid 500); 8 Aug 2006 22:14:27 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 98000 invoked by uid 500); 8 Aug 2006 22:14:27 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 97991 invoked by uid 99); 8 Aug 2006 22:14:27 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Aug 2006 15:14:27 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Aug 2006 15:14:26 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A1EDD1A981A; Tue, 8 Aug 2006 15:14:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r429851 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/dfs/JspHelper.java src/webapps/dfs/dfshealth.jsp Date: Tue, 08 Aug 2006 22:14:05 -0000 To: hadoop-commits@lucene.apache.org From: cutting@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060808221405.A1EDD1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: cutting Date: Tue Aug 8 15:14:04 2006 New Revision: 429851 URL: http://svn.apache.org/viewvc?rev=429851&view=rev Log: HADOOP-415. Replace some uses of DatanodeDescriptor in the DFS web ui code with DatanodeInfo, the preferred public class. Contributed by Devaraj. Modified: lucene/hadoop/trunk/CHANGES.txt lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/JspHelper.java lucene/hadoop/trunk/src/webapps/dfs/dfshealth.jsp Modified: lucene/hadoop/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=429851&r1=429850&r2=429851&view=diff ============================================================================== --- lucene/hadoop/trunk/CHANGES.txt (original) +++ lucene/hadoop/trunk/CHANGES.txt Tue Aug 8 15:14:04 2006 @@ -1,6 +1,13 @@ Hadoop Change Log +Trunk (unreleased changes) + + 1. HADOOP-415. Replace some uses of DatanodeDescriptor in the DFS + web UI code with DatanodeInfo, the preferred public class. + (Devaraj Das via cutting) + + Release 0.5.0 - 2006-08-04 1. HADOOP-352. Fix shell scripts to use /bin/sh instead of Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/JspHelper.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/JspHelper.java?rev=429851&r1=429850&r2=429851&view=diff ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/JspHelper.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/JspHelper.java Tue Aug 8 15:14:04 2006 @@ -143,7 +143,7 @@ TreeMap nodesSortedByName = new TreeMap(); fsn.DFSNodesStatus(live, dead); for (int num = 0; num < live.size(); num++) { - DatanodeDescriptor d = (DatanodeDescriptor)live.elementAt(num); + DatanodeInfo d = (DatanodeInfo)live.elementAt(num); nodesSortedByName.put(d.getName(), d); } live.clear(); Modified: lucene/hadoop/trunk/src/webapps/dfs/dfshealth.jsp URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/webapps/dfs/dfshealth.jsp?rev=429851&r1=429850&r2=429851&view=diff ============================================================================== --- lucene/hadoop/trunk/src/webapps/dfs/dfshealth.jsp (original) +++ lucene/hadoop/trunk/src/webapps/dfs/dfshealth.jsp Tue Aug 8 15:14:04 2006 @@ -13,7 +13,7 @@ long currentTime; JspHelper jspHelper = new JspHelper(); - public void generateLiveNodeData(JspWriter out, DatanodeDescriptor d) + public void generateLiveNodeData(JspWriter out, DatanodeInfo d) throws IOException { long c = d.getCapacity(); long r = d.getRemaining(); @@ -57,8 +57,8 @@ int max = (live.size() > dead.size()) ? live.size() : dead.size(); currentTime = System.currentTimeMillis(); for (i = 0; i < min; i++) { - DatanodeDescriptor l = (DatanodeDescriptor)live.elementAt(i); - DatanodeDescriptor d = (DatanodeDescriptor)dead.elementAt(i); + DatanodeInfo l = (DatanodeInfo)live.elementAt(i); + DatanodeInfo d = (DatanodeInfo)dead.elementAt(i); out.print(""); generateLiveNodeData(out, l); out.print("" + @@ -70,12 +70,12 @@ for (i = min; i < max; i++) { out.print(""); if (type == 1) { - DatanodeDescriptor l = (DatanodeDescriptor)live.elementAt(i); + DatanodeInfo l = (DatanodeInfo)live.elementAt(i); generateLiveNodeData(out, l); out.print("
"); } else if (type == 0) { - DatanodeDescriptor d = (DatanodeDescriptor)dead.elementAt(i); + DatanodeInfo d = (DatanodeInfo)dead.elementAt(i); out.print("
"); out.print("" + d.getName() +