You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/10/22 23:26:25 UTC
svn commit: r1187809 [5/5] - in /tomcat/trunk/webapps: ROOT/ ROOT/WEB-INF/
docs/ docs/WEB-INF/ docs/api/ docs/appdev/ docs/appdev/sample/
docs/appdev/sample/src/mypackage/ docs/architecture/
docs/architecture/startup/ docs/config/ docs/elapi/ docs/imag...
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java Sat Oct 22 21:26:20 2011
@@ -33,7 +33,7 @@ public class JspCalendar {
public int getYear() {
return calendar.get(Calendar.YEAR);
}
-
+
public String getMonth() {
int m = getMonthInt();
String[] months = new String [] { "January", "February", "March",
@@ -42,14 +42,14 @@ public class JspCalendar {
"October", "November", "December" };
if (m > 12)
return "Unknown to Man";
-
+
return months[m - 1];
}
public String getDay() {
int x = getDayOfWeek();
- String[] days = new String[] {"Sunday", "Monday", "Tuesday", "Wednesday",
+ String[] days = new String[] {"Sunday", "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday"};
if (x > 7)
@@ -58,7 +58,7 @@ public class JspCalendar {
return days[x - 1];
}
-
+
public int getMonthInt() {
return 1 + calendar.get(Calendar.MONTH);
}
@@ -107,11 +107,11 @@ public class JspCalendar {
public int getDayOfWeek() {
return calendar.get(Calendar.DAY_OF_WEEK);
}
-
+
public int getHour() {
return calendar.get(Calendar.HOUR_OF_DAY);
}
-
+
public int getMinute() {
return calendar.get(Calendar.MINUTE);
}
@@ -121,7 +121,7 @@ public class JspCalendar {
return calendar.get(Calendar.SECOND);
}
-
+
public int getEra() {
return calendar.get(Calendar.ERA);
}
@@ -129,7 +129,7 @@ public class JspCalendar {
public String getUSTimeZone() {
String[] zones = new String[] {"Hawaii", "Alaskan", "Pacific",
"Mountain", "Central", "Eastern"};
-
+
return zones[10 + getZoneOffset()];
}
@@ -142,7 +142,7 @@ public class JspCalendar {
return calendar.get(Calendar.DST_OFFSET)/(60*60*1000);
}
-
+
public int getAMPM() {
return calendar.get(Calendar.AM_PM);
}
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java Sat Oct 22 21:26:20 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,14 +43,14 @@ public class ChatServlet
private static final String CHARSET = "UTF-8";
- protected ArrayList<HttpServletResponse> connections =
+ protected ArrayList<HttpServletResponse> connections =
new ArrayList<HttpServletResponse>();
protected transient MessageSender messageSender = null;
-
+
@Override
public void init() throws ServletException {
messageSender = new MessageSender();
- Thread messageSenderThread =
+ Thread messageSenderThread =
new Thread(messageSender, "MessageSender[" + getServletContext().getContextPath() + "]");
messageSenderThread.setDaemon(true);
messageSenderThread.start();
@@ -65,7 +65,7 @@ public class ChatServlet
/**
* Process the given Comet event.
- *
+ *
* @param event The Comet event that will be processed
* @throws IOException
* @throws ServletException
@@ -78,7 +78,7 @@ public class ChatServlet
// mixing Comet stuff with regular connection processing
HttpServletRequest request = event.getHttpServletRequest();
HttpServletResponse response = event.getHttpServletResponse();
-
+
if (event.getEventType() == CometEvent.EventType.BEGIN) {
String action = request.getParameter("action");
if (action != null) {
@@ -132,20 +132,20 @@ public class ChatServlet
messageSender.send("Tomcat", request.getSession(true).getAttribute("nickname") + " joined the chat.");
}
-
+
protected void end(CometEvent event, HttpServletRequest request, HttpServletResponse response)
throws IOException {
log("End for session: " + request.getSession(true).getId());
synchronized(connections) {
connections.remove(response);
}
-
+
PrintWriter writer = response.getWriter();
writer.println("</body></html>");
-
+
event.close();
}
-
+
protected void error(CometEvent event, HttpServletRequest request, HttpServletResponse response)
throws IOException {
log("Error for session: " + request.getSession(true).getId());
@@ -154,7 +154,7 @@ public class ChatServlet
}
event.close();
}
-
+
protected void read(CometEvent event, HttpServletRequest request, HttpServletResponse response)
throws IOException {
InputStream is = request.getInputStream();
@@ -163,7 +163,7 @@ public class ChatServlet
log("Available: " + is.available());
int n = is.read(buf);
if (n > 0) {
- log("Read " + n + " bytes: " + new String(buf, 0, n)
+ log("Read " + n + " bytes: " + new String(buf, 0, n)
+ " for session: " + request.getSession(true).getId());
} else if (n < 0) {
log("End of file: " + n);
@@ -185,7 +185,7 @@ public class ChatServlet
writer.println("Configure a connector that supports Comet and try again.");
writer.println("</body></html>");
}
-
+
/**
* Poller class.
@@ -194,11 +194,11 @@ public class ChatServlet
protected boolean running = true;
protected ArrayList<String> messages = new ArrayList<String>();
-
+
public MessageSender() {
// Default contructor
}
-
+
public void stop() {
running = false;
synchronized (messages) {
@@ -260,7 +260,7 @@ public class ChatServlet
* in HTML.
*
* @param message The message string to be filtered
- * @author Copied from org.apache.catalina.util.RequestUtil#filter(String)
+ * @author Copied from org.apache.catalina.util.RequestUtil#filter(String)
*/
protected static String filter(String message) {
if (message == null)
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java Sat Oct 22 21:26:20 2011
@@ -82,7 +82,7 @@ public class ColorGameBean {
public boolean getSuccess() {
if (background.equalsIgnoreCase("black") ||
background.equalsIgnoreCase("cyan")) {
-
+
if (foreground.equalsIgnoreCase("black") ||
foreground.equalsIgnoreCase("cyan")) {
return true;
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java Sat Oct 22 21:26:20 2011
@@ -182,8 +182,8 @@ public class CompressionFilter implement
}
chain.doFilter(request, response);
return;
- }
-
+ }
+
if (response instanceof HttpServletResponse) {
CompressionServletResponseWrapper wrappedResponse =
new CompressionServletResponseWrapper((HttpServletResponse)response);
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java Sat Oct 22 21:26:20 2011
@@ -231,7 +231,7 @@ public class CompressionServletResponseW
} else {
writer = new PrintWriter(stream);
}
-
+
return (writer);
}
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/dates/JspCalendar.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/dates/JspCalendar.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/dates/JspCalendar.java Sat Oct 22 21:26:20 2011
@@ -31,7 +31,7 @@ public class JspCalendar {
public int getYear() {
return calendar.get(Calendar.YEAR);
}
-
+
public String getMonth() {
int m = getMonthInt();
String[] months = new String [] { "January", "February", "March",
@@ -40,14 +40,14 @@ public class JspCalendar {
"October", "November", "December" };
if (m > 12)
return "Unknown to Man";
-
+
return months[m - 1];
}
public String getDay() {
int x = getDayOfWeek();
- String[] days = new String[] {"Sunday", "Monday", "Tuesday", "Wednesday",
+ String[] days = new String[] {"Sunday", "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday"};
if (x > 7)
@@ -56,7 +56,7 @@ public class JspCalendar {
return days[x - 1];
}
-
+
public int getMonthInt() {
return 1 + calendar.get(Calendar.MONTH);
}
@@ -89,11 +89,11 @@ public class JspCalendar {
public int getDayOfWeek() {
return calendar.get(Calendar.DAY_OF_WEEK);
}
-
+
public int getHour() {
return calendar.get(Calendar.HOUR_OF_DAY);
}
-
+
public int getMinute() {
return calendar.get(Calendar.MINUTE);
}
@@ -132,7 +132,7 @@ public class JspCalendar {
public String getUSTimeZone() {
String[] zones = new String[] {"Hawaii", "Alaskan", "Pacific",
"Mountain", "Central", "Eastern"};
-
+
return zones[10 + getZoneOffset()];
}
@@ -145,7 +145,7 @@ public class JspCalendar {
return calendar.get(Calendar.DST_OFFSET)/(60*60*1000);
}
-
+
public int getAMPM() {
return calendar.get(Calendar.AM_PM);
}
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java Sat Oct 22 21:26:20 2011
@@ -39,7 +39,7 @@ public abstract class ExampleTagBase ext
public Tag getParent() {
return this.parent;
}
-
+
@Override
public int doStartTag() throws JspException {
return SKIP_BODY;
@@ -49,7 +49,7 @@ public abstract class ExampleTagBase ext
public int doEndTag() throws JspException {
return EVAL_PAGE;
}
-
+
@Override
public void doInitBody() throws JspException {
@@ -68,7 +68,7 @@ public abstract class ExampleTagBase ext
pageContext = null;
parent = null;
}
-
+
protected BodyContent bodyOut;
protected Tag parent;
}
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java Sat Oct 22 21:26:20 2011
@@ -34,15 +34,15 @@ public class FooTag extends ExampleTagBa
private String atts[] = new String[3];
int i = 0;
-
+
private final void setAtt(int index, String value) {
atts[index] = value;
}
-
+
public void setAtt1(String value) {
setAtt(0, value);
}
-
+
public void setAtt2(String value) {
setAtt(1, value);
}
@@ -50,7 +50,7 @@ public class FooTag extends ExampleTagBa
public void setAtt3(String value) {
setAtt(2, value);
}
-
+
/**
* Process start tag
*
@@ -67,7 +67,7 @@ public class FooTag extends ExampleTagBa
pageContext.setAttribute("member", atts[i]);
i++;
}
-
+
@Override
public int doAfterBody() throws JspException {
try {
@@ -75,7 +75,7 @@ public class FooTag extends ExampleTagBa
bodyOut.writeOut(bodyOut.getEnclosingWriter());
return SKIP_BODY;
}
-
+
pageContext.setAttribute("member", atts[i]);
i++;
return EVAL_BODY_BUFFERED;
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java Sat Oct 22 21:26:20 2011
@@ -23,7 +23,7 @@ import javax.servlet.jsp.tagext.Variable
public class FooTagExtraInfo extends TagExtraInfo {
@Override
public VariableInfo[] getVariableInfo(TagData data) {
- return new VariableInfo[]
+ return new VariableInfo[]
{
new VariableInfo("member",
"String",
@@ -33,4 +33,4 @@ public class FooTagExtraInfo extends Tag
}
}
-
+
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java Sat Oct 22 21:26:20 2011
@@ -22,14 +22,14 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspTagException;
/**
- * Log the contents of the body. Could be used to handle errors etc.
+ * Log the contents of the body. Could be used to handle errors etc.
*/
public class LogTag extends ExampleTagBase {
private static final long serialVersionUID = 1L;
boolean toBrowser = false;
-
+
public void setToBrowser(String value) {
if (value == null)
toBrowser = false;
@@ -43,7 +43,7 @@ public class LogTag extends ExampleTagBa
public int doStartTag() throws JspException {
return EVAL_BODY_BUFFERED;
}
-
+
@Override
public int doAfterBody() throws JspException {
try {
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java Sat Oct 22 21:26:20 2011
@@ -33,7 +33,7 @@ public class ShowSource extends TagSuppo
private static final long serialVersionUID = 1L;
String jspFile;
-
+
public void setJspFile(String jspFile) {
this.jspFile = jspFile;
}
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java Sat Oct 22 21:26:20 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/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java Sat Oct 22 21:26:20 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/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java Sat Oct 22 21:26:20 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/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java Sat Oct 22 21:26:20 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/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java Sat Oct 22 21:26:20 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/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java Sat Oct 22 21:26:20 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/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java Sat Oct 22 21:26:20 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/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java Sat Oct 22 21:26:20 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/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java Sat Oct 22 21:26:20 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/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java Sat Oct 22 21:26:20 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/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java Sat Oct 22 21:26:20 2011
@@ -34,7 +34,7 @@ public class Clock2 extends Applet imple
private static final long serialVersionUID = 1L;
Thread timer; // The thread that displays clock
int lastxs, lastys, lastxm,
- lastym, lastxh, lastyh; // Dimensions used to draw hands
+ lastym, lastxh, lastyh; // Dimensions used to draw hands
SimpleDateFormat formatter; // Formats the date displayed
String lastdate; // String to hold date displayed
Font clockFaceFont; // Font for number display on clock
@@ -118,7 +118,7 @@ public class Clock2 extends Applet imple
m = Integer.parseInt(formatter.format(currentDate));
} catch (NumberFormatException n) {
m = 10;
- }
+ }
formatter.applyPattern("h");
try {
h = Integer.parseInt(formatter.format(currentDate));
@@ -129,30 +129,30 @@ public class Clock2 extends Applet imple
today = formatter.format(currentDate);
xcenter=80;
ycenter=55;
-
+
// a= s* pi/2 - pi/2 (to switch 0,0 from 3:00 to 12:00)
// x = r(cos a) + xcenter, y = r(sin a) + ycenter
-
+
xs = (int)(Math.cos(s * 3.14f/30 - 3.14f/2) * 45 + xcenter);
ys = (int)(Math.sin(s * 3.14f/30 - 3.14f/2) * 45 + ycenter);
xm = (int)(Math.cos(m * 3.14f/30 - 3.14f/2) * 40 + xcenter);
ym = (int)(Math.sin(m * 3.14f/30 - 3.14f/2) * 40 + ycenter);
xh = (int)(Math.cos((h*30 + m/2) * 3.14f/180 - 3.14f/2) * 30 + xcenter);
yh = (int)(Math.sin((h*30 + m/2) * 3.14f/180 - 3.14f/2) * 30 + ycenter);
-
+
// Draw the circle and numbers
-
+
g.setFont(clockFaceFont);
g.setColor(handColor);
circle(xcenter,ycenter,50,g);
g.setColor(numberColor);
- g.drawString("9",xcenter-45,ycenter+3);
+ g.drawString("9",xcenter-45,ycenter+3);
g.drawString("3",xcenter+40,ycenter+3);
g.drawString("12",xcenter-5,ycenter-37);
g.drawString("6",xcenter-3,ycenter+45);
// Erase if necessary, and redraw
-
+
g.setColor(getBackground());
if (xs != lastxs || ys != lastys) {
g.drawLine(xcenter, ycenter, lastxs, lastys);
@@ -166,7 +166,7 @@ public class Clock2 extends Applet imple
g.drawLine(xcenter-1, ycenter, lastxh, lastyh); }
g.setColor(numberColor);
g.drawString("", 5, 125);
- g.drawString(today, 5, 125);
+ g.drawString(today, 5, 125);
g.drawLine(xcenter, ycenter, xs, ys);
g.setColor(handColor);
g.drawLine(xcenter, ycenter-1, xm, ym);
@@ -212,7 +212,7 @@ public class Clock2 extends Applet imple
public String getAppletInfo() {
return "Title: A Clock \nAuthor: Rachel Gollub, 1995 \nAn analog clock.";
}
-
+
@Override
public String[][] getParameterInfo() {
String[][] info = {
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=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld Sat Oct 22 21:26:20 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/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=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld Sat Oct 22 21:26:20 2011
@@ -38,7 +38,7 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- </tag>
+ </tag>
<!-- A simple Tag -->
<!-- foo tag -->
Modified: tomcat/trunk/webapps/examples/WEB-INF/tags/displayProducts.tag
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/tags/displayProducts.tag?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/tags/displayProducts.tag (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/tags/displayProducts.tag Sat Oct 22 21:26:20 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/trunk/webapps/examples/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Sat Oct 22 21:26:20 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>
Modified: tomcat/trunk/webapps/examples/jsp/async/index.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/async/index.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/async/index.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/async/index.jsp Sat Oct 22 21:26:20 2011
@@ -19,16 +19,16 @@
<pre>
Use cases:
-1. Simple dispatch
+1. Simple dispatch
- servlet does startAsync()
- - background thread calls ctx.dispatch()
+ - background thread calls ctx.dispatch()
<a href="<%=response.encodeURL("/examples/async/async0")%>"> Async 0 </a>
-
+
2. Simple dispatch
- servlet does startAsync()
- background thread calls dispatch(/path/to/jsp)
<a href="<%=response.encodeURL("/examples/async/async1")%>"> Async 1 </a>
-
+
3. Simple dispatch
- servlet does startAsync()
- background thread calls writes and calls complete()
@@ -43,27 +43,27 @@ Use cases:
3. Timeout s1
- servlet does a startAsync()
- servlet does a setAsyncTimeout
- - returns - waits for timeout to happen should return error page
-
+ - returns - waits for timeout to happen should return error page
+
4. Timeout s2
- servlet does a startAsync()
- servlet does a setAsyncTimeout
- servlet does a addAsyncListener
- - returns - waits for timeout to happen and listener invoked
-
+ - returns - waits for timeout to happen and listener invoked
+
5. Dispatch to asyncSupported=false servlet
- servlet1 does a startAsync()
- servlet1 dispatches to dispatch(/servlet2)
- the container calls complete() after servlet2 is complete
- TODO
-
+
6. Chained dispatch
- servlet1 does a startAsync
- servlet1 does a dispatch to servlet2 (asyncsupported=true)
- servlet2 does a dispatch to servlet3 (asyncsupported=true)
- - servlet3 does a dispatch to servlet4 (asyncsupported=false)
-
-
+ - servlet3 does a dispatch to servlet4 (asyncsupported=false)
+
+
7. Stock ticker
<a href="<%=response.encodeURL("/examples/async/stockticker")%>"> StockTicker </a>
</pre>
\ No newline at end of file
Modified: tomcat/trunk/webapps/examples/jsp/cal/cal1.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/cal/cal1.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/cal/cal1.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/cal/cal1.jsp Sat Oct 22 21:26:20 2011
@@ -15,7 +15,7 @@
limitations under the License.
--%>
<HTML>
-<HEAD><TITLE>
+<HEAD><TITLE>
Calendar: A JSP APPLICATION
</TITLE></HEAD>
@@ -52,13 +52,13 @@
cal.Entry entr = table.getEntries().getEntry(i);
%>
<TR>
- <TD>
+ <TD>
<A HREF=cal2.jsp?time=<%= entr.getHour() %>>
<%= entr.getHour() %> </A>
</TD>
<TD BGCOLOR=<%= entr.getColor() %>>
<% out.print(util.HTMLFilter.filter(entr.getDescription())); %>
- </TD>
+ </TD>
</TR>
<%
}
@@ -70,7 +70,7 @@
<!-- footer -->
<TABLE WIDTH=60% BGCOLOR=yellow CELLPADDING=15>
<TR>
-<TD ALIGN=CENTER> <% out.print(util.HTMLFilter.filter(table.getName())); %> :
+<TD ALIGN=CENTER> <% out.print(util.HTMLFilter.filter(table.getName())); %> :
<% out.print(util.HTMLFilter.filter(table.getEmail())); %> </TD>
</TR>
</TABLE>
Modified: tomcat/trunk/webapps/examples/jsp/cal/cal2.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/cal/cal2.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/cal/cal2.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/cal/cal2.jsp Sat Oct 22 21:26:20 2011
@@ -15,7 +15,7 @@
limitations under the License.
--%>
<HTML>
-<HEAD><TITLE>
+<HEAD><TITLE>
Calendar: A JSP APPLICATION
</TITLE></HEAD>
@@ -23,7 +23,7 @@
<BODY BGCOLOR="white">
<jsp:useBean id="table" scope="session" class="cal.TableBean" />
-<%
+<%
String time = request.getParameter ("time");
%>
@@ -32,7 +32,7 @@
<BR> Time <%= util.HTMLFilter.filter(time) %> </h3>
</FONT>
<FORM METHOD=POST ACTION=cal1.jsp>
-<BR>
+<BR>
<BR> <INPUT NAME="date" TYPE=HIDDEN VALUE="current">
<BR> <INPUT NAME="time" TYPE=HIDDEN VALUE="<%= util.HTMLFilter.filter(time) %>">
<BR> <h2> Description of the event <INPUT NAME="description" TYPE=TEXT SIZE=20> </h2>
Modified: tomcat/trunk/webapps/examples/jsp/cal/login.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/cal/login.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/cal/login.html (original)
+++ tomcat/trunk/webapps/examples/jsp/cal/login.html Sat Oct 22 21:26:20 2011
@@ -38,8 +38,8 @@
</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
+<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
used with html tables and forms.</font>
</center>
Modified: tomcat/trunk/webapps/examples/jsp/checkbox/checkresult.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/checkbox/checkresult.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/checkbox/checkresult.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/checkbox/checkresult.jsp Sat Oct 22 21:26:20 2011
@@ -23,7 +23,7 @@
<jsp:setProperty name="foo" property="fruit" param="fruit" />
<hr>
The checked fruits (got using request) are: <br>
-<%
+<%
fruits = request.getParameterValues("fruit");
%>
<ul>
@@ -43,7 +43,7 @@ The checked fruits (got using request) a
The checked fruits (got using beans) are <br>
-<%
+<%
fruits = foo.getFruit();
%>
<ul>
Modified: tomcat/trunk/webapps/examples/jsp/colors/colors.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/colors/colors.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/colors/colors.html (original)
+++ tomcat/trunk/webapps/examples/jsp/colors/colors.html Sat Oct 22 21:26:20 2011
@@ -20,16 +20,16 @@
<font size=6 color=red>
<hr>
-This web page is an example using JSP and BEANs.
+This web page is an example using JSP and BEANs.
<p>
-Guess my favorite two colors
+Guess my favorite two colors
<p> If you fail to guess both of them - you get yellow on red.
-<p> If you guess one of them right, either your foreground or
+<p> If you guess one of them right, either your foreground or
your background will change to the color that was guessed right.
-<p> Guess them both right and your browser foreground/background
+<p> Guess them both right and your browser foreground/background
will change to my two favorite colors to display this page.
<hr>
Modified: tomcat/trunk/webapps/examples/jsp/colors/colrs.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/colors/colrs.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/colors/colrs.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/colors/colrs.jsp Sat Oct 22 21:26:20 2011
@@ -28,7 +28,7 @@
<p>
<% if (cb.getHint()==true) { %>
-
+
<p> Hint #1: Vampires prey at night!
<p> <p> Hint #2: Nancy without the n.
@@ -38,7 +38,7 @@
<p> CONGRATULATIONS!!
<% if (cb.getHintTaken()==true) { %>
-
+
<p> ( although I know you cheated and peeked into the hints)
<% } %>
Modified: tomcat/trunk/webapps/examples/jsp/error/err.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/error/err.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/error/err.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/error/err.jsp Sat Oct 22 21:26:20 2011
@@ -19,7 +19,7 @@
<%@ page errorPage="errorpge.jsp" %>
<jsp:useBean id="foo" scope="request" class="error.Smart" />
- <%
+ <%
String name = null;
if (request.getParameter("name") == null) {
@@ -35,7 +35,7 @@
<H1> Yes!!! <a href="http://www.acura.com">Acura</a> is my favorite car.
- <%
+ <%
}
}
%>
Modified: tomcat/trunk/webapps/examples/jsp/error/errorpge.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/error/errorpge.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/error/errorpge.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/error/errorpge.jsp Sat Oct 22 21:26:20 2011
@@ -20,6 +20,6 @@
<%@ page isErrorPage="true" %>
<h1> The exception <%= exception.getMessage() %> tells me you
- made a wrong choice.
+ made a wrong choice.
</body>
</html>
Modified: tomcat/trunk/webapps/examples/jsp/forward/forward.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/forward/forward.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/forward/forward.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/forward/forward.jsp Sat Oct 22 21:26:20 2011
@@ -15,11 +15,11 @@
limitations under the License.
--%>
<html>
-<%
+<%
double freeMem = Runtime.getRuntime().freeMemory();
double totlMem = Runtime.getRuntime().totalMemory();
double percent = freeMem/totlMem;
- if (percent < 0.5) {
+ if (percent < 0.5) {
%>
<jsp:forward page="one.jsp"/>
Modified: tomcat/trunk/webapps/examples/jsp/include/include.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/include/include.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/include/include.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/include/include.jsp Sat Oct 22 21:26:20 2011
@@ -30,6 +30,6 @@
<jsp:include page="foo.jsp" flush="true"/>
-:-)
+:-)
</html>
Modified: tomcat/trunk/webapps/examples/jsp/index.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/index.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/index.html (original)
+++ tomcat/trunk/webapps/examples/jsp/index.html Sat Oct 22 21:26:20 2011
@@ -335,7 +335,7 @@ This can be done using browser options.
<tr VALIGN=TOP>
<td>If </td>
<td VALIGN=TOP WIDTH="30%">
- <a href="tagplugin/if.jsp"><img SRC="images/execute.gif" HSPACE=4 BORDER=0
+ <a href="tagplugin/if.jsp"><img SRC="images/execute.gif" HSPACE=4 BORDER=0
align=TOP></a>
<a href="tagplugin/if.jsp">Execute</a>
</td>
@@ -349,7 +349,7 @@ ght=24 width=24 align=TOP></a>
<tr VALIGN=TOP>
<td>ForEach </td>
<td VALIGN=TOP WIDTH="30%">
- <a href="tagplugin/foreach.jsp"><img SRC="images/execute.gif" HSPACE=4 BORDER=0
+ <a href="tagplugin/foreach.jsp"><img SRC="images/execute.gif" HSPACE=4 BORDER=0
align=TOP></a>
<a href="tagplugin/foreach.jsp">Execute</a>
</td>
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=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/el/composite.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/el/composite.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/el/composite.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/el/composite.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/el/functions.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp Sat Oct 22 21:26:20 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/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=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/misc/config.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/repeat.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/repeat.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/repeat.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/tagfiles/hello.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/hello.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/hello.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/hello.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp Sat Oct 22 21:26:20 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>
Modified: tomcat/trunk/webapps/examples/jsp/jsptoserv/jts.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsptoserv/jts.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsptoserv/jts.html (original)
+++ tomcat/trunk/webapps/examples/jsp/jsptoserv/jts.html Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/plugin/plugin.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/plugin/plugin.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/plugin/plugin.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/plugin/plugin.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/sessions/carts.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/sessions/carts.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/sessions/carts.html (original)
+++ tomcat/trunk/webapps/examples/jsp/sessions/carts.html Sat Oct 22 21:26:20 2011
@@ -47,7 +47,7 @@ Add Item:
<INPUT TYPE=submit name="submit" value="remove">
</form>
-
+
</FONT>
</body>
</html>
Modified: tomcat/trunk/webapps/examples/jsp/sessions/carts.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/sessions/carts.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/sessions/carts.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/sessions/carts.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/snp/snoop.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/snp/snoop.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/snp/snoop.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/snp/snoop.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/tagplugin/choose.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/choose.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/tagplugin/choose.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/choose.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/tagplugin/foreach.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/foreach.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/tagplugin/foreach.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/foreach.jsp Sat Oct 22 21:26:20 2011
@@ -51,4 +51,4 @@
${item}
</c:forEach>
</body>
-</html>
+</html>
Modified: tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/tagplugin/if.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp Sat Oct 22 21:26:20 2011
@@ -44,4 +44,4 @@
<p>It's not true that (0>2)! Failed.</p>
</c:if>
</body>
-</html>
+</html>
Modified: tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html Sat Oct 22 21:26:20 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/trunk/webapps/examples/jsp/xml/xml.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/xml/xml.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/xml/xml.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/xml/xml.jsp Sat Oct 22 21:26:20 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/trunk/webapps/examples/servlets/cookies.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/servlets/cookies.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/servlets/cookies.html (original)
+++ tomcat/trunk/webapps/examples/servlets/cookies.html Sat Oct 22 21:26:20 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/trunk/webapps/examples/servlets/reqinfo.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/servlets/reqinfo.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/servlets/reqinfo.html (original)
+++ tomcat/trunk/webapps/examples/servlets/reqinfo.html Sat Oct 22 21:26:20 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/trunk/webapps/examples/servlets/reqparams.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/servlets/reqparams.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/servlets/reqparams.html (original)
+++ tomcat/trunk/webapps/examples/servlets/reqparams.html Sat Oct 22 21:26:20 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/trunk/webapps/examples/servlets/sessions.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/servlets/sessions.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/servlets/sessions.html (original)
+++ tomcat/trunk/webapps/examples/servlets/sessions.html Sat Oct 22 21:26:20 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>
Modified: tomcat/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp (original)
+++ tomcat/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp Sat Oct 22 21:26:20 2011
@@ -37,7 +37,7 @@
and you have used your browsers back button, used a saved book-mark or
similar then you may have triggered the cross-site request forgery (CSRF)
protection that has been enabled for the HTML interface of the Host Manager
- application. You will need to reset this protection by returning to the
+ application. You will need to reset this protection by returning to the
<a href="<%=request.getContextPath()%>/html">main Host Manager page</a>.
Once you return to this page, you will be able to continue using the Host
Manager appliction's HTML interface normally. If you continue to see this
Modified: tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/WEB-INF/web.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/host-manager/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/host-manager/WEB-INF/web.xml Sat Oct 22 21:26:20 2011
@@ -21,7 +21,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">
<display-name>Tomcat Host Manager Application</display-name>
<description>
@@ -68,12 +68,12 @@
<param-value>/html,/html/,/html/list,/index.jsp</param-value>
</init-param>
</filter>
-
+
<filter-mapping>
<filter-name>CSRF</filter-name>
<servlet-name>HTMLHostManager</servlet-name>
</filter-mapping>
-
+
<!-- Define the Manager Servlet Mapping -->
<servlet-mapping>
<servlet-name>HostManager</servlet-name>
@@ -140,5 +140,5 @@
<error-code>404</error-code>
<location>/WEB-INF/jsp/404.jsp</location>
</error-page>
-
+
</web-app>
Modified: tomcat/trunk/webapps/manager/WEB-INF/jsp/403.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/jsp/403.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/WEB-INF/jsp/403.jsp (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/jsp/403.jsp Sat Oct 22 21:26:20 2011
@@ -37,7 +37,7 @@
you have used your browsers back button, used a saved book-mark or similar
then you may have triggered the cross-site request forgery (CSRF) protection
that has been enabled for the HTML interface of the Manager application. You
- will need to reset this protection by returning to the
+ will need to reset this protection by returning to the
<a href="<%=request.getContextPath()%>/html">main Manager page</a>. Once you
return to this page, you will be able to continue using the Manager
appliction's HTML interface normally. If you continue to see this access
Modified: tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp Sat Oct 22 21:26:20 2011
@@ -21,7 +21,7 @@
<%@page import="org.apache.catalina.Session" %>
<%@page import="org.apache.catalina.manager.JspHelper" %>
<%@page import="org.apache.catalina.util.ContextName" %>
-<!DOCTYPE html
+<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<%--!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
@@ -99,7 +99,7 @@
<td><%= JspHelper.getDisplayTTLForSession(currentSession) %></td>
</tr>
</table>
-
+
<form method="post" action="<%= submitUrl %>">
<div>
<input type="hidden" name="sessionId" value="<%= currentSessionId %>" />
@@ -113,10 +113,10 @@
%> <input type="submit" value="Refresh" />
</div>
</form>
-
+
<div class="error"><%= JspHelper.escapeXml(request.getAttribute("error")) %></div>
<div class="message"><%= JspHelper.escapeXml(request.getAttribute("message")) %></div>
-
+
<table style="text-align: left;" border="1" cellpadding="2" cellspacing="2">
<% int nAttributes = 0;
Enumeration attributeNamesEnumeration = currentHttpSession.getAttributeNames();
Modified: tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp Sat Oct 22 21:26:20 2011
@@ -22,7 +22,7 @@
<%@page import="org.apache.catalina.Session" %>
<%@page import="org.apache.catalina.ha.session.DeltaSession" %>
<%@page import="org.apache.catalina.util.ContextName" %>
-<!DOCTYPE html
+<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
Modified: tomcat/trunk/webapps/manager/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/web.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/web.xml Sat Oct 22 21:26:20 2011
@@ -21,7 +21,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">
<display-name>Tomcat Manager Application</display-name>
<description>
@@ -103,7 +103,7 @@
<filter-name>SetCharacterEncoding</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
<filter>
<filter-name>CSRF</filter-name>
<filter-class>org.apache.catalina.filters.CsrfPreventionFilter</filter-class>
@@ -112,13 +112,13 @@
<param-value>/html,/html/,/html/list,/index.jsp</param-value>
</init-param>
</filter>
-
+
<filter-mapping>
<filter-name>CSRF</filter-name>
<servlet-name>HTMLManager</servlet-name>
<servlet-name>jsp</servlet-name>
</filter-mapping>
-
+
<!-- Define a Security Constraint on this Application -->
<!-- NOTE: None of these roles are present in the default users file -->
<security-constraint>
@@ -188,7 +188,7 @@
</security-role>
<security-role>
<description>
- The role that is required to access to the Manager Status pages
+ The role that is required to access to the Manager Status pages
</description>
<role-name>manager-status</role-name>
</security-role>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org