tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/tester/web Xerces00.jsp
Date Fri, 27 Apr 2001 18:09:42 GMT
craigmcc    01/04/27 11:09:41

  Modified:    jasper/src/share/org/apache/jasper/compiler
                        JspParseEventListener.java
                        ParserXJspSaxHandler.java XmlOutputter.java
               jasper/src/share/org/apache/jasper/resources
                        messages.properties
               tester/web Xerces00.jsp
  Log:
  Re-implement the following changes in handling of JSP pages in XML syntax,
  to conform to the revised JSP 1.2 PFD2 specification:
  * Do not generate a DOCTYPE declaration in the rendered view
  * Correct the URL used for the "jsp" namespace, and add a "version"
    attribute, on the <jsp:root> element
  * Change <jsp:cdata> to <jsp:text>
  
  Revision  Changes    Path
  1.29      +5 -6      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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- JspParseEventListener.java	2001/04/26 23:17:40	1.28
  +++ JspParseEventListener.java	2001/04/27 18:09:29	1.29
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.28 2001/04/26 23:17:40 horwat Exp $
  - * $Revision: 1.28 $
  - * $Date: 2001/04/26 23:17:40 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.29 2001/04/27 18:09:29 craigmcc Exp $
  + * $Revision: 1.29 $
  + * $Date: 2001/04/27 18:09:29 $
    *
    * ====================================================================
    *
  @@ -1103,9 +1103,8 @@
       {
   	if (data != null) {
   	    handleCharData(start, stop, data);
  -            xo.append("jsp:cdata", null, data);
  -            // FLAG: JSP 1.2 PFD2 implement later
  -            // xo.append("jsp:text", null, data);
  +            // xo.append("jsp:cdata", null, data);
  +            xo.append("jsp:text", null, data);
   	}
       }
   
  
  
  
  1.13      +1 -3      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ParserXJspSaxHandler.java	2001/04/27 01:32:47	1.12
  +++ ParserXJspSaxHandler.java	2001/04/27 18:09:31	1.13
  @@ -304,9 +304,7 @@
   	    if (name.equals("jsp:root")) {
   		node.validate(true, false);
   		jspHandler.handleRootEnd();
  -	    } else if (name.equals("jsp:cdata")) {
  -            // FLAG: JSP 1.2 PFD2 implement later
  -	    // } else if (name.equals("jsp:text")) {
  +            } 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.13      +6 -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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- XmlOutputter.java	2001/04/25 20:54:19	1.12
  +++ XmlOutputter.java	2001/04/27 18:09:32	1.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
1.12 2001/04/25 20:54:19 horwat Exp $
  - * $Revision: 1.12 $
  - * $Date: 2001/04/25 20:54:19 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
1.13 2001/04/27 18:09:32 craigmcc Exp $
  + * $Revision: 1.13 $
  + * $Date: 2001/04/27 18:09:32 $
    *
    * ====================================================================
    *
  @@ -98,9 +98,8 @@
        */
       private int jspRootLevel = 0;
   
  -    public static final String JSP_NAMESPACE = "http://java.sun.com/dtd/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_NAMESPACE = "http://java.sun.com/dtd/jsp_1_2";
  +    public static final String JSP_NAMESPACE = "http://java.sun.com/JSP/Page";
       public static final String JSP_VERSION = "1.2";
   
   
  @@ -112,8 +111,7 @@
   	rootAttrs = new AttributesImpl();
   
           rootAttrs.addAttribute("", "xmlns:jsp", "xmlns:jsp", "CDATA", JSP_NAMESPACE);
  -        // FLAG: JSP 1.2 PFD2 implement later
  -        // rootAttrs.addAttribute("", "version", "version", "CDATA", JSP_VERSION);
  +        rootAttrs.addAttribute("", "version", "version", "CDATA", JSP_VERSION);
       }
   
       //*********************************************************************
  
  
  
  1.17      +3 -4      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- messages.properties	2001/04/25 19:34:01	1.16
  +++ messages.properties	2001/04/27 18:09:36	1.17
  @@ -1,4 +1,4 @@
  -# $Id: messages.properties,v 1.16 2001/04/25 19:34:01 horwat Exp $
  +# $Id: messages.properties,v 1.17 2001/04/27 18:09:36 craigmcc Exp $
   #
   # Default localized string information
   # Localized this the Default Locale as is en_US
  @@ -231,9 +231,8 @@
   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 &lt;{0}&gt; cannot
have template data. Template data must be encapsulated within a &lt;jsp:cdata&gt;
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 &lt;{0}&gt; cannot
have template data. Template data must be encapsulated within a &lt;jsp:text&gt; element.
[JSP1.2 PFD section 5.1.9]\nTemplate data in error: {1}
  +#jspx.error.templateDataNotInJspCdata=Validation Error: Element &lt;{0}&gt; cannot
have template data. Template data must be encapsulated within a &lt;jsp:cdata&gt;
element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: {1}
  +jspx.error.templateDataNotInJspCdata=Validation Error: Element &lt;{0}&gt; cannot
have template data. Template data must be encapsulated within a &lt;jsp:text&gt; 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.
  
  
  
  1.4       +2 -5      jakarta-tomcat-4.0/tester/web/Xerces00.jsp
  
  Index: Xerces00.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/Xerces00.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Xerces00.jsp	2001/04/26 17:21:29	1.3
  +++ Xerces00.jsp	2001/04/27 18:09:40	1.4
  @@ -1,11 +1,8 @@
  -<!DOCTYPE root
  -PUBLIC "-//Sun Microsystems Inc.//DTD JavaServer Pages Version 1.2//EN"
  -"http://java.sun.com/products/jsp/dtd/jspcore_1_2.dtd" > 
   <!-- This File is generated automatically by jsp2XML converter tool --> 
   <!-- Written By Ramesh Mandava/Santosh Singh -->
   <jsp:root
  -xmlns:jsp="http://java.sun.com/products/jsp/dtd/jsp_1_2.dtd"
  +xmlns:jsp="http://java.sun.com/JSP/Page" version="1.2"
   ><jsp:directive.page contentType="text/plain"
  -/><jsp:cdata><![CDATA[Xerces00 PASSED]]></jsp:cdata>
  +/><jsp:text><![CDATA[Xerces00 PASSED]]></jsp:text>
   </jsp:root>
   
  
  
  

Mime
View raw message