Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 39747 invoked from network); 19 Feb 2002 16:49:05 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 19 Feb 2002 16:49:05 -0000 Received: (qmail 6105 invoked by uid 97); 19 Feb 2002 16:48:52 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 6021 invoked by uid 97); 19 Feb 2002 16:48:52 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 5942 invoked by uid 97); 19 Feb 2002 16:48:51 -0000 Date: 19 Feb 2002 16:48:47 -0000 Message-ID: <20020219164847.20413.qmail@icarus.apache.org> From: bodewig@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/types RegularExpression.java defaults.properties X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N bodewig 02/02/19 08:48:47 Modified: docs/manual/OptionalTasks replaceregexp.html src/etc/testcases/taskdefs/optional replaceregexp.xml src/main/org/apache/tools/ant/taskdefs/optional ReplaceRegExp.java src/main/org/apache/tools/ant/types RegularExpression.java defaults.properties Log: --> Revision Changes Path 1.7 +5 -5 jakarta-ant/docs/manual/OptionalTasks/replaceregexp.html Index: replaceregexp.html =================================================================== RCS file: /home/cvs/jakarta-ant/docs/manual/OptionalTasks/replaceregexp.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- replaceregexp.html 3 Feb 2002 22:09:09 -0000 1.6 +++ replaceregexp.html 19 Feb 2002 16:48:47 -0000 1.7 @@ -54,7 +54,7 @@ match The regular expression pattern to match in the file(s) - Yes, if no nested <regularexpression> is used + Yes, if no nested <regexp> is used replace @@ -94,12 +94,12 @@

Parameters specified as nested elements

This task supports a nested FileSet element.

-

This task supports a nested RegularExpression element to specify +

This task supports a nested Regexp element to specify the regular expression. You can use this element to refer to a previously defined regular expression datatype instance.

- <regularexpression id="id" pattern="expression" />
- <regularexpression refid="id" /> + <regexp id="id" pattern="expression" />
+ <regexp refid="id" />

This task supports a nested Substitution element to specify the substitution pattern. You can use this element to refer to a previously @@ -112,7 +112,7 @@ 

   <replaceregexp byline="true">
  -  <regularexpression expression="OldProperty=(.*)" />
  +  <regexp expression="OldProperty=(.*)" />
     <substitution expression="NewProperty=\1" />
     <fileset dir=".">
      <includes="*.properties" />
  
  
  
  1.3       +1 -1      jakarta-ant/src/etc/testcases/taskdefs/optional/replaceregexp.xml
  
  Index: replaceregexp.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/optional/replaceregexp.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- replaceregexp.xml	26 Oct 2001 09:36:40 -0000	1.2
  +++ replaceregexp.xml	19 Feb 2002 16:48:47 -0000	1.3
  @@ -10,7 +10,7 @@
   
     
       
  -      
  +      
         
       
     
  
  
  
  1.7       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
  
  Index: ReplaceRegExp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ReplaceRegExp.java	20 Jan 2002 20:45:57 -0000	1.6
  +++ ReplaceRegExp.java	19 Feb 2002 16:48:47 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -107,7 +107,7 @@
    *                    replace="pattern" 
    *                    flags="options"?
    *                    byline="true|false"? >
  - *       regularexpression?
  + *       regexp?
    *       substitution?
    *       fileset*
    *     </replaceregexp>
  @@ -217,7 +217,7 @@
           filesets.addElement(set);
       }
   
  -    public RegularExpression createRegularExpression()
  +    public RegularExpression createRegexp()
       {
           if (regex != null) {
               throw new BuildException("Only one regular expression is allowed.");
  
  
  
  1.5       +4 -4      jakarta-ant/src/main/org/apache/tools/ant/types/RegularExpression.java
  
  Index: RegularExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/RegularExpression.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RegularExpression.java	8 Jan 2002 22:21:59 -0000	1.4
  +++ RegularExpression.java	19 Feb 2002 16:48:47 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -83,7 +83,7 @@
    *
* * 
  - *   <regularexpression [ [id="id"] pattern="expression" | refid="id" ] 
  + *   <regexp [ [id="id"] pattern="expression" | refid="id" ] 
    *   />
    *
* @@ -96,7 +96,7 @@ */ public class RegularExpression extends DataType { - public final static String DATA_TYPE_NAME = "regularexpression"; + public final static String DATA_TYPE_NAME = "regexp"; // The regular expression factory private final static RegexpFactory factory = new RegexpFactory(); @@ -151,7 +151,7 @@ Object o = ref.getReferencedObject(p); if (!(o instanceof RegularExpression)) { - String msg = ref.getRefId() + " doesn\'t denote a regularexpression"; + String msg = ref.getRefId() + " doesn\'t denote a "+DATA_TYPE_NAME; throw new BuildException(msg); } else 1.8 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/types/defaults.properties Index: defaults.properties =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/defaults.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- defaults.properties 30 Nov 2001 11:33:26 -0000 1.7 +++ defaults.properties 19 Feb 2002 16:48:47 -0000 1.8 @@ -7,4 +7,4 @@ description=org.apache.tools.ant.types.Description classfileset=org.apache.tools.ant.types.optional.depend.ClassfileSet substitution=org.apache.tools.ant.types.Substitution -regularexpression=org.apache.tools.ant.types.RegularExpression +regexp=org.apache.tools.ant.types.RegularExpression -- To unsubscribe, e-mail: For additional commands, e-mail: