horwat 01/04/25 12:34:03
Modified: jasper/src/share/org/apache/jasper/compiler
XmlOutputter.java JspParseEventListener.java
ParserXJspSaxHandler.java
jasper/src/share/org/apache/jasper/resources
messages.properties
Log:
It was too late in the development process to make these changes for JSP 1.2 PFD2.
Reverting and flagging for later integration.
Revision Changes Path
1.11 +8 -5
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XmlOutputter.java 2001/04/25 00:36:39 1.10
+++ XmlOutputter.java 2001/04/25 19:33:55 1.11
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
1.11 2001/04/25 19:33:55 horwat Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/04/25 19:33:55 $
*
* ====================================================================
*
@@ -98,7 +98,9 @@
*/
private int jspRootLevel = 0;
- public static final String JSP_NAMESPACE =
"http://java.sun.com/JSP/TagLibraryDescriptor";;
+ public static final String JSP_NAMESPACE = "http://java.sun.com/jsp_1_2";;
+ // FLAG: JSP 1.2 PFD2 implement later
+ // public static final String JSP_NAMESPACE =
"http://java.sun.com/JSP/TagLibraryDescriptor";;
public static final String JSP_VERSION = "1.2";
@@ -110,7 +112,8 @@
rootAttrs = new AttributesImpl();
rootAttrs.addAttribute("", "xmlns:jsp", "xmlns:jsp", "CDATA",
JSP_NAMESPACE);
- rootAttrs.addAttribute("", "version", "version", "CDATA", JSP_VERSION);
+ // FLAG: JSP 1.2 PFD2 implement later
+ // rootAttrs.addAttribute("", "version", "version", "CDATA", JSP_VERSION);
}
//*********************************************************************
1.27 +6 -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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- JspParseEventListener.java 2001/04/25 00:36:39 1.26
+++ JspParseEventListener.java 2001/04/25 19:33:55 1.27
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.27 2001/04/25 19:33:55 horwat Exp $
+ * $Revision: 1.27 $
+ * $Date: 2001/04/25 19:33:55 $
*
* ====================================================================
*
@@ -1103,7 +1103,9 @@
{
if (data != null) {
handleCharData(start, stop, data);
- xo.append("jsp:text", null, data);
+ xo.append("jsp:cdata", null, data);
+ // FLAG: JSP 1.2 PFD2 implement later
+ // xo.append("jsp:text", null, data);
}
}
1.10 +3 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ParserXJspSaxHandler.java 2001/04/25 00:36:39 1.9
+++ ParserXJspSaxHandler.java 2001/04/25 19:33:56 1.10
@@ -291,7 +291,9 @@
if (name.equals("jsp:root")) {
node.validate(true, false);
jspHandler.handleRootEnd();
- } else if (name.equals("jsp:text")) {
+ } else if (name.equals("jsp:cdata")) {
+ // FLAG: JSP 1.2 PFD2 implement later
+ // } 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.16 +4 -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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- messages.properties 2001/04/25 00:36:40 1.15
+++ messages.properties 2001/04/25 19:34:01 1.16
@@ -1,4 +1,4 @@
-# $Id: messages.properties,v 1.15 2001/04/25 00:36:40 horwat Exp $
+# $Id: messages.properties,v 1.16 2001/04/25 19:34:01 horwat Exp $
#
# Default localized string information
# Localized this the Default Locale as is en_US
@@ -231,7 +231,9 @@
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:text>
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:cdata>
element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: {1}
+# FLAG: JSP 1.2 PFD2 implement later
+# 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.
