Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 86261 invoked from network); 28 Feb 2003 00:13:15 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 28 Feb 2003 00:13:15 -0000 Received: (qmail 23726 invoked by uid 97); 28 Feb 2003 00:14:56 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 23719 invoked from network); 28 Feb 2003 00:14:56 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 28 Feb 2003 00:14:56 -0000 Received: (qmail 84151 invoked by uid 500); 28 Feb 2003 00:12:45 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 84115 invoked by uid 500); 28 Feb 2003 00:12:45 -0000 Received: (qmail 84076 invoked from network); 28 Feb 2003 00:12:44 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 28 Feb 2003 00:12:44 -0000 Received: (qmail 83485 invoked by uid 1384); 28 Feb 2003 00:12:42 -0000 Date: 28 Feb 2003 00:12:42 -0000 Message-ID: <20030228001242.83483.qmail@icarus.apache.org> From: kinman@apache.org To: jakarta-tomcat-jasper-cvs@apache.org Subject: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N kinman 2003/02/27 16:12:42 Modified: jasper2/src/share/org/apache/jasper/compiler Parser.java jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties Log: - Fix 17387: Bad error message for illegal content in Revision Changes Path 1.66 +6 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java Index: Parser.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- Parser.java 26 Feb 2003 17:58:07 -0000 1.65 +++ Parser.java 28 Feb 2003 00:12:41 -0000 1.66 @@ -1501,9 +1501,11 @@ new Node.TemplateText( ttext.toString(), start, parent ); - if( !reader.matchesETagWithoutLessThan( "jsp:text" ) ) { + if (! reader.hasMoreInput()) { err.jspError( start, "jsp.error.unterminated", "<jsp:text>" ); + } else if( !reader.matchesETagWithoutLessThan( "jsp:text" ) ) { + err.jspError( start, "jsp.error.jsptext.badcontent"); } } } 1.102 +2 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties Index: messages.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- messages.properties 26 Feb 2003 17:10:48 -0000 1.101 +++ messages.properties 28 Feb 2003 00:12:41 -0000 1.102 @@ -370,3 +370,4 @@ jsp.error.prelude.xml=The JSP document {0} has a prelude ({1}) associated with it jsp.error.coda.xml=The JSP document {0} has a coda ({1}) associated with it jsp.error.attribute.null_name=Null attribute name +jsp.error.jsptext.badcontent=\'<\', when appears in the body of <jsp:text>, must be encapsulated within a CDATA 1.36 +2 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties Index: messages_es.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- messages_es.properties 24 Feb 2003 23:44:00 -0000 1.35 +++ messages_es.properties 28 Feb 2003 00:12:41 -0000 1.36 @@ -265,3 +265,4 @@ jsp.error.variable.alias= jsp.error.prelude.xml= jsp.error.coda.xml= +jsp.error.jsptext.badcontent= 1.20 +2 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties Index: messages_fr.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- messages_fr.properties 24 Feb 2003 23:44:00 -0000 1.19 +++ messages_fr.properties 28 Feb 2003 00:12:41 -0000 1.20 @@ -303,4 +303,5 @@ jsp.error.variable.alias= jsp.error.prelude.xml= jsp.error.coda.xml= +jsp.error.jsptext.badcontent= 1.36 +2 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties Index: messages_ja.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- messages_ja.properties 24 Feb 2003 23:44:00 -0000 1.35 +++ messages_ja.properties 28 Feb 2003 00:12:41 -0000 1.36 @@ -296,4 +296,5 @@ jsp.error.variable.alias= jsp.error.prelude.xml= jsp.error.coda.xml= +jsp.error.jsptext.badcontent= --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org