kinman      2002/07/24 16:57:12

  Modified:    jasper2/src/share/org/apache/jasper/compiler
                        ParserController.java
               jasper2/src/share/org/apache/jasper/resources
                        messages.properties
  Log:
  - Fix problem with looking for tag directives in prescan phase.
  
  Revision  Changes    Path
  1.7       +1 -1      
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ParserController.java     22 Jul 2002 20:35:27 -0000      1.6
  +++ ParserController.java     24 Jul 2002 23:57:12 -0000      1.7
  @@ -254,7 +254,7 @@
            jspReader.reset(startMark);
            while (jspReader.skipUntil("<%@") != null) {
                jspReader.skipSpaces();
  -             isTagFile = jspReader.matches("tag");
  +             isTagFile = jspReader.matches("tag ");
                if (isTagFile || jspReader.matches("page")) {
                    jspReader.skipSpaces();
                    Attributes attrs = Parser.parseAttributes(this, jspReader);
  
  
  
  1.15      +4 -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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- messages.properties       24 Jul 2002 22:38:43 -0000      1.14
  +++ messages.properties       24 Jul 2002 23:57:12 -0000      1.15
  @@ -273,3 +273,6 @@
   
   jsp.error.dynamic.attributes.not.implemented=The {0} tag declares that it accepts 
dynamic attributes but does not implement the required interface
   jsp.error.nomatching.fragment=an attribute directive whose name attribute equals 
{0} and whose fragment attribute equals true must be declared prior to this directive.
  +jsp.error.attribute.noequal=equal symbol expected
  +jsp.error.attribute.noquote=quote symbol expected
  +jsp.error.attribute.unterminated=attribute for {0} is not properly terminated
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to