浏览代码

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/branches/branch-0.20-security@1205534 13f79535-47bb-0310-9956-ffa450edef68
Matthew Foley 13 年之前
父节点
当前提交
17f23544e0

+ 4 - 2
CHANGES.txt

@@ -140,8 +140,10 @@ Release 0.20.205.1 - unreleased
 
 
   BUG FIXES
   BUG FIXES
 
 
-    HADOOP-7815. Fixed configuring map memory mb in hadoop-setup-conf.sh.
-    (ramya)
+    HADOOP-7827. jsp pages missing DOCTYPE. (Dave Vronay via mattf)
+
+    HADOOP-7815. Fixed configuring map memory mb in hadoop-setup-conf.sh. 
+    (Ramya Sunil)
 
 
     HDFS-2346. TestHost2NodesMap & TestReplicasMap will fail depending upon 
     HDFS-2346. TestHost2NodesMap & TestReplicasMap will fail depending upon 
     execution order of test methods. (Laxman and Uma Maheswara Rao via Matt Foley)
     execution order of test methods. (Laxman and Uma Maheswara Rao via Matt Foley)

+ 1 - 0
src/webapps/datanode/browseBlock.jsp

@@ -407,6 +407,7 @@
   }
   }
 
 
 %>
 %>
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
 <%JspHelper.createTitle(out, request, request.getParameter("filename")); %>
 <%JspHelper.createTitle(out, request, request.getParameter("filename")); %>

+ 1 - 0
src/webapps/datanode/browseDirectory.jsp

@@ -163,6 +163,7 @@
 
 
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
 <style type=text/css>
 <style type=text/css>

+ 1 - 0
src/webapps/datanode/tail.jsp

@@ -118,6 +118,7 @@
 
 
 
 
 
 
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
 <%JspHelper.createTitle(out, request, request.getParameter("filename")); %>
 <%JspHelper.createTitle(out, request, request.getParameter("filename")); %>

+ 1 - 0
src/webapps/hdfs/dfshealth.jsp

@@ -238,6 +238,7 @@
   String namenodeLabel = nn.getNameNodeAddress().getHostName() + ":" + nn.getNameNodeAddress().getPort();
   String namenodeLabel = nn.getNameNodeAddress().getHostName() + ":" + nn.getNameNodeAddress().getPort();
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
 
 
 <link rel="stylesheet" type="text/css" href="/static/hadoop.css">
 <link rel="stylesheet" type="text/css" href="/static/hadoop.css">

+ 1 - 0
src/webapps/hdfs/dfsnodelist.jsp

@@ -313,6 +313,7 @@ FSNamesystem fsn = nn.getNamesystem();
 String namenodeLabel = nn.getNameNodeAddress().getHostName() + ":" + nn.getNameNodeAddress().getPort();
 String namenodeLabel = nn.getNameNodeAddress().getHostName() + ":" + nn.getNameNodeAddress().getPort();
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
 
 
 <link rel="stylesheet" type="text/css" href="/static/hadoop.css">
 <link rel="stylesheet" type="text/css" href="/static/hadoop.css">

+ 1 - 0
src/webapps/hdfs/nn_browsedfscontent.jsp

@@ -72,6 +72,7 @@
   }
   }
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
 
 
 <title></title>
 <title></title>

+ 1 - 0
src/webapps/history/analysejobhistory.jsp

@@ -16,6 +16,7 @@
 %>
 %>
 <%!	private static final long serialVersionUID = 1L;
 <%!	private static final long serialVersionUID = 1L;
 %>
 %>
+<!DOCTYPE html>
 <html><body>
 <html><body>
 <%
 <%
   String logFile = request.getParameter("logFile");
   String logFile = request.getParameter("logFile");

+ 1 - 0
src/webapps/history/job_authorization_error.jsp

@@ -28,6 +28,7 @@
 <%!	private static final long serialVersionUID = 1L;
 <%!	private static final long serialVersionUID = 1L;
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
 <title>Error: User cannot access this Job</title>
 <title>Error: User cannot access this Job</title>

+ 1 - 0
src/webapps/history/jobconf_history.jsp

@@ -27,6 +27,7 @@
 
 
 %>
 %>
   
   
+<!DOCTYPE html>
 <html>
 <html>
 
 
 <title>Job Configuration: JobId - <%= jobId %></title>
 <title>Job Configuration: JobId - <%= jobId %></title>

+ 1 - 0
src/webapps/history/jobdetailshistory.jsp

@@ -35,6 +35,7 @@
   	String encodedLogFileName = JobHistory.JobInfo.encodeJobHistoryFilePath(logFile);
   	String encodedLogFileName = JobHistory.JobInfo.encodeJobHistoryFilePath(logFile);
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
 <title>Hadoop Job <%=jobid%> on History Viewer</title>
 <title>Hadoop Job <%=jobid%> on History Viewer</title>

+ 1 - 0
src/webapps/history/jobhistoryhome.jsp

@@ -33,6 +33,7 @@
 <%!private static SimpleDateFormat dateFormat = new SimpleDateFormat(
 <%!private static SimpleDateFormat dateFormat = new SimpleDateFormat(
       "d/MM HH:mm:ss");%>
       "d/MM HH:mm:ss");%>
 <%!private static final long serialVersionUID = 1L;%>
 <%!private static final long serialVersionUID = 1L;%>
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
 <script type="text/JavaScript">
 <script type="text/JavaScript">

+ 1 - 0
src/webapps/history/jobtaskshistory.jsp

@@ -35,6 +35,7 @@
   }
   }
   Map<String, JobHistory.Task> tasks = job.getAllTasks(); 
   Map<String, JobHistory.Task> tasks = job.getAllTasks(); 
 %>
 %>
+<!DOCTYPE html>
 <html>
 <html>
 <body>
 <body>
 <h2><%=taskStatus%> <%=taskType %> task list for <a href="jobdetailshistory.jsp?logFile=<%=encodedLogFileName%>"><%=jobid %> </a></h2>
 <h2><%=taskStatus%> <%=taskType %> task list for <a href="jobdetailshistory.jsp?logFile=<%=encodedLogFileName%>"><%=jobid %> </a></h2>

+ 1 - 0
src/webapps/history/legacyjobhistory.jsp

@@ -35,6 +35,7 @@
 %>
 %>
 <%!	private static final long serialVersionUID = 1L;
 <%!	private static final long serialVersionUID = 1L;
 %>
 %>
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
 <script type="text/JavaScript">
 <script type="text/JavaScript">

+ 1 - 0
src/webapps/history/taskdetailshistory.jsp

@@ -35,6 +35,7 @@
   JobHistory.Task task = job.getAllTasks().get(tipid); 
   JobHistory.Task task = job.getAllTasks().get(tipid); 
   String type = task.get(Keys.TASK_TYPE);
   String type = task.get(Keys.TASK_TYPE);
 %>
 %>
+<!DOCTYPE html>
 <html>
 <html>
 <body>
 <body>
 <h2><%=tipid %> attempts for <a href="jobdetailshistory.jsp?logFile=<%=encodedLogFileName%>"> <%=jobid %> </a></h2>
 <h2><%=tipid %> attempts for <a href="jobdetailshistory.jsp?logFile=<%=encodedLogFileName%>"> <%=jobid %> </a></h2>

+ 1 - 0
src/webapps/history/taskstatshistory.jsp

@@ -62,6 +62,7 @@
     Counters.fromEscapedCompactString(attempt.get(Keys.COUNTERS));
     Counters.fromEscapedCompactString(attempt.get(Keys.COUNTERS));
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
   <head>
   <head>
     <title>Counters for <%=attemptid%></title>
     <title>Counters for <%=attemptid%></title>

+ 1 - 0
src/webapps/job/job_authorization_error.jsp

@@ -28,6 +28,7 @@
 <%!	private static final long serialVersionUID = 1L;
 <%!	private static final long serialVersionUID = 1L;
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
 <title>Error: User cannot access this Job</title>
 <title>Error: User cannot access this Job</title>

+ 1 - 0
src/webapps/job/jobblacklistedtrackers.jsp

@@ -54,6 +54,7 @@
     }
     }
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
 <title>Hadoop <%=jobId%>'s black-listed tasktrackers</title>
 <title>Hadoop <%=jobId%>'s black-listed tasktrackers</title>
 <body>
 <body>

+ 1 - 0
src/webapps/job/jobconf.jsp

@@ -21,6 +21,7 @@
   }
   }
 %>
 %>
   
   
+<!DOCTYPE html>
 <html>
 <html>
 
 
 <title>Job Configuration: JobId - <%= jobId %></title>
 <title>Job Configuration: JobId - <%= jobId %></title>

+ 1 - 0
src/webapps/job/jobdetails.jsp

@@ -246,6 +246,7 @@
 %>
 %>
 
 
 <%@page import="org.apache.hadoop.mapred.TaskGraphServlet"%>
 <%@page import="org.apache.hadoop.mapred.TaskGraphServlet"%>
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
   <% 
   <% 

+ 1 - 0
src/webapps/job/jobfailures.jsp

@@ -165,6 +165,7 @@
     String cause = request.getParameter("cause");
     String cause = request.getParameter("cause");
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
 <title>Hadoop <%=jobId%> failures on <%=trackerName%></title>
 <title>Hadoop <%=jobId%> failures on <%=trackerName%></title>
 <body>
 <body>

+ 1 - 0
src/webapps/job/jobqueue_details.jsp

@@ -22,6 +22,7 @@ private static final long serialVersionUID = 526456771152222127L;
   Collection<JobInProgress> jobs = scheduler.getJobs(queueName);
   Collection<JobInProgress> jobs = scheduler.getJobs(queueName);
   JobQueueInfo schedInfo = tracker.getQueueInfo(queueName);
   JobQueueInfo schedInfo = tracker.getQueueInfo(queueName);
 %>
 %>
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
 <title>Queue details for
 <title>Queue details for

+ 1 - 0
src/webapps/job/jobtasks.jsp

@@ -55,6 +55,7 @@
   }
   }
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
   <head>
   <head>
     <title>Hadoop <%=type%> task list for <%=jobid%> on <%=trackerName%></title>
     <title>Hadoop <%=type%> task list for <%=jobid%> on <%=trackerName%></title>

+ 1 - 0
src/webapps/job/jobtracker.jsp

@@ -77,6 +77,7 @@
   }%>
   }%>
 
 
 
 
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
 <title><%= trackerName %> Hadoop Map/Reduce Administration</title>
 <title><%= trackerName %> Hadoop Map/Reduce Administration</title>

+ 1 - 0
src/webapps/job/machines.jsp

@@ -153,6 +153,7 @@
   }
   }
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
 
 
 <title><%=trackerName%> Hadoop Machine List</title>
 <title><%=trackerName%> Hadoop Machine List</title>

+ 1 - 0
src/webapps/job/taskdetails.jsp

@@ -145,6 +145,7 @@
 %>
 %>
 
 
 
 
+<!DOCTYPE html>
 <html>
 <html>
 <head>
 <head>
   <link rel="stylesheet" type="text/css" href="/static/hadoop.css">
   <link rel="stylesheet" type="text/css" href="/static/hadoop.css">

+ 1 - 0
src/webapps/job/taskstats.jsp

@@ -52,6 +52,7 @@
   }
   }
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
   <head>
   <head>
     <title>Counters for <%=attemptid%></title>
     <title>Counters for <%=attemptid%></title>

+ 1 - 0
src/webapps/task/tasktracker.jsp

@@ -16,6 +16,7 @@
   String trackerName = tracker.getName();
   String trackerName = tracker.getName();
 %>
 %>
 
 
+<!DOCTYPE html>
 <html>
 <html>
 
 
 <title><%= trackerName %> Task Tracker Status</title>
 <title><%= trackerName %> Task Tracker Status</title>