jakarta-watchdog-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rlu...@apache.org
Subject cvs commit: jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle tag_attr_setting_1.jsp tag_attr_setting_2.jsp tag_attr_setting_3.jsp tag_check_BodyContent_2.jsp tag_check_BodyContent_3.jsp tag_check_BodyContent_4.jsp tag_check_BodyContent_5.jsp tag_check_comments_1.jsp tag_check_comments_2.jsp tag_doEndTag_skip_page.jsp tag_doStart_eval_body_include.jsp tag_doStart_skip_body.jsp tag_translationtime_verify_1.jsp
Date Tue, 29 Jan 2002 00:06:09 GMT
rlubke      02/01/28 16:06:09

  Modified:    src/server/jsp-tests/jsp/tagext/LifeCycle
                        tag_attr_setting_1.jsp tag_attr_setting_2.jsp
                        tag_attr_setting_3.jsp tag_check_BodyContent_2.jsp
                        tag_check_BodyContent_3.jsp
                        tag_check_BodyContent_4.jsp
                        tag_check_BodyContent_5.jsp
                        tag_check_comments_1.jsp tag_check_comments_2.jsp
                        tag_doEndTag_skip_page.jsp
                        tag_doStart_eval_body_include.jsp
                        tag_doStart_skip_body.jsp
                        tag_translationtime_verify_1.jsp
  Log:
   - content push from CTS
  
  Revision  Changes    Path
  1.2       +15 -15    jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_attr_setting_1.jsp
  
  Index: tag_attr_setting_1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_attr_setting_1.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_attr_setting_1.jsp	4 Oct 2000 00:24:16 -0000	1.1
  +++ tag_attr_setting_1.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -2,23 +2,23 @@
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
   
   <x:count>
  -  <x:count att1="one">
  -    one
  -  </x:count>
  -  <x:count att1="two">
  -    <x:checkCount nested="2"/>
  -    two
  -  </x:count>
  -  <x:checkCount nested="1"/>
  +<x:count att1="one">
  +one
  +</x:count>
  +<x:count att1="two">
  +<x:checkCount nested="2"/>
  +two
  +</x:count>
  +<x:checkCount nested="1"/>
   </x:count>
   
   <x:count>
  -  <x:count att1="one"/>
  -  <x:count att2="bye">
  -     <x:count att2="three">
  -        <x:checkCount nested="3"/>
  -     </x:count>
  -  </x:count>
  +<x:count att1="one"/>
  +<x:count att2="bye">
  +<x:count att2="three">
  +<x:checkCount nested="3"/>
  +</x:count>
   </x:count>
  -   
  +</x:count>
  +
   <x:checkCount start="7"/>
  
  
  
  1.2       +12 -12    jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_attr_setting_2.jsp
  
  Index: tag_attr_setting_2.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_attr_setting_2.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_attr_setting_2.jsp	4 Oct 2000 00:24:16 -0000	1.1
  +++ tag_attr_setting_2.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -5,17 +5,17 @@
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
   
   <x:count>
  -  <x:count att1="one">
  -    <x:aTag att="foo">
  -    one
  -      <x:checkCount nested="2"/>
  -    </x:aTag>
  -  </x:count>
  -  <x:aTag att="bar"/>
  -  <x:count att1="two">
  -    <x:checkCount nested="2"/>
  -    two
  -  </x:count>
  -  <x:checkCount nested="1"/>
  +<x:count att1="one">
  +<x:aTag att="foo">
  +one
  +<x:checkCount nested="2"/>
  +</x:aTag>
  +</x:count>
  +<x:aTag att="bar"/>
  +<x:count att1="two">
  +<x:checkCount nested="2"/>
  +two
  +</x:count>
  +<x:checkCount nested="1"/>
   </x:count>
   
  
  
  
  1.2       +18 -18    jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_attr_setting_3.jsp
  
  Index: tag_attr_setting_3.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_attr_setting_3.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_attr_setting_3.jsp	4 Oct 2000 00:24:16 -0000	1.1
  +++ tag_attr_setting_3.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -5,23 +5,23 @@
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
   
   <x:count>
  -  <x:count att1="one">
  -    <x:aTag att="foo">
  -    one
  -      <x:checkCount nested="2"/>
  -    </x:aTag>
  -  </x:count>
  -  <x:bTag att="wombat">
  -    <x:bTag att='wombat'>
  -      <x:aTag att="bar"/>
  -    </x:bTag>
  -  </x:bTag>
  -  <x:count att1="two">
  -    <x:count att1="two">
  -      <x:checkCount nested="3"/>
  -      two
  -    </x:count>
  -  </x:count>
  -  <x:checkCount nested="1"/>
  +<x:count att1="one">
  +<x:aTag att="foo">
  +one
  +<x:checkCount nested="2"/>
  +</x:aTag>
  +</x:count>
  +<x:bTag att="wombat">
  +<x:bTag att='wombat'>
  +<x:aTag att="bar"/>
  +</x:bTag>
  +</x:bTag>
  +<x:count att1="two">
  +<x:count att1="two">
  +<x:checkCount nested="3"/>
  +two
  +</x:count>
  +</x:count>
  +<x:checkCount nested="1"/>
   </x:count>
   
  
  
  
  1.2       +0 -1      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_BodyContent_2.jsp
  
  Index: tag_check_BodyContent_2.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_BodyContent_2.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_check_BodyContent_2.jsp	4 Oct 2000 00:24:16 -0000	1.1
  +++ tag_check_BodyContent_2.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -2,7 +2,6 @@
     Check that BodyContent provides access to the proper information
   --%>
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
  -
   <x:verbatim how="string">
   one
   <x:verbatim how="reader">
  
  
  
  1.2       +0 -1      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_BodyContent_3.jsp
  
  Index: tag_check_BodyContent_3.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_BodyContent_3.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_check_BodyContent_3.jsp	4 Oct 2000 00:24:16 -0000	1.1
  +++ tag_check_BodyContent_3.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -2,7 +2,6 @@
     Check that BodyContent provides access to the proper information
   --%>
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
  -
   <x:verbatim how="reader">
   one
   <x:verbatim how="reader">
  
  
  
  1.2       +0 -1      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_BodyContent_4.jsp
  
  Index: tag_check_BodyContent_4.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_BodyContent_4.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_check_BodyContent_4.jsp	4 Oct 2000 00:24:16 -0000	1.1
  +++ tag_check_BodyContent_4.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -2,7 +2,6 @@
     Check that BodyContent provides access to the proper information
   --%>
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
  -
   <x:verbatim how="writeout">
   one
   <x:verbatim how="writeout">
  
  
  
  1.2       +0 -1      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_BodyContent_5.jsp
  
  Index: tag_check_BodyContent_5.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_BodyContent_5.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_check_BodyContent_5.jsp	4 Oct 2000 00:24:17 -0000	1.1
  +++ tag_check_BodyContent_5.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -2,7 +2,6 @@
     Check that BodyContent provides access to the proper information
   --%>
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
  -
   <x:verbatim how="string">
   one
   <x:verbatim how="string">
  
  
  
  1.2       +1 -1      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_comments_1.jsp
  
  Index: tag_check_comments_1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_comments_1.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_check_comments_1.jsp	4 Oct 2000 00:24:17 -0000	1.1
  +++ tag_check_comments_1.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -4,7 +4,7 @@
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
   
   <x:count>
  -  <%-- <x:count /> --%>
  +<%-- <x:count /> --%>
   </x:count>
   <x:checkCount start="1"/>
   Correct count and correct processing of a JSP comment
  
  
  
  1.3       +3 -3      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_comments_2.jsp
  
  Index: tag_check_comments_2.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_check_comments_2.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tag_check_comments_2.jsp	19 Dec 2000 22:08:21 -0000	1.2
  +++ tag_check_comments_2.jsp	29 Jan 2002 00:06:09 -0000	1.3
  @@ -2,10 +2,10 @@
    Test that comments are processed correctly...
   --%>
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
  -
   <x:count>
  -  <%-- <x:count /> --%>
  +<!-- <x:count /> -->
   </x:count>
  -<x:checkCount start="1"/>
  +<x:checkCount start="2"/>
  +
   Correct count and handling of JSP comments
   
  
  
  
  1.2       +0 -1      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_doEndTag_skip_page.jsp
  
  Index: tag_doEndTag_skip_page.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_doEndTag_skip_page.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_doEndTag_skip_page.jsp	4 Oct 2000 00:24:17 -0000	1.1
  +++ tag_doEndTag_skip_page.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -1,6 +1,5 @@
   <%-- Test for doEndTag SKIP_PAGE --%>
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
  -
   <x:count skipPage="true">
   once upon a time
   </x:count>
  
  
  
  1.2       +1 -2      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_doStart_eval_body_include.jsp
  
  Index: tag_doStart_eval_body_include.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_doStart_eval_body_include.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_doStart_eval_body_include.jsp	4 Oct 2000 00:24:17 -0000	1.1
  +++ tag_doStart_eval_body_include.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -1,10 +1,9 @@
   <%-- Test for doStartTag EVAL_BODY_INCLUDE --%>
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
  -
   <x:count includeBody="true">
   once upon a time
   <x:count includeBody="false">
   this will not show up
   </x:count>
   in a far far away kingdom...
  -</x:count> 
  +</x:count>
  
  
  
  1.2       +1 -2      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_doStart_skip_body.jsp
  
  Index: tag_doStart_skip_body.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_doStart_skip_body.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_doStart_skip_body.jsp	4 Oct 2000 00:24:17 -0000	1.1
  +++ tag_doStart_skip_body.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -1,10 +1,9 @@
   <%-- Test for doStartTag SKIP_BODY --%>
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
  -
   <x:count includeBody="true">
   once upon a time
   <x:count includeBody="false">
   <% if(true) throw new Error("Call the errorpage"); %>
   </x:count>
   in a far far away kingdom...
  -</x:count> 
  +</x:count>
  
  
  
  1.2       +0 -1      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_translationtime_verify_1.jsp
  
  Index: tag_translationtime_verify_1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/LifeCycle/tag_translationtime_verify_1.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tag_translationtime_verify_1.jsp	4 Oct 2000 00:24:17 -0000	1.1
  +++ tag_translationtime_verify_1.jsp	29 Jan 2002 00:06:09 -0000	1.2
  @@ -3,6 +3,5 @@
    Succeed.  2+3 == 5.
   --%>
   <%@ taglib uri="/TestLib.tld" prefix="x" %>
  -
   <x:silly a="3" b="2" c="5"/>
   sucess!
  
  
  

--
To unsubscribe, e-mail:   <mailto:watchdog-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:watchdog-dev-help@jakarta.apache.org>


Mime
View raw message