horwat 01/04/24 17:36:40
Modified: jasper/src/share/org/apache/jasper/compiler
XmlOutputter.java JspParseEventListener.java
ParserXJspSaxHandler.java
jasper/src/share/org/apache/jasper/resources
messages.properties
Log:
Implementation of the following JSP 1.2 PFD2 changes:
JSP.E.1.2 Version Information Corrections
- new URI for jsp namespace is "http://java.sun.com/JSP/TagLibraryDescriptor";
JSP.E.1.6 XML Syntax Corrections
- changed jsp:cdata to jsp:text
- added version attribute to jsp:root
- removed DOCTYPE
Revision Changes Path
1.10 +14 -8
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java
Index: XmlOutputter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XmlOutputter.java 2001/04/13 21:54:40 1.9
+++ XmlOutputter.java 2001/04/25 00:36:39 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
1.9 2001/04/13 21:54:40 horwat Exp $
- * $Revision: 1.9 $
- * $Date: 2001/04/13 21:54:40 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
1.10 2001/04/25 00:36:39 horwat Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/04/25 00:36:39 $
*
* ====================================================================
*
@@ -98,12 +98,19 @@
*/
private int jspRootLevel = 0;
+ public static final String JSP_NAMESPACE =
"http://java.sun.com/JSP/TagLibraryDescriptor";;
+ public static final String JSP_VERSION = "1.2";
+
+
//*********************************************************************
// Constructor
XmlOutputter() {
sb = new StringBuffer();
rootAttrs = new AttributesImpl();
+
+ rootAttrs.addAttribute("", "xmlns:jsp", "xmlns:jsp", "CDATA",
JSP_NAMESPACE);
+ rootAttrs.addAttribute("", "version", "version", "CDATA", JSP_VERSION);
}
//*********************************************************************
@@ -131,7 +138,7 @@
* Add a namespace entry for every taglib in the <jsp:root> tag.
*/
void addRootNamespaces(String prefix, String uri) {
- rootAttrs.addAttribute("", "localname", "xmlns:" + prefix, "CDATA", uri);
+ rootAttrs.addAttribute("", "xmlns", "xmlns:" + prefix, "CDATA", uri);
}
@@ -226,18 +233,17 @@
//*********************************************************************
// Outputting the XML stream
- private static final String PROLOG =
- "<!DOCTYPE jsp:root\n PUBLIC \"-//Sun Microsystems Inc.//DTD JavaServer Pages
Version 1.1//EN\"\n \"http://java.sun.com/products/jsp/dtd/jspcore_1_2.dtd\";>\n";
-
PageData getPageData() {
StringBuffer buff = new StringBuffer();
+ AttributesImpl attrs = new AttributesImpl();
- buff.append(PROLOG);
+
append("jsp:root", rootAttrs, buff);
buff.append(sb.toString());
buff.append("</jsp:root>");
InputStream is =
new ByteArrayInputStream(buff.toString().getBytes());
+ //System.out.println("XmlOutputter: \n" + buff);
PageData pageData = new PageDataImpl(is);
return pageData;
}
1.26 +4 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JspParseEventListener.java 2001/04/13 21:51:33 1.25
+++ JspParseEventListener.java 2001/04/25 00:36:39 1.26
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.25 2001/04/13 21:51:33 horwat Exp $
- * $Revision: 1.25 $
- * $Date: 2001/04/13 21:51:33 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.26 2001/04/25 00:36:39 horwat Exp $
+ * $Revision: 1.26 $
+ * $Date: 2001/04/25 00:36:39 $
*
* ====================================================================
*
@@ -1103,7 +1103,7 @@
{
if (data != null) {
handleCharData(start, stop, data);
- xo.append("jsp:cdata", null, data);
+ xo.append("jsp:text", null, data);
}
}
1.9 +1 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserXJspSaxHandler.java
Index: ParserXJspSaxHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserXJspSaxHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ParserXJspSaxHandler.java 2001/03/30 22:26:37 1.8
+++ ParserXJspSaxHandler.java 2001/04/25 00:36:39 1.9
@@ -291,7 +291,7 @@
if (name.equals("jsp:root")) {
node.validate(true, false);
jspHandler.handleRootEnd();
- } else if (name.equals("jsp:cdata")) {
+ } else if (name.equals("jsp:text")) {
node.validate(false, true);
jspHandler.handleJspCdata(node.start, stop, node.getText());
} else if (name.equals("jsp:directive.include")) {
1.15 +2 -2
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- messages.properties 2001/03/22 17:20:14 1.14
+++ messages.properties 2001/04/25 00:36:40 1.15
@@ -1,4 +1,4 @@
-# $Id: messages.properties,v 1.14 2001/03/22 17:20:14 craigmcc Exp $
+# $Id: messages.properties,v 1.15 2001/04/25 00:36:40 horwat Exp $
#
# Default localized string information
# Localized this the Default Locale as is en_US
@@ -231,7 +231,7 @@
jsp.error.tldInWebDotXmlNotFound=Could not locate TLD {1} for URI {0} specified in
web.xml
jsp.error.taglibDirective.absUriCannotBeResolved=This absolute uri ({0}) cannot be
resolved in either web.xml or the jar files deployed with this application
jsp.error.unterminated.user.tag=Unterminated user-defined tag: ending tag {0} not
found or incorrectly nested
-jspx.error.templateDataNotInJspCdata=Validation Error: Element <{0}> cannot
have template data. Template data must be encapsulated within a <jsp:cdata>
element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: {1}
+jspx.error.templateDataNotInJspCdata=Validation Error: Element <{0}> cannot
have template data. Template data must be encapsulated within a <jsp:text>
element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: {1}
#Error while processing taglib jar file {0}: {1}
jsp.error.taglib.jarFileException=
jsp.error.invalid.javaEncoding=Invalid java encodings. Tried {0} and then {1}. Both
failed.
