Browse Source

HADOOP-7827 reverted.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1208935 13f79535-47bb-0310-9956-ffa450edef68
Matthew Foley 13 years ago
parent
commit
a74fc0dfe9

+ 0 - 2
CHANGES.txt

@@ -160,8 +160,6 @@ Release 1.0.0 - unreleased
 
 
   BUG FIXES
   BUG FIXES
 
 
-    HADOOP-7827. jsp pages missing DOCTYPE. (Dave Vronay via mattf)
-
     HADOOP-7815. Fixed configuring map memory mb in hadoop-setup-conf.sh. 
     HADOOP-7815. Fixed configuring map memory mb in hadoop-setup-conf.sh. 
     (Ramya Sunil)
     (Ramya Sunil)
 
 

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

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

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

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

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

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

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

@@ -238,7 +238,6 @@
   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">

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

@@ -313,7 +313,6 @@ 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">

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

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

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

@@ -16,7 +16,6 @@
 %>
 %>
 <%!	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");

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

@@ -28,7 +28,6 @@
 <%!	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>

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

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

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

@@ -35,7 +35,6 @@
   	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>

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

@@ -33,7 +33,6 @@
 <%!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">

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

@@ -35,7 +35,6 @@
   }
   }
   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>

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

@@ -35,7 +35,6 @@
 %>
 %>
 <%!	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">

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

@@ -35,7 +35,6 @@
   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>

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

@@ -62,7 +62,6 @@
     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>

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

@@ -28,7 +28,6 @@
 <%!	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>

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

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

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

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

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

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

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

@@ -165,7 +165,6 @@
     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>

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

@@ -22,7 +22,6 @@ 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

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

@@ -55,7 +55,6 @@
   }
   }
 %>
 %>
 
 
-<!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>

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

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

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

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

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

@@ -145,7 +145,6 @@
 %>
 %>
 
 
 
 
-<!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">

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

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

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

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