diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp index 1d3d46d21a77..5942d25c944c 100644 --- a/webapps/ROOT/index.jsp +++ b/webapps/ROOT/index.jsp @@ -25,11 +25,10 @@ request.setAttribute("tomcatExamplesUrl", "/examples/"); - + <%=request.getServletContext().getServerInfo() %> - - - + + @@ -42,7 +41,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/"); Wiki Mailing Lists Find Help -
+

${pageContext.servletContext.serverInfo}

@@ -52,7 +51,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 +70,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/"); Host Manager
-
+

Developer Quick Start

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

Tomcat Versions

-
+
@@ -109,7 +108,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 +137,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..61aba84d272b 100644 --- a/webapps/docs/annotationapi/index.html +++ b/webapps/docs/annotationapi/index.html @@ -15,12 +15,11 @@ limitations under the License. --> - + - + API docs - The Annotation API Javadoc is not installed by default. Download and install diff --git a/webapps/docs/api/index.html b/webapps/docs/api/index.html index 246dc78bc0b7..b32af2b386e1 100644 --- a/webapps/docs/api/index.html +++ b/webapps/docs/api/index.html @@ -15,12 +15,11 @@ limitations under the License. --> - - - + + + API docs - Tomcat's internal javadoc is not installed by default. Download and install diff --git a/webapps/docs/appdev/sample/index.html b/webapps/docs/appdev/sample/index.html index 589bd71d067c..07bf1bbbcf80 100644 --- a/webapps/docs/appdev/sample/index.html +++ b/webapps/docs/appdev/sample/index.html @@ -15,41 +15,41 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - -Sample Application + + + Sample Application -

Sample Application

-

- The example app has been packaged as a war file and can be downloaded - here (Note: make sure your browser doesn't - change file extension or append a new one). -

-

- The easiest way to run this application is simply to move the war file - to your CATALINA_BASE/webapps directory. A default Tomcat install - 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 -

-

- If you just want to browse the contents, you can unpack the war file - with the jar command. -

- 
-        jar -xvf sample.war
-
-

- Note: CATALINA_BASE is usually the directory in which you - unpacked the Tomcat distribution. For more information on - CATALINA_HOME, CATALINA_BASE and the difference between - them see RUNNING.txt in the directory you unpacked your Tomcat - distribution. -

+

Sample Application

+

+ The example app has been packaged as a war file and can be downloaded + here (Note: make sure your browser doesn't + change file extension or append a new one). +

+

+ The easiest way to run this application is simply to move the war file + to your CATALINA_BASE/webapps directory. A default Tomcat install + 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 +

+

+ If you just want to browse the contents, you can unpack the war file + with the jar command. +

+ 
+    jar -xvf sample.war
+
+

+ Note: CATALINA_BASE is usually the directory in which you + unpacked the Tomcat distribution. For more information on + CATALINA_HOME, CATALINA_BASE and the difference between + them see RUNNING.txt in the directory you unpacked your Tomcat + distribution. +

\ No newline at end of file diff --git a/webapps/docs/appdev/sample/web/hello.jsp b/webapps/docs/appdev/sample/web/hello.jsp index bd5680addd41..8f4a1ca39936 100644 --- a/webapps/docs/appdev/sample/web/hello.jsp +++ b/webapps/docs/appdev/sample/web/hello.jsp @@ -16,21 +16,20 @@ --%> <%@ page session="false" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> - + - -Sample Application JSP Page + + Sample Application JSP Page
- + tomcat

Sample Application JSP Page

This is the output of a JSP page that is part of the Hello, World application. - <%= new String("Hello!") %> diff --git a/webapps/docs/appdev/sample/web/index.html b/webapps/docs/appdev/sample/web/index.html index 1c6938a66806..5504d941d813 100644 --- a/webapps/docs/appdev/sample/web/index.html +++ b/webapps/docs/appdev/sample/web/index.html @@ -14,26 +14,23 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - -Sample "Hello, World" Application + + Sample "Hello, World" Application - -
- -
-

Sample "Hello, World" Application

-

This is the home page for a sample application used to illustrate the -source directory organization of a web application utilizing the principles -outlined in the Application Developer's Guide. - -

To prove that they work, you can execute either of the following links:

- - +
+ tomcat +
+

Sample "Hello, World" Application

+

This is the home page for a sample application used to illustrate the + source directory organization of a web application utilizing the principles + outlined in the Application Developer's Guide.

+

To prove that they work, you can execute either of the following links:

+ diff --git a/webapps/docs/elapi/index.html b/webapps/docs/elapi/index.html index 00c72fedf6d8..7559378d44ce 100644 --- a/webapps/docs/elapi/index.html +++ b/webapps/docs/elapi/index.html @@ -15,12 +15,11 @@ limitations under the License. --> - - - + + + API docs - The EL Javadoc is not installed by default. Download and install diff --git a/webapps/docs/jaspicapi/index.html b/webapps/docs/jaspicapi/index.html index e4f31a26882b..652a2c64d336 100644 --- a/webapps/docs/jaspicapi/index.html +++ b/webapps/docs/jaspicapi/index.html @@ -15,12 +15,11 @@ limitations under the License. --> - + - + API docs - The JASPIC Javadoc is not installed by default. Download and install diff --git a/webapps/docs/jspapi/index.html b/webapps/docs/jspapi/index.html index 4d0d1274827f..407cb981cb2b 100644 --- a/webapps/docs/jspapi/index.html +++ b/webapps/docs/jspapi/index.html @@ -15,12 +15,11 @@ limitations under the License. --> - - - + + + API docs - The JSP Javadoc is not installed by default. Download and install diff --git a/webapps/docs/servletapi/index.html b/webapps/docs/servletapi/index.html index b8a7a6697841..f21a5cb5e041 100644 --- a/webapps/docs/servletapi/index.html +++ b/webapps/docs/servletapi/index.html @@ -15,12 +15,11 @@ limitations under the License. --> - - - + + + API docs - The Servlet Javadoc is not installed by default. Download and install diff --git a/webapps/docs/websocketapi/index.html b/webapps/docs/websocketapi/index.html index 19cd77817d08..81e7021dcda8 100644 --- a/webapps/docs/websocketapi/index.html +++ b/webapps/docs/websocketapi/index.html @@ -15,12 +15,11 @@ limitations under the License. --> - - - + + + API docs - The WebSocket Javadoc is not installed by default. Download and install 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/async/index.jsp b/webapps/examples/jsp/async/index.jsp index be2d71363915..b26a8ccb0111 100644 --- a/webapps/examples/jsp/async/index.jsp +++ b/webapps/examples/jsp/async/index.jsp @@ -63,7 +63,6 @@ Use cases: - servlet2 does a dispatch to servlet3 (asyncsupported=true) - servlet3 does a dispatch to servlet4 (asyncsupported=false) - 7. Stock ticker "> StockTicker \ No newline at end of file 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..8257e699957d 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..14f894bdce76 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..a26e190af7cc 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
- - -checkbox.CheckTest Bean Properties - - -

-checkbox.CheckTest Bean Properties -

-
-
-
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..a1f2c3fa1622 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
- - -
- - -
- - + + + + +
+
+ + Check all Favorite fruits:
+ + Apples
+ Grapes
+ Oranges
+ Melons
+ +
+ +
+ + diff --git a/webapps/examples/jsp/checkbox/cresult.html b/webapps/examples/jsp/checkbox/cresult.html index b6a28d6645fc..3c669778de09 100644 --- a/webapps/examples/jsp/checkbox/cresult.html +++ b/webapps/examples/jsp/checkbox/cresult.html @@ -1,4 +1,5 @@ - + + - -Untitled Document - + Untitled Document + + - - -

- -

Source Code for Checkbox Example -

- -

Property Sheet for CheckTest -

- + +

+ + Execute + + + Return + +

+

+ Source Code for Checkbox Example +

+

+ Property Sheet for CheckTest +

diff --git a/webapps/examples/jsp/colors/ColorGameBean.html b/webapps/examples/jsp/colors/ColorGameBean.html index 172bc6646b26..6d96732540b6 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
- - -colors.ColorGameBean Bean Properties - - -

-colors.ColorGameBean Bean Properties -

-
-
-
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..015cd1a20b06 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 -

- + +

+ + Execute + + + Return + +

+

+ 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.html b/webapps/examples/jsp/dates/date.html index 683ab4d2a06a..d39023ba97f0 100644 --- a/webapps/examples/jsp/dates/date.html +++ b/webapps/examples/jsp/dates/date.html @@ -1,4 +1,5 @@ - + + -Untitled Document - + Untitled Document + + - - -

- -

Source Code for Date Example -

- + +

+ + Execute + + + Return + +

+

+ Source Code for Date Example +

diff --git a/webapps/examples/jsp/dates/date.jsp b/webapps/examples/jsp/dates/date.jsp index d6c6b8664ce3..57c793389f1b 100644 --- a/webapps/examples/jsp/dates/date.jsp +++ b/webapps/examples/jsp/dates/date.jsp @@ -19,9 +19,9 @@ <%@ page session="false"%> - + - +
  • Day of month: is
  • Year: is diff --git a/webapps/examples/jsp/error/er.html b/webapps/examples/jsp/error/er.html index af78159dda60..ed6510b6caf6 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/error/errorpge.jsp b/webapps/examples/jsp/error/errorpge.jsp index 5c6eb0a38718..c7372b8f0992 100644 --- a/webapps/examples/jsp/error/errorpge.jsp +++ b/webapps/examples/jsp/error/errorpge.jsp @@ -14,12 +14,16 @@ See the License for the specific language governing permissions and limitations under the License. --%> - - - - + + + + + + <%@ page isErrorPage="true" %>

    The exception <%= exception.getMessage() %> tells me you - made a wrong choice. + made a wrong choice.

    diff --git a/webapps/examples/jsp/forward/fwd.html b/webapps/examples/jsp/forward/fwd.html index b3b0219fc903..53d8b8de72b3 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/include/inc.html b/webapps/examples/jsp/include/inc.html index fedaed0918e4..5212088e852e 100644 --- a/webapps/examples/jsp/include/inc.html +++ b/webapps/examples/jsp/include/inc.html @@ -1,4 +1,5 @@ - + + -Untitled Document - + Untitled Document + + - - -

    - -

    Source Code for Include Example -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for Include Example +

    diff --git a/webapps/examples/jsp/index.html b/webapps/examples/jsp/index.html index 977ed04237ae..47b1e25565bd 100644 --- a/webapps/examples/jsp/index.html +++ b/webapps/examples/jsp/index.html @@ -14,20 +14,20 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + - - + + JSP Examples - -

    JSP -Samples

    +

    JSP Samples

    This is a collection of samples demonstrating the usage of different parts of the Java Server Pages (JSP) specification. Both JSP 2.0 and JSP 1.2 examples are presented below. @@ -88,9 +88,8 @@

    JSP 2.0 Examples

    Source - -
    SimpleTag Handlers and JSP Fragments +
    SimpleTag Handlers and JSP Fragments @@ -115,7 +114,7 @@

    JSP 2.0 Examples

    -
    Tag Files +
    Tag Files @@ -140,7 +139,7 @@

    JSP 2.0 Examples

    -
    New JSP XML Syntax (.jspx) +
    New JSP XML Syntax (.jspx) @@ -158,7 +157,7 @@

    JSP 2.0 Examples

    -
    Other JSP 2.0 Features +
    Other JSP 2.0 Features diff --git a/webapps/examples/jsp/jsp2/el/basic-arithmetic.html b/webapps/examples/jsp/jsp2/el/basic-arithmetic.html index 8a2f0a61dbb0..876eac7c2218 100644 --- a/webapps/examples/jsp/jsp2/el/basic-arithmetic.html +++ b/webapps/examples/jsp/jsp2/el/basic-arithmetic.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    - -

    Source Code for Basic Arithmetic Example -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for Basic Arithmetic Example +

    diff --git a/webapps/examples/jsp/jsp2/el/basic-comparisons.html b/webapps/examples/jsp/jsp2/el/basic-comparisons.html index 60fb40a3bbf9..1524f2e4af8c 100644 --- a/webapps/examples/jsp/jsp2/el/basic-comparisons.html +++ b/webapps/examples/jsp/jsp2/el/basic-comparisons.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    - -

    Source Code for Basic Comparisons Example -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for Basic Comparisons Example +

    diff --git a/webapps/examples/jsp/jsp2/el/functions.html b/webapps/examples/jsp/jsp2/el/functions.html index 726dda3661cc..ebbf4948b9b6 100644 --- a/webapps/examples/jsp/jsp2/el/functions.html +++ b/webapps/examples/jsp/jsp2/el/functions.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    - -

    Source Code for functions.jsp -

    -

    Source Code for Functions.java -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for functions.jsp +

    +

    + Source Code for Functions.java +

    diff --git a/webapps/examples/jsp/jsp2/el/implicit-objects.html b/webapps/examples/jsp/jsp2/el/implicit-objects.html index 15268db59abc..37bb127b08ba 100644 --- a/webapps/examples/jsp/jsp2/el/implicit-objects.html +++ b/webapps/examples/jsp/jsp2/el/implicit-objects.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    -

    - -

    Source Code for Implicit Objects Example -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for Implicit Objects Example +

    diff --git a/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html b/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html index df1b6e68c6dd..ad1be370a72c 100644 --- a/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html +++ b/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    -

    - -

    Source Code for jspattribute.jsp -

    - -

    Source Code for HelloWorldSimpleTag.java -

    - -

    Source Code for FooBean.java -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for jspattribute.jsp +

    +

    + Source Code for HelloWorldSimpleTag.java +

    +

    + Source Code for FooBean.java +

    diff --git a/webapps/examples/jsp/jsp2/jspattribute/shuffle.html b/webapps/examples/jsp/jsp2/jspattribute/shuffle.html index 5711860afe55..0e382efbd2b7 100644 --- a/webapps/examples/jsp/jsp2/jspattribute/shuffle.html +++ b/webapps/examples/jsp/jsp2/jspattribute/shuffle.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    -

    - -

    Source Code for shuffle.jsp -

    - -

    Source Code for ShuffleSimpleTag.java -

    - -

    Source Code for TileSimpleTag.java -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for shuffle.jsp +

    +

    + Source Code for ShuffleSimpleTag.java +

    +

    + Source Code for TileSimpleTag.java +

    diff --git a/webapps/examples/jsp/jsp2/jspx/basic.html b/webapps/examples/jsp/jsp2/jspx/basic.html index f9df6a4a2015..d0904d227ff8 100644 --- a/webapps/examples/jsp/jsp2/jspx/basic.html +++ b/webapps/examples/jsp/jsp2/jspx/basic.html @@ -17,15 +17,23 @@ --> - -View Source Code + + View Source Code + - -

    ExecuteReturn

    - -

    Source Code for XHTML Basic Example

    - +

    + + Execute + + + Return + +

    +

    + Source Code for XHTML Basic Example +

    diff --git a/webapps/examples/jsp/jsp2/jspx/svgexample.html b/webapps/examples/jsp/jsp2/jspx/svgexample.html index f7d591a58370..84de54fc2ae9 100644 --- a/webapps/examples/jsp/jsp2/jspx/svgexample.html +++ b/webapps/examples/jsp/jsp2/jspx/svgexample.html @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + JSP 2.0 SVG Example diff --git a/webapps/examples/jsp/jsp2/jspx/textRotate.html b/webapps/examples/jsp/jsp2/jspx/textRotate.html index 5b3befe2e048..46c3336c4192 100644 --- a/webapps/examples/jsp/jsp2/jspx/textRotate.html +++ b/webapps/examples/jsp/jsp2/jspx/textRotate.html @@ -17,16 +17,25 @@ --> - -View Source Code + + View Source Code + - -

    Execute Return

    - -

    Source Code for SVG (Scalable Vector Graphics) -Example

    - +

    + + Execute + + + Return + +

    +

    + Source Code for SVG (Scalable Vector Graphics)Example +

    diff --git a/webapps/examples/jsp/jsp2/misc/config.html b/webapps/examples/jsp/jsp2/misc/config.html index 707d68faf1c7..5f9d8836f2bb 100644 --- a/webapps/examples/jsp/jsp2/misc/config.html +++ b/webapps/examples/jsp/jsp2/misc/config.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    -

    - -

    Source Code for config.jsp -

    -

    Source Code for prelude.jspf -

    -

    Source Code for coda.jspf -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for config.jsp +

    +

    + Source Code for prelude.jspf +

    +

    + Source Code for coda.jspf +

    diff --git a/webapps/examples/jsp/jsp2/misc/dynamicattrs.html b/webapps/examples/jsp/jsp2/misc/dynamicattrs.html index 4fa1bf14e6f8..630ae7a26887 100644 --- a/webapps/examples/jsp/jsp2/misc/dynamicattrs.html +++ b/webapps/examples/jsp/jsp2/misc/dynamicattrs.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    -

    - -

    Source Code for dynamicattrs.jsp -

    -

    Source Code for EchoAttributesTag.java -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for dynamicattrs.jsp +

    +

    + Source Code for EchoAttributesTag.java +

    diff --git a/webapps/examples/jsp/jsp2/simpletag/book.html b/webapps/examples/jsp/jsp2/simpletag/book.html index 2841acf17f8b..2325920193ad 100644 --- a/webapps/examples/jsp/jsp2/simpletag/book.html +++ b/webapps/examples/jsp/jsp2/simpletag/book.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    -

    - -

    Source Code for the Book Example JSP -

    -

    Source Code for the FindBook SimpleTag Handler -

    -

    Source Code for BookBean -

    -

    Source Code for the EL Functions -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for the Book Example JSP +

    +

    + Source Code for the FindBook SimpleTag Handler +

    +

    + Source Code for BookBean +

    +

    + Source Code for the EL Functions +

    diff --git a/webapps/examples/jsp/jsp2/simpletag/hello.html b/webapps/examples/jsp/jsp2/simpletag/hello.html index 20cadf877c32..02e782071c80 100644 --- a/webapps/examples/jsp/jsp2/simpletag/hello.html +++ b/webapps/examples/jsp/jsp2/simpletag/hello.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    -

    - -

    Source Code for the Hello World Tag Example JSP -

    -

    Source Code for the Hello World SimpleTag Handler -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for the Hello World Tag Example JSP +

    +

    + Source Code for the Hello World SimpleTag Handler +

    diff --git a/webapps/examples/jsp/jsp2/simpletag/repeat.html b/webapps/examples/jsp/jsp2/simpletag/repeat.html index a56bfcd2e700..43920ea64ff8 100644 --- a/webapps/examples/jsp/jsp2/simpletag/repeat.html +++ b/webapps/examples/jsp/jsp2/simpletag/repeat.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    -

    - -

    Source Code for the Repeat Tag Example JSP -

    -

    Source Code for the Repeat SimpleTag Handler -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for the Repeat Tag Example JSP +

    +

    + Source Code for the Repeat SimpleTag Handler +

    diff --git a/webapps/examples/jsp/jsp2/tagfiles/hello.html b/webapps/examples/jsp/jsp2/tagfiles/hello.html index f29a37969b2e..bfefd9df45ae 100644 --- a/webapps/examples/jsp/jsp2/tagfiles/hello.html +++ b/webapps/examples/jsp/jsp2/tagfiles/hello.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    -

    - -

    Source Code for hello.jsp -

    -

    Source Code for helloWorld.tag -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for hello.jsp +

    +

    + Source Code for helloWorld.tag +

    diff --git a/webapps/examples/jsp/jsp2/tagfiles/panel.html b/webapps/examples/jsp/jsp2/tagfiles/panel.html index 1f03b9cab7b2..5e591e949448 100644 --- a/webapps/examples/jsp/jsp2/tagfiles/panel.html +++ b/webapps/examples/jsp/jsp2/tagfiles/panel.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    -

    - -

    Source Code for panel.jsp -

    -

    Source Code for panel.tag -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for panel.jsp +

    +

    + Source Code for panel.tag +

    diff --git a/webapps/examples/jsp/jsp2/tagfiles/products.html b/webapps/examples/jsp/jsp2/tagfiles/products.html index 72ae49ff2c63..1fce7cc3d86a 100644 --- a/webapps/examples/jsp/jsp2/tagfiles/products.html +++ b/webapps/examples/jsp/jsp2/tagfiles/products.html @@ -1,4 +1,5 @@ - + + -View Source Code - + View Source Code + + - - -

    -

    - -

    Source Code for products.jsp -

    -

    Source Code for displayProducts.tag -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for products.jsp +

    +

    + Source Code for displayProducts.tag +

    diff --git a/webapps/examples/jsp/jsptoserv/hello.jsp b/webapps/examples/jsp/jsptoserv/hello.jsp index 8b2a43f555ee..f7c1d50e3a04 100644 --- a/webapps/examples/jsp/jsptoserv/hello.jsp +++ b/webapps/examples/jsp/jsptoserv/hello.jsp @@ -14,13 +14,18 @@ See the License for the specific language governing permissions and limitations under the License. --%> - - - -

    -I have been invoked by -<% out.print (request.getAttribute("servletName").toString()); %> -Servlet. -

    - + + + + + + +

    + I have been invoked by + <% out.print (request.getAttribute("servletName").toString()); %> + Servlet. +

    + \ No newline at end of file diff --git a/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp b/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp index db68a6ff07b3..1c0fac2ff0ca 100644 --- a/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp +++ b/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp @@ -15,9 +15,15 @@ limitations under the License. --%> - + + + + + \ No newline at end of file diff --git a/webapps/examples/jsp/jsptoserv/jts.html b/webapps/examples/jsp/jsptoserv/jts.html index a4e16794a3af..4801fdfb7c66 100644 --- a/webapps/examples/jsp/jsptoserv/jts.html +++ b/webapps/examples/jsp/jsptoserv/jts.html @@ -15,22 +15,26 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - -Untitled Document - + + Untitled Document + - -

    Execute
    - Return

    - -

    Source Code for JSP calling servlet

    - -

    Source Code for Servlet calling JSP

    - +

    + Execute Execute +
    + Return Return +

    +

    + Source Code for JSP calling servlet +

    +

    + Source Code for Servlet calling JSP +

    diff --git a/webapps/examples/jsp/num/numguess.html b/webapps/examples/jsp/num/numguess.html index 1c5a4844aa17..67fce87d8ce2 100644 --- a/webapps/examples/jsp/num/numguess.html +++ b/webapps/examples/jsp/num/numguess.html @@ -1,4 +1,5 @@ - + + -Untitled Document - + Untitled Document + + - - -

    - -

    Source Code for Numguess Example -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for Numguess Example +

    diff --git a/webapps/examples/jsp/num/numguess.jsp b/webapps/examples/jsp/num/numguess.jsp index d9c61b912db5..3026da970722 100644 --- a/webapps/examples/jsp/num/numguess.jsp +++ b/webapps/examples/jsp/num/numguess.jsp @@ -24,10 +24,15 @@ - -Number Guess - - + + + Number Guess + + + + <% if (numguess.getSuccess()) { %> @@ -44,9 +49,9 @@ I'm thinking of a number between 1 and 100.

    -

    - What's your guess? - + + What's your guess? +
    <% } else { %> @@ -57,9 +62,9 @@ I'm thinking of a number between 1 and 100.

    -

    - What's your guess? - + + What's your guess? +
    <% } %> diff --git a/webapps/examples/jsp/plugin/plugin.html b/webapps/examples/jsp/plugin/plugin.html index 27bc51b131ff..14d0e657303e 100644 --- a/webapps/examples/jsp/plugin/plugin.html +++ b/webapps/examples/jsp/plugin/plugin.html @@ -1,4 +1,5 @@ - + + -Untitled Document - + Untitled Document + + - - -

    - -

    Source Code for Plugin Example -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for Plugin Example +

    diff --git a/webapps/examples/jsp/plugin/plugin.jsp b/webapps/examples/jsp/plugin/plugin.jsp index a07dda3af581..81d8f7e1a114 100644 --- a/webapps/examples/jsp/plugin/plugin.jsp +++ b/webapps/examples/jsp/plugin/plugin.jsp @@ -15,20 +15,23 @@ limitations under the License. --%> - Plugin example - + + Plugin example + + +

    Current time is :

    - + Plugin tag OBJECT or EMBED not supported by browser. -

    - The above applet is loaded using the Java Plugin from a jsp page using the plugin tag. -

    diff --git a/webapps/examples/jsp/security/protected/index.jsp b/webapps/examples/jsp/security/protected/index.jsp index 31122eb361fd..0cf4913f671f 100644 --- a/webapps/examples/jsp/security/protected/index.jsp +++ b/webapps/examples/jsp/security/protected/index.jsp @@ -22,11 +22,14 @@ return; } %> - + -Protected Page for Examples + Protected Page for Examples + - + You are logged in as remote user <%= util.HTMLFilter.filter(request.getRemoteUser()) %> @@ -69,7 +72,7 @@ To check whether your user name has been granted a particular role, enter it here:
    - +


    @@ -77,7 +80,7 @@ To add some data to the authenticated session, enter it here:
    - +


    diff --git a/webapps/examples/jsp/security/protected/login.jsp b/webapps/examples/jsp/security/protected/login.jsp index e11a898c7dbf..e750b41597b3 100644 --- a/webapps/examples/jsp/security/protected/login.jsp +++ b/webapps/examples/jsp/security/protected/login.jsp @@ -14,25 +14,29 @@ See the License for the specific language governing permissions and limitations under the License. --%> - + -Login Page for Examples - -
    - - - - - - - - - - - - - -
    Username:
    Password:
    -
    + Login Page for Examples + + + +
    + + + + + + + + + + + + + +
    Username:
    Password:
    +
    diff --git a/webapps/examples/jsp/sessions/DummyCart.html b/webapps/examples/jsp/sessions/DummyCart.html index d953fa920976..139faa70ea80 100644 --- a/webapps/examples/jsp/sessions/DummyCart.html +++ b/webapps/examples/jsp/sessions/DummyCart.html @@ -1,4 +1,4 @@ - + + +sessions.DummyCart Bean Properties + + + +

    sessions.DummyCart Bean Properties

    +
    +
    +
    public class DummyCart
    extends Object
    - - -sessions.DummyCart Bean Properties - - -

    -sessions.DummyCart Bean Properties -

    -
    -
    -
    public class DummyCart
    extends Object
    +

    +

    +

    -

    -

    - -

    - - - - - - +
    -Properties Summary
    + + + + - + + -
    +Properties Summary
    - + String -DummyCart:items -
    -     		DummyCart:items +
    +     		- + Multi -
    -

    - - +     + +
    + + diff --git a/webapps/examples/jsp/sessions/carts.html b/webapps/examples/jsp/sessions/carts.html index 834ee0a594fd..905c9619bbe8 100644 --- a/webapps/examples/jsp/sessions/carts.html +++ b/webapps/examples/jsp/sessions/carts.html @@ -1,4 +1,5 @@ - + + - carts + - - - - -
    -
    -Please enter item to add or remove: -
    -Add Item: - - - - -

    - - - -
    - -     + +
    +
    + Please enter item to add or remove: +
    + Add Item: + +

    + + +
    diff --git a/webapps/examples/jsp/sessions/carts.jsp b/webapps/examples/jsp/sessions/carts.jsp index dc51495c4bec..3f268c1e20c6 100644 --- a/webapps/examples/jsp/sessions/carts.jsp +++ b/webapps/examples/jsp/sessions/carts.jsp @@ -22,8 +22,7 @@ cart.processRequest(); %> - - +
    You have the following items in your cart:
      <% @@ -36,7 +35,7 @@ %>
    -     +
    <%@ include file ="carts.html" %> diff --git a/webapps/examples/jsp/sessions/crt.html b/webapps/examples/jsp/sessions/crt.html index 11e6edafe0e9..c31c87e387cc 100644 --- a/webapps/examples/jsp/sessions/crt.html +++ b/webapps/examples/jsp/sessions/crt.html @@ -1,4 +1,5 @@ - + + - -Untitled Document - + Untitled Document + + - - -

    - -

    Source Code for Cart Example -

    - -

    Property Sheet for DummyCart -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for Cart Example +

    +

    + Property Sheet for DummyCart +

    diff --git a/webapps/examples/jsp/simpletag/foo.html b/webapps/examples/jsp/simpletag/foo.html index e20f840b7b97..8556cb0ff00a 100644 --- a/webapps/examples/jsp/simpletag/foo.html +++ b/webapps/examples/jsp/simpletag/foo.html @@ -1,4 +1,5 @@ - + + -Untitled Document - + Untitled Document + + - - -

    - -

    Source Code for the Simple Tag Example -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for the Simple Tag Example +

    diff --git a/webapps/examples/jsp/snp/snoop.html b/webapps/examples/jsp/snp/snoop.html index e48355b4351d..09091a551f17 100644 --- a/webapps/examples/jsp/snp/snoop.html +++ b/webapps/examples/jsp/snp/snoop.html @@ -1,4 +1,5 @@ - + + - -Untitled Document - + Untitled Document + + - - -

    - -

    Source Code for Request Parameters Example -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for Request Parameters Example +

    diff --git a/webapps/examples/jsp/tagplugin/choose.html b/webapps/examples/jsp/tagplugin/choose.html index afe90b2f42ef..6179356047ee 100644 --- a/webapps/examples/jsp/tagplugin/choose.html +++ b/webapps/examples/jsp/tagplugin/choose.html @@ -14,23 +14,27 @@ 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..a45051291589 100644 --- a/webapps/examples/jsp/tagplugin/foreach.html +++ b/webapps/examples/jsp/tagplugin/foreach.html @@ -14,23 +14,27 @@ See the License for the specific language governing permissions and 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..3eb7acb88c36 100644 --- a/webapps/examples/jsp/tagplugin/if.html +++ b/webapps/examples/jsp/tagplugin/if.html @@ -14,23 +14,27 @@ See the License for the specific language governing permissions and 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.html b/webapps/examples/jsp/xml/xml.html index 00121424e98b..e00ecafe890e 100644 --- a/webapps/examples/jsp/xml/xml.html +++ b/webapps/examples/jsp/xml/xml.html @@ -1,4 +1,5 @@ - + + - -Untitled Document - + Untitled Document + + - - -

    - -

    Source Code for XML syntax Example -

    - + +

    + + Execute + + + Return + +

    +

    + Source Code for XML syntax Example +

    diff --git a/webapps/examples/jsp/xml/xml.jsp b/webapps/examples/jsp/xml/xml.jsp index 840b21f3248b..a576c29bfac6 100644 --- a/webapps/examples/jsp/xml/xml.jsp +++ b/webapps/examples/jsp/xml/xml.jsp @@ -32,10 +32,9 @@ Example JSP in XML format - This is the output of a simple JSP using XML format. -
    +
    Use a jsp:scriptlet to loop from 1 to 10:
    @@ -60,7 +59,6 @@ This is the output of a simple JSP using XML format. getDateTimeStr(request.getLocale()) - <p>This sentence is enclosed in a jsp:text element.</p> 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 diff --git a/webapps/manager/xform.xsl b/webapps/manager/xform.xsl index 0f0753f3d3e1..b631297fa449 100644 --- a/webapps/manager/xform.xsl +++ b/webapps/manager/xform.xsl @@ -34,7 +34,7 @@ -
    Tomcat Status
    +
    Tomcat Status