cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Parser.java

2001-10-03 Thread kinman 

kinman  01/10/03 12:26:47

  Modified:jasper/src/share/org/apache/jasper/compiler Tag:
tomcat_40_branch Parser.java
  Log:
  PR: Bugzilla 3845
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.13.2.2  +8 -8  
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.13.2.1
  retrieving revision 1.13.2.2
  diff -u -r1.13.2.1 -r1.13.2.2
  --- Parser.java   2001/09/20 21:50:58 1.13.2.1
  +++ Parser.java   2001/10/03 19:26:47 1.13.2.2
  @@ -834,20 +834,16 @@
   


  - if (reader.matches(CLOSE_1)
  - || bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_EMPTY)) {
  - if (reader.matches(CLOSE_1))
  - reader.advance(CLOSE_1.length());
  - else
  - throw new ParseException(start, Body is supposed to be empty for 
+tag);
  -
  - listener.setTemplateInfo(parser.tmplStart, parser.tmplStop);   
 
  + if (reader.matches(CLOSE_1)) {
  + reader.advance(CLOSE_1.length());
  + listener.setTemplateInfo(parser.tmplStart, parser.tmplStop);
listener.handleTagBegin(start, reader.mark(), attrs, prefix,
shortTagName, tli, ti, true);
listener.handleTagEnd(start, reader.mark(), prefix, 
  shortTagName, attrs, tli, ti, true);
} else { 
// Body can be either
  + // - empty
// - JSP tags
// - tag dependent stuff
if (reader.matches(CLOSE)) {
  @@ -861,12 +857,16 @@
   if (bodyStop != null) {
   String bodyString = new String(reader.getChars(bodyStart, 
bodyStop));
   hasBody = (bodyString.length()  0);
  + if (hasBody  
bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_EMPTY)) 
  + throw new ParseException(start,
  + Body is supposed to be empty for +tag);
   }
   reader.reset(bodyStart);
   
listener.handleTagBegin(start, bodyStart, attrs, prefix, 
shortTagName, tli, ti, hasBody);
   if (bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_TAG_DEPENDENT) ||
  + bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_EMPTY) ||
   bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_JSP)) 
   {
   // Parse until the end of the tag body.

cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Parser.java

2001-10-03 Thread kinman 

kinman  01/10/03 12:29:28

  Modified:jasper/src/share/org/apache/jasper/compiler Parser.java
  Log:
  PR: Bugzilla 3845
  
  Revision  ChangesPath
  1.15  +8 -8  
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Parser.java   2001/09/20 21:47:32 1.14
  +++ Parser.java   2001/10/03 19:29:28 1.15
  @@ -834,20 +834,16 @@
   


  - if (reader.matches(CLOSE_1)
  - || bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_EMPTY)) {
  - if (reader.matches(CLOSE_1))
  - reader.advance(CLOSE_1.length());
  - else
  - throw new ParseException(start, Body is supposed to be empty for 
+tag);
  -
  - listener.setTemplateInfo(parser.tmplStart, parser.tmplStop);   
 
  + if (reader.matches(CLOSE_1)) {
  + reader.advance(CLOSE_1.length());
  + listener.setTemplateInfo(parser.tmplStart, parser.tmplStop);
listener.handleTagBegin(start, reader.mark(), attrs, prefix,
shortTagName, tli, ti, true);
listener.handleTagEnd(start, reader.mark(), prefix, 
  shortTagName, attrs, tli, ti, true);
} else { 
// Body can be either
  + // - empty
// - JSP tags
// - tag dependent stuff
if (reader.matches(CLOSE)) {
  @@ -861,12 +857,16 @@
   if (bodyStop != null) {
   String bodyString = new String(reader.getChars(bodyStart, 
bodyStop));
   hasBody = (bodyString.length()  0);
  + if (hasBody  
bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_EMPTY)) 
  + throw new ParseException(start,
  + Body is supposed to be empty for +tag);
   }
   reader.reset(bodyStart);
   
listener.handleTagBegin(start, bodyStart, attrs, prefix, 
shortTagName, tli, ti, hasBody);
   if (bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_TAG_DEPENDENT) ||
  + bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_EMPTY) ||
   bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_JSP)) 
   {
   // Parse until the end of the tag body.

cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Parser.java

2001-09-20 Thread remm 

remm01/09/20 14:47:32

  Modified:jasper/src/share/org/apache/jasper/compiler Parser.java
  Log:
  - Fixes bug 3740.
Patch submitted by Kin-Man Chung.
  
  Revision  ChangesPath
  1.14  +5 -4  
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Parser.java   2001/09/15 01:18:10 1.13
  +++ Parser.java   2001/09/20 21:47:32 1.14
  @@ -1096,11 +1096,12 @@
boolean noJspElement = false;
while (reader.hasMoreInput()) {
   
  +if (tmplStart == null)
  +tmplStart = reader.mark();
  +if (tmplStop == null)
  +tmplStop = reader.mark();
  +
   if (until != null  reader.matches(until)) {
  -if (tmplStart == null)
  -tmplStart = reader.mark();
  -if (tmplStop == null)
  -tmplStop = reader.mark();
   return;
   }

cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Parser.java

2001-09-20 Thread remm 

remm01/09/20 14:50:58

  Modified:jasper/src/share/org/apache/jasper/compiler Tag:
tomcat_40_branch Parser.java
  Log:
  - Fixes bug 3740.
Patch submitted by Kin-Man Chung.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.13.2.1  +5 -4  
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- Parser.java   2001/09/15 01:18:10 1.13
  +++ Parser.java   2001/09/20 21:50:58 1.13.2.1
  @@ -1096,11 +1096,12 @@
boolean noJspElement = false;
while (reader.hasMoreInput()) {
   
  +if (tmplStart == null)
  +tmplStart = reader.mark();
  +if (tmplStop == null)
  +tmplStop = reader.mark();
  +
   if (until != null  reader.matches(until)) {
  -if (tmplStart == null)
  -tmplStart = reader.mark();
  -if (tmplStop == null)
  -tmplStop = reader.mark();
   return;
   }

cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Parser.java

2001-09-14 Thread craigmcc 

craigmcc01/09/14 18:18:10

  Modified:.RELEASE-PLAN-4.0.txt
   jasper/src/share/org/apache/jasper/compiler Parser.java
  Log:
  Fix NPE in JakartaCommentGenerator.  Patch by Kin-Man Chung.
  
  PR:  Bugzilla #3079
  Submitted by: Daniele Gaffuri [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.18  +1 -3  jakarta-tomcat-4.0/RELEASE-PLAN-4.0.txt
  
  Index: RELEASE-PLAN-4.0.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-PLAN-4.0.txt,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- RELEASE-PLAN-4.0.txt  2001/09/14 20:01:21 1.17
  +++ RELEASE-PLAN-4.0.txt  2001/09/15 01:18:10 1.18
  @@ -1,4 +1,4 @@
  -$Id: RELEASE-PLAN-4.0.txt,v 1.17 2001/09/14 20:01:21 craigmcc Exp $
  +$Id: RELEASE-PLAN-4.0.txt,v 1.18 2001/09/15 01:18:10 craigmcc Exp $
   
 Release Plan for Apache Tomcat 4.0
 ==
  @@ -54,8 +54,6 @@
   (likely to be the same issue as 1788)
   
   Connectors  3534File Upload doesn't work with Apache, mod_webapp, Tomcat 4
  -
  -Jasper  3079NullPointerException in JakartaCommentGenerator.generateEnd
   
   
   Nice To Have Fixes Before Final Release:
  
  
  
  1.13  +7 -1  
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Parser.java   2001/07/12 23:29:31 1.12
  +++ Parser.java   2001/09/15 01:18:10 1.13
  @@ -1095,8 +1095,14 @@
   
boolean noJspElement = false;
while (reader.hasMoreInput()) {
  -if (until != null  reader.matches(until)) 
  +
  +if (until != null  reader.matches(until)) {
  +if (tmplStart == null)
  +tmplStart = reader.mark();
  +if (tmplStop == null)
  +tmplStop = reader.mark();
   return;
  +}
   
// If the file has changed because of a 'push' or a 'pop'
// we must flush the character data for the old file.

cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Parser.java

2001-02-08 Thread horwat 

horwat  01/02/08 16:19:21

  Modified:jasper/src/share/org/apache/jasper/compiler Parser.java
  Log:
  It is up to the tag implementation to process the body of the tag dependent tag.
  
  Submitted by: Jeff Bonevich  Danno Ferrin
  
  Bugzilla #546
  
  Revision  ChangesPath
  1.7   +7 -1  
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Parser.java   2000/11/06 21:04:56 1.6
  +++ Parser.java   2001/02/09 00:19:19 1.7
  @@ -858,7 +858,13 @@
   String tagEnd = "/"+tag+"";
   // Parse until the end of the tag body. 
   // Then skip the tag end... 
  -parser.parse(tagEnd);
  + if 
(bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_TAG_DEPENDENT))
  + // accept no core elements for tag dependent,
  + // ie. literal inclusion of the content
  + parser.parse(tagEnd, new Class[] {});
  + else
  + // it is JSP body content, so accept all core elements
  +parser.parse(tagEnd);
try {
reader.advance(tagEnd.length());
} catch (ParseException ex) {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]