cvs commit: jakarta-tomcat-catalina/tester/web/golden JspDoc02.txt
remm2003/11/25 00:31:55 Modified:tester/web/golden JspDoc02.txt Log: - The latest updates to Jasper make it generate extra CRLF with XML, apparently. There's no actual difference, so I'm updating the golden file. Revision ChangesPath 1.2 +11 -3 jakarta-tomcat-catalina/tester/web/golden/JspDoc02.txt Index: JspDoc02.txt === RCS file: /home/cvs/jakarta-tomcat-catalina/tester/web/golden/JspDoc02.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JspDoc02.txt 19 Aug 2003 16:04:56 - 1.1 +++ JspDoc02.txt 25 Nov 2003 08:31:55 - 1.2 @@ -1,6 +1,14 @@ htmlheadtitleExample JSP in XML format/title/headbody -This is the output of a simple JSP using XML format. br/divUse a jsp:scriptlet to loop from 1 to 10: /div1, 2, 3, 4, 5, 6, 7, 8, 9, 10 - brbrdiv align=left - Use a jsp:expression to write something: foo/div +This is the output of a simple JSP using XML format. +br/divUse a jsp:scriptlet to loop from 1 to 10: /div1, 2, 3, 4, 5, 6, 7, 8, 9, 10 + + + + brbr + + +div align=left + Use a jsp:expression to write something: + foo/div pThis sentence is enclosed in a jsp:text element./p /body/html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/tester/web/golden JspDoc02.txt
kinman 2003/11/25 15:05:13 Modified:tester/web/golden JspDoc02.txt Log: - Update golden file to reflect changes in jasper regarding template text output in XML syntax. Sorry, Remy :) Revision ChangesPath 1.3 +0 -5 jakarta-tomcat-catalina/tester/web/golden/JspDoc02.txt Index: JspDoc02.txt === RCS file: /home/cvs/jakarta-tomcat-catalina/tester/web/golden/JspDoc02.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JspDoc02.txt 25 Nov 2003 08:31:55 - 1.2 +++ JspDoc02.txt 25 Nov 2003 23:05:13 - 1.3 @@ -1,12 +1,7 @@ htmlheadtitleExample JSP in XML format/title/headbody This is the output of a simple JSP using XML format. br/divUse a jsp:scriptlet to loop from 1 to 10: /div1, 2, 3, 4, 5, 6, 7, 8, 9, 10 - - - brbr - - div align=left Use a jsp:expression to write something: foo/div - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/tester/web/golden JspDoc02.txt JspDoc01.txt
remm2003/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 ChangesPath
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.xml20 Jul 2003 15:05:59 - 1.7
+++ tester.xml19 Aug 2003 16:04:55 - 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 - 1.1
+++ JspDoc01.jsp 19 Aug 2003 16:04:55 - 1.2
@@ -1,8 +1,9 @@
+?xml version=1.0?
jsp:root xmlns:jsp=http://java.sun.com/JSP/Page; version=1.2
atextb/b/a
- jsp:textatextb/b/a/jsp:text
+ jsp:textlt;agt;textlt;bgt;lt;/bgt;lt;/agt;/jsp:text
cdtext/d/c
- jsp:textcdtext/d/c/jsp:text
+ jsp:textlt;cgt;lt;dgt;textlt;/dgt;lt;/cgt;/jsp:text
ef/ftextf/f/e
- jsp:textef/ftextf/f/e/jsp:text
+ jsp:textlt;egt;lt;fgt;lt;/fgt;textlt;fgt;lt;/fgt;lt;/egt;/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
titleExample JSP in XML format/title
/head
body
This is the output of a simple JSP using XML format.
br /
divUse 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[
brbr
]]
div align=left
Use a jsp:expression to write something:
jsp:expressiongetData()/jsp:expression
/div
jsp:text
lt;pgt;This sentence is enclosed in a jsp:text element.lt;/pgt;
/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 - 1.1
+++ JspDoc01.txt 19 Aug 2003 16:04:56 - 1.2
@@ -1 +1 @@
-atextb/b/aatextb/b/acdtext/d/ccdtext/d/cef/ftextf/f/eef/ftextf/f/e
+atextb//aatextb/b/acdtext/d/ccdtext/d/cef/textf//eef/ftextf/f/e
1.1 jakarta-tomcat-catalina/tester/web/golden/JspDoc02.txt
Index: JspDoc02.txt
===
htmlheadtitleExample JSP in XML format/title/headbody
This is the output of a simple JSP using XML format. br/divUse a jsp:scriptlet
to loop from 1 to 10: /div1, 2, 3, 4, 5, 6, 7, 8, 9, 10
brbrdiv align=left
Use a jsp:expression to write something: foo/div
pThis sentence is enclosed in a jsp:text element./p
/body/html
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
