HADOOP-1500. Fix typographical errors in the HDFS WebUI.

(Nigel Daley via dhruba)



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

CHANGES.txt

@@ -87,6 +87,9 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
+    HADOOP-1500. Fix typographical errors in the DFS WebUI.
+    (Nigel Daley via dhruba)
+
     HADOOP-1887. The Namenode encounters an ArrayIndexOutOfBoundsException
     while listing a directory that had a file that was
     being actively written to.  (Dhruba Borthakur via dhruba)

src/webapps/datanode/browseBlock.jsp

@@ -99,10 +99,10 @@
                  "&referrer=" + 
           URLEncoder.encode(req.getRequestURL() + "?" + req.getQueryString(),
                             "UTF-8");
-    out.print("<a href=\"" + tailUrl + "\">TAIL this file</a><br>");
+    out.print("<a href=\"" + tailUrl + "\">Tail this file</a><br>");
 
     out.print("<form action=\"/browseBlock.jsp\" method=GET>");
-    out.print("<b>Chunk Size to view (in bytes, upto file's DFS blocksize): </b>");
+    out.print("<b>Chunk size to view (in bytes, up to file's DFS block size): </b>");
     out.print("<input type=\"hidden\" name=\"blockId\" value=\"" + currBlockId +
               "\">");
     out.print("<input type=\"hidden\" name=\"blockSize\" value=\"" + 
@@ -359,6 +359,6 @@
 <a href="/logs/">Log</a> directory
 
 <hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/datanode/browseDirectory.jsp

@@ -33,7 +33,7 @@
     DFSClient dfs = new DFSClient(jspHelper.nameNodeAddr, jspHelper.conf);
     String target = dir;
     if (!dfs.exists(target)) {
-      out.print("<h3>File or directory : " + target + " does not exists</h3>");
+      out.print("<h3>File or directory : " + target + " does not exist</h3>");
       JspHelper.printGotoForm(out, namenodeInfoPort, target);
     }
     else {
@@ -75,7 +75,7 @@
       //generate a table and dump the info
       String [] headings = new String[6];
       headings[0] = "Name"; headings[1] = "Type"; headings[2] = "Size";
-      headings[3] = "Replication"; headings[4] = "BlockSize";
+      headings[3] = "Replication"; headings[4] = "Block Size";
       headings[5] = "Modification Time";
       out.print("<h3>Contents of directory ");
       JspHelper.printPathWithLinks(dir, out, namenodeInfoPort);
@@ -171,6 +171,6 @@ body
 <a href="/logs/">Log</a> directory
 
 <hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/datanode/tail.jsp

@@ -29,7 +29,7 @@
 
     String filename = req.getParameter("filename");
     if (filename == null) {
-      out.print("Invalid input (filename absent)");
+      out.print("Invalid input (file name absent)");
       return;
     }
 
@@ -52,7 +52,7 @@
     else {
       out.print("<h3>" + filename + "</h3>");
     }
-    out.print("<b>Chunk Size to view (in bytes, upto file's DFS blocksize): </b>");
+    out.print("<b>Chunk size to view (in bytes, up to file's DFS block size): </b>");
     out.print("<input type=\"text\" name=\"chunkSizeToView\" value=" +
               chunkSizeToView + " size=10 maxlength=10>");
     out.print("&nbsp;&nbsp;<input type=\"submit\" name=\"submit\" value=\"Refresh\"><hr>");
@@ -117,6 +117,6 @@
 <a href="/logs/">Log</a> directory
 
 <hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/dfs/dfshealth.jsp

@@ -250,6 +250,6 @@
 <a href="/logs/">Log</a> directory
 
 <hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/dfs/nn_browsedfscontent.jsp

@@ -47,6 +47,6 @@
 <a href="/logs/">Log</a> directory
 
 <hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/job/jobblacklistedtrackers.jsp

@@ -56,6 +56,6 @@ Black-listed task-trackers</h1>
 
 <hr>
 <a href="jobdetails.jsp?jobid=><%=jobId%>">Go back to <%=jobId%></a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/job/jobconf.jsp

@@ -56,7 +56,7 @@
 
 <br>
 <hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 
 </body>
-</html>
+</html>

src/webapps/job/jobdetails.jsp

@@ -160,7 +160,7 @@
     } else {
       if (runState == JobStatus.SUCCEEDED) {
         out.print("<b>Status:</b> Succeeded<br>\n");
-        out.print("<b>Started at :</b> " + new Date(job.getStartTime()) + "<br>\n");
+        out.print("<b>Started at:</b> " + new Date(job.getStartTime()) + "<br>\n");
         out.print("<b>Finished at:</b> " + new Date(job.getFinishTime()) +
                   "<br>\n");
         out.print("<b>Finished in:</b> " + StringUtils.formatTimeDiff(
@@ -168,9 +168,9 @@
       } else if (runState == JobStatus.FAILED) {
         out.print("<b>Status:</b> Failed<br>\n");
         out.print("<b>Started at:</b> " + new Date(job.getStartTime()) + "<br>\n");
-        out.print("<b>Failed at :</b> " + new Date(job.getFinishTime()) +
+        out.print("<b>Failed at:</b> " + new Date(job.getFinishTime()) +
                   "<br>\n");
-        out.print("<b>Failed in :</b> " + StringUtils.formatTimeDiff(
+        out.print("<b>Failed in:</b> " + StringUtils.formatTimeDiff(
             job.getFinishTime(), job.getStartTime()) + "<br>\n");
       }
     }
@@ -258,6 +258,6 @@
 <% } %>
 <hr>
 <a href="jobtracker.jsp">Go back to JobTracker</a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/job/jobdetailshistory.jsp

@@ -22,13 +22,13 @@
 <html><body>
 <h2>Hadoop Job <%=jobid %> </h2>
 
-<b>User : </b> <%=job.get(Keys.USER) %><br/> 
-<b>JobName : </b> <%=job.get(Keys.JOBNAME) %><br/> 
-<b>JobConf : </b> <%=job.get(Keys.JOBCONF) %><br/> 
-<b>Submitted At : </b> <%=StringUtils.getFormattedTimeWithDiff(dateFormat, job.getLong(Keys.SUBMIT_TIME), 0 )  %><br/> 
-<b>Launched At : </b> <%=StringUtils.getFormattedTimeWithDiff(dateFormat, job.getLong(Keys.LAUNCH_TIME), job.getLong(Keys.SUBMIT_TIME)) %><br/>
-<b>Finished At : </b>  <%=StringUtils.getFormattedTimeWithDiff(dateFormat, job.getLong(Keys.FINISH_TIME), job.getLong(Keys.LAUNCH_TIME)) %><br/>
-<b>Status : </b> <%= ((job.get(Keys.JOB_STATUS) == null)?"Incomplete" :job.get(Keys.JOB_STATUS)) %><br/> 
+<b>User: </b> <%=job.get(Keys.USER) %><br/> 
+<b>JobName: </b> <%=job.get(Keys.JOBNAME) %><br/> 
+<b>JobConf: </b> <%=job.get(Keys.JOBCONF) %><br/> 
+<b>Submitted At: </b> <%=StringUtils.getFormattedTimeWithDiff(dateFormat, job.getLong(Keys.SUBMIT_TIME), 0 )  %><br/> 
+<b>Launched At: </b> <%=StringUtils.getFormattedTimeWithDiff(dateFormat, job.getLong(Keys.LAUNCH_TIME), job.getLong(Keys.SUBMIT_TIME)) %><br/>
+<b>Finished At: </b>  <%=StringUtils.getFormattedTimeWithDiff(dateFormat, job.getLong(Keys.FINISH_TIME), job.getLong(Keys.LAUNCH_TIME)) %><br/>
+<b>Status: </b> <%= ((job.get(Keys.JOB_STATUS) == null)?"Incomplete" :job.get(Keys.JOB_STATUS)) %><br/> 
 <%
 	Map<String, JobHistory.Task> tasks = job.getAllTasks();
 	int totalMaps = 0 ; 

src/webapps/job/jobfailures.jsp

@@ -115,7 +115,7 @@
         }
       }
     } catch (IllegalArgumentException e) {
-      out.print("<b>Cause " + cause + " not supported.</b><br>\n");
+      out.print("<b>Cause '" + cause + "' not supported.</b><br>\n");
       return;
     }
     	
@@ -156,6 +156,6 @@ failures on <a href="jobtracker.jsp"><%=trackerName%></a></h1>
 
 <hr>
 <a href="jobtracker.jsp">Go back to JobTracker</a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/job/jobhistory.jsp

@@ -33,7 +33,7 @@
       String trackerStartTime = entry.getKey();
       Map<String, JobInfo> jobs = entry.getValue();
 %>
-<h2>JobTracker started at : <%=new Date(Long.parseLong(trackerStartTime)) %></h2>
+<h2>JobTracker started at: <%=new Date(Long.parseLong(trackerStartTime)) %></h2>
 <hr/>
 <h3>Completed Jobs </h3>
 <center>
@@ -96,4 +96,4 @@
 	    out.print("</tr>");
 	}
  %>  
-</body></html>
+</body></html>

src/webapps/job/jobtasks.jsp

@@ -103,6 +103,6 @@
 
 <hr>
 <a href="jobtracker.jsp">Go back to JobTracker</a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/job/jobtracker.jsp

@@ -23,12 +23,12 @@
       if (jobs.size() > 0) {
         out.print("<tr><td><b>Jobid</b></td><td><b>User</b></td>");
         out.print("<td><b>Name</b></td>");
-        out.print("<td><b>Map % complete</b></td>");
-        out.print("<td><b>Map total</b></td>");
-        out.print("<td><b>Maps completed</b></td>");
-        out.print("<td><b>Reduce % complete</b></td>");
-        out.print("<td><b>Reduce total</b></td>");
-        out.print("<td><b>Reduces completed</b></td></tr>\n");
+        out.print("<td><b>Map % Complete</b></td>");
+        out.print("<td><b>Map Total</b></td>");
+        out.print("<td><b>Maps Completed</b></td>");
+        out.print("<td><b>Reduce % Complete</b></td>");
+        out.print("<td><b>Reduce Total</b></td>");
+        out.print("<td><b>Reduces Completed</b></td></tr>\n");
         for (Iterator it = jobs.iterator(); it.hasNext(); ) {
           JobInProgress job = (JobInProgress) it.next();
           JobProfile profile = job.getProfile();
@@ -126,6 +126,6 @@
 Job Tracker History</a>
 
 <hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/job/machines.jsp

@@ -19,14 +19,14 @@
     Collection c = tracker.taskTrackers();
 
     if (c.size() == 0) {
-      out.print("There are currently no known TaskTracker(s).");
+      out.print("There are currently no known Task Trackers.");
     } else {
       out.print("<center>\n");
       out.print("<table border=\"2\" cellpadding=\"5\" cellspacing=\"2\">\n");
       out.print("<tr><td align=\"center\" colspan=\"5\"><b>Task Trackers</b></td></tr>\n");
       out.print("<tr><td><b>Name</b></td><td><b>Host</b></td>" +
                 "<td><b># running tasks</b></td><td><b>Failures</b></td>" +
-                "<td><b>Secs since heartbeat</b></td></tr>\n");
+                "<td><b>Seconds since heartbeat</b></td></tr>\n");
       int maxFailures = 0;
       String failureKing = null;
       for (Iterator it = c.iterator(); it.hasNext(); ) {
@@ -76,6 +76,6 @@
 %>
 
 <hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/job/taskdetails.jsp

@@ -174,6 +174,6 @@
 <hr>
 <a href="jobdetails.jsp?jobid=<%=jobid%>">Go back to the job</a><br>
 <a href="jobtracker.jsp">Go back to JobTracker</a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/job/taskstats.jsp

@@ -78,6 +78,6 @@
 <hr>
 <a href="jobdetails.jsp?jobid=<%=jobid%>">Go back to the job</a><br>
 <a href="jobtracker.jsp">Go back to JobTracker</a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>

src/webapps/task/tasktracker.jsp

@@ -61,6 +61,6 @@
 <a href="/logs/">Log</a> directory
 
 <hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
+<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
 </body>
 </html>