Author: markt
Date: Mon Aug 2 16:10:21 2010
New Revision: 981578
URL: http://svn.apache.org/viewvc?rev=981578&view=rev
Log:
Tab police
Modified:
tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld
tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld
tomcat/trunk/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
tomcat/trunk/webapps/examples/jsp/cal/cal1.jsp
tomcat/trunk/webapps/examples/jsp/cal/cal2.jsp
tomcat/trunk/webapps/examples/jsp/cal/login.html
tomcat/trunk/webapps/examples/jsp/checkbox/checkresult.jsp
tomcat/trunk/webapps/examples/jsp/colors/colrs.jsp
tomcat/trunk/webapps/examples/jsp/dates/date.jsp
tomcat/trunk/webapps/examples/jsp/error/err.jsp
tomcat/trunk/webapps/examples/jsp/error/errorpge.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx
tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp
tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp
tomcat/trunk/webapps/examples/jsp/sessions/carts.jsp
tomcat/trunk/webapps/examples/jsp/tagplugin/choose.jsp
tomcat/trunk/webapps/examples/jsp/tagplugin/foreach.jsp
tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp
Modified: tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld Mon Aug 2
16:10:21 2010
@@ -17,7 +17,7 @@
-->
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/j2ee/dtd/web-jsptaglibrary_1_2.dtd";>
+ "http://java.sun.com/j2ee/dtd/web-jsptaglibrary_1_2.dtd";>
<!-- a tag library descriptor -->
@@ -42,11 +42,11 @@
<tag-class>examples.LogTag</tag-class>
<body-content>TAGDEPENDENT</body-content>
<description>
- Perform a server side action; Log the message.
+ Perform a server side action; Log the message.
</description>
<attribute>
- <name>toBrowser</name>
- <required>false</required>
+ <name>toBrowser</name>
+ <required>false</required>
</attribute>
</tag>
Modified: tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld Mon Aug 2
16:10:21 2010
@@ -17,7 +17,7 @@
-->
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/j2ee/dtd/web-jsptaglibrary_1_2.dtd";>
+ "http://java.sun.com/j2ee/dtd/web-jsptaglibrary_1_2.dtd";>
<taglib>
@@ -26,7 +26,7 @@
<short-name>simple</short-name>
<uri>http://tomcat.apache.org/example-taglib</uri>
<description>
- A simple tab library for the examples
+ A simple tab library for the examples
</description>
<tag>
@@ -48,7 +48,7 @@
<tei-class>examples.FooTagExtraInfo</tei-class>
<body-content>JSP</body-content>
<description>
- Perform a server side action; uses 3 mandatory attributes
+ Perform a server side action; uses 3 mandatory attributes
</description>
<attribute>
@@ -72,11 +72,11 @@
<tag-class>examples.LogTag</tag-class>
<body-content>TAGDEPENDENT</body-content>
<description>
- Perform a server side action; Log the message.
+ Perform a server side action; Log the message.
</description>
<attribute>
- <name>toBrowser</name>
- <required>false</required>
+ <name>toBrowser</name>
+ <required>false</required>
</attribute>
</tag>
Modified: tomcat/trunk/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld Mon Aug
2 16:10:21 2010
@@ -25,10 +25,10 @@
<short-name>SimpleTagLibrary</short-name>
<uri>http://tomcat.apache.org/jsp2-example-taglib</uri>
<tag>
- <description>Outputs Hello, World</description>
+ <description>Outputs Hello, World</description>
<name>helloWorld</name>
- <tag-class>jsp2.examples.simpletag.HelloWorldSimpleTag</tag-class>
- <body-content>empty</body-content>
+ <tag-class>jsp2.examples.simpletag.HelloWorldSimpleTag</tag-class>
+ <body-content>empty</body-content>
</tag>
<tag>
<description>Repeats the body of the tag 'num' times</description>
@@ -46,15 +46,15 @@
</attribute>
</tag>
<tag>
- <description>Populates the page context with a BookBean</description>
+ <description>Populates the page context with a BookBean</description>
<name>findBook</name>
- <tag-class>jsp2.examples.simpletag.FindBookSimpleTag</tag-class>
- <body-content>empty</body-content>
- <attribute>
- <name>var</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
+ <tag-class>jsp2.examples.simpletag.FindBookSimpleTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>var</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
<description>
@@ -66,17 +66,17 @@
<attribute>
<name>fragment1</name>
<required>true</required>
- <fragment>true</fragment>
+ <fragment>true</fragment>
</attribute>
<attribute>
<name>fragment2</name>
<required>true</required>
- <fragment>true</fragment>
+ <fragment>true</fragment>
</attribute>
<attribute>
<name>fragment3</name>
<required>true</required>
- <fragment>true</fragment>
+ <fragment>true</fragment>
</attribute>
</tag>
<tag>
@@ -94,31 +94,31 @@
</attribute>
</tag>
<tag>
- <description>
- Tag that echoes all its attributes and body content
- </description>
- <name>echoAttributes</name>
- <tag-class>jsp2.examples.simpletag.EchoAttributesTag</tag-class>
- <body-content>empty</body-content>
- <dynamic-attributes>true</dynamic-attributes>
+ <description>
+ Tag that echoes all its attributes and body content
+ </description>
+ <name>echoAttributes</name>
+ <tag-class>jsp2.examples.simpletag.EchoAttributesTag</tag-class>
+ <body-content>empty</body-content>
+ <dynamic-attributes>true</dynamic-attributes>
</tag>
<function>
<description>Reverses the characters in the given String</description>
<name>reverse</name>
- <function-class>jsp2.examples.el.Functions</function-class>
- <function-signature>java.lang.String reverse( java.lang.String
)</function-signature>
+ <function-class>jsp2.examples.el.Functions</function-class>
+ <function-signature>java.lang.String reverse( java.lang.String
)</function-signature>
</function>
<function>
<description>Counts the number of vowels (a,e,i,o,u) in the given
String</description>
<name>countVowels</name>
- <function-class>jsp2.examples.el.Functions</function-class>
- <function-signature>java.lang.String numVowels( java.lang.String
)</function-signature>
+ <function-class>jsp2.examples.el.Functions</function-class>
+ <function-signature>java.lang.String numVowels( java.lang.String
)</function-signature>
</function>
<function>
- <description>Converts the string to all caps</description>
+ <description>Converts the string to all caps</description>
<name>caps</name>
- <function-class>jsp2.examples.el.Functions</function-class>
- <function-signature>java.lang.String caps( java.lang.String
)</function-signature>
+ <function-class>jsp2.examples.el.Functions</function-class>
+ <function-signature>java.lang.String caps( java.lang.String
)</function-signature>
</function>
</taglib>
Modified: tomcat/trunk/webapps/examples/jsp/cal/cal1.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/cal/cal1.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/cal/cal1.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/cal/cal1.jsp Mon Aug 2 16:10:21 2010
@@ -16,7 +16,7 @@
limitations under the License.
-->
<HEAD><TITLE>
- Calendar: A JSP APPLICATION
+ Calendar: A JSP APPLICATION
</TITLE></HEAD>
@@ -26,8 +26,8 @@
<jsp:useBean id="table" scope="session" class="cal.TableBean" />
<%
- table.processRequest(request);
- if (table.getProcessError() == false) {
+ table.processRequest(request);
+ if (table.getProcessError() == false) {
%>
<!-- html table goes here -->
@@ -48,20 +48,20 @@
</TR>
<FORM METHOD=POST ACTION=cal1.jsp>
<%
- for(int i=0; i<table.getEntries().getRows(); i++) {
- cal.Entry entr = table.getEntries().getEntry(i);
+ 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>
+ <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>
@@ -71,19 +71,19 @@
<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>
+ <% out.print(util.HTMLFilter.filter(table.getEmail())); %> </TD>
</TR>
</TABLE>
</CENTER>
<%
- } else {
+ } else {
%>
<font size=5>
- You must enter your name and email address correctly.
+ You must enter your name and email address correctly.
</font>
<%
- }
+ }
%>
Modified: tomcat/trunk/webapps/examples/jsp/cal/cal2.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/cal/cal2.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/cal/cal2.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/cal/cal2.jsp Mon Aug 2 16:10:21 2010
@@ -17,7 +17,7 @@
-->
<HEAD><TITLE>
- Calendar: A JSP APPLICATION
+ Calendar: A JSP APPLICATION
</TITLE></HEAD>
@@ -25,7 +25,7 @@
<jsp:useBean id="table" scope="session" class="cal.TableBean" />
<%
- String time = request.getParameter ("time");
+ String time = request.getParameter ("time");
%>
<FONT SIZE=5> Please add the following event:
Modified: tomcat/trunk/webapps/examples/jsp/cal/login.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/cal/login.html?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/cal/login.html (original)
+++ tomcat/trunk/webapps/examples/jsp/cal/login.html Mon Aug 2 16:10:21 2010
@@ -17,26 +17,26 @@
-->
<head>
- <title> Login page for the calendar. </title>
+ <title> Login page for the calendar. </title>
</head>
<body bgcolor="white">
<center>
- <font size=7 color="red"> Please Enter the following information:
</font>
+ <font size=7 color="red"> Please Enter the following information: </font>
<br>
- <form method=GET action=cal1.jsp>
+ <form method=GET action=cal1.jsp>
- <font size=5> Name <input type=text name="name" size=20>
- </font>
- <br>
- <font size=5> Email <input type=text name="email" size=20>
- </font>
- <br>
- <input type=submit name=action value="Submit">
+ <font size=5> Name <input type=text name="name" size=20>
+ </font>
+ <br>
+ <font size=5> Email <input type=text name="email" size=20>
+ </font>
+ <br>
+ <input type=submit name=action value="Submit">
- </form>
+ </form>
<hr>
<font size=3 color="red"> Note: This application does not implement the
complete
functionality of a typical calendar application. It demostartes a way JSP can
be
Modified: tomcat/trunk/webapps/examples/jsp/checkbox/checkresult.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/checkbox/checkresult.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/checkbox/checkresult.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/checkbox/checkresult.jsp Mon Aug 2
16:10:21 2010
@@ -25,18 +25,18 @@
<hr>
The checked fruits (got using request) are: <br>
<%
- fruits = request.getParameterValues("fruit");
+ fruits = request.getParameterValues("fruit");
%>
<ul>
<%
if (fruits != null) {
- for (int i = 0; i < fruits.length; i++) {
+ for (int i = 0; i < fruits.length; i++) {
%>
<li>
<%
- out.println (util.HTMLFilter.filter(fruits[i]));
- }
- } else out.println ("none selected");
+ out.println (util.HTMLFilter.filter(fruits[i]));
+ }
+ } else out.println ("none selected");
%>
</ul>
<br>
@@ -45,18 +45,18 @@ The checked fruits (got using request) a
The checked fruits (got using beans) are <br>
<%
- fruits = foo.getFruit();
+ fruits = foo.getFruit();
%>
<ul>
<%
if (!fruits[0].equals("1")) {
- for (int i = 0; i < fruits.length; i++) {
+ for (int i = 0; i < fruits.length; i++) {
%>
<li>
<%
- out.println (util.HTMLFilter.filter(fruits[i]));
- }
- } else out.println ("none selected");
+ out.println (util.HTMLFilter.filter(fruits[i]));
+ }
+ } else out.println ("none selected");
%>
</ul>
</font>
Modified: tomcat/trunk/webapps/examples/jsp/colors/colrs.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/colors/colrs.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/colors/colrs.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/colors/colrs.jsp Mon Aug 2 16:10:21 2010
@@ -20,7 +20,7 @@
<jsp:setProperty name="cb" property="*" />
<%
- cb.processRequest();
+ cb.processRequest();
%>
<body bgcolor=<%= cb.getColor1() %>>
@@ -28,20 +28,20 @@
<p>
<% if (cb.getHint()==true) { %>
-
- <p> Hint #1: Vampires prey at night!
- <p> <p> Hint #2: Nancy without the n.
+
+ <p> Hint #1: Vampires prey at night!
+ <p> <p> Hint #2: Nancy without the n.
<% } %>
<% if (cb.getSuccess()==true) { %>
<p> CONGRATULATIONS!!
- <% if (cb.getHintTaken()==true) { %>
+ <% if (cb.getHintTaken()==true) { %>
<p> ( although I know you cheated and peeked into the hints)
- <% } %>
+ <% } %>
<% } %>
Modified: tomcat/trunk/webapps/examples/jsp/dates/date.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/dates/date.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/dates/date.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/dates/date.jsp Mon Aug 2 16:10:21 2010
@@ -23,17 +23,17 @@
<font size=4>
<ul>
-<li> Day of month: is <jsp:getProperty name="clock" property="dayOfMonth"/>
-<li> Year: is <jsp:getProperty name="clock" property="year"/>
-<li> Month: is <jsp:getProperty name="clock" property="month"/>
-<li> Time: is <jsp:getProperty name="clock" property="time"/>
-<li> Date: is <jsp:getProperty name="clock" property="date"/>
-<li> Day: is <jsp:getProperty name="clock" property="day"/>
-<li> Day Of Year: is <jsp:getProperty name="clock" property="dayOfYear"/>
-<li> Week Of Year: is <jsp:getProperty name="clock" property="weekOfYear"/>
-<li> era: is <jsp:getProperty name="clock" property="era"/>
-<li> DST Offset: is <jsp:getProperty name="clock" property="DSTOffset"/>
-<li> Zone Offset: is <jsp:getProperty name="clock" property="zoneOffset"/>
+<li> Day of month: is <jsp:getProperty name="clock" property="dayOfMonth"/>
+<li> Year: is <jsp:getProperty name="clock" property="year"/>
+<li> Month: is <jsp:getProperty name="clock" property="month"/>
+<li> Time: is <jsp:getProperty name="clock" property="time"/>
+<li> Date: is <jsp:getProperty name="clock" property="date"/>
+<li> Day: is <jsp:getProperty name="clock" property="day"/>
+<li> Day Of Year: is <jsp:getProperty name="clock" property="dayOfYear"/>
+<li> Week Of Year: is <jsp:getProperty name="clock" property="weekOfYear"/>
+<li> era: is <jsp:getProperty name="clock" property="era"/>
+<li> DST Offset: is <jsp:getProperty name="clock" property="DSTOffset"/>
+<li> Zone Offset: is <jsp:getProperty name="clock" property="zoneOffset"/>
</ul>
</font>
Modified: tomcat/trunk/webapps/examples/jsp/error/err.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/error/err.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/error/err.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/error/err.jsp Mon Aug 2 16:10:21 2010
@@ -17,28 +17,28 @@
-->
<body bgcolor="lightblue">
- <%@ page errorPage="errorpge.jsp" %>
- <jsp:useBean id="foo" scope="request" class="error.Smart" />
- <%
- String name = null;
+ <%@ page errorPage="errorpge.jsp" %>
+ <jsp:useBean id="foo" scope="request" class="error.Smart" />
+ <%
+ String name = null;
- if (request.getParameter("name") == null) {
- %>
- <%@ include file="error.html" %>
- <%
- } else {
- foo.setName(request.getParameter("name"));
- if (foo.getName().equalsIgnoreCase("integra"))
- name = "acura";
- if (name.equalsIgnoreCase("acura")) {
- %>
+ if (request.getParameter("name") == null) {
+ %>
+ <%@ include file="error.html" %>
+ <%
+ } else {
+ foo.setName(request.getParameter("name"));
+ if (foo.getName().equalsIgnoreCase("integra"))
+ name = "acura";
+ if (name.equalsIgnoreCase("acura")) {
+ %>
- <H1> Yes!!! <a href="http://www.acura.com";>Acura</a> is my favorite car.
+ <H1> Yes!!! <a href="http://www.acura.com";>Acura</a> is my favorite car.
- <%
- }
- }
- %>
+ <%
+ }
+ }
+ %>
</body>
</html>
Modified: tomcat/trunk/webapps/examples/jsp/error/errorpge.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/error/errorpge.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/error/errorpge.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/error/errorpge.jsp Mon Aug 2 16:10:21
2010
@@ -18,8 +18,8 @@
<body bgcolor="red">
- <%@ page isErrorPage="true" %>
- <h1> The exception <%= exception.getMessage() %> tells me you
- made a wrong choice.
+ <%@ page isErrorPage="true" %>
+ <h1> The exception <%= exception.getMessage() %> tells me you
+ made a wrong choice.
</body>
</html>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp Mon Aug 2
16:10:21 2010
@@ -30,58 +30,58 @@
<code>
<table border="1">
<thead>
- <td><b>EL Expression</b></td>
- <td><b>Result</b></td>
- </thead>
- <tr>
- <td>\${1}</td>
- <td>${1}</td>
- </tr>
- <tr>
- <td>\${1 + 2}</td>
- <td>${1 + 2}</td>
- </tr>
- <tr>
- <td>\${1.2 + 2.3}</td>
- <td>${1.2 + 2.3}</td>
- </tr>
- <tr>
- <td>\${1.2E4 + 1.4}</td>
- <td>${1.2E4 + 1.4}</td>
- </tr>
- <tr>
- <td>\${-4 - 2}</td>
- <td>${-4 - 2}</td>
- </tr>
- <tr>
- <td>\${21 * 2}</td>
- <td>${21 * 2}</td>
- </tr>
- <tr>
- <td>\${3/4}</td>
- <td>${3/4}</td>
- </tr>
- <tr>
- <td>\${3 div 4}</td>
- <td>${3 div 4}</td>
- </tr>
- <tr>
- <td>\${3/0}</td>
- <td>${3/0}</td>
- </tr>
- <tr>
- <td>\${10%4}</td>
- <td>${10%4}</td>
- </tr>
- <tr>
- <td>\${10 mod 4}</td>
- <td>${10 mod 4}</td>
- </tr>
+ <td><b>EL Expression</b></td>
+ <td><b>Result</b></td>
+ </thead>
+ <tr>
+ <td>\${1}</td>
+ <td>${1}</td>
+ </tr>
+ <tr>
+ <td>\${1 + 2}</td>
+ <td>${1 + 2}</td>
+ </tr>
+ <tr>
+ <td>\${1.2 + 2.3}</td>
+ <td>${1.2 + 2.3}</td>
+ </tr>
+ <tr>
+ <td>\${1.2E4 + 1.4}</td>
+ <td>${1.2E4 + 1.4}</td>
+ </tr>
+ <tr>
+ <td>\${-4 - 2}</td>
+ <td>${-4 - 2}</td>
+ </tr>
+ <tr>
+ <td>\${21 * 2}</td>
+ <td>${21 * 2}</td>
+ </tr>
+ <tr>
+ <td>\${3/4}</td>
+ <td>${3/4}</td>
+ </tr>
+ <tr>
+ <td>\${3 div 4}</td>
+ <td>${3 div 4}</td>
+ </tr>
+ <tr>
+ <td>\${3/0}</td>
+ <td>${3/0}</td>
+ </tr>
+ <tr>
+ <td>\${10%4}</td>
+ <td>${10%4}</td>
+ </tr>
+ <tr>
+ <td>\${10 mod 4}</td>
+ <td>${10 mod 4}</td>
+ </tr>
<tr>
<td>\${(1==2) ? 3 : 4}</td>
<td>${(1==2) ? 3 : 4}</td>
</tr>
- </table>
+ </table>
</code>
</blockquote>
</body>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp Mon Aug 2
16:10:21 2010
@@ -36,80 +36,80 @@
<code>
<table border="1">
<thead>
- <td><b>EL Expression</b></td>
- <td><b>Result</b></td>
- </thead>
- <tr>
- <td>\${1 < 2}</td>
- <td>${1 < 2}</td>
- </tr>
- <tr>
- <td>\${1 lt 2}</td>
- <td>${1 lt 2}</td>
- </tr>
- <tr>
- <td>\${1 > (4/2)}</td>
- <td>${1 > (4/2)}</td>
- </tr>
- <tr>
- <td>\${1 gt (4/2)}</td>
- <td>${1 gt (4/2)}</td>
- </tr>
- <tr>
- <td>\${4.0 >= 3}</td>
- <td>${4.0 >= 3}</td>
- </tr>
- <tr>
- <td>\${4.0 ge 3}</td>
- <td>${4.0 ge 3}</td>
- </tr>
- <tr>
- <td>\${4 <= 3}</td>
- <td>${4 <= 3}</td>
- </tr>
- <tr>
- <td>\${4 le 3}</td>
- <td>${4 le 3}</td>
- </tr>
- <tr>
- <td>\${100.0 == 100}</td>
- <td>${100.0 == 100}</td>
- </tr>
- <tr>
- <td>\${100.0 eq 100}</td>
- <td>${100.0 eq 100}</td>
- </tr>
- <tr>
- <td>\${(10*10) != 100}</td>
- <td>${(10*10) != 100}</td>
- </tr>
- <tr>
- <td>\${(10*10) ne 100}</td>
- <td>${(10*10) ne 100}</td>
- </tr>
- </table>
+ <td><b>EL Expression</b></td>
+ <td><b>Result</b></td>
+ </thead>
+ <tr>
+ <td>\${1 < 2}</td>
+ <td>${1 < 2}</td>
+ </tr>
+ <tr>
+ <td>\${1 lt 2}</td>
+ <td>${1 lt 2}</td>
+ </tr>
+ <tr>
+ <td>\${1 > (4/2)}</td>
+ <td>${1 > (4/2)}</td>
+ </tr>
+ <tr>
+ <td>\${1 gt (4/2)}</td>
+ <td>${1 gt (4/2)}</td>
+ </tr>
+ <tr>
+ <td>\${4.0 >= 3}</td>
+ <td>${4.0 >= 3}</td>
+ </tr>
+ <tr>
+ <td>\${4.0 ge 3}</td>
+ <td>${4.0 ge 3}</td>
+ </tr>
+ <tr>
+ <td>\${4 <= 3}</td>
+ <td>${4 <= 3}</td>
+ </tr>
+ <tr>
+ <td>\${4 le 3}</td>
+ <td>${4 le 3}</td>
+ </tr>
+ <tr>
+ <td>\${100.0 == 100}</td>
+ <td>${100.0 == 100}</td>
+ </tr>
+ <tr>
+ <td>\${100.0 eq 100}</td>
+ <td>${100.0 eq 100}</td>
+ </tr>
+ <tr>
+ <td>\${(10*10) != 100}</td>
+ <td>${(10*10) != 100}</td>
+ </tr>
+ <tr>
+ <td>\${(10*10) ne 100}</td>
+ <td>${(10*10) ne 100}</td>
+ </tr>
+ </table>
</code>
<br>
<u><b>Alphabetic</b></u>
<code>
<table border="1">
<thead>
- <td><b>EL Expression</b></td>
- <td><b>Result</b></td>
- </thead>
- <tr>
- <td>\${'a' < 'b'}</td>
- <td>${'a' < 'b'}</td>
- </tr>
- <tr>
- <td>\${'hip' > 'hit'}</td>
- <td>${'hip' > 'hit'}</td>
- </tr>
- <tr>
- <td>\${'4' > 3}</td>
- <td>${'4' > 3}</td>
- </tr>
- </table>
+ <td><b>EL Expression</b></td>
+ <td><b>Result</b></td>
+ </thead>
+ <tr>
+ <td>\${'a' < 'b'}</td>
+ <td>${'a' < 'b'}</td>
+ </tr>
+ <tr>
+ <td>\${'hip' > 'hit'}</td>
+ <td>${'hip' > 'hit'}</td>
+ </tr>
+ <tr>
+ <td>\${'4' > 3}</td>
+ <td>${'4' > 3}</td>
+ </tr>
+ </table>
</code>
</blockquote>
</body>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp Mon Aug 2 16:10:21
2010
@@ -32,33 +32,33 @@
<blockquote>
<u><b>Change Parameter</b></u>
<form action="functions.jsp" method="GET">
- foo = <input type="text" name="foo"
value="${fn:escapeXml(param["foo"])}">
+ foo = <input type="text" name="foo"
value="${fn:escapeXml(param["foo"])}">
<input type="submit">
</form>
<br>
<code>
<table border="1">
<thead>
- <td><b>EL Expression</b></td>
- <td><b>Result</b></td>
- </thead>
- <tr>
- <td>\${param["foo"]}</td>
- <td>${fn:escapeXml(param["foo"])} </td>
- </tr>
- <tr>
- <td>\${my:reverse(param["foo"])}</td>
- <td>${my:reverse(fn:escapeXml(param["foo"]))} </td>
- </tr>
- <tr>
- <td>\${my:reverse(my:reverse(param["foo"]))}</td>
- <td>${my:reverse(my:reverse(fn:escapeXml(param["foo"])))} </td>
- </tr>
- <tr>
- <td>\${my:countVowels(param["foo"])}</td>
- <td>${my:countVowels(fn:escapeXml(param["foo"]))} </td>
- </tr>
- </table>
+ <td><b>EL Expression</b></td>
+ <td><b>Result</b></td>
+ </thead>
+ <tr>
+ <td>\${param["foo"]}</td>
+ <td>${fn:escapeXml(param["foo"])} </td>
+ </tr>
+ <tr>
+ <td>\${my:reverse(param["foo"])}</td>
+ <td>${my:reverse(fn:escapeXml(param["foo"]))} </td>
+ </tr>
+ <tr>
+ <td>\${my:reverse(my:reverse(param["foo"]))}</td>
+
<td>${my:reverse(my:reverse(fn:escapeXml(param["foo"])))} </td>
+ </tr>
+ <tr>
+ <td>\${my:countVowels(param["foo"])}</td>
+ <td>${my:countVowels(fn:escapeXml(param["foo"]))} </td>
+ </tr>
+ </table>
</code>
</blockquote>
</body>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp Mon Aug 2
16:10:21 2010
@@ -52,37 +52,37 @@
<blockquote>
<u><b>Change Parameter</b></u>
<form action="implicit-objects.jsp" method="GET">
- foo = <input type="text" name="foo"
value="${fn:escapeXml(param["foo"])}">
+ foo = <input type="text" name="foo"
value="${fn:escapeXml(param["foo"])}">
<input type="submit">
</form>
<br>
<code>
<table border="1">
<thead>
- <td><b>EL Expression</b></td>
- <td><b>Result</b></td>
- </thead>
- <tr>
- <td>\${param.foo}</td>
- <td>${fn:escapeXml(param["foo"])} </td>
- </tr>
- <tr>
- <td>\${param["foo"]}</td>
- <td>${fn:escapeXml(param["foo"])} </td>
- </tr>
- <tr>
- <td>\${header["host"]}</td>
- <td>${fn:escapeXml(header["host"])} </td>
- </tr>
- <tr>
- <td>\${header["accept"]}</td>
- <td>${fn:escapeXml(header["accept"])} </td>
- </tr>
- <tr>
- <td>\${header["user-agent"]}</td>
- <td>${fn:escapeXml(header["user-agent"])} </td>
- </tr>
- </table>
+ <td><b>EL Expression</b></td>
+ <td><b>Result</b></td>
+ </thead>
+ <tr>
+ <td>\${param.foo}</td>
+ <td>${fn:escapeXml(param["foo"])} </td>
+ </tr>
+ <tr>
+ <td>\${param["foo"]}</td>
+ <td>${fn:escapeXml(param["foo"])} </td>
+ </tr>
+ <tr>
+ <td>\${header["host"]}</td>
+ <td>${fn:escapeXml(header["host"])} </td>
+ </tr>
+ <tr>
+ <td>\${header["accept"]}</td>
+ <td>${fn:escapeXml(header["accept"])} </td>
+ </tr>
+ <tr>
+ <td>\${header["user-agent"]}</td>
+ <td>${fn:escapeXml(header["user-agent"])} </td>
+ </tr>
+ </table>
</code>
</blockquote>
</body>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
(original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp Mon
Aug 2 16:10:21 2010
@@ -36,7 +36,7 @@
Bean created! Setting foo.bar...<br>
<jsp:setProperty name="foo" property="bar">
<jsp:attribute name="value">
- <my:helloWorld/>
+ <my:helloWorld/>
</jsp:attribute>
</jsp:setProperty>
</jsp:useBean>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx Mon Aug 2 16:10:21
2010
@@ -17,7 +17,7 @@
<tags:xhtmlbasic xmlns:tags="urn:jsptagdir:/WEB-INF/tags"
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt";
- xmlns="http://www.w3.org/1999/xhtml";>
+ xmlns="http://www.w3.org/1999/xhtml";>
<jsp:directive.page contentType="text/html" />
<head>
<title>JSPX - XHTML Basic Example</title>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp Mon Aug 2 16:10:21
2010
@@ -24,7 +24,7 @@
<li>Uses <include-prelude> to include the top banner.</li>
<li>Uses <include-coda> to include the bottom banner.</li>
<li>Uses <scripting-invalid> true to disable
- <% scripting %> elements</li>
+ <% scripting %> elements</li>
<li>Uses <el-ignored> true to disable ${EL} elements</li>
<li>Uses <page-encoding> ISO-8859-1 to set the page encoding
(though this is the default anyway)</li>
</ul>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp Mon Aug 2
16:10:21 2010
@@ -37,8 +37,8 @@
<h2>Invocation 3 (three attributes)</h2>
<ul>
<my:echoAttributes dogName="Scruffy"
- catName="Fluffy"
- blowfishName="Puffy"/>
+ catName="Fluffy"
+ blowfishName="Puffy"/>
</ul>
</body>
</html>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp Mon Aug 2
16:10:21 2010
@@ -31,25 +31,25 @@
<my:findBook var="book"/>
<table border="1">
<thead>
- <td><b>Field</b></td>
- <td><b>Value</b></td>
- <td><b>Capitalized</b></td>
- </thead>
- <tr>
- <td>Title</td>
- <td>${book.title}</td>
- <td>${my:caps(book.title)}</td>
- </tr>
- <tr>
- <td>Author</td>
- <td>${book.author}</td>
- <td>${my:caps(book.author)}</td>
- </tr>
- <tr>
- <td>ISBN</td>
- <td>${book.isbn}</td>
- <td>${my:caps(book.isbn)}</td>
- </tr>
+ <td><b>Field</b></td>
+ <td><b>Value</b></td>
+ <td><b>Capitalized</b></td>
+ </thead>
+ <tr>
+ <td>Title</td>
+ <td>${book.title}</td>
+ <td>${my:caps(book.title)}</td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>${book.author}</td>
+ <td>${my:caps(book.author)}</td>
+ </tr>
+ <tr>
+ <td>ISBN</td>
+ <td>${book.isbn}</td>
+ <td>${my:caps(book.isbn)}</td>
+ </tr>
</table>
</body>
</html>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp Mon Aug 2
16:10:21 2010
@@ -32,25 +32,25 @@
<tr valign="top">
<td>
<tags:panel color="#ff8080" bgcolor="#ffc0c0" title="Panel 1">
- First panel.<br/>
- </tags:panel>
+ First panel.<br/>
+ </tags:panel>
</td>
<td>
<tags:panel color="#80ff80" bgcolor="#c0ffc0" title="Panel 2">
- Second panel.<br/>
- Second panel.<br/>
- Second panel.<br/>
- Second panel.<br/>
- </tags:panel>
+ Second panel.<br/>
+ Second panel.<br/>
+ Second panel.<br/>
+ Second panel.<br/>
+ </tags:panel>
</td>
<td>
<tags:panel color="#8080ff" bgcolor="#c0c0ff" title="Panel 3">
- Third panel.<br/>
+ Third panel.<br/>
<tags:panel color="#ff80ff" bgcolor="#ffc0ff" title="Inner">
- A panel in a panel.
- </tags:panel>
- Third panel.<br/>
- </tags:panel>
+ A panel in a panel.
+ </tags:panel>
+ Third panel.<br/>
+ </tags:panel>
</td>
</tr>
</table>
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp Mon Aug 2
16:10:21 2010
@@ -31,23 +31,23 @@
<h2>Products</h2>
<tags:displayProducts>
<jsp:attribute name="normalPrice">
- Item: ${name}<br/>
- Price: ${price}
+ Item: ${name}<br/>
+ Price: ${price}
</jsp:attribute>
<jsp:attribute name="onSale">
- Item: ${name}<br/>
- <font color="red"><strike>Was: ${origPrice}</strike></font><br/>
- <b>Now: ${salePrice}</b>
+ Item: ${name}<br/>
+ <font color="red"><strike>Was: ${origPrice}</strike></font><br/>
+ <b>Now: ${salePrice}</b>
</jsp:attribute>
</tags:displayProducts>
<hr>
<h2>Products (Same tag, alternate style)</h2>
<tags:displayProducts>
<jsp:attribute name="normalPrice">
- <b>${name}</b> @ ${price} ea.
+ <b>${name}</b> @ ${price} ea.
</jsp:attribute>
<jsp:attribute name="onSale">
- <b>${name}</b> @ ${salePrice} ea. (was: ${origPrice})
+ <b>${name}</b> @ ${salePrice} ea. (was: ${origPrice})
</jsp:attribute>
</tags:displayProducts>
</body>
Modified: tomcat/trunk/webapps/examples/jsp/sessions/carts.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/sessions/carts.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/sessions/carts.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/sessions/carts.jsp Mon Aug 2 16:10:21
2010
@@ -20,7 +20,7 @@
<jsp:setProperty name="cart" property="*" />
<%
- cart.processRequest();
+ cart.processRequest();
%>
@@ -28,12 +28,12 @@
<br> You have the following items in your cart:
<ol>
<%
- String[] items = cart.getItems();
- for (int i=0; i<items.length; i++) {
+ String[] items = cart.getItems();
+ for (int i=0; i<items.length; i++) {
%>
<li> <% out.print(util.HTMLFilter.filter(items[i])); %>
<%
- }
+ }
%>
</ol>
Modified: tomcat/trunk/webapps/examples/jsp/tagplugin/choose.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/choose.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/tagplugin/choose.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/choose.jsp Mon Aug 2 16:10:21
2010
@@ -40,18 +40,18 @@ FF"></a>
<c:forEach var="index" begin="0" end="4">
# ${index}:
<c:choose>
- <c:when test="${index == 1}">
+ <c:when test="${index == 1}">
One!</br>
- </c:when>
- <c:when test="${index == 4}">
+ </c:when>
+ <c:when test="${index == 4}">
Four!</br>
- </c:when>
- <c:when test="${index == 3}">
+ </c:when>
+ <c:when test="${index == 3}">
Three!</br>
- </c:when>
- <c:otherwise>
+ </c:when>
+ <c:otherwise>
Huh?</br>
- </c:otherwise>
+ </c:otherwise>
</c:choose>
</c:forEach>
</body>
Modified: tomcat/trunk/webapps/examples/jsp/tagplugin/foreach.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/foreach.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/tagplugin/foreach.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/foreach.jsp Mon Aug 2 16:10:21
2010
@@ -43,15 +43,15 @@ FF"></a>
</c:forEach>
<% Vector v = new Vector();
- v.add("One"); v.add("Two"); v.add("Three"); v.add("Four");
+ v.add("One"); v.add("Two"); v.add("Three"); v.add("Four");
- pageContext.setAttribute("vector", v);
+ pageContext.setAttribute("vector", v);
%>
<h3>Iterating over a Vector</h3>
<c:forEach items="${vector}" var="item" >
- ${item}
+ ${item}
</c:forEach>
</body>
</html>
Modified: tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp?rev=981578&r1=981577&r2=981578&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp Mon Aug 2 16:10:21 2010
@@ -39,7 +39,7 @@
<h3>Conditionally execute the body</h3>
<c:if test="${2>0}">
- It's true that (2>0)!
+ It's true that (2>0)!
</c:if>
</body>
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
