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..551ba59667b6 100644 --- a/webapps/docs/annotationapi/index.html +++ b/webapps/docs/annotationapi/index.html @@ -17,7 +17,7 @@ - + API docs diff --git a/webapps/docs/api/index.html b/webapps/docs/api/index.html index 246dc78bc0b7..cf2cdf6129d2 100644 --- a/webapps/docs/api/index.html +++ b/webapps/docs/api/index.html @@ -17,7 +17,7 @@ - + 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/index.html b/webapps/docs/appdev/sample/web/index.html index 1c6938a66806..5a0d2d395664 100644 --- a/webapps/docs/appdev/sample/web/index.html +++ b/webapps/docs/appdev/sample/web/index.html @@ -16,13 +16,13 @@ --> - + 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..63969cf8ceff 100644 --- a/webapps/docs/elapi/index.html +++ b/webapps/docs/elapi/index.html @@ -17,7 +17,7 @@ - + API docs diff --git a/webapps/docs/jaspicapi/index.html b/webapps/docs/jaspicapi/index.html index e4f31a26882b..14229d24059c 100644 --- a/webapps/docs/jaspicapi/index.html +++ b/webapps/docs/jaspicapi/index.html @@ -17,7 +17,7 @@ - + API docs diff --git a/webapps/docs/jspapi/index.html b/webapps/docs/jspapi/index.html index 4d0d1274827f..2bd08cd472e3 100644 --- a/webapps/docs/jspapi/index.html +++ b/webapps/docs/jspapi/index.html @@ -17,7 +17,7 @@ - + API docs diff --git a/webapps/docs/servletapi/index.html b/webapps/docs/servletapi/index.html index b8a7a6697841..e229c16843c6 100644 --- a/webapps/docs/servletapi/index.html +++ b/webapps/docs/servletapi/index.html @@ -17,7 +17,7 @@ - + API docs diff --git a/webapps/docs/websocketapi/index.html b/webapps/docs/websocketapi/index.html index 19cd77817d08..4f53570ce5cc 100644 --- a/webapps/docs/websocketapi/index.html +++ b/webapps/docs/websocketapi/index.html @@ -17,7 +17,7 @@ - + API docs diff --git a/webapps/examples/jsp/cal/login.html b/webapps/examples/jsp/cal/login.html index 2c4aa55e0f7c..e681f8fc8916 100644 --- a/webapps/examples/jsp/cal/login.html +++ b/webapps/examples/jsp/cal/login.html @@ -17,28 +17,28 @@ --> - Login page for the calendar. + Login page for the calendar.

- Please Enter the following information: + Please Enter the following information:
-
+ - Name + Name
- Email + Email
- +
- Note: This application does not implement the complete + 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..b734032a9208 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/colors.html b/webapps/examples/jsp/colors/colors.html index 900651e2c6db..a1abf2a9c7fd 100644 --- a/webapps/examples/jsp/colors/colors.html +++ b/webapps/examples/jsp/colors/colors.html @@ -16,8 +16,8 @@ limitations under the License. --> - - + +
This web page is an example using JSP and BEANs. @@ -33,13 +33,13 @@ will change to my two favorite colors to display this page.
-
-Color #1: + +Color #1:
-Color #2: +Color #2:

- - + +

diff --git a/webapps/examples/jsp/colors/colrs.jsp b/webapps/examples/jsp/colors/colrs.jsp index ec3af887c4fd..6cd0053ddb50 100644 --- a/webapps/examples/jsp/colors/colrs.jsp +++ b/webapps/examples/jsp/colors/colrs.jsp @@ -23,8 +23,8 @@ cb.processRequest(); %> -> -> + +

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

-

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

- - + +

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/index.html b/webapps/examples/jsp/index.html index 977ed04237ae..b31949f7667c 100644 --- a/webapps/examples/jsp/index.html +++ b/webapps/examples/jsp/index.html @@ -16,8 +16,8 @@ --> - - + + 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/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 -