jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gl...@apache.org
Subject cvs commit: jakarta-taglibs/regexp/xml regexp.xml
Date Fri, 06 Jul 2001 02:18:48 GMT
glenn       01/07/05 19:18:47

  Modified:    regexp/examples/web index.html regexp.jsp
               regexp/src/org/apache/taglibs/regexp MatchTag.java
               regexp/xml regexp.xml
  Log:
  Minor changes prior to release
  
  Revision  Changes    Path
  1.4       +1 -2      jakarta-taglibs/regexp/examples/web/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/regexp/examples/web/index.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.html	2001/07/03 16:32:56	1.3
  +++ index.html	2001/07/06 02:18:40	1.4
  @@ -2,10 +2,9 @@
   <html>
   <head>
      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  -   <meta name="GENERATOR" content="Mozilla/4.74 [en] (X11; U; FreeBSD 3.4-RELEASE i386)
[Netscape]">
      <title>Jakarta REGEXP Taglib Example</title>
   </head>
  -<body text="#000000" bgcolor="#FFFFFF" link="#0000EE" vlink="#551A8B" alink="#FF0000">
  +<body bgcolor="#FFFFFF">
   
   <center>
   <h1>
  
  
  
  1.2       +11 -12    jakarta-taglibs/regexp/examples/web/regexp.jsp
  
  Index: regexp.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/regexp/examples/web/regexp.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- regexp.jsp	2000/10/22 01:32:04	1.1
  +++ regexp.jsp	2001/07/06 02:18:41	1.2
  @@ -2,10 +2,9 @@
   <html>
   <head>
      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  -   <meta name="GENERATOR" content="Mozilla/4.74 [en] (X11; U; FreeBSD 3.4-RELEASE i386)
[Netscape]">
      <title>Jakarta REGEXP Taglib Example</title>
   </head>
  -<body text="#000000" bgcolor="#FFFFFF" link="#0000EE" vlink="#551A8B" alink="#FF0000">
  +<body bgcolor="#FFFFFF">
   
   <center>
   <h1>
  @@ -25,12 +24,12 @@
   test of regular expression matching.
   </rx:text>
   <br>Seeing if a match exists...<br>
  -<rx:existsmatch regexp="rx1" text="test">
  +<rx:existsMatch regexp="rx1" text="test">
      A match was found!<br>
  -</rx:existsmatch>
  -<rx:existsmatch regexp="rx1" text="test" value="false">
  +</rx:existsMatch>
  +<rx:existsMatch regexp="rx1" text="test" value="false">
      A match was not found!<br>
  -</rx:existsmatch>
  +</rx:existsMatch>
   <br>Setting the text to match on to<br>
   <pre>
   This is
  @@ -43,12 +42,12 @@
   I hope you like it, and will use it.
   </rx:text>
   <br>Seeing if a match exists...<br>
  -<rx:existsmatch regexp="rx1" text="test1"> 
  +<rx:existsMatch regexp="rx1" text="test1"> 
      A match was found!<br>
  -</rx:existsmatch>    
  -<rx:existsmatch regexp="rx1" text="test1" value="false"> 
  +</rx:existsMatch>    
  +<rx:existsMatch regexp="rx1" text="test1" value="false"> 
      A match was not found!<br>                 
  -</rx:existsmatch>
  +</rx:existsMatch>
   <br>Create the substition regexp "s/test1/test2/gmi"<br>
   <rx:regexp id="rx2">s/test1/test2/gmi</rx:regexp>
   <br>Here is the last text after substitution<br>
  @@ -72,8 +71,8 @@
   <rx:match id="match" regexp="rx4" text="test1">
     Match: <jsp:getProperty name="match" property="match"/>
       Parenthesized Group 1: <rx:group number="1"/>
  -    PreMatch: <jsp:getProperty name="match" property="prematch"/>
  -    PostMatch: <jsp:getProperty name="match" property="postmatch"/>
  +    PreMatch: <jsp:getProperty name="match" property="preMatch"/>
  +    PostMatch: <jsp:getProperty name="match" property="postMatch"/>
   </rx:match>
   </pre>
   </body>
  
  
  
  1.4       +7 -7      jakarta-taglibs/regexp/src/org/apache/taglibs/regexp/MatchTag.java
  
  Index: MatchTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/regexp/src/org/apache/taglibs/regexp/MatchTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MatchTag.java	2001/07/02 02:06:15	1.3
  +++ MatchTag.java	2001/07/06 02:18:44	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-taglibs/regexp/src/org/apache/taglibs/regexp/MatchTag.java,v
1.3 2001/07/02 02:06:15 glenn Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/07/02 02:06:15 $
  + * $Header: /home/cvs/jakarta-taglibs/regexp/src/org/apache/taglibs/regexp/MatchTag.java,v
1.4 2001/07/06 02:18:44 glenn Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/07/06 02:18:44 $
    *
    * ====================================================================
    *
  @@ -212,22 +212,22 @@
   
       /**
        * Returns the string preceding the current match
  -     * using &lt;jsp:getProperty name=<i>"id"</i> property="prematch"/&gt;
  +     * using &lt;jsp:getProperty name=<i>"id"</i> property="preMatch"/&gt;
        *
        * @return String - text preceding match
        */
  -    public final String getPrematch()
  +    public final String getPreMatch()
       {
   	return perl.preMatch();
       }
   
       /**
        * Returns the string after the current match                                     
        
  -     * using &lt;jsp:getProperty name=<i>"id"</i> property="postmatch"/&gt;
  +     * using &lt;jsp:getProperty name=<i>"id"</i> property="postMatch"/&gt;
        * 
        * @return String - text after the match
        */
  -    public final String getPostmatch() 
  +    public final String getPostMatch() 
       {
           return perl.postMatch();
       }
  
  
  
  1.5       +33 -14    jakarta-taglibs/regexp/xml/regexp.xml
  
  Index: regexp.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/regexp/xml/regexp.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- regexp.xml	2001/07/05 12:24:31	1.4
  +++ regexp.xml	2001/07/06 02:18:46	1.5
  @@ -37,7 +37,7 @@
     <!-- URI of taglib -->
     <uri>http://jakarta.apache.org/taglibs/regexp-1.0</uri>
     <!-- The name to use in titles, etc. for the taglib -->
  -  <display-name>Regexp Tag library</display-name>
  +  <display-name>Regexp Tag library (Pre Beta)</display-name>
   
     <!-- JSP 1.2 tag library DTD only, not used for generating
          documentation.
  @@ -305,10 +305,10 @@
       </tag>
   
       <tag>
  -      <name>existsmatch</name>
  +      <name>existsMatch</name>
         <tag-class>org.apache.taglibs.regexp.ExistsMatchTag</tag-class>
         <body-content>JSP</body-content>
  -      <display-name>existsmatch</display-name>
  +      <display-name>existsMatch</display-name>
         <description>
           Uses a regexp to determine if a match exists in the text.
         </description>
  @@ -342,7 +342,7 @@
           <required>false</required>
           <rtexprvalue>false</rtexprvalue>
           <description>
  -          If value is set to false the existsmatch tag includes body
  +          If value is set to false the existsMatch tag includes body
             of tag if a match does not exist.
           </description>
           <availability>1.0</availability>
  @@ -364,12 +364,12 @@
   test of regular expression matching.
   </rx:text>
   See if a match exists...<br>
  -<rx:existsmatch regexp="rx1" text="test">
  +<rx:existsMatch regexp="rx1" text="test">
        A match was found!<br>
  -</rx:existsmatch>
  -<rx:existsmatch regexp="rx1" text="test" value="false">
  +</rx:existsMatch>
  +<rx:existsMatch regexp="rx1" text="test" value="false">
        A match was not found!<br>
  -</rx:existsmatch>]]>
  +</rx:existsMatch>]]>
             </code>
           </usage>
         </example>
  @@ -597,7 +597,7 @@
             <availability>1.0</availability>
           </beanprop>                  
           <beanprop>                   
  -          <name>prematch</name>
  +          <name>preMatch</name>
             <get>Yes</get>      
             <set>No</set>       
             <description>
  @@ -606,7 +606,7 @@
             <availability>1.0</availability>
           </beanprop>                  
           <beanprop>                   
  -          <name>postmatch</name>
  +          <name>postMatch</name>
             <get>Yes</get>       
             <set>No</set>        
             <description>
  @@ -664,8 +664,8 @@
   <pre>                          
   <rx:match id="mtch" text="test" regexp="rx4">
      Match: <jsp:getProperty name="mtch" property="match"/><br>
  -    Pre Match: <jsp:getProperty name="mtch" property="prematch"/><br>
  -    Post Match: <jsp:getProperty name="mtch" property="postmatch"/><br>
  +    Pre Match: <jsp:getProperty name="mtch" property="preMatch"/><br>
  +    Post Match: <jsp:getProperty name="mtch" property="postMatch"/><br>
   </rx:match>]]>
             </code>
           </usage>
  @@ -730,11 +730,30 @@
   
   </taglib>
   
  +<revision release="Pre Beta" date="07/05/2001">
  +  <description>
  +    Clean up of tag library prior to performing a beta
  +    release, moving toward an official release.
  +  </description>
  +  <section name="Tag Changes">
  +    <item>
  +      Changed the name of the <b>existsmatch</b> tag to
  +      <b>existsMatch</b>.
  +    </item>
  +    <item>
  +      Changed the <b>match</b> tag script variable property
  +      names <b>prematch</b> and <b>postmatch</b> to
  +      <b>preMatch</b> and <b>postMatch</b>.
  +    </item>
  +  </section>
  +</revision>
  +
   <revision release="Development" date="11/05/2000">
     <description>
  -    The Regexp tag library is still considered in development,
  -    but no changes have been made since the above date.
  +    Initial version of tag library before Jakarta-Taglibs
  +    had an official release policy for tag libraries.
     </description>
  +
   </revision>
   
   </document>
  
  
  

Mime
View raw message