Author: kkolinko
Date: Thu Nov 10 04:03:27 2011
New Revision: 1200123
URL: http://svn.apache.org/viewvc?rev=1200123&view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
/webapps/examples, 5
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/tags/displayProducts.tag
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
Thu Nov 10 04:03:27 2011
@@ -41,7 +41,7 @@ public class RequestHeaderExample extend
private static final long serialVersionUID = 1L;
private static final ResourceBundle RB =
ResourceBundle.getBundle("LocalStrings");
-
+
@Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
@@ -63,7 +63,7 @@ public class RequestHeaderExample extend
// XXX
// making these absolute till we work out the
- // addition of a PathInfo issue
+ // addition of a PathInfo issue
out.println("<a href=\"../reqheaders.html\">");
out.println("<img src=\"../images/code.gif\" height=24 " +
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
Thu Nov 10 04:03:27 2011
@@ -79,30 +79,30 @@ public class RequestInfoExample extends
out.println(request.getMethod());
out.println("</td></tr><tr><td>");
out.println(RB.getString("requestinfo.label.requesturi"));
- out.println("</td><td>");
+ out.println("</td><td>");
out.println(HTMLFilter.filter(request.getRequestURI()));
- out.println("</td></tr><tr><td>");
+ out.println("</td></tr><tr><td>");
out.println(RB.getString("requestinfo.label.protocol"));
- out.println("</td><td>");
+ out.println("</td><td>");
out.println(request.getProtocol());
out.println("</td></tr><tr><td>");
out.println(RB.getString("requestinfo.label.pathinfo"));
- out.println("</td><td>");
+ out.println("</td><td>");
out.println(HTMLFilter.filter(request.getPathInfo()));
out.println("</td></tr><tr><td>");
out.println(RB.getString("requestinfo.label.remoteaddr"));
String cipherSuite=
(String)request.getAttribute("javax.servlet.request.cipher_suite");
- out.println("</td><td>");
+ out.println("</td><td>");
out.println(request.getRemoteAddr());
out.println("</table>");
-
+
if(cipherSuite!=null){
out.println("</td></tr><tr><td>");
out.println("SSLCipherSuite:");
out.println("</td>");
- out.println("<td>");
+ out.println("<td>");
out.println(request.getAttribute("javax.servlet.request.cipher_suite"));
out.println("</td>");
}
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
Thu Nov 10 04:03:27 2011
@@ -40,7 +40,7 @@ public class RequestParamExample extends
private static final long serialVersionUID = 1L;
private static final ResourceBundle RB =
ResourceBundle.getBundle("LocalStrings");
-
+
@Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
@@ -64,7 +64,7 @@ public class RequestParamExample extends
// XXX
// making these absolute till we work out the
- // addition of a PathInfo issue
+ // addition of a PathInfo issue
out.println("<a href=\"../reqparams.html\">");
out.println("<img src=\"../images/code.gif\" height=24 " +
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
Thu Nov 10 04:03:27 2011
@@ -43,7 +43,7 @@ public class SessionExample extends Http
private static final long serialVersionUID = 1L;
private static final ResourceBundle RB =
ResourceBundle.getBundle("LocalStrings");
-
+
@Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
@@ -66,8 +66,8 @@ public class SessionExample extends Http
// XXX
// making these absolute till we work out the
- // addition of a PathInfo issue
-
+ // addition of a PathInfo issue
+
out.println("<a href=\"../sessions.html\">");
out.println("<img src=\"../images/code.gif\" height=24 " +
"width=24 align=right border=0 alt=\"view code\"></a>");
@@ -95,9 +95,9 @@ public class SessionExample extends Http
out.println(RB.getString("sessions.data") + "<br>");
Enumeration<String> names = session.getAttributeNames();
while (names.hasMoreElements()) {
- String name = names.nextElement();
+ String name = names.nextElement();
String value = session.getAttribute(name).toString();
- out.println(HTMLFilter.filter(name) + " = "
+ out.println(HTMLFilter.filter(name) + " = "
+ HTMLFilter.filter(value) + "<br>");
}
@@ -132,10 +132,10 @@ public class SessionExample extends Http
out.print("<p><a href=\"");
out.print(response.encodeURL("SessionExample?dataname=foo&datavalue=bar"));
out.println("\" >URL encoded </a>");
-
+
out.println("</body>");
out.println("</html>");
-
+
out.println("</body>");
out.println("</html>");
}
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
Thu Nov 10 04:03:27 2011
@@ -22,7 +22,7 @@ public class BookBean {
private String title;
private String author;
private String isbn;
-
+
public BookBean( String title, String author, String isbn ) {
this.title = title;
this.author = author;
@@ -32,13 +32,13 @@ public class BookBean {
public String getTitle() {
return this.title;
}
-
+
public String getAuthor() {
return this.author;
}
-
+
public String getIsbn() {
return this.isbn;
}
-
+
}
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
Thu Nov 10 04:03:27 2011
@@ -20,17 +20,17 @@ package jsp2.examples;
public class FooBean {
private String bar;
-
+
public FooBean() {
bar = "Initial value";
}
-
+
public String getBar() {
return this.bar;
}
-
+
public void setBar(String bar) {
this.bar = bar;
}
-
+
}
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
Thu Nov 10 04:03:27 2011
@@ -20,7 +20,7 @@ import java.util.Locale;
/**
* Defines the functions for the jsp2 example tag library.
- *
+ *
* <p>Each function is defined as a static method.</p>
*/
public class Functions {
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
Thu Nov 10 04:03:27 2011
@@ -27,9 +27,9 @@ import javax.servlet.jsp.tagext.DynamicA
import javax.servlet.jsp.tagext.SimpleTagSupport;
/**
- * SimpleTag handler that echoes all its attributes
+ * SimpleTag handler that echoes all its attributes
*/
-public class EchoAttributesTag
+public class EchoAttributesTag
extends SimpleTagSupport
implements DynamicAttributes
{
@@ -47,8 +47,8 @@ public class EchoAttributesTag
}
@Override
- public void setDynamicAttribute( String uri, String localName,
- Object value )
+ public void setDynamicAttribute( String uri, String localName,
+ Object value )
throws JspException
{
keys.add( localName );
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
Thu Nov 10 04:03:27 2011
@@ -29,7 +29,7 @@ import jsp2.examples.BookBean;
*/
public class FindBookSimpleTag extends SimpleTagSupport {
private String var;
-
+
private static final String BOOK_TITLE = "The Lord of the Rings";
private static final String BOOK_AUTHOR = "J. R. R. Tolkein";
private static final String BOOK_ISBN = "0618002251";
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
Thu Nov 10 04:03:27 2011
@@ -24,7 +24,7 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
/**
- * SimpleTag handler that accepts a num attribute and
+ * SimpleTag handler that accepts a num attribute and
* invokes its body 'num' times.
*/
public class RepeatSimpleTag extends SimpleTagSupport {
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
Thu Nov 10 04:03:27 2011
@@ -32,7 +32,7 @@ import javax.servlet.jsp.tagext.SimpleTa
public class ShuffleSimpleTag extends SimpleTagSupport {
// No need for this to use SecureRandom
private static Random random = new Random();
-
+
private JspFragment fragment1;
private JspFragment fragment2;
private JspFragment fragment3;
@@ -76,11 +76,11 @@ public class ShuffleSimpleTag extends Si
public void setFragment1( JspFragment fragment1 ) {
this.fragment1 = fragment1;
}
-
+
public void setFragment2( JspFragment fragment2 ) {
this.fragment2 = fragment2;
}
-
+
public void setFragment3( JspFragment fragment3 ) {
this.fragment3 = fragment3;
}
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
Thu Nov 10 04:03:27 2011
@@ -32,16 +32,16 @@ public class TileSimpleTag extends Simpl
@Override
public void doTag() throws JspException, IOException {
- getJspContext().getOut().write(
- "<td width=\"32\" height=\"32\" bgcolor=\"" + this.color +
- "\"><font color=\"#ffffff\"><center>" + this.label +
+ getJspContext().getOut().write(
+ "<td width=\"32\" height=\"32\" bgcolor=\"" + this.color +
+ "\"><font color=\"#ffffff\"><center>" + this.label +
"</center></font></td>" );
}
public void setColor( String color ) {
this.color = color;
}
-
+
public void setLabel( String label ) {
this.label = label;
}
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
Thu Nov 10 04:03:27 2011
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpSessionLis
* introduced in the 2.3 version of the Servlet API. This listener merely
* documents the occurrence of such events in the application log associated
* with our servlet context.
- *
+ *
* @author Craig R. McClanahan
* @version $Id$
*/
@@ -48,7 +48,7 @@ public final class SessionListener imple
/**
* Record the fact that a servlet context attribute was added.
- *
+ *
* @param event
* The session attribute event
*/
@@ -62,7 +62,7 @@ public final class SessionListener imple
/**
* Record the fact that a servlet context attribute was removed.
- *
+ *
* @param event
* The session attribute event
*/
@@ -76,7 +76,7 @@ public final class SessionListener imple
/**
* Record the fact that a servlet context attribute was replaced.
- *
+ *
* @param event
* The session attribute event
*/
@@ -90,7 +90,7 @@ public final class SessionListener imple
/**
* Record the fact that this web application has been destroyed.
- *
+ *
* @param event
* The servlet context event
*/
@@ -104,7 +104,7 @@ public final class SessionListener imple
/**
* Record the fact that this web application has been initialized.
- *
+ *
* @param event
* The servlet context event
*/
@@ -118,7 +118,7 @@ public final class SessionListener imple
/**
* Record the fact that a session has been created.
- *
+ *
* @param event
* The session event
*/
@@ -131,7 +131,7 @@ public final class SessionListener imple
/**
* Record the fact that a session has been destroyed.
- *
+ *
* @param event
* The session event
*/
@@ -146,7 +146,7 @@ public final class SessionListener imple
/**
* Log a message to the servlet context application log.
- *
+ *
* @param message
* Message to be logged
*/
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
Thu Nov 10 04:03:27 2011
@@ -22,7 +22,7 @@ public class DummyCart {
Vector<String> v = new Vector<String>();
String submit = null;
String item = null;
-
+
private void addItem(String name) {
v.addElement(name);
}
@@ -34,7 +34,7 @@ public class DummyCart {
public void setItem(String name) {
item = name;
}
-
+
public void setSubmit(String s) {
submit = s;
}
@@ -44,15 +44,15 @@ public class DummyCart {
v.copyInto(s);
return s;
}
-
+
public void processRequest() {
- // null value for submit - user hit enter instead of clicking on
+ // null value for submit - user hit enter instead of clicking on
// "add" or "remove"
if (submit == null || submit.equals("add"))
addItem(item);
- else if (submit.equals("remove"))
+ else if (submit.equals("remove"))
removeItem(item);
-
+
// reset at the end of the request
reset();
}
Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld Thu Nov
10 04:03:27 2011
@@ -36,7 +36,7 @@
<validator-class>validators.DebugValidator</validator-class>
</validator>
- <!-- This is a dummy tag solely to satisfy DTD requirements -->
+ <!-- This is a dummy tag solely to satisfy DTD requirements -->
<tag>
<name>log</name>
<tag-class>examples.LogTag</tag-class>
@@ -49,6 +49,6 @@
<required>false</required>
</attribute>
</tag>
-
+
</taglib>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld Thu
Nov 10 04:03:27 2011
@@ -38,7 +38,7 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- </tag>
+ </tag>
<!-- A simple Tag -->
<!-- foo tag -->
Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/tags/displayProducts.tag
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/tags/displayProducts.tag?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/tags/displayProducts.tag
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/tags/displayProducts.tag Thu
Nov 10 04:03:27 2011
@@ -24,28 +24,28 @@
<table border="1">
<tr>
- <td>
+ <td>
<c:set var="name" value="Hand-held Color PDA"/>
<c:set var="price" value="$298.86"/>
<jsp:invoke fragment="normalPrice"/>
</td>
- <td>
+ <td>
<c:set var="name" value="4-Pack 150 Watt Light Bulbs"/>
<c:set var="origPrice" value="$2.98"/>
<c:set var="salePrice" value="$2.32"/>
<jsp:invoke fragment="onSale"/>
</td>
- <td>
+ <td>
<c:set var="name" value="Digital Cellular Phone"/>
<c:set var="price" value="$68.74"/>
<jsp:invoke fragment="normalPrice"/>
</td>
- <td>
+ <td>
<c:set var="name" value="Baby Grand Piano"/>
<c:set var="price" value="$10,800.00"/>
<jsp:invoke fragment="normalPrice"/>
</td>
- <td>
+ <td>
<c:set var="name" value="Luxury Car w/ Leather Seats"/>
<c:set var="origPrice" value="$23,980.00"/>
<c:set var="salePrice" value="$21,070.00"/>
Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml?rev=1200123&r1=1200122&r2=1200123&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml Thu Nov 10 04:03:27
2011
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
version="3.0"
- metadata-complete="true">
+ metadata-complete="true">
<description>
Servlet and JSP Examples.
@@ -227,7 +227,7 @@
<include-coda>/jsp/jsp2/misc/coda.jspf</include-coda>
</jsp-property-group>
</jsp-config>
-
+
<security-constraint>
<display-name>Example Security Constraint</display-name>
<web-resource-collection>
@@ -256,14 +256,14 @@
<form-error-page>/jsp/security/protected/error.jsp</form-error-page>
</form-login-config>
</login-config>
-
+
<!-- Security roles referenced by this web application -->
<security-role>
<role-name>role1</role-name>
</security-role>
<security-role>
<role-name>tomcat</role-name>
- </security-role>
+ </security-role>
<!-- Environment entry examples -->
<!--env-entry>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
