From 953416ecff89ab897a05e191449dc2189f6de5bf Mon Sep 17 00:00:00 2001 From: John Bampton Date: Sun, 5 Jul 2020 05:51:47 +1000 Subject: [PATCH] Use lowercase HTML tags and attributes. Add quotes around attributes. Fix some HTML errors. Use HTML5. Indent HTML and JSP. Remove whitespace. --- webapps/ROOT/index.jsp | 30 ++-- webapps/docs/annotationapi/index.html | 4 +- webapps/docs/api/index.html | 4 +- webapps/docs/appdev/sample/index.html | 8 +- webapps/docs/appdev/sample/web/hello.jsp | 6 +- webapps/docs/appdev/sample/web/index.html | 6 +- webapps/docs/elapi/index.html | 4 +- webapps/docs/jaspicapi/index.html | 4 +- webapps/docs/jspapi/index.html | 4 +- webapps/docs/servletapi/index.html | 4 +- webapps/docs/websocketapi/index.html | 4 +- webapps/examples/index.html | 29 ++-- webapps/examples/jsp/cal/cal1.jsp | 132 +++++++++-------- webapps/examples/jsp/cal/cal2.jsp | 52 +++---- webapps/examples/jsp/cal/calendar.html | 60 +++++--- webapps/examples/jsp/cal/login.html | 41 ++---- webapps/examples/jsp/checkbox/CheckTest.html | 57 ++++---- webapps/examples/jsp/checkbox/check.html | 28 ++-- .../examples/jsp/colors/ColorGameBean.html | 137 +++++++++--------- webapps/examples/jsp/colors/clr.html | 38 +++-- webapps/examples/jsp/colors/colors.html | 59 ++++---- webapps/examples/jsp/colors/colrs.jsp | 26 ++-- webapps/examples/jsp/dates/date.jsp | 2 +- webapps/examples/jsp/error/er.html | 32 ++-- webapps/examples/jsp/error/err.jsp | 14 +- webapps/examples/jsp/error/error.html | 43 +++--- webapps/examples/jsp/forward/fwd.html | 31 ++-- webapps/examples/jsp/forward/one.jsp | 16 +- webapps/examples/jsp/forward/two.html | 16 +- webapps/examples/jsp/index.html | 14 +- webapps/examples/jsp/jsptoserv/jts.html | 4 +- webapps/examples/jsp/num/numguess.jsp | 4 +- webapps/examples/jsp/plugin/plugin.jsp | 2 +- .../examples/jsp/security/protected/index.jsp | 4 +- .../examples/jsp/security/protected/login.jsp | 1 + webapps/examples/jsp/sessions/DummyCart.html | 57 ++++---- webapps/examples/jsp/sessions/carts.html | 36 ++--- webapps/examples/jsp/sessions/carts.jsp | 4 +- webapps/examples/jsp/sessions/crt.html | 34 +++-- webapps/examples/jsp/tagplugin/choose.html | 41 +++--- webapps/examples/jsp/tagplugin/choose.jsp | 22 ++- webapps/examples/jsp/tagplugin/foreach.html | 35 +++-- webapps/examples/jsp/tagplugin/foreach.jsp | 16 +- webapps/examples/jsp/tagplugin/if.html | 35 +++-- webapps/examples/jsp/tagplugin/if.jsp | 14 +- webapps/examples/jsp/tagplugin/notes.html | 3 +- webapps/examples/jsp/xml/xml.jsp | 2 +- webapps/examples/servlets/index.html | 10 +- .../servlets/nonblocking/bytecounter.html | 11 +- webapps/host-manager/WEB-INF/jsp/401.jsp | 8 +- webapps/host-manager/WEB-INF/jsp/403.jsp | 8 +- webapps/host-manager/WEB-INF/jsp/404.jsp | 8 +- webapps/manager/WEB-INF/jsp/401.jsp | 8 +- webapps/manager/WEB-INF/jsp/403.jsp | 8 +- webapps/manager/WEB-INF/jsp/404.jsp | 8 +- 55 files changed, 670 insertions(+), 618 deletions(-) diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp index 1d3d46d21a77..5d9330a6d4bd 100644 --- a/webapps/ROOT/index.jsp +++ b/webapps/ROOT/index.jsp @@ -25,11 +25,11 @@ request.setAttribute("tomcatExamplesUrl", "/examples/"); - + <%=request.getServletContext().getServerInfo() %> - - - + + + @@ -42,7 +42,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/"); Wiki Mailing Lists Find Help -
+

${pageContext.servletContext.serverInfo}

@@ -52,7 +52,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");

If you're seeing this, you've successfully installed Tomcat. Congratulations!

- [tomcat logo] + [tomcat logo]

Recommended Reading:

Security Considerations How-To

@@ -71,7 +71,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/"); Host Manager
-
+

Developer Quick Start

@@ -98,7 +98,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");

Tomcat Versions

-
+
@@ -109,7 +109,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/"); 
$CATALINA_HOME/conf/tomcat-users.xml

In Tomcat @VERSION_MAJOR_MINOR@ access to the manager application is split between different users.   Read more...

-
+

Release Notes

Changelog

Migration Guide

@@ -138,22 +138,22 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");

FAQ and Mailing Lists

The following mailing lists are available:

-
+
-
+

Copyright ©1999-${year} Apache Software Foundation. All Rights Reserved

diff --git a/webapps/docs/annotationapi/index.html b/webapps/docs/annotationapi/index.html index 2c633f558353..80a833fb3f1e 100644 --- a/webapps/docs/annotationapi/index.html +++ b/webapps/docs/annotationapi/index.html @@ -15,9 +15,9 @@ limitations under the License. --> - + - + API docs diff --git a/webapps/docs/api/index.html b/webapps/docs/api/index.html index 246dc78bc0b7..43b4fa9c5c99 100644 --- a/webapps/docs/api/index.html +++ b/webapps/docs/api/index.html @@ -15,9 +15,9 @@ limitations under the License. --> - + - + API docs diff --git a/webapps/docs/appdev/sample/index.html b/webapps/docs/appdev/sample/index.html index 589bd71d067c..773ba508a041 100644 --- 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. --> - + - - + + Sample Application @@ -34,7 +34,7 @@

Sample Application

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): -
+
http://localhost:8080/sample

diff --git a/webapps/docs/appdev/sample/web/hello.jsp b/webapps/docs/appdev/sample/web/hello.jsp index bd5680addd41..e7b3e4cf438b 100644 --- a/webapps/docs/appdev/sample/web/hello.jsp +++ b/webapps/docs/appdev/sample/web/hello.jsp @@ -16,15 +16,15 @@ --%> <%@ page session="false" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> - + - + Sample Application JSP Page

- +

Sample Application JSP Page

This is the output of a JSP page that is part of the Hello, World diff --git a/webapps/docs/appdev/sample/web/index.html b/webapps/docs/appdev/sample/web/index.html index 1c6938a66806..1bfc3ab46a2e 100644 --- a/webapps/docs/appdev/sample/web/index.html +++ b/webapps/docs/appdev/sample/web/index.html @@ -14,15 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - + Sample "Hello, World" Application
- +

Sample "Hello, World" Application

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 index 00c72fedf6d8..7a65f45d82de 100644 --- a/webapps/docs/elapi/index.html +++ b/webapps/docs/elapi/index.html @@ -15,9 +15,9 @@ limitations under the License. --> - + - + API docs diff --git a/webapps/docs/jaspicapi/index.html b/webapps/docs/jaspicapi/index.html index e4f31a26882b..5d5bdb961ce5 100644 --- a/webapps/docs/jaspicapi/index.html +++ b/webapps/docs/jaspicapi/index.html @@ -15,9 +15,9 @@ limitations under the License. --> - + - + API docs diff --git a/webapps/docs/jspapi/index.html b/webapps/docs/jspapi/index.html index 4d0d1274827f..9e5a7e192399 100644 --- a/webapps/docs/jspapi/index.html +++ b/webapps/docs/jspapi/index.html @@ -15,9 +15,9 @@ limitations under the License. --> - + - + API docs diff --git a/webapps/docs/servletapi/index.html b/webapps/docs/servletapi/index.html index b8a7a6697841..86d56d76e574 100644 --- a/webapps/docs/servletapi/index.html +++ b/webapps/docs/servletapi/index.html @@ -15,9 +15,9 @@ limitations under the License. --> - + - + API docs diff --git a/webapps/docs/websocketapi/index.html b/webapps/docs/websocketapi/index.html index 19cd77817d08..6d6f25aaa2e1 100644 --- a/webapps/docs/websocketapi/index.html +++ b/webapps/docs/websocketapi/index.html @@ -15,9 +15,9 @@ limitations under the License. --> - + - + API docs diff --git a/webapps/examples/index.html b/webapps/examples/index.html index 0799e10f7227..3ebe842d79b6 100644 --- 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. --> - - -Apache Tomcat Examples - - -

-

Apache Tomcat Examples

-

- - + + + + + Apache Tomcat Examples + + +

Apache Tomcat Examples

+ + + diff --git a/webapps/examples/jsp/cal/cal1.jsp b/webapps/examples/jsp/cal/cal1.jsp index e6b8a49d0c9e..73cf9403c09d 100644 --- 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" %> - - - Calendar: A JSP APPLICATION - + + + Calendar: A JSP APPLICATION + + + + <%@ page language="java" import="cal.*" %> + - - -<%@ page language="java" import="cal.*" %> - - -<% + <% table.processRequest(request); if (table.getProcessError() == false) { -%> + %> - -
- - - - -
prev - Calendar:<%= table.getDate() %> next -
+ +
+ + + + +
prev + Calendar:<%= table.getDate() %> next +
- - - - - - - -<% - for(int i=0; i - - - - -<% - } -%> - -
Time Appointment
- > - <%= entr.getHour() %> - > - <% out.print(util.HTMLFilter.filter(entr.getDescription())); %> -
-
+ + + + + + + + <% + for(int i=0; i + + + + + <% + } + %> + +
Time Appointment
+ + <%= entr.getHour() %> + + <% out.print(util.HTMLFilter.filter(entr.getDescription())); %> +
+
- - - - - -
<% out.print(util.HTMLFilter.filter(table.getName())); %> : - <% out.print(util.HTMLFilter.filter(table.getEmail())); %>
-
+ + + + + +
<% out.print(util.HTMLFilter.filter(table.getName())); %> : + <% out.print(util.HTMLFilter.filter(table.getEmail())); %>
+
-<% - } else { -%> - + <% + } else { + %> + You must enter your name and email address correctly. - -<% - } -%> - - - - - + + <% + } + %> + + diff --git a/webapps/examples/jsp/cal/cal2.jsp b/webapps/examples/jsp/cal/cal2.jsp index e7e14d8e0468..88b02d74efec 100644 --- a/webapps/examples/jsp/cal/cal2.jsp +++ b/webapps/examples/jsp/cal/cal2.jsp @@ -15,31 +15,31 @@ limitations under the License. --%> <%@page contentType="text/html; charset=UTF-8" %> - - - Calendar: A JSP APPLICATION - - - - - - -<% + + + Calendar: A JSP APPLICATION + + + + + + <% String time = request.getParameter ("time"); -%> - - Please add the following event: -

Date <%= table.getDate() %> -
Time <%= util.HTMLFilter.filter(time) %>

- -
-
-
-
-

Description of the event

-
-
- - - + %> + + Please add the following event: +
+

Date <%= table.getDate() %>
Time <%= util.HTMLFilter.filter(time) %>

+ +
+
+
+
+

Description of the event

+
+
+ + diff --git a/webapps/examples/jsp/cal/calendar.html b/webapps/examples/jsp/cal/calendar.html index a0a3ea184134..98c307399f72 100644 --- a/webapps/examples/jsp/cal/calendar.html +++ b/webapps/examples/jsp/cal/calendar.html @@ -1,4 +1,5 @@ - + + - -Untitled Document - + Source Code for Calendar Example. + + - - -

- -

Source Code for Calendar Example.
-

cal1.jsp -

-

cal2.jsp -

- -
-

Beans. -

TableBean -

-

Entries -

-

Entry -

- + +

+ + execute + + + return + +

+

Source Code for Calendar Example.

+
+

+ cal1.jsp +

+

+ cal2.jsp +

+
+

Beans.

+

+ TableBean +

+

+ Entries +

+

+ Entry +

diff --git a/webapps/examples/jsp/cal/login.html b/webapps/examples/jsp/cal/login.html index 2c4aa55e0f7c..a7c914c7d7e5 100644 --- a/webapps/examples/jsp/cal/login.html +++ b/webapps/examples/jsp/cal/login.html @@ -1,4 +1,4 @@ - + - - Login page for the calendar. + Login page for the calendar. - -
- - Please Enter the following information: - -
-
- - Name - -
- Email - +
+ Please Enter the following information:
- - - -
- Note: This application does not implement the complete -functionality of a typical calendar application. It demonstrates a way JSP can -be used with html tables and forms. - -
+
+ Name +
+ Email +
+ +
+
+ Note: This application does not implement the complete + functionality of a typical calendar application. It demonstrates a way JSP can + be used with html tables and forms. +
diff --git a/webapps/examples/jsp/checkbox/CheckTest.html b/webapps/examples/jsp/checkbox/CheckTest.html index 284d9ec3bce2..77f239e22b77 100644 --- a/webapps/examples/jsp/checkbox/CheckTest.html +++ b/webapps/examples/jsp/checkbox/CheckTest.html @@ -1,4 +1,4 @@ - + - + checkbox.CheckTest Bean Properties - -

+ + +

checkbox.CheckTest Bean Properties -

-
-
-
public class CheckTest
extends Object
+ +
+
+
public class CheckTest
extends Object
-

-

+

+

-

+

- - - - - +
-Properties Summary
+ + + + - + + -
+Properties Summary
- + String -CheckTest:fruit -
- 		CheckTest:fruit +
+ 		- + Multi -
-

- - + + +
+ + diff --git a/webapps/examples/jsp/checkbox/check.html b/webapps/examples/jsp/checkbox/check.html index b6d6b3bc1b3c..44dc18f77dbe 100644 --- a/webapps/examples/jsp/checkbox/check.html +++ b/webapps/examples/jsp/checkbox/check.html @@ -1,4 +1,4 @@ - + - + - -
-
- + +
+ Check all Favorite fruits:
- Apples
- Grapes
- Oranges
- Melons
- + Apples
+ Grapes
+ Oranges
+ Melons
-
+
 - - - + + + diff --git a/webapps/examples/jsp/colors/ColorGameBean.html b/webapps/examples/jsp/colors/ColorGameBean.html index 172bc6646b26..4a9bab7a44d1 100644 --- a/webapps/examples/jsp/colors/ColorGameBean.html +++ b/webapps/examples/jsp/colors/ColorGameBean.html @@ -1,4 +1,4 @@ - + - + colors.ColorGameBean Bean Properties - -

+ + +

colors.ColorGameBean Bean Properties -

-
-
-
public class ColorGameBean
extends Object
+ +
+
+
public class ColorGameBean
extends Object
-

-

+

+

-

+

- - - - - +
-Properties Summary
+ + + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + -
+Properties Summary
- + String -ColorGameBean:color2 -
- 		ColorGameBean:color2 +
+ 		- + Single -
- + String -ColorGameBean:color1 -
- 		ColorGameBean:color1 +
+ 		- + Single -
- + int -ColorGameBean:attempts -
- 		ColorGameBean:attempts +
+ 		- + Single -
- + boolean -ColorGameBean:hint -
- 		ColorGameBean:hint +
+ 		- + Single -
- + boolean -ColorGameBean:success -
- 		ColorGameBean:success +
+ 		- + Single -
- + boolean -ColorGameBean:hintTaken -
- 		ColorGameBean:hintTaken +
+ 		- + Single -
-

- - +
+ +
+ + diff --git a/webapps/examples/jsp/colors/clr.html b/webapps/examples/jsp/colors/clr.html index e411f597d22d..2cb273ad3b54 100644 --- a/webapps/examples/jsp/colors/clr.html +++ b/webapps/examples/jsp/colors/clr.html @@ -1,4 +1,5 @@ - + + - -Untitled Document - + Untitled Document + + - - -

- -

Source Code for Color Example -

- -

Property Sheet for ColorGameBean -

- + +

+ + + + + + +

+

+ Source Code for Color Example +

+

+ Property Sheet for ColorGameBean +

diff --git a/webapps/examples/jsp/colors/colors.html b/webapps/examples/jsp/colors/colors.html index 900651e2c6db..aa6f49903f68 100644 --- a/webapps/examples/jsp/colors/colors.html +++ b/webapps/examples/jsp/colors/colors.html @@ -1,4 +1,5 @@ - + + - - - - -
-This web page is an example using JSP and BEANs. -

-Guess my favorite two colors - -

If you fail to guess both of them - you get yellow on red. - -

If you guess one of them right, either your foreground or - your background will change to the color that was guessed right. - -

Guess them both right and your browser foreground/background - will change to my two favorite colors to display this page. - -

-
-Color #1: -
-Color #2: -

- - -

- - + + Example using JSP and BEANs. + + + +
+ This web page is an example using JSP and BEANs. +

Guess my favorite two colors

+ +

If you fail to guess both of them - you get yellow on red.

+ +

If you guess one of them right, either your foreground or + your background will change to the color that was guessed right.

+ +

Guess them both right and your browser foreground/background + will change to my two favorite colors to display this page.

+ +
+
+ Color #1: +
+ Color #2: +

+ + +

diff --git a/webapps/examples/jsp/colors/colrs.jsp b/webapps/examples/jsp/colors/colrs.jsp index ec3af887c4fd..acdd09ea0584 100644 --- a/webapps/examples/jsp/colors/colrs.jsp +++ b/webapps/examples/jsp/colors/colrs.jsp @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> - + @@ -23,8 +23,8 @@ cb.processRequest(); %> -> -> + +

<% if (cb.getHint()==true) { %> @@ -50,19 +50,13 @@

-

- -Color #1: - -
- -Color #2: - -

- - - - + + Color #1: +
+ Color #2: +

+ +

diff --git a/webapps/examples/jsp/dates/date.jsp b/webapps/examples/jsp/dates/date.jsp index d6c6b8664ce3..0b00d095a07e 100644 --- a/webapps/examples/jsp/dates/date.jsp +++ b/webapps/examples/jsp/dates/date.jsp @@ -21,7 +21,7 @@ - +
  • Day of month: is
  • Year: is diff --git a/webapps/examples/jsp/error/er.html b/webapps/examples/jsp/error/er.html index af78159dda60..c710766d90b6 100644 --- a/webapps/examples/jsp/error/er.html +++ b/webapps/examples/jsp/error/er.html @@ -1,4 +1,5 @@ - + + - -Untitled Document - + Untitled Document + + - - -

    - -

    Source Code for Error Example -

    - + +

    + + execute + + + return + +

    +

    + Source Code for Error Example +

    diff --git a/webapps/examples/jsp/error/err.jsp b/webapps/examples/jsp/error/err.jsp index d188456b3040..830acd6d2a9c 100644 --- a/webapps/examples/jsp/error/err.jsp +++ b/webapps/examples/jsp/error/err.jsp @@ -14,14 +14,18 @@ See the License for the specific language governing permissions and limitations under the License. --%> - - - + + + + + + <%@ page errorPage="errorpge.jsp" %> <% String name = null; - if (request.getParameter("name") == null) { %> <%@ include file="error.html" %> @@ -33,7 +37,7 @@ if (name.equalsIgnoreCase("acura")) { %> -

    Yes!!! Acura is my favorite car. +

    Yes!!! Acura is my favorite car.

    <% } diff --git a/webapps/examples/jsp/error/error.html b/webapps/examples/jsp/error/error.html index b1b029c90a8a..3aef0f951430 100644 --- a/webapps/examples/jsp/error/error.html +++ b/webapps/examples/jsp/error/error.html @@ -1,4 +1,5 @@ - + + - - - -

    This example uses errorpage directive

    -
    -

    Select my favourite car.

    -
    - - -
    -
    - + + Errorpage directive example + + + +

    This example uses errorpage directive

    +
    +

    Select my favourite car.

    +
    + + +
    + +
    diff --git a/webapps/examples/jsp/forward/fwd.html b/webapps/examples/jsp/forward/fwd.html index b3b0219fc903..97a43d2e6408 100644 --- a/webapps/examples/jsp/forward/fwd.html +++ b/webapps/examples/jsp/forward/fwd.html @@ -1,4 +1,5 @@ - + + -Untitled Document - + Untitled Document + + - - -

    - -

    Source Code for Forward Example -

    - + +

    + + execute + + + return + +

    +

    + Source Code for Forward Example +

    diff --git a/webapps/examples/jsp/forward/one.jsp b/webapps/examples/jsp/forward/one.jsp index c7f0004aa6f9..89517b0bf251 100644 --- a/webapps/examples/jsp/forward/one.jsp +++ b/webapps/examples/jsp/forward/one.jsp @@ -14,10 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --%> - - - - - -VM Memory usage < 50%. + + + + + + + VM Memory usage < 50%. + \ No newline at end of file diff --git a/webapps/examples/jsp/forward/two.html b/webapps/examples/jsp/forward/two.html index 24f4c08f041e..50254adbd635 100644 --- a/webapps/examples/jsp/forward/two.html +++ b/webapps/examples/jsp/forward/two.html @@ -1,4 +1,5 @@ - + + - - - - -VM Memory usage > 50%. + + + + + VM Memory usage > 50%. + \ No newline at end of file diff --git a/webapps/examples/jsp/index.html b/webapps/examples/jsp/index.html index 977ed04237ae..44bc74d5a43a 100644 --- a/webapps/examples/jsp/index.html +++ b/webapps/examples/jsp/index.html @@ -16,10 +16,10 @@ --> - - + + JSP Examples - - - -

    - -

    Source Code for Cart Example -

    - -

    Property Sheet for DummyCart -

    - + +

    + + + + +

    +

    + Source Code for Cart Example +

    +

    + Property Sheet for DummyCart +

    diff --git a/webapps/examples/jsp/tagplugin/choose.html b/webapps/examples/jsp/tagplugin/choose.html index afe90b2f42ef..837ab0f6714f 100644 --- a/webapps/examples/jsp/tagplugin/choose.html +++ b/webapps/examples/jsp/tagplugin/choose.html @@ -14,23 +14,26 @@ See the License for the specific language governing permissions and limitations under the License. --> - - -View Source Code - - - -

    - - - - - -

    - -

    - Source Code for choose.jsp -

    - - + + + + View Source Code + + + +

    + + execute + + + return + +

    +

    + Source Code for choose.jsp +

    + diff --git a/webapps/examples/jsp/tagplugin/choose.jsp b/webapps/examples/jsp/tagplugin/choose.jsp index 745e5f538d6c..ebac4b6bcc39 100644 --- a/webapps/examples/jsp/tagplugin/choose.jsp +++ b/webapps/examples/jsp/tagplugin/choose.jsp @@ -20,16 +20,14 @@

    Tag Plugin Examples - <c:choose>

    - -
    -
    +
    +
    Plugin Introductory Notes -
    +
    Brief Instructions for Writing Plugins -

    -
    - -
    +

    +
    +
    <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> @@ -37,16 +35,16 @@ # ${index}: - One!
    + One!
     - Four!
    + Four!
     - Three!
    + Three!
     - Huh?
    + Huh?
         diff --git a/webapps/examples/jsp/tagplugin/foreach.html b/webapps/examples/jsp/tagplugin/foreach.html index 3d2e6082daa0..7298b28c98d5 100644 --- a/webapps/examples/jsp/tagplugin/foreach.html +++ b/webapps/examples/jsp/tagplugin/foreach.html @@ -15,22 +15,21 @@ limitations under the License. --> - -View Source Code - - - -

    - - - - - -

    - -

    - Source Code for foreach.jsp -

    - - + + View Source Code + + +

    + + + execute + + return + + +

    +

    + Source Code for foreach.jsp +

    + diff --git a/webapps/examples/jsp/tagplugin/foreach.jsp b/webapps/examples/jsp/tagplugin/foreach.jsp index 48035062db6b..7cfe7f288435 100644 --- a/webapps/examples/jsp/tagplugin/foreach.jsp +++ b/webapps/examples/jsp/tagplugin/foreach.jsp @@ -20,16 +20,14 @@

    Tag Plugin Examples - <c:forEach>

    - -
    -
    +
    +
    Plugin Introductory Notes -
    +
    Brief Instructions for Writing Plugins -

    -
    - -
    +

    +
    +
    <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ page import="java.util.Vector" %> @@ -47,7 +45,7 @@

    Iterating over a Vector

    - + ${item} diff --git a/webapps/examples/jsp/tagplugin/if.html b/webapps/examples/jsp/tagplugin/if.html index b04ac592b9bc..c19c9b8a11df 100644 --- a/webapps/examples/jsp/tagplugin/if.html +++ b/webapps/examples/jsp/tagplugin/if.html @@ -15,22 +15,21 @@ limitations under the License. --> - -View Source Code - - - -

    - - - - - -

    - -

    - Source Code for if.jsp -

    - - + + View Source Code + + +

    + + + execute + + return + + +

    +

    + Source Code for if.jsp +

    + diff --git a/webapps/examples/jsp/tagplugin/if.jsp b/webapps/examples/jsp/tagplugin/if.jsp index af627bf36034..38048a2836b9 100644 --- a/webapps/examples/jsp/tagplugin/if.jsp +++ b/webapps/examples/jsp/tagplugin/if.jsp @@ -20,16 +20,14 @@

    Tag Plugin Examples - <c:if>

    - -
    -
    +
    +
    Plugin Introductory Notes -
    +
    Brief Instructions for Writing Plugins -

    -
    - -
    +

    +
    +
    <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>

    Set the test result to a variable

    diff --git a/webapps/examples/jsp/tagplugin/notes.html b/webapps/examples/jsp/tagplugin/notes.html index cd326fc2df9b..e5dffd38063d 100644 --- a/webapps/examples/jsp/tagplugin/notes.html +++ b/webapps/examples/jsp/tagplugin/notes.html @@ -14,7 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + Tag Plugin Introduction diff --git a/webapps/examples/jsp/xml/xml.jsp b/webapps/examples/jsp/xml/xml.jsp index 840b21f3248b..76f0ee921313 100644 --- a/webapps/examples/jsp/xml/xml.jsp +++ b/webapps/examples/jsp/xml/xml.jsp @@ -35,7 +35,7 @@ This is the output of a simple JSP using XML format. -
    +
    Use a jsp:scriptlet to loop from 1 to 10:
    diff --git a/webapps/examples/servlets/index.html b/webapps/examples/servlets/index.html index d07a277e9c85..fe7ef0a33fde 100644 --- a/webapps/examples/servlets/index.html +++ b/webapps/examples/servlets/index.html @@ -16,10 +16,10 @@ --> - - + + Servlet Examples - diff --git a/webapps/host-manager/WEB-INF/jsp/403.jsp b/webapps/host-manager/WEB-INF/jsp/403.jsp index 74e1e2da9310..0063868cc0c2 100644 --- a/webapps/host-manager/WEB-INF/jsp/403.jsp +++ b/webapps/host-manager/WEB-INF/jsp/403.jsp @@ -21,10 +21,10 @@ 403 Access Denied diff --git a/webapps/host-manager/WEB-INF/jsp/404.jsp b/webapps/host-manager/WEB-INF/jsp/404.jsp index 956b9a974141..7ae964922b4f 100644 --- a/webapps/host-manager/WEB-INF/jsp/404.jsp +++ b/webapps/host-manager/WEB-INF/jsp/404.jsp @@ -22,10 +22,10 @@ 404 Not found diff --git a/webapps/manager/WEB-INF/jsp/401.jsp b/webapps/manager/WEB-INF/jsp/401.jsp index 84c9a970e079..45d185284c54 100644 --- a/webapps/manager/WEB-INF/jsp/401.jsp +++ b/webapps/manager/WEB-INF/jsp/401.jsp @@ -21,10 +21,10 @@ 401 Unauthorized diff --git a/webapps/manager/WEB-INF/jsp/403.jsp b/webapps/manager/WEB-INF/jsp/403.jsp index 4baa2f4c5582..8848f5b9770d 100644 --- a/webapps/manager/WEB-INF/jsp/403.jsp +++ b/webapps/manager/WEB-INF/jsp/403.jsp @@ -21,10 +21,10 @@ 403 Access Denied diff --git a/webapps/manager/WEB-INF/jsp/404.jsp b/webapps/manager/WEB-INF/jsp/404.jsp index d08b659469cb..a7f96f372c55 100644 --- a/webapps/manager/WEB-INF/jsp/404.jsp +++ b/webapps/manager/WEB-INF/jsp/404.jsp @@ -22,10 +22,10 @@ 404 Not found