Author: kkolinko
Date: Thu Nov 10 03:59:06 2011
New Revision: 1200119
URL: http://svn.apache.org/viewvc?rev=1200119&view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
/webapps/examples, 2
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/composite.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/functions.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/config.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/hello.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp Thu
Nov 10 03:59:06 2011
@@ -22,7 +22,7 @@
<h1>JSP 2.0 Expression Language - Basic Arithmetic</h1>
<hr>
This example illustrates basic Expression Language arithmetic.
- Addition (+), subtraction (-), multiplication (*), division (/ or div),
+ Addition (+), subtraction (-), multiplication (*), division (/ or div),
and modulus (% or mod) are all supported. Error conditions, like
division by zero, are handled gracefully.
<br>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/composite.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/composite.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/composite.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/composite.jsp Thu Nov 10
03:59:06 2011
@@ -70,7 +70,7 @@
</tr>
<!--
Undefined values are to be coerced to String, to be "",
- https://issues.apache.org/bugzilla/show_bug.cgi?id=47413
+ https://issues.apache.org/bugzilla/show_bug.cgi?id=47413
-->
<tr>
<td>\${undefinedFoo}hello world\${undefinedBar}</td>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/functions.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/functions.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/functions.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/functions.jsp Thu Nov 10
03:59:06 2011
@@ -26,7 +26,7 @@
<hr>
An upgrade from the JSTL expression language, the JSP 2.0 EL also
allows for simple function invocation. Functions are defined
- by tag libraries and are implemented by a Java programmer as
+ by tag libraries and are implemented by a Java programmer as
static methods.
<blockquote>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp Thu
Nov 10 03:59:06 2011
@@ -23,28 +23,28 @@
<body>
<h1>JSP 2.0 Expression Language - Implicit Objects</h1>
<hr>
- This example illustrates some of the implicit objects available
- in the Expression Lanaguage. The following implicit objects are
+ This example illustrates some of the implicit objects available
+ in the Expression Lanaguage. The following implicit objects are
available (not all illustrated here):
<ul>
<li>pageContext - the PageContext object</li>
- <li>pageScope - a Map that maps page-scoped attribute names to
+ <li>pageScope - a Map that maps page-scoped attribute names to
their values</li>
- <li>requestScope - a Map that maps request-scoped attribute names
+ <li>requestScope - a Map that maps request-scoped attribute names
to their values</li>
- <li>sessionScope - a Map that maps session-scoped attribute names
+ <li>sessionScope - a Map that maps session-scoped attribute names
to their values</li>
- <li>applicationScope - a Map that maps application-scoped attribute
+ <li>applicationScope - a Map that maps application-scoped attribute
names to their values</li>
- <li>param - a Map that maps parameter names to a single String
+ <li>param - a Map that maps parameter names to a single String
parameter value</li>
- <li>paramValues - a Map that maps parameter names to a String[] of
+ <li>paramValues - a Map that maps parameter names to a String[] of
all values for that parameter</li>
- <li>header - a Map that maps header names to a single String
+ <li>header - a Map that maps header names to a single String
header value</li>
- <li>headerValues - a Map that maps header names to a String[] of
+ <li>headerValues - a Map that maps header names to a String[] of
all values for that header</li>
- <li>initParam - a Map that maps context initialization parameter
+ <li>initParam - a Map that maps context initialization parameter
names to their String parameter value</li>
<li>cookie - a Map that maps cookie names to a single Cookie object.</li>
</ul>
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
Thu Nov 10 03:59:06 2011
@@ -23,7 +23,7 @@
<body>
<h1>JSP 2.0 Examples - jsp:attribute and jsp:body</h1>
<hr>
- <p>The new <jsp:attribute> and <jsp:body>
+ <p>The new <jsp:attribute> and <jsp:body>
standard actions can be used to specify the value of any standard
action or custom action attribute.</p>
<p>This example uses the <jsp:attribute>
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp Thu
Nov 10 03:59:06 2011
@@ -25,10 +25,10 @@
<hr>
<p>Try reloading the page a few times. Both the rows and the columns
are shuffled and appear different each time.</p>
- <p>Here's how the code works. The SimpleTag handler called
- <my:shuffle> accepts three attributes. Each attribute is a
+ <p>Here's how the code works. The SimpleTag handler called
+ <my:shuffle> accepts three attributes. Each attribute is a
JSP Fragment, meaning it is a fragment of JSP code that can be
- dynamically executed by the shuffle tag handler on demand. The
+ dynamically executed by the shuffle tag handler on demand. The
shuffle tag handler executes the three fragments in a random order.
To shuffle both the rows and the columns, the shuffle tag is used
with itself as a parameter.</p>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx Thu Nov 10
03:59:06 2011
@@ -26,7 +26,7 @@
<h1>JSPX - XHTML Basic Example</h1>
<hr/>
This example illustrates how to use JSPX to produce an XHTML basic
- document suitable for use with mobile phones, televisions,
+ document suitable for use with mobile phones, televisions,
PDAs, vending machines, pagers, car navigation systems,
mobile game machines, digital book readers, smart watches, etc.
<p/>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html Thu Nov
10 03:59:06 2011
@@ -23,7 +23,7 @@
<hr>
This example uses JSP 2.0's new, simplified JSPX syntax to render a
Scalable Vector Graphics (SVG) document. When you view the source,
- notice the lack of a <jsp:root> element! The text to be rendered
+ notice the lack of a <jsp:root> element! The text to be rendered
can be modified by changing the value of the name parameter.
<p>
SVG has many potential uses, such as searchable images, or images
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx Thu Nov
10 03:59:06 2011
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!--
+<!--
- This example is based off the textRotate.svg example that comes
- with Batik. The original example was written by Bill Haneman.
- This version by Mark Roth.
@@ -38,14 +38,14 @@
<jsp:text>
<![CDATA[<g opacity="0.95" transform="scale(1.05) rotate(15)">]]>
</jsp:text>
- <text x="0" y="0" transform="scale(1.6, 1.6)" fill="DarkSlateBlue"
- text-anchor="middle" font-size="40" font-family="Serif"
+ <text x="0" y="0" transform="scale(1.6, 1.6)" fill="DarkSlateBlue"
+ text-anchor="middle" font-size="40" font-family="Serif"
id="words">${name}</text>
</c:forEach>
<c:forEach var="i" begin="1" end="24">
<jsp:text><![CDATA[</g>]]></jsp:text>
</c:forEach>
- <text style="font-size:75;font-family:Serif;fill:white"
+ <text style="font-size:75;font-family:Serif;fill:white"
text-anchor="middle">${name}</text>
</g>
</g>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/config.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/config.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/config.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/config.jsp Thu Nov 10
03:59:06 2011
@@ -17,13 +17,13 @@
<%@ taglib prefix="my" uri="http://tomcat.apache.org/jsp2-example-taglib"%>
<h1>JSP 2.0 Examples - JSP Configuration</h1>
<hr>
- <p>Using a <jsp-property-group> element in the web.xml
+ <p>Using a <jsp-property-group> element in the web.xml
deployment descriptor, this JSP page has been configured in the
following ways:</p>
<ul>
<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
+ <li>Uses <scripting-invalid> true to disable
<% 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>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp Thu
Nov 10 03:59:06 2011
@@ -22,7 +22,7 @@
<body>
<h1>JSP 2.0 Examples - Dynamic Attributes</h1>
<hr>
- <p>This JSP page invokes a custom tag that accepts a dynamic set
+ <p>This JSP page invokes a custom tag that accepts a dynamic set
of attributes. The tag echoes the name and value of all attributes
passed to it.</p>
<hr>
@@ -36,8 +36,8 @@
</ul>
<h2>Invocation 3 (three attributes)</h2>
<ul>
- <my:echoAttributes dogName="Scruffy"
- catName="Fluffy"
+ <my:echoAttributes dogName="Scruffy"
+ catName="Fluffy"
blowfishName="Puffy"/>
</ul>
</body>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp Thu Nov
10 03:59:06 2011
@@ -22,9 +22,9 @@
<body>
<h1>JSP 2.0 Examples - Book SimpleTag Handler</h1>
<hr>
- <p>Illustrates a semi-realistic use of SimpleTag and the Expression
- Language. First, a <my:findBook> tag is invoked to populate
- the page context with a BookBean. Then, the books fields are printed
+ <p>Illustrates a semi-realistic use of SimpleTag and the Expression
+ Language. First, a <my:findBook> tag is invoked to populate
+ the page context with a BookBean. Then, the books fields are printed
in all caps.</p>
<br>
<b><u>Result:</u></b><br>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/repeat.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/repeat.jsp Thu Nov
10 03:59:06 2011
@@ -23,11 +23,11 @@
<h1>JSP 2.0 Examples - Repeat SimpleTag Handler</h1>
<hr>
<p>This tag handler accepts a "num" parameter and repeats the body of the
- tag "num" times. It's a simple example, but the implementation of
- such a tag in JSP 2.0 is substantially simpler than the equivalent
+ tag "num" times. It's a simple example, but the implementation of
+ such a tag in JSP 2.0 is substantially simpler than the equivalent
JSP 1.2-style classic tag handler.</p>
<p>The body of the tag is encapsulated in a "JSP Fragment" and passed
- to the tag handler, which then executes it five times, inside a
+ to the tag handler, which then executes it five times, inside a
for loop. The tag handler passes in the current invocation in a
scoped variable called count, which can be accessed using the EL.</p>
<br>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/hello.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/hello.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/hello.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/hello.jsp Thu Nov
10 03:59:06 2011
@@ -22,7 +22,7 @@
<body>
<h1>JSP 2.0 Examples - Hello World Using a Tag File</h1>
<hr>
- <p>This JSP page invokes a custom tag that simply echos "Hello, World!"
+ <p>This JSP page invokes a custom tag that simply echos "Hello, World!"
The custom tag is generated from a tag file in the /WEB-INF/tags
directory.</p>
<p>Notice that we did not need to write a TLD for this tag. We just
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp Thu Nov
10 03:59:06 2011
@@ -22,8 +22,8 @@
<body>
<h1>JSP 2.0 Examples - Panels using Tag Files</h1>
<hr>
- <p>This JSP page invokes a custom tag that draws a
- panel around the contents of the tag body. Normally, such a tag
+ <p>This JSP page invokes a custom tag that draws a
+ panel around the contents of the tag body. Normally, such a tag
implementation would require a Java class with many println() statements,
outputting HTML. Instead, we can use a .tag file as a template,
and we don't need to write a single line of Java or even a TLD!</p>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp?rev=1200119&r1=1200118&r2=1200119&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp Thu
Nov 10 03:59:06 2011
@@ -22,7 +22,7 @@
<body>
<h1>JSP 2.0 Examples - Display Products Tag File</h1>
<hr>
- <p>This JSP page invokes a tag file that displays a listing of
+ <p>This JSP page invokes a tag file that displays a listing of
products. The custom tag accepts two fragments that enable
customization of appearance. One for when the product is on sale
and one for normal price.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
