ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/testcases/org/apache/antlib/core IfTest.java
Date Sun, 03 Mar 2002 07:09:30 GMT
donaldp     02/03/02 23:09:30

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition
                        Http.java Socket.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text
                        RegularExpression.java Substitution.java
               proposal/myrmidon/src/main/org/apache/tools/ant/types
                        FileList.java FilterSet.java
               proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers
                        Mapper.java
               proposal/myrmidon/src/testcases/org/apache/antlib/core
                        IfTest.java
  Removed:     proposal/myrmidon/src/main/org/apache/tools/ant
                        ProjectComponent.java
  Log:
  Die ProjectComponent die!
  
  Revision  Changes    Path
  1.7       +4 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
  
  Index: Http.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Http.java	3 Mar 2002 02:19:10 -0000	1.6
  +++ Http.java	3 Mar 2002 07:09:30 -0000	1.7
  @@ -11,10 +11,10 @@
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.net.URLConnection;
  -import org.apache.myrmidon.api.TaskException;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.myrmidon.api.TaskContext;
  +import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.Condition;
  -import org.apache.tools.ant.ProjectComponent;
   
   /**
    * Condition to wait for a HTTP request to succeed. Its attribute(s) are: url -
  @@ -22,10 +22,10 @@
    *
    * @author <a href="mailto:denis@network365.com">Denis Hennessy</a>
    *
  - * @ant:type type="condition" nam="http"
  + * @ant:type type="condition" name="http"
    */
   public class Http
  -    extends ProjectComponent
  +    extends AbstractLogEnabled
       implements Condition
   {
       String spec = null;
  
  
  
  1.7       +4 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java
  
  Index: Socket.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Socket.java	3 Mar 2002 02:19:10 -0000	1.6
  +++ Socket.java	3 Mar 2002 07:09:30 -0000	1.7
  @@ -8,10 +8,10 @@
   package org.apache.tools.ant.taskdefs.condition;
   
   import java.io.IOException;
  -import org.apache.myrmidon.api.TaskException;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.myrmidon.api.TaskContext;
  +import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.Condition;
  -import org.apache.tools.ant.ProjectComponent;
   
   /**
    * Condition to wait for a TCP/IP socket to have a listener. Its attribute(s)
  @@ -19,10 +19,10 @@
    *
    * @author <a href="mailto:denis@network365.com">Denis Hennessy</a>
    *
  - * @ant:type type="condition" nam="socket"
  + * @ant:type type="condition" name="socket"
    */
   public class Socket
  -    extends ProjectComponent
  +    extends AbstractLogEnabled
       implements Condition
   {
       String server = null;
  
  
  
  1.2       +0 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/RegularExpression.java
  
  Index: RegularExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/RegularExpression.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RegularExpression.java	12 Jan 2002 23:42:21 -0000	1.1
  +++ RegularExpression.java	3 Mar 2002 07:09:30 -0000	1.2
  @@ -8,7 +8,6 @@
   package org.apache.tools.ant.taskdefs.text;
   
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.ProjectComponent;
   import org.apache.tools.ant.util.regexp.Regexp;
   import org.apache.tools.ant.util.regexp.RegexpFactory;
   
  @@ -42,7 +41,6 @@
    * @see org.apache.tools.ant.util.regexp.Regexp
    */
   public class RegularExpression
  -    extends ProjectComponent
   {
       // The regular expression factory
       private final static RegexpFactory factory = new RegexpFactory();
  
  
  
  1.3       +0 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Substitution.java
  
  Index: Substitution.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Substitution.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Substitution.java	4 Jan 2002 09:25:13 -0000	1.2
  +++ Substitution.java	3 Mar 2002 07:09:30 -0000	1.3
  @@ -7,8 +7,6 @@
    */
   package org.apache.tools.ant.taskdefs.text;
   
  -import org.apache.tools.ant.ProjectComponent;
  -
   /**
    * A regular expression substitution datatype. It is an expression that is meant
    * to replace a regular expression. <pre>
  @@ -21,7 +19,6 @@
    * @see org.apache.oro.text.regex.Perl5Substitition
    */
   public class Substitution
  -    extends ProjectComponent
   {
       private String m_expression;
   
  
  
  
  1.9       +1 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java
  
  Index: FileList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FileList.java	4 Jan 2002 09:26:42 -0000	1.8
  +++ FileList.java	3 Mar 2002 07:09:30 -0000	1.9
  @@ -11,7 +11,6 @@
   import java.util.ArrayList;
   import java.util.StringTokenizer;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.ProjectComponent;
   
   /**
    * FileList represents an explicitly named list of files. FileLists are useful
  @@ -20,10 +19,9 @@
    * a matched file if it currently exists in the file system.
    *
    * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
  - * @version $Revision: 1.8 $ $Date: 2002/01/04 09:26:42 $
  + * @version $Revision: 1.9 $ $Date: 2002/03/03 07:09:30 $
    */
   public class FileList
  -    extends ProjectComponent
   {
       private final ArrayList m_filenames = new ArrayList();
       private File m_dir;
  
  
  
  1.14      +2 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FilterSet.java
  
  Index: FilterSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FilterSet.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- FilterSet.java	14 Feb 2002 10:49:34 -0000	1.13
  +++ FilterSet.java	3 Mar 2002 07:09:30 -0000	1.14
  @@ -15,19 +15,18 @@
   import java.util.Hashtable;
   import java.util.Iterator;
   import java.util.Properties;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.Filter;
  -import org.apache.tools.ant.ProjectComponent;
   
   /**
    * A set of filters to be applied to something. A filter set may have begintoken
    * and endtokens defined.
    *
    * @author <A href="mailto:gholam@xtra.co.nz"> Michael McCallum </A>
  - * @created 14 March 2001
    */
   public class FilterSet
  -    extends ProjectComponent
  +    extends AbstractLogEnabled
       implements Cloneable
   {
       /**
  
  
  
  1.4       +0 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/Mapper.java
  
  Index: Mapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/Mapper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Mapper.java	20 Jan 2002 09:55:12 -0000	1.3
  +++ Mapper.java	3 Mar 2002 07:09:30 -0000	1.4
  @@ -10,7 +10,6 @@
   import java.net.URL;
   import java.net.URLClassLoader;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.ProjectComponent;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.PathUtil;
   
  @@ -20,8 +19,6 @@
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    */
   public class Mapper
  -    extends ProjectComponent
  -    implements Cloneable
   {
       private MapperType m_type;
       private String m_classname;
  
  
  
  1.2       +3 -3      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/antlib/core/IfTest.java
  
  Index: IfTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/antlib/core/IfTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IfTest.java	2 Mar 2002 06:24:09 -0000	1.1
  +++ IfTest.java	3 Mar 2002 07:09:30 -0000	1.2
  @@ -17,13 +17,13 @@
    * Test cases for the <if> task.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/03/02 06:24:09 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/03 07:09:30 $
    */
   public class IfTest
       extends AbstractProjectTest
   {
  -    private final static Resources REZ
  -        = ResourceManager.getPackageResources( IfTest.class );
  +    private final static Resources REZ =
  +        ResourceManager.getPackageResources( IfTest.class );
   
       public IfTest( String name )
       {
  
  
  

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


Mime
View raw message