HADOOP-7827 HDFS-2588 MAPREDUCE-3464. jsp pages missing DOCTYPE. Contributed by Dave Vronay.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1205519 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 18:15:37 +00:00 · 2011-11-23 18:15:37 +00:00 · db092f5048
parent 41b1e3ffec
commit db092f5048
31 changed files with 33 additions and 3 deletions
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@ -182,6 +182,8 @@ Release 0.23.1 - UNRELEASED

    HDFS-2575. DFSTestUtil may create empty files (todd)

+    HDFS-2588. hdfs jsp pages missing DOCTYPE. (Dave Vronay via mattf)
+    
 Release 0.23.0 - 2011-11-01 

  INCOMPATIBLE CHANGES
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/browseBlock.jsp
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/browseBlock.jsp
@ -27,7 +27,7 @@
  //for java.io.Serializable
  private static final long serialVersionUID = 1L;
 %>
-
+<!DOCTYPE html>
 <html>
 <head>
 <%JspHelper.createTitle(out, request, request.getParameter("filename")); %>
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/browseDirectory.jsp
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/browseDirectory.jsp
@ -29,7 +29,7 @@
  //for java.io.Serializable
  private static final long serialVersionUID = 1L;
 %>
-
+<!DOCTYPE html>
 <html>
 <head>
 <style type=text/css>
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/tail.jsp
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/tail.jsp
@ -27,6 +27,7 @@
  //for java.io.Serializable
  private static final long serialVersionUID = 1L;
 %>
+<!DOCTYPE html>
 <html>
 <head>
 <%JspHelper.createTitle(out, request, request.getParameter("filename")); %>
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/corrupt_files.jsp
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/corrupt_files.jsp
@ -38,6 +38,7 @@
  int corruptFileCount = corruptFileBlocks.size();
 %>

+<!DOCTYPE html>
 <html>
 <link rel="stylesheet" type="text/css" href="/static/hadoop.css">
 <title>Hadoop <%=namenodeRole%> <%=namenodeLabel%></title>
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.jsp
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.jsp
@ -33,6 +33,7 @@
  String namenodeLabel = nn.getNameNodeAddress().getHostName() + ":" + nn.getNameNodeAddress().getPort();
 %>

+<!DOCTYPE html>
 <html>

 <link rel="stylesheet" type="text/css" href="/static/hadoop.css">
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfsnodelist.jsp
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfsnodelist.jsp
@ -33,6 +33,7 @@ FSNamesystem fsn = nn.getNamesystem();
 String namenodeLabel = nn.getNameNodeAddress().getHostName() + ":" + nn.getNameNodeAddress().getPort();
 %>

+<!DOCTYPE html>
 <html>

 <link rel="stylesheet" type="text/css" href="/static/hadoop.css">
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/nn_browsedfscontent.jsp
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/nn_browsedfscontent.jsp
@ -27,6 +27,7 @@
  //for java.io.Serializable
  private static final long serialVersionUID = 1L;
 %>
+<!DOCTYPE html>
 <html>

 <title></title>
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.jsp
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.jsp
@ -27,6 +27,7 @@
  private static final long serialVersionUID = 1L;
 %>

+<!DOCTYPE html>
 <html>
 <link rel="stylesheet" type="text/css" href="/static/hadoop.css">
 <title>Hadoop SecondaryNameNode</title>
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@ -173,6 +173,8 @@ Release 0.23.1 - Unreleased
    MAPREDUCE-3329. Fixed CapacityScheduler to ensure maximum-capacity cannot
    be lesser than capacity for any queue. (acmurthy)

+    MAPREDUCE-3464. mapreduce jsp pages missing DOCTYPE. (Dave Vronay via mattf)
+
 Release 0.23.0 - 2011-11-01 

  INCOMPATIBLE CHANGES
--- a/hadoop-mapreduce-project/src/webapps/job/analysejobhistory.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/analysejobhistory.jsp
@ -35,6 +35,7 @@
 %>
 <%!	private static final long serialVersionUID = 1L;
 %>
+<!DOCTYPE html>
 <html><body>
 <%
  String logFile = request.getParameter("logFile");
--- a/hadoop-mapreduce-project/src/webapps/job/job_authorization_error.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/job_authorization_error.jsp
@ -28,6 +28,7 @@
 <%!	private static final long serialVersionUID = 1L;
 %>

+<!DOCTYPE html>
 <html>
 <head>
 <title>Error: User cannot access this Job</title>
--- a/hadoop-mapreduce-project/src/webapps/job/jobblacklistedtrackers.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/jobblacklistedtrackers.jsp
@ -74,6 +74,7 @@
    }
 %>

+<!DOCTYPE html>
 <html>
 <title>Hadoop <%=jobId%>'s black-listed tasktrackers</title>
 <body>
--- a/hadoop-mapreduce-project/src/webapps/job/jobconf.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/jobconf.jsp
@ -39,7 +39,7 @@
    return;
  }
 %>
-  
+<!DOCTYPE html>  
 <html>

 <title>Job Configuration: JobId - <%= jobId %></title>
--- a/hadoop-mapreduce-project/src/webapps/job/jobconf_history.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/jobconf_history.jsp
@ -49,6 +49,7 @@

 %>
  
+<!DOCTYPE html>
 <html>

 <title>Job Configuration: JobId - <%= jobId %></title>
--- a/hadoop-mapreduce-project/src/webapps/job/jobdetails.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/jobdetails.jsp
@ -267,6 +267,7 @@
 %>

 <%@page import="org.apache.hadoop.mapred.TaskGraphServlet"%>
+<!DOCTYPE html>
 <html>
 <head>
  <% 
--- a/hadoop-mapreduce-project/src/webapps/job/jobdetailshistory.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/jobdetailshistory.jsp
@ -60,6 +60,7 @@
      reasonforFailure = job.getErrorInfo();
 %>

+<!DOCTYPE html>
 <html>
 <head>
 <title>Hadoop Job <%=jobid%> on History Viewer</title>
--- a/hadoop-mapreduce-project/src/webapps/job/jobfailures.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/jobfailures.jsp
@ -184,6 +184,7 @@
    String cause = request.getParameter("cause");
 %>

+<!DOCTYPE html>
 <html>
 <title>Hadoop <%=jobId%> failures on <%=trackerName%></title>
 <body>
--- a/hadoop-mapreduce-project/src/webapps/job/jobhistory.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/jobhistory.jsp
@ -44,6 +44,7 @@
  private static SimpleDateFormat dateFormat = 
                                    new SimpleDateFormat("d/MM HH:mm:ss");
 %>
+<!DOCTYPE html>
 <html>
 <head>
 <script type="text/JavaScript">
--- a/hadoop-mapreduce-project/src/webapps/job/jobqueue_details.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/jobqueue_details.jsp
@ -35,6 +35,7 @@
  TaskScheduler scheduler = tracker.getTaskScheduler();
  JobQueueInfo schedInfo = tracker.getQueueInfo(queueName);
 %>
+<!DOCTYPE html>
 <html>
 <head>
 <title>Queue details for <%=queueName != null ? queueName : ""%> </title>
--- a/hadoop-mapreduce-project/src/webapps/job/jobtasks.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/jobtasks.jsp
@ -75,6 +75,7 @@
  }
 %>

+<!DOCTYPE html>
 <html>
  <head>
    <title>Hadoop <%=type%> task list for <%=jobid%> on <%=trackerName%></title>
--- a/hadoop-mapreduce-project/src/webapps/job/jobtaskshistory.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/jobtaskshistory.jsp
@ -53,6 +53,7 @@
  }
  Map<TaskID, JobHistoryParser.TaskInfo> tasks = job.getAllTasks(); 
 %>
+<!DOCTYPE html>
 <html>
 <body>
 <h2><%=taskStatus%> <%=taskType %> task list for <a href="jobdetailshistory.jsp?logFile=<%=logFile%>"><%=job.getJobId() %> </a></h2>
--- a/hadoop-mapreduce-project/src/webapps/job/jobtracker.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/jobtracker.jsp
@ -100,6 +100,7 @@
  }%>


+<!DOCTYPE html>
 <html>
 <head>
 <title><%= trackerName %> Hadoop Map/Reduce Administration</title>
--- a/hadoop-mapreduce-project/src/webapps/job/machines.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/machines.jsp
@ -165,6 +165,7 @@
  }
 %>

+<!DOCTYPE html>
 <html>

 <title><%=trackerName%> Hadoop Machine List</title>
--- a/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp
@ -27,6 +27,7 @@ import="javax.servlet.http.*"
 import="java.io.*"
 import="java.util.*"
 %>
+<!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
--- a/hadoop-mapreduce-project/src/webapps/job/queuetable.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/queuetable.jsp
@ -32,6 +32,7 @@ private static final long serialVersionUID = 1L;
  import="org.apache.hadoop.util.*"
  import="org.apache.hadoop.util.ServletUtil"
 %>
+<!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
--- a/hadoop-mapreduce-project/src/webapps/job/taskdetails.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/taskdetails.jsp
@ -174,6 +174,7 @@
 %>


+<!DOCTYPE html>
 <html>
 <head>
  <link rel="stylesheet" type="text/css" href="/static/hadoop.css">
--- a/hadoop-mapreduce-project/src/webapps/job/taskdetailshistory.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/taskdetailshistory.jsp
@ -51,6 +51,7 @@
  JobHistoryParser.TaskInfo task = job.getAllTasks().get(TaskID.forName(tipid)); 
  TaskType type = task.getTaskType();
 %>
+<!DOCTYPE html>
 <html>
 <body>
 <h2><%=tipid %> attempts for <a href="jobdetailshistory.jsp?logFile=<%=logFile%>"> <%=job.getJobId() %> </a></h2>
--- a/hadoop-mapreduce-project/src/webapps/job/taskstats.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/taskstats.jsp
@ -81,6 +81,7 @@
  }
 %>

+<!DOCTYPE html>
 <html>
  <head>
    <title>Counters for <%=attemptid%></title>
--- a/hadoop-mapreduce-project/src/webapps/job/taskstatshistory.jsp
+++ b/hadoop-mapreduce-project/src/webapps/job/taskstatshistory.jsp
@ -66,6 +66,7 @@
  Counters counters = attempt.getCounters();
 %>

+<!DOCTYPE html>
 <html>
  <head>
    <title>Counters for <%=attemptid%></title>
--- a/hadoop-mapreduce-project/src/webapps/task/tasktracker.jsp
+++ b/hadoop-mapreduce-project/src/webapps/task/tasktracker.jsp
@ -35,6 +35,7 @@
  String trackerName = tracker.getName();
 %>

+<!DOCTYPE html>
 <html>

 <title><%= trackerName %> Task Tracker Status</title>