logicTestIterateTag.java

David Graham Thu, 06 Mar 2003 08:09:49 -0800

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 -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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

_________________________________________________________________ The new MSN 8: advanced junk mail protection and 2 months FREE* http://join.msn.com/?page=features/junkmail


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

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

Reply via email to