Re: cvs commit: jakarta-struts/src/test/org/apache/struts/taglib/logicTestIterateTag.java

2003-03-06 Thread David Graham 
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: [EMAIL PROTECTED]
Reply-To: Struts Developers List [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Subject: cvs commit: jakarta-struts/src/test/org/apache/struts/taglib/logic 
TestIterateTag.java
Date: 6 Mar 2003 16:07:13 -

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  ChangesPath
  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 -	1.7
  +++ NestedPropertyTag.java	6 Mar 2003 16:07:13 -	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 -	1.7
  +++ NestedRootTag.java	6 Mar 2003 16:07:13 -	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 -	1.2
  +++ TestIterateTag.java	6 Mar 2003 16:07:13 -	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

Re: cvs commit: jakarta-struts/src/test/org/apache/struts/taglib/logicTestIterateTag.java

2003-03-06 Thread Craig R. McClanahan 


On Thu, 6 Mar 2003, David Graham wrote:

 Date: Thu, 06 Mar 2003 09:10:45 -0700
 From: David Graham [EMAIL PROTECTED]
 Reply-To: Struts Developers List [EMAIL PROTECTED]
 To: [EMAIL PROTECTED]
 Subject: Re: cvs commit:
 jakarta-struts/src/test/org/apache/struts/taglib/logic TestIterateTag.java

 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?


The nightly builds are indeed built against Servlet 2.3 / JSP 1.2.

I can modify this over the weekend (on a business trip now, and don't have
good remote access to my home network that is running the builds).

 David

Craig





 From: [EMAIL PROTECTED]
 Reply-To: Struts Developers List [EMAIL PROTECTED]
 To: [EMAIL PROTECTED]
 Subject: cvs commit: jakarta-struts/src/test/org/apache/struts/taglib/logic
 TestIterateTag.java
 Date: 6 Mar 2003 16:07:13 -
 
 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  ChangesPath
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.java28 Feb 2003 05:14:01 -  1.7
+++ NestedPropertyTag.java6 Mar 2003 16:07:13 -   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.java28 Feb 2003 05:14:01 -  1.7
+++ NestedRootTag.java6 Mar 2003 16:07:13 -   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 -  1.2
+++ TestIterateTag.java   6 Mar 2003 16:07:13 -   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() ==