cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties

[kinman]

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 <jsp:text>
  
  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",
                       "&lt;jsp:text&gt;" );
  +         } 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=\'&lt;\', when appears in the body of 
&lt;jsp:text&gt;, 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]