You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2011/11/10 05:00:19 UTC
svn commit: r1200120 - in /tomcat/tc7.0.x/trunk/webapps/examples:
jsp/jsptoserv/ jsp/plugin/ jsp/sessions/ jsp/snp/ jsp/tagplugin/ jsp/xml/
servlets/
Author: kkolinko
Date: Thu Nov 10 04:00:19 2011
New Revision: 1200120
URL: http://svn.apache.org/viewvc?rev=1200120&view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
/webapps/examples, 3
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsptoserv/jts.html
tomcat/tc7.0.x/trunk/webapps/examples/jsp/plugin/plugin.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.html
tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/snp/snoop.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/choose.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/foreach.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/howto.html
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/if.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/notes.html
tomcat/tc7.0.x/trunk/webapps/examples/jsp/xml/xml.jsp
tomcat/tc7.0.x/trunk/webapps/examples/servlets/cookies.html
tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqinfo.html
tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqparams.html
tomcat/tc7.0.x/trunk/webapps/examples/servlets/sessions.html
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsptoserv/jts.html
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsptoserv/jts.html?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsptoserv/jts.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsptoserv/jts.html Thu Nov 10 04:00:19 2011
@@ -27,7 +27,7 @@
<h3><a href="jsptoservlet.jsp.html">Source Code for JSP calling servlet <font color="#0000FF"></a>
</font> </h3>
-<h3><a href="servletToJsp.java.html">Source Code for Servlet calling JSP
+<h3><a href="servletToJsp.java.html">Source Code for Servlet calling JSP
<font color="#0000FF"></a> </font> </h3>
</body>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/plugin/plugin.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/plugin/plugin.jsp?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/plugin/plugin.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/plugin/plugin.jsp Thu Nov 10 04:00:19 2011
@@ -25,7 +25,7 @@
</jsp:plugin>
<p>
<h4>
-<font color=red>
+<font color=red>
The above applet is loaded using the Java Plugin from a jsp page using the
plugin tag.
</font>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.html
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.html?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.html Thu Nov 10 04:00:19 2011
@@ -47,7 +47,7 @@ Add Item:
<INPUT TYPE=submit name="submit" value="remove">
</form>
-
+
</FONT>
</body>
</html>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp Thu Nov 10 04:00:19 2011
@@ -26,11 +26,11 @@
<FONT size = 5 COLOR="#CC0000">
<br> You have the following items in your cart:
<ol>
-<%
+<%
String[] items = cart.getItems();
for (int i=0; i<items.length; i++) {
%>
-<li> <% out.print(util.HTMLFilter.filter(items[i])); %>
+<li> <% out.print(util.HTMLFilter.filter(items[i])); %>
<%
}
%>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/snp/snoop.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/snp/snoop.jsp?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/snp/snoop.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/snp/snoop.jsp Thu Nov 10 04:00:19 2011
@@ -44,7 +44,7 @@ Remote address: <%= util.HTMLFilter.filt
<br>
Remote host: <%= util.HTMLFilter.filter(request.getRemoteHost()) %>
<br>
-Authorization scheme: <%= util.HTMLFilter.filter(request.getAuthType()) %>
+Authorization scheme: <%= util.HTMLFilter.filter(request.getAuthType()) %>
<br>
Locale: <%= request.getLocale() %>
<hr>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/choose.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/choose.jsp?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/choose.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/choose.jsp Thu Nov 10 04:00:19 2011
@@ -34,7 +34,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<c:forEach var="index" begin="0" end="4">
- # ${index}:
+ # ${index}:
<c:choose>
<c:when test="${index == 1}">
One!<br/>
@@ -51,4 +51,4 @@
</c:choose>
</c:forEach>
</body>
-</html>
+</html>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/foreach.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/foreach.jsp?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/foreach.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/foreach.jsp Thu Nov 10 04:00:19 2011
@@ -51,4 +51,4 @@
${item}
</c:forEach>
</body>
-</html>
+</html>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/howto.html
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/howto.html?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/howto.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/howto.html Thu Nov 10 04:00:19 2011
@@ -26,7 +26,7 @@
<ol>
<li>
Implement the plugin class.<p/>
- This class, which implements
+ This class, which implements
<tt>org.apache.jasper.compiler.tagplugin.TagPlugin</tt>
instructs Jasper what Java codes to generate in place of the tag
handler calls.
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/if.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/if.jsp?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/if.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/if.jsp Thu Nov 10 04:00:19 2011
@@ -44,4 +44,4 @@
<p>It's not true that (0>2)! Failed.</p>
</c:if>
</body>
-</html>
+</html>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/notes.html
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/notes.html?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/notes.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/notes.html Thu Nov 10 04:00:19 2011
@@ -30,7 +30,7 @@
<p>
Tomcat 5 is released with plugins for several JSTL tags. Note
that these plugins work with JSTL 1.1 as well as JSTL 1.0, though
- the examples uses JSTL 1.1 and JSP 2.0.
+ the examples uses JSTL 1.1 and JSP 2.0.
These plugins are not complete (for instance, some item types not
handled in <c:if>).
They do serve as examples to show plugins in action (just
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/xml/xml.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/xml/xml.jsp?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/xml/xml.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/xml/xml.jsp Thu Nov 10 04:00:19 2011
@@ -34,7 +34,7 @@
</head>
<body>
-This is the output of a simple JSP using XML format.
+This is the output of a simple JSP using XML format.
<br />
<div>Use a jsp:scriptlet to loop from 1 to 10: </div>
@@ -56,7 +56,7 @@ This is the output of a simple JSP using
]]>
<div align="left">
- Use a jsp:expression to write the date and time in the browser's locale:
+ Use a jsp:expression to write the date and time in the browser's locale:
<jsp:expression>getDateTimeStr(request.getLocale())</jsp:expression>
</div>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/servlets/cookies.html
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/servlets/cookies.html?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/servlets/cookies.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/servlets/cookies.html Thu Nov 10 04:00:19 2011
@@ -24,7 +24,7 @@
<p><font color="#0000FF"><a href="servlet/CookieExample"><img src="images/execute.gif" align="right" border="0"></a><a href="index.html"><img src="images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
<h3>Source Code for Cookie Example<font color="#0000FF"><br>
</font> </h3>
-<font color="#0000FF"></font>
+<font color="#0000FF"></font>
<pre><font color="#0000FF">import</font> java.io.*;
<font color="#0000FF">import</font> javax.servlet.*;
<font color="#0000FF">import</font> javax.servlet.http.*;
@@ -36,7 +36,7 @@
{
response.setContentType("<font color="#009900">text/html</font>");
PrintWriter out = response.getWriter();
-
+
<font color="#CC0000">// print out cookies</font>
Cookie[] cookies = request.getCookies();
Modified: tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqinfo.html
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqinfo.html?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqinfo.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqinfo.html Thu Nov 10 04:00:19 2011
@@ -24,7 +24,7 @@
<p><font color="#0000FF"><a href="servlet/RequestInfoExample"><img src="images/execute.gif" align="right" border="0"></a><a href="index.html"><img src="images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
<h3>Source Code for Request Info Example<font color="#0000FF"><br>
</font> </h3>
-<font color="#0000FF"></font>
+<font color="#0000FF"></font>
<pre><font color="#0000FF">import</font> java.io.*;
<font color="#0000FF">import</font> javax.servlet.*;
<font color="#0000FF">import</font> javax.servlet.http.*;
Modified: tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqparams.html
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqparams.html?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqparams.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqparams.html Thu Nov 10 04:00:19 2011
@@ -24,7 +24,7 @@
<p><font color="#0000FF"><a href="servlet/RequestParamExample"><img src="images/execute.gif" align="right" border="0"></a><a href="index.html"><img src="images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
<h3>Source Code for Request Parameter Example<font color="#0000FF"><br>
</font> </h3>
-<font color="#0000FF"></font>
+<font color="#0000FF"></font>
<pre><font color="#0000FF">import</font> java.io.*;
<font color="#0000FF">import</font> java.util.*;
<font color="#0000FF">import</font> javax.servlet.*;
Modified: tomcat/tc7.0.x/trunk/webapps/examples/servlets/sessions.html
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/servlets/sessions.html?rev=1200120&r1=1200119&r2=1200120&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/servlets/sessions.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/servlets/sessions.html Thu Nov 10 04:00:19 2011
@@ -24,7 +24,7 @@
<p><font color="#0000FF"><a href="servlet/SessionExample"><img src="images/execute.gif" align="right" border="0"></a><a href="index.html"><img src="images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
<h3>Source Code for Session Example<font color="#0000FF"><br>
</font> </h3>
-<font color="#0000FF"></font>
+<font color="#0000FF"></font>
<pre><font color="#0000FF">import</font> java.io.*;
<font color="#0000FF">import</font> java.util.*;
<font color="#0000FF">import</font> javax.servlet.*;
@@ -37,7 +37,7 @@
{
response.setContentType("<font color="#009900">text/html</font>");
PrintWriter out = response.getWriter();
-
+
HttpSession session = request.getSession(true);
<font color="#CC0000">// print session info</font>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org