13 gadi atpakaļ · cebadc32cb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -46,6 +46,8 @@ Release 0.20.205.1 - unreleased
 
				 
			
 
				   BUG FIXES
			
 
				 
			
 
				+    HADOOP-7827. jsp pages missing DOCTYPE. (Dave Vronay via mattf)
			
 
				+
			
 
				     HADOOP-7815. Fixed configuring map memory mb in hadoop-setup-conf.sh. 
			
 
				     (Ramya Sunil)
			
 
				  
			
--- a/src/webapps/datanode/browseBlock.jsp
+++ b/src/webapps/datanode/browseBlock.jsp
@@ -407,6 +407,7 @@
 
				   }
			
 
				 
			
 
				 %>
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				 <%JspHelper.createTitle(out, request, request.getParameter("filename")); %>
			
--- a/src/webapps/datanode/browseDirectory.jsp
+++ b/src/webapps/datanode/browseDirectory.jsp
@@ -163,6 +163,7 @@
 
				 
			
 
				 %>
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				 <style type=text/css>
			
--- a/src/webapps/datanode/tail.jsp
+++ b/src/webapps/datanode/tail.jsp
@@ -118,6 +118,7 @@
 
				 
			
 
				 
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				 <%JspHelper.createTitle(out, request, request.getParameter("filename")); %>
			
--- a/src/webapps/hdfs/dfshealth.jsp
+++ b/src/webapps/hdfs/dfshealth.jsp
@@ -238,6 +238,7 @@
 
				   String namenodeLabel = nn.getNameNodeAddress().getHostName() + ":" + nn.getNameNodeAddress().getPort();
			
 
				 %>
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 
			
 
				 <link rel="stylesheet" type="text/css" href="/static/hadoop.css">
			
--- a/src/webapps/hdfs/dfsnodelist.jsp
+++ b/src/webapps/hdfs/dfsnodelist.jsp
@@ -313,6 +313,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/src/webapps/hdfs/nn_browsedfscontent.jsp
+++ b/src/webapps/hdfs/nn_browsedfscontent.jsp
@@ -72,6 +72,7 @@
 
				   }
			
 
				 %>
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 
			
 
				 <title></title>
			
--- a/src/webapps/history/analysejobhistory.jsp
+++ b/src/webapps/history/analysejobhistory.jsp
@@ -16,6 +16,7 @@
 
				 %>
			
 
				 <%!	private static final long serialVersionUID = 1L;
			
 
				 %>
			
 
				+<!DOCTYPE html>
			
 
				 <html><body>
			
 
				 <%
			
 
				   String logFile = request.getParameter("logFile");
			
--- a/src/webapps/history/job_authorization_error.jsp
+++ b/src/webapps/history/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/src/webapps/history/jobconf_history.jsp
+++ b/src/webapps/history/jobconf_history.jsp
@@ -27,6 +27,7 @@
 
				 
			
 
				 %>
			
 
				   
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 
			
 
				 <title>Job Configuration: JobId - <%= jobId %></title>
			
--- a/src/webapps/history/jobdetailshistory.jsp
+++ b/src/webapps/history/jobdetailshistory.jsp
@@ -35,6 +35,7 @@
 
				   	String encodedLogFileName = JobHistory.JobInfo.encodeJobHistoryFilePath(logFile);
			
 
				 %>
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				 <title>Hadoop Job <%=jobid%> on History Viewer</title>
			
--- a/src/webapps/history/jobhistoryhome.jsp
+++ b/src/webapps/history/jobhistoryhome.jsp
@@ -33,6 +33,7 @@
 
				 <%!private static SimpleDateFormat dateFormat = new SimpleDateFormat(
			
 
				       "d/MM HH:mm:ss");%>
			
 
				 <%!private static final long serialVersionUID = 1L;%>
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				 <script type="text/JavaScript">
			
--- a/src/webapps/history/jobtaskshistory.jsp
+++ b/src/webapps/history/jobtaskshistory.jsp
@@ -35,6 +35,7 @@
 
				   }
			
 
				   Map<String, JobHistory.Task> tasks = job.getAllTasks(); 
			
 
				 %>
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <body>
			
 
				 <h2><%=taskStatus%> <%=taskType %> task list for <a href="jobdetailshistory.jsp?logFile=<%=encodedLogFileName%>"><%=jobid %> </a></h2>
			
--- a/src/webapps/history/legacyjobhistory.jsp
+++ b/src/webapps/history/legacyjobhistory.jsp
@@ -35,6 +35,7 @@
 
				 %>
			
 
				 <%!	private static final long serialVersionUID = 1L;
			
 
				 %>
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				 <script type="text/JavaScript">
			
--- a/src/webapps/history/taskdetailshistory.jsp
+++ b/src/webapps/history/taskdetailshistory.jsp
@@ -35,6 +35,7 @@
 
				   JobHistory.Task task = job.getAllTasks().get(tipid); 
			
 
				   String type = task.get(Keys.TASK_TYPE);
			
 
				 %>
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <body>
			
 
				 <h2><%=tipid %> attempts for <a href="jobdetailshistory.jsp?logFile=<%=encodedLogFileName%>"> <%=jobid %> </a></h2>
			
--- a/src/webapps/history/taskstatshistory.jsp
+++ b/src/webapps/history/taskstatshistory.jsp
@@ -62,6 +62,7 @@
 
				     Counters.fromEscapedCompactString(attempt.get(Keys.COUNTERS));
			
 
				 %>
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				   <head>
			
 
				     <title>Counters for <%=attemptid%></title>
			
--- a/src/webapps/job/job_authorization_error.jsp
+++ b/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/src/webapps/job/jobblacklistedtrackers.jsp
+++ b/src/webapps/job/jobblacklistedtrackers.jsp
@@ -54,6 +54,7 @@
 
				     }
			
 
				 %>
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <title>Hadoop <%=jobId%>'s black-listed tasktrackers</title>
			
 
				 <body>
			
--- a/src/webapps/job/jobconf.jsp
+++ b/src/webapps/job/jobconf.jsp
@@ -21,6 +21,7 @@
 
				   }
			
 
				 %>
			
 
				   
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 
			
 
				 <title>Job Configuration: JobId - <%= jobId %></title>
			
--- a/src/webapps/job/jobdetails.jsp
+++ b/src/webapps/job/jobdetails.jsp
@@ -246,6 +246,7 @@
 
				 %>
			
 
				 
			
 
				 <%@page import="org.apache.hadoop.mapred.TaskGraphServlet"%>
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				   <% 
			
--- a/src/webapps/job/jobfailures.jsp
+++ b/src/webapps/job/jobfailures.jsp
@@ -165,6 +165,7 @@
 
				     String cause = request.getParameter("cause");
			
 
				 %>
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <title>Hadoop <%=jobId%> failures on <%=trackerName%></title>
			
 
				 <body>
			
--- a/src/webapps/job/jobqueue_details.jsp
+++ b/src/webapps/job/jobqueue_details.jsp
@@ -22,6 +22,7 @@ private static final long serialVersionUID = 526456771152222127L;
 
				   Collection<JobInProgress> jobs = scheduler.getJobs(queueName);
			
 
				   JobQueueInfo schedInfo = tracker.getQueueInfo(queueName);
			
 
				 %>
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				 <title>Queue details for
			
--- a/src/webapps/job/jobtasks.jsp
+++ b/src/webapps/job/jobtasks.jsp
@@ -55,6 +55,7 @@
 
				   }
			
 
				 %>
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				   <head>
			
 
				     <title>Hadoop <%=type%> task list for <%=jobid%> on <%=trackerName%></title>
			
--- a/src/webapps/job/jobtracker.jsp
+++ b/src/webapps/job/jobtracker.jsp
@@ -77,6 +77,7 @@
 
				   }%>
			
 
				 
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				 <title><%= trackerName %> Hadoop Map/Reduce Administration</title>
			
--- a/src/webapps/job/machines.jsp
+++ b/src/webapps/job/machines.jsp
@@ -150,6 +150,7 @@
 
				   }
			
 
				 %>
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 
			
 
				 <title><%=trackerName%> Hadoop Machine List</title>
			
--- a/src/webapps/job/taskdetails.jsp
+++ b/src/webapps/job/taskdetails.jsp
@@ -145,6 +145,7 @@
 
				 %>
			
 
				 
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				   <link rel="stylesheet" type="text/css" href="/static/hadoop.css">
			
--- a/src/webapps/job/taskstats.jsp
+++ b/src/webapps/job/taskstats.jsp
@@ -52,6 +52,7 @@
 
				   }
			
 
				 %>
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				   <head>
			
 
				     <title>Counters for <%=attemptid%></title>
			
--- a/src/webapps/task/tasktracker.jsp
+++ b/src/webapps/task/tasktracker.jsp
@@ -16,6 +16,7 @@
 
				   String trackerName = tracker.getName();
			
 
				 %>
			
 
				 
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 
			
 
				 <title><%= trackerName %> Task Tracker Status</title>