kinman 02/04/19 13:35:01 Modified: jasper2 BUILDING.txt jasper2/src/share/org/apache/jasper/compiler Generator.java Node.java PageInfo.java ParserController.java Validator.java Log: - Implement errata_a per http://jcp.org/aboutJava/communityprocess/maintenance/jsr053/errata_1_2_a_20020321.html Revision Changes Path 1.2 +8 -4 jakarta-tomcat-jasper/jasper2/BUILDING.txt Index: BUILDING.txt =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/BUILDING.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BUILDING.txt 28 Mar 2002 18:46:15 -0000 1.1 +++ BUILDING.txt 19 Apr 2002 20:35:01 -0000 1.2 @@ -1,9 +1,13 @@ -1. Build tomcat 4 +1. Go to a tomcat 4.0/4.1 repository cd jakarta-tomcat-4.0 - ant -2. Build jasper2 +2. Edit jakarta-tomcat-4.0/build.properties to include this line + + jasper.home=../jakarta-tomcat-jasper/jasper2 - cd ../jakarta-tomcat-jasper/jasper2 +3. Build tomcat 4 + + ant clean ant + 1.5 +6 -15 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java Index: Generator.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Generator.java 11 Apr 2002 18:14:03 -0000 1.4 +++ Generator.java 19 Apr 2002 20:35:01 -0000 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v 1.4 2002/04/11 18:14:03 kinman Exp $ - * $Revision: 1.4 $ - * $Date: 2002/04/11 18:14:03 $ + * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v 1.5 2002/04/19 20:35:01 kinman Exp $ + * $Revision: 1.5 $ + * $Date: 2002/04/19 20:35:01 $ * * ==================================================================== * @@ -160,7 +160,6 @@ String servletPackageName = ctxt.getServletPackageName(); String servletClassName = ctxt.getServletClassName(); String serviceMethodName = Constants.SERVICE_METHOD_NAME; - String servletContentType = Constants.SERVLET_CONTENT_TYPE; // First the package name: @@ -229,17 +228,9 @@ out.printil("_jspxFactory = JspFactory.getDefaultFactory();"); - if (pageInfo.getContentType() != null) { - servletContentType = pageInfo.getContentType(); - out.printin("response.setContentType("); - out.print (quote(servletContentType)); - out.println(");"); - } - else { - out.printin("response.setContentType(\""); - out.print (servletContentType); - out.println(";charset=ISO-8859-1\");"); - } + out.printin("response.setContentType("); + out.print (quote(pageInfo.getContentType())); + out.println(");"); out.printil("pageContext = _jspxFactory.getPageContext(" + "this, request, response,"); 1.6 +4 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java Index: Node.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Node.java 5 Apr 2002 20:27:30 -0000 1.5 +++ Node.java 19 Apr 2002 20:35:01 -0000 1.6 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v 1.5 2002/04/05 20:27:30 kinman Exp $ - * $Revision: 1.5 $ - * $Date: 2002/04/05 20:27:30 $ + * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v 1.6 2002/04/19 20:35:01 kinman Exp $ + * $Revision: 1.6 $ + * $Date: 2002/04/19 20:35:01 $ * * ==================================================================== * @@ -740,7 +740,7 @@ */ /** - * Represents attributes that can be runtime expressions. + * Represents attributes that can be request time expressions. */ public static class JspAttribute { 1.2 +12 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java Index: PageInfo.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PageInfo.java 28 Mar 2002 18:46:18 -0000 1.1 +++ PageInfo.java 19 Apr 2002 20:35:01 -0000 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java,v 1.1 2002/03/28 18:46:18 kinman Exp $ - * $Revision: 1.1 $ - * $Date: 2002/03/28 18:46:18 $ + * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java,v 1.2 2002/04/19 20:35:01 kinman Exp $ + * $Revision: 1.2 $ + * $Date: 2002/04/19 20:35:01 $ * * ==================================================================== * @@ -86,6 +86,7 @@ private boolean threadSafe = true; private boolean isErrorPage = false; private String errorPage = null; + private String pageEncoding = null; PageInfo(BeanRepository beanRepository) { this.beanRepository = beanRepository; @@ -183,5 +184,13 @@ public void setIsErrorPage(boolean isErrorPage) { this.isErrorPage = isErrorPage; + } + + public void setPageEncoding(String pageEncoding) { + this.pageEncoding = pageEncoding; + } + + public String getPageEncoding() { + return pageEncoding; } } 1.2 +2 -0 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java Index: ParserController.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ParserController.java 28 Mar 2002 18:46:16 -0000 1.1 +++ ParserController.java 19 Apr 2002 20:35:01 -0000 1.2 @@ -262,6 +262,8 @@ return; } } + if (newEncoding == null) + newEncoding = "ISO-8859-1"; } else { return; } 1.4 +19 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java Index: Validator.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Validator.java 11 Apr 2002 18:14:03 -0000 1.3 +++ Validator.java 19 Apr 2002 20:35:01 -0000 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v 1.3 2002/04/11 18:14:03 kinman Exp $ - * $Revision: 1.3 $ - * $Date: 2002/04/11 18:14:03 $ + * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v 1.4 2002/04/19 20:35:01 kinman Exp $ + * $Revision: 1.4 $ + * $Date: 2002/04/19 20:35:01 $ * * ==================================================================== * @@ -115,6 +115,7 @@ private boolean isErrorPageSeen = false; private boolean contentTypeSeen = false; private boolean infoSeen = false; + private boolean pageEncodingSeen = false; /* * Constructor @@ -228,6 +229,11 @@ if (infoSeen) err.jspError(n, "jsp.error.info.multiple"); infoSeen = true; + } else if ("pageEncoding".equals(attr)) { + if (pageEncodingSeen) + err.jspError(n, "jsp.error.pageEncoding.multiple"); + pageEncodingSeen = true; + pageInfo.setPageEncoding(value); } } @@ -238,6 +244,16 @@ // Attributes for imports for this node have been processed by // the parsers, just add them to pageInfo. pageInfo.addImports(n.getImports()); + + // Determine the output context type, per errata_a + // http://jcp.org/aboutJava/communityprocess/maintenance/jsr053/errata_1_2_a_20020321.html + if (pageInfo.getContentType() == null) { + String defaultType = n.isXmlSyntax()? "text/xml;": "text/html;"; + String charset = pageInfo.getPageEncoding(); + if (charset == null) + charset = n.isXmlSyntax()? "UTF-8": "ISO-8859-1"; + pageInfo.setContentType(defaultType + charset); + } } }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>