remm 2003/08/19 09:04:56
Modified: tester/src/bin tester.xml
tester/web JspDoc01.jsp
tester/web/golden JspDoc01.txt
Added: tester/web JspDoc02.jsp
tester/web/golden JspDoc02.txt
Log:
- As suggested by Eric, add a second JSP XML test to the tester. It is not exactly
the same as the example (as the example puts a time in the page).
- Fix the first JSP XML test.
Revision Changes Path
1.8 +4 -0 jakarta-tomcat-catalina/tester/src/bin/tester.xml
Index: tester.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/src/bin/tester.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tester.xml 20 Jul 2003 15:05:59 -0000 1.7
+++ tester.xml 19 Aug 2003 16:04:55 -0000 1.8
@@ -595,6 +595,10 @@
request="${context.path}/JspDoc01.jsp" debug="${debug}"
golden="${golden.path}/JspDoc01.txt"/>
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0"
+ request="${context.path}/JspDoc02.jsp" debug="${debug}"
+ golden="${golden.path}/JspDoc02.txt"/>
+
<echo message="----- jsp:forward -----"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
1.2 +4 -3 jakarta-tomcat-catalina/tester/web/JspDoc01.jsp
Index: JspDoc01.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/web/JspDoc01.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspDoc01.jsp 18 Jul 2002 16:47:24 -0000 1.1
+++ JspDoc01.jsp 19 Aug 2003 16:04:55 -0000 1.2
@@ -1,8 +1,9 @@
+<?xml version="1.0"?>
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="1.2">
<a>text<b></b></a>
- <jsp:text><a>text<b></b></a></jsp:text>
+ <jsp:text><a>text<b></b></a></jsp:text>
<c><d>text</d></c>
- <jsp:text><c><d>text</d></c></jsp:text>
+ <jsp:text><c><d>text</d></c></jsp:text>
<e><f></f>text<f></f></e>
- <jsp:text><e><f></f>text<f></f></e></jsp:text>
+ <jsp:text><e><f></f>text<f></f></e></jsp:text>
</jsp:root>
1.1 jakarta-tomcat-catalina/tester/web/JspDoc02.jsp
Index: JspDoc02.jsp
===================================================================
<?xml version="1.0"?>
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page";
version="1.2">
<jsp:directive.page contentType="text/html"/>
<jsp:directive.page import="java.util.Date, java.util.Locale"/>
<jsp:directive.page import="java.text.*"/>
<jsp:declaration>
String getData() {
return "foo";
}
</jsp:declaration>
<html>
<head>
<title>Example JSP in XML format</title>
</head>
<body>
This is the output of a simple JSP using XML format.
<br />
<div>Use a jsp:scriptlet to loop from 1 to 10: </div>
<jsp:scriptlet>
// Note we need to declare CDATA because we don't escape the less than symbol
<![CDATA[
for (int i = 1; i<=10; i++) {
out.print(i);
if (i < 10) {
out.print(", ");
}
}
]]>
</jsp:scriptlet>
<!-- Because I omit br's end tag, declare it as CDATA -->
<![CDATA[
<br><br>
]]>
<div align="left">
Use a jsp:expression to write something:
<jsp:expression>getData()</jsp:expression>
</div>
<jsp:text>
<p>This sentence is enclosed in a jsp:text element.</p>
</jsp:text>
</body>
</html>
</jsp:root>
1.2 +1 -1 jakarta-tomcat-catalina/tester/web/golden/JspDoc01.txt
Index: JspDoc01.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/web/golden/JspDoc01.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspDoc01.txt 18 Jul 2002 16:47:25 -0000 1.1
+++ JspDoc01.txt 19 Aug 2003 16:04:56 -0000 1.2
@@ -1 +1 @@
-<a>text<b></b></a><a>text<b></b></a><c><d>text</d></c><c><d>text</d></c><e><f></f>text<f></f></e><e><f></f>text<f></f></e>
+<a>text<b/></a><a>text<b></b></a><c><d>text</d></c><c><d>text</d></c><e><f/>text<f/></e><e><f></f>text<f></f></e>
1.1 jakarta-tomcat-catalina/tester/web/golden/JspDoc02.txt
Index: JspDoc02.txt
===================================================================
<html><head><title>Example JSP in XML format</title></head><body>
This is the output of a simple JSP using XML format. <br/><div>Use a jsp:scriptlet
to loop from 1 to 10: </div>1, 2, 3, 4, 5, 6, 7, 8, 9, 10
<br><br><div align="left">
Use a jsp:expression to write something: foo</div>
<p>This sentence is enclosed in a jsp:text element.</p>
</body></html>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
