Return-Path: Delivered-To: apmail-jakarta-struts-dev-archive@apache.org Received: (qmail 25930 invoked from network); 6 Mar 2003 16:11:06 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 6 Mar 2003 16:11:06 -0000 Received: (qmail 25018 invoked by uid 97); 6 Mar 2003 16:12:46 -0000 Delivered-To: qmlist-jakarta-archive-struts-dev@nagoya.betaversion.org Received: (qmail 25011 invoked from network); 6 Mar 2003 16:12:46 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 6 Mar 2003 16:12:46 -0000 Received: (qmail 24514 invoked by uid 500); 6 Mar 2003 16:10:43 -0000 Mailing-List: contact struts-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Struts Developers List" Reply-To: "Struts Developers List" Delivered-To: mailing list struts-dev@jakarta.apache.org Received: (qmail 24473 invoked from network); 6 Mar 2003 16:10:42 -0000 Received: from f23.law15.hotmail.com (HELO hotmail.com) (64.4.23.23) by daedalus.apache.org with SMTP; 6 Mar 2003 16:10:42 -0000 Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; Thu, 6 Mar 2003 08:10:45 -0800 Received: from 32.97.110.142 by lw15fd.law15.hotmail.msn.com with HTTP; Thu, 06 Mar 2003 16:10:45 GMT X-Originating-IP: [32.97.110.142] From: "David Graham" To: struts-dev@jakarta.apache.org Bcc: Subject: Re: cvs commit: jakarta-struts/src/test/org/apache/struts/taglib/logic TestIterateTag.java Date: Thu, 06 Mar 2003 09:10:45 -0700 Mime-Version: 1.0 Content-Type: text/plain; format=flowed Message-ID: X-OriginalArrivalTime: 06 Mar 2003 16:10:45.0313 (UTC) FILETIME=[F184B310:01C2E3FA] X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N Thanks for fixing this Martin. It concerns me that the nightly builds were unaffected by this, indicating that they're built against the servlet 2.3 jar. Craig, is that the case? Can we change it to build against 2.2 since that's our baseline? David >From: martinc@apache.org >Reply-To: "Struts Developers List" >To: jakarta-struts-cvs@apache.org >Subject: cvs commit: jakarta-struts/src/test/org/apache/struts/taglib/logic >TestIterateTag.java >Date: 6 Mar 2003 16:07:13 -0000 > >martinc 2003/03/06 08:07:13 > > Modified: src/share/org/apache/struts/taglib/nested > NestedPropertyTag.java NestedRootTag.java > src/test/org/apache/struts/taglib/logic TestIterateTag.java > Log: > Replace EVAL_BODY_AGAIN with EVAL_BODY_TAG so that the code compiles > against the JSP 1.1 API. > > Revision Changes Path > 1.8 +5 -5 >jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java > > Index: NestedPropertyTag.java > =================================================================== > RCS file: >/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java,v > retrieving revision 1.7 > retrieving revision 1.8 > diff -u -r1.7 -r1.8 > --- NestedPropertyTag.java 28 Feb 2003 05:14:01 -0000 1.7 > +++ NestedPropertyTag.java 6 Mar 2003 16:07:13 -0000 1.8 > @@ -118,7 +118,7 @@ > NestedPropertyHelper.setName(request, originalName); > > // run the body part > - return (EVAL_BODY_AGAIN); > + return (EVAL_BODY_TAG); > } > > > > > > 1.8 +5 -5 >jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedRootTag.java > > Index: NestedRootTag.java > =================================================================== > RCS file: >/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedRootTag.java,v > retrieving revision 1.7 > retrieving revision 1.8 > diff -u -r1.7 -r1.8 > --- NestedRootTag.java 28 Feb 2003 05:14:01 -0000 1.7 > +++ NestedRootTag.java 6 Mar 2003 16:07:13 -0000 1.8 > @@ -132,7 +132,7 @@ > } > > // do the JSP thing > - return (EVAL_BODY_AGAIN); > + return (EVAL_BODY_TAG); > } > > /** > > > > 1.3 +24 -24 >jakarta-struts/src/test/org/apache/struts/taglib/logic/TestIterateTag.java > > Index: TestIterateTag.java > =================================================================== > RCS file: >/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/logic/TestIterateTag.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- TestIterateTag.java 28 Feb 2003 02:42:11 -0000 1.2 > +++ TestIterateTag.java 6 Mar 2003 16:07:13 -0000 1.3 > @@ -146,7 +146,7 @@ > out.print((String)pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -193,7 +193,7 @@ > out.print((String)pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -240,7 +240,7 @@ > out.print((String)pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -308,7 +308,7 @@ > out.print((String)pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -366,7 +366,7 @@ > out.print((String)pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -424,7 +424,7 @@ > out.print((String)pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -478,7 +478,7 @@ > { > out.print((String)pageContext.getAttribute("theId")); > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > > } > @@ -522,7 +522,7 @@ > { > out.print((String)pageContext.getAttribute("theId")); > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > > } > @@ -566,7 +566,7 @@ > { > out.print((String)pageContext.getAttribute("theId")); > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > > } > @@ -625,7 +625,7 @@ > { > out.print((String)pageContext.getAttribute("theId")); > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > > } > @@ -673,7 +673,7 @@ > { > out.print((String)pageContext.getAttribute("theId")); > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > > } > @@ -721,7 +721,7 @@ > { > out.print((String)pageContext.getAttribute("theId")); > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > > } > @@ -784,7 +784,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -831,7 +831,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -878,7 +878,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -942,7 +942,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -993,7 +993,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -1044,7 +1044,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -1105,7 +1105,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -1157,7 +1157,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -1209,7 +1209,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -1275,7 +1275,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -1331,7 +1331,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > @@ -1387,7 +1387,7 @@ > out.print(pageContext.getAttribute("theId")); > iteration++; > > - } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN); > + } while (tag.doAfterBody() == tag.EVAL_BODY_TAG); > tag.doEndTag(); > assertEquals(iterations, iteration); > } > > > > >--------------------------------------------------------------------- >To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org >For additional commands, e-mail: struts-dev-help@jakarta.apache.org _________________________________________________________________ The new MSN 8: advanced junk mail protection and 2 months FREE* http://join.msn.com/?page=features/junkmail --------------------------------------------------------------------- To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: struts-dev-help@jakarta.apache.org