Use lowercase HTML tags and attributes. Add quotes around attributes.

Fix some HTML errors. Use HTML5. Indent HTML and JSP. Remove whitespace.
apache · Jul 6, 2020 · 6bcb3e2 · 6bcb3e2
1 parent 96b5ab3
commit 6bcb3e2
Show file tree

Hide file tree

Showing 48 changed files with 635 additions and 583 deletions.
diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
@@ -25,11 +25,11 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <meta charset="UTF-8" />
+        <meta charset="UTF-8">
         <title><%=request.getServletContext().getServerInfo() %></title>
-        <link href="favicon.ico" rel="icon" type="image/x-icon" />
-        <link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
-        <link href="tomcat.css" rel="stylesheet" type="text/css" />
+        <link href="favicon.ico" rel="icon" type="image/x-icon">
+        <link href="favicon.ico" rel="shortcut icon" type="image/x-icon">
+        <link href="tomcat.css" rel="stylesheet" type="text/css">
     </head>
 
     <body>
@@ -42,7 +42,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
                 <span id="nav-wiki"><a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a></span>
                 <span id="nav-lists"><a href="${tomcatUrl}lists.html">Mailing Lists</a></span>
                 <span id="nav-help"><a href="${tomcatUrl}findhelp.html">Find Help</a></span>
-                <br class="separator" />
+                <br class="separator">
             </div>
             <div id="asf-box">
                 <h1>${pageContext.servletContext.serverInfo}</h1>
@@ -52,7 +52,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
                     <h2>If you're seeing this, you've successfully installed Tomcat. Congratulations!</h2>
                 </div>
                 <div id="notice">
-                    <img src="tomcat.png" alt="[tomcat logo]" />
+                    <img src="tomcat.png" alt="[tomcat logo]">
                     <div id="tasks">
                         <h3>Recommended Reading:</h3>
                         <h4><a href="${tomcatDocUrl}security-howto.html">Security Considerations How-To</a></h4>
@@ -71,7 +71,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
                         <a class="container shadow" href="/host-manager/html"><span>Host Manager</span></a>
                     </div>
                 </div>
-                <br class="separator" />
+                <br class="separator">
             </div>
             <div id="middle" class="curved container">
                 <h3>Developer Quick Start</h3>
@@ -98,7 +98,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
                         <p><a href="https://wiki.apache.org/tomcat/TomcatVersions">Tomcat Versions</a></p>
                     </div>
                 </div>
-                <br class="separator" />
+                <br class="separator">
             </div>
             <div id="lower">
                 <div id="low-manage" class="">
@@ -109,7 +109,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
                         <pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>
                         <p>In Tomcat @VERSION_MAJOR_MINOR@ access to the manager application is split between
                            different users. &nbsp; <a href="${tomcatDocUrl}manager-howto.html">Read more...</a></p>
-                        <br />
+                        <br>
                         <h4><a href="${tomcatDocUrl}RELEASE-NOTES.txt">Release Notes</a></h4>
                         <h4><a href="${tomcatDocUrl}changelog.html">Changelog</a></h4>
                         <h4><a href="${tomcatUrl}migration.html">Migration Guide</a></h4>
@@ -138,22 +138,22 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
                         <h4><a href="${tomcatUrl}faq/">FAQ</a> and <a href="${tomcatUrl}lists.html">Mailing Lists</a></h4>
                         <p>The following mailing lists are available:</p>
                         <ul>
-                            <li id="list-announce"><strong><a href="${tomcatUrl}lists.html#tomcat-announce">tomcat-announce</a><br />
+                            <li id="list-announce"><strong><a href="${tomcatUrl}lists.html#tomcat-announce">tomcat-announce</a><br>
                                 Important announcements, releases, security vulnerability notifications. (Low volume).</strong>
                             </li>
-                            <li><a href="${tomcatUrl}lists.html#tomcat-users">tomcat-users</a><br />
+                            <li><a href="${tomcatUrl}lists.html#tomcat-users">tomcat-users</a><br>
                                 User support and discussion
                             </li>
-                            <li><a href="${tomcatUrl}lists.html#taglibs-user">taglibs-user</a><br />
+                            <li><a href="${tomcatUrl}lists.html#taglibs-user">taglibs-user</a><br>
                                 User support and discussion for <a href="${tomcatUrl}taglibs/">Apache Taglibs</a>
                             </li>
-                            <li><a href="${tomcatUrl}lists.html#tomcat-dev">tomcat-dev</a><br />
+                            <li><a href="${tomcatUrl}lists.html#tomcat-dev">tomcat-dev</a><br>
                                 Development mailing list, including commit messages
                             </li>
                         </ul>
                     </div>
                 </div>
-                <br class="separator" />
+                <br class="separator">
             </div>
             <div id="footer" class="curved container">
                 <div class="col20">
@@ -211,7 +211,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
                         </ul>
                     </div>
                 </div>
-                <br class="separator" />
+                <br class="separator">
             </div>
             <p class="copyright">Copyright &copy;1999-${year} Apache Software Foundation.  All Rights Reserved</p>
         </div>

diff --git a/webapps/docs/annotationapi/index.html b/webapps/docs/annotationapi/index.html
@@ -17,7 +17,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="UTF-8" />
+    <meta charset="UTF-8">
     <title>API docs</title>
 </head>
 

diff --git a/webapps/docs/api/index.html b/webapps/docs/api/index.html
@@ -17,7 +17,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-    <meta charset="UTF-8" />
+    <meta charset="UTF-8">
     <title>API docs</title>
 </head>
 

diff --git a/webapps/docs/appdev/sample/index.html b/webapps/docs/appdev/sample/index.html
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<html>
+<html lang="en">
 <head>
-<meta charset="UTF-8" />
-<meta name="author" content="Ben Souther" />
+<meta charset="UTF-8">
+<meta name="author" content="Ben Souther">
 <title>Sample Application</title>
 </head>
 <body>
@@ -34,7 +34,7 @@ <h2>Sample Application</h2>
         will automatically expand and deploy the application for you. You can
         view it with the following URL (assuming that you're running tomcat on
         port 8080 which is the default):
-        <br />
+        <br>
         <a href="http://localhost:8080/sample">http://localhost:8080/sample</a>
       </p>
       <p>

diff --git a/webapps/docs/appdev/sample/web/index.html b/webapps/docs/appdev/sample/web/index.html
@@ -16,13 +16,13 @@
 -->
 <html>
 <head>
-<meta charset="UTF-8" />
+<meta charset="UTF-8">
 <title>Sample "Hello, World" Application</title>
 </head>
 <body>
 
 <div style="float: left; padding: 10px;">
-<img src="images/tomcat.gif" alt="" />
+<img src="images/tomcat.gif" alt="">
 </div>
 <h1>Sample "Hello, World" Application</h1>
 <p>This is the home page for a sample application used to illustrate the

diff --git a/webapps/docs/elapi/index.html b/webapps/docs/elapi/index.html
@@ -17,7 +17,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-    <meta charset="UTF-8" />
+    <meta charset="UTF-8">
     <title>API docs</title>
 </head>
 

diff --git a/webapps/docs/jaspicapi/index.html b/webapps/docs/jaspicapi/index.html
@@ -17,7 +17,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="UTF-8" />
+    <meta charset="UTF-8">
     <title>API docs</title>
 </head>
 

diff --git a/webapps/docs/jspapi/index.html b/webapps/docs/jspapi/index.html
@@ -17,7 +17,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-    <meta charset="UTF-8" />
+    <meta charset="UTF-8">
     <title>API docs</title>
 </head>
 

diff --git a/webapps/docs/servletapi/index.html b/webapps/docs/servletapi/index.html
@@ -17,7 +17,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-    <meta charset="UTF-8" />
+    <meta charset="UTF-8">
     <title>API docs</title>
 </head>
 

diff --git a/webapps/docs/websocketapi/index.html b/webapps/docs/websocketapi/index.html
@@ -17,7 +17,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-    <meta charset="UTF-8" />
+    <meta charset="UTF-8">
     <title>API docs</title>
 </head>
 

diff --git a/webapps/examples/index.html b/webapps/examples/index.html
@@ -14,17 +14,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE HTML><html lang="en"><head>
-<meta charset="UTF-8">
-<title>Apache Tomcat Examples</title>
-</head>
-<body>
-<p>
-<h3>Apache Tomcat Examples</H3>
-<p></p>
-<ul>
-<li><a href="servlets">Servlets examples</a></li>
-<li><a href="jsp">JSP Examples</a></li>
-<li><a href="websocket/index.xhtml">WebSocket Examples</a></li>
-</ul>
-</body></html>
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title>Apache Tomcat Examples</title>
+    </head>
+    <body>
+        <h3>Apache Tomcat Examples</h3>
+        <ul>
+            <li><a href="servlets">Servlets examples</a></li>
+            <li><a href="jsp">JSP Examples</a></li>
+            <li><a href="websocket/index.xhtml">WebSocket Examples</a></li>
+        </ul>
+    </body>
+</html>
diff --git a/webapps/examples/jsp/cal/cal1.jsp b/webapps/examples/jsp/cal/cal1.jsp
@@ -15,80 +15,78 @@
   limitations under the License.
 --%>
 <%@page contentType="text/html; charset=UTF-8" %>
-<HTML>
-<HEAD><TITLE>
-    Calendar: A JSP APPLICATION
-</TITLE></HEAD>
+<html lang="en">
+  <head>
+    <title>Calendar: A JSP APPLICATION</title>
+    <style>
+      body {background-color: white;}
+    </style>
+  </head>
+  <body>
 
+  <%@ page language="java" import="cal.*" %>
+  <jsp:useBean id="table" scope="session" class="cal.TableBean" />
 
-<BODY BGCOLOR="white">
-
-<%@ page language="java" import="cal.*" %>
-<jsp:useBean id="table" scope="session" class="cal.TableBean" />
-
-<%
+  <%
     table.processRequest(request);
     if (table.getProcessError() == false) {
-%>
+  %>
 
-<!-- html table goes here -->
-<CENTER>
-<TABLE WIDTH=60% BGCOLOR=yellow CELLPADDING=15>
-<TR>
-<TD ALIGN=CENTER> <A HREF=cal1.jsp?date=prev> prev </A>
-<TD ALIGN=CENTER> Calendar:<%= table.getDate() %></TD>
-<TD ALIGN=CENTER> <A HREF=cal1.jsp?date=next> next </A>
-</TR>
-</TABLE>
+  <!-- html table goes here -->
+  <center>
+    <table width="60%" bgcolor="yellow" cellpadding="15">
+      <tr>
+        <td align="center"> <a href="cal1.jsp?date=prev"> prev </a>
+        <td align="center"> Calendar:<%= table.getDate() %></td>
+        <td align="center"> <a href="cal1.jsp?date=next"> next </a>
+      </tr>
+    </table>
 
-<!-- the main table -->
-<TABLE WIDTH=60% BGCOLOR=lightblue BORDER=1 CELLPADDING=10>
-<TR>
-<TH> Time </TH>
-<TH> Appointment </TH>
-</TR>
-<FORM METHOD=POST ACTION=cal1.jsp>
-<%
-    for(int i=0; i<table.getEntries().getRows(); i++) {
-       cal.Entry entr = table.getEntries().getEntry(i);
-%>
-    <TR>
-    <TD>
-    <A HREF=cal2.jsp?time=<%= entr.getHour() %>>
-        <%= entr.getHour() %> </A>
-    </TD>
-    <TD BGCOLOR=<%= entr.getColor() %>>
-    <% out.print(util.HTMLFilter.filter(entr.getDescription())); %>
-    </TD>
-    </TR>
-<%
-    }
-%>
-</FORM>
-</TABLE>
-<BR>
+    <!-- the main table -->
+    <table width="60%" bgcolor="lightblue" border="1" cellpadding="10">
+      <tr>
+        <th> Time </th>
+        <th> Appointment </th>
+      </tr>
+      <form method="POST" action="cal1.jsp">
+      <%
+        for(int i=0; i<table.getEntries().getRows(); i++) {
+           cal.Entry entr = table.getEntries().getEntry(i);
+      %>
+        <tr>
+          <td>
+          <a href="cal2.jsp?time=<%= entr.getHour() %>">
+            <%= entr.getHour() %> </a>
+          </td>
+          <td bgcolor="<%= entr.getColor() %>">
+            <% out.print(util.HTMLFilter.filter(entr.getDescription())); %>
+          </td>
+        </tr>
+      <%
+        }
+      %>
+      </form>
+    </table>
+    <br>
 
-<!-- footer -->
-<TABLE WIDTH=60% BGCOLOR=yellow CELLPADDING=15>
-<TR>
-<TD ALIGN=CENTER>  <% out.print(util.HTMLFilter.filter(table.getName())); %> :
-             <% out.print(util.HTMLFilter.filter(table.getEmail())); %> </TD>
-</TR>
-</TABLE>
-</CENTER>
+    <!-- footer -->
+    <table width="60%" bgcolor="yellow" cellpadding="15">
+      <tr>
+        <td align="center">  <% out.print(util.HTMLFilter.filter(table.getName())); %> :
+          <% out.print(util.HTMLFilter.filter(table.getEmail())); %> </td>
+      </tr>
+    </table>
+  </center>
 
-<%
-    } else {
-%>
-<font size=5>
+  <%
+      } else {
+  %>
+  <font size="5">
     You must enter your name and email address correctly.
-</font>
-<%
-    }
-%>
-
-
-</BODY>
-</HTML>
-
+  </font>
+  <%
+      }
+  %>
 
+  </body>
+</html>