ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java MimeMail.java TelnetTask.java
Date Sun, 23 Jun 2002 06:05:46 GMT
stevel      2002/06/22 23:05:46

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/net Tag:
                        ANT_15_BRANCH FTP.java MimeMail.java
                        TelnetTask.java
  Log:
  net tasks
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.21.2.3  +10 -5     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  
  Index: FTP.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
  retrieving revision 1.21.2.2
  retrieving revision 1.21.2.3
  diff -u -r1.21.2.2 -r1.21.2.3
  --- FTP.java	20 Jun 2002 00:35:47 -0000	1.21.2.2
  +++ FTP.java	23 Jun 2002 06:05:46 -0000	1.21.2.3
  @@ -323,8 +323,8 @@
   
   
       /**
  -     * Set to true to transmit only files that are new or changed from their
  -     * remote counterparts. The default is to transmit all files.
  +     * A synonym for <tt>depends</tt>. Set to true to transmit only new or
changed
  +     * files.
        */
       public void setNewer(boolean newer) {
           this.newerOnly = newer;
  @@ -332,8 +332,8 @@
   
   
       /**
  -     * A synonym for setnewer. Set to true to transmit only new or changed
  -     * files.
  +     * Set to true to transmit only files that are new or changed from their
  +     * remote counterparts. The default is to transmit all files.
        */
       public void setDepends(boolean depends) {
           this.newerOnly = depends;
  @@ -368,7 +368,7 @@
   
   
       /**
  -     *  Adds a set of files.
  +     *  A set of files to upload or download
        */
       public void addFileset(FileSet set) {
           filesets.addElement(set);
  @@ -383,6 +383,7 @@
        *      setAction(FTP.Action) to make Ant's Introspection mechanism do the
        *      work and also to encapsulate operations on the type in its own
        *      class.
  +     * @ant.attribute ignore="true"
        */
       public void setAction(String action) throws BuildException {
           log("DEPRECATED - The setAction(String) method has been deprecated."
  @@ -992,6 +993,10 @@
       }
   
   
  +    /**
  +     * an action to perform, one of 
  +     * "send", "put", "recv", "get", "del", "delete", "list", "mkdir", "chmod"
  +     */
       public static class Action extends EnumeratedAttribute {
   
           private static final String[] validActions = {
  
  
  
  1.9.2.1   +2 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
  
  Index: MimeMail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- MimeMail.java	15 Apr 2002 13:36:21 -0000	1.9
  +++ MimeMail.java	23 Jun 2002 06:05:46 -0000	1.9.2.1
  @@ -57,10 +57,7 @@
   import org.apache.tools.ant.taskdefs.email.EmailTask;
   
   /**
  - * A task to send SMTP email. This version has near identical syntax to
  - * the SendEmail task, but is MIME aware. It also requires Sun's mail.jar and
  - * activation.jar to compile and execute, which puts it clearly into the
  - * very optional category.
  + * A task to send SMTP email; Use <tt>mail</tt> instead 
    *
    * @deprecated Use {@link EmailTask} instead.
    *
  @@ -68,6 +65,7 @@
    * @author steve_l@iseran.com steve loughran
    * @author ehatcher@apache.org Erik Hatcher
    * @author paulo.gaspar@krankikom.de Paulo Gaspar
  + * @since Ant1.4
    */
   public class MimeMail extends EmailTask {
       /**
  
  
  
  1.12.2.2  +29 -15    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
  
  Index: TelnetTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java,v
  retrieving revision 1.12.2.1
  retrieving revision 1.12.2.2
  diff -u -r1.12.2.1 -r1.12.2.2
  --- TelnetTask.java	25 May 2002 05:46:10 -0000	1.12.2.1
  +++ TelnetTask.java	23 Jun 2002 06:05:46 -0000	1.12.2.2
  @@ -172,41 +172,44 @@
       }
   
       /**
  -     *  Set the userid attribute 
  +     * Set the the login id to use on the server; 
  +     * required if <tt>password</tt> is set. 
        */
       public void setUserid(String u) { this.userid = u; }
   
       /**
  -     *  Set the password attribute 
  +     *  Set the the login password to use
  +     * required if <tt>userid</tt> is set. 
        */
       public void setPassword(String p) { this.password = p; }
   
       /**
  -     *  Set the server address attribute 
  +     *  Set the hostname or address of the remote server.
        */
       public void setServer(String m) { this.server = m; }
   
       /**
  -     *  Set the tcp port to connect to attribute 
  +     *  Set the tcp port to connect to; default is 23.
        */
       public void setPort(int p) { this.port = p; }
   
       /**
  -     *  Set the tcp port to connect to attribute 
  +     *  send a carriage return after connecting; optional, defaults to false.
        */
       public void setInitialCR(boolean b) {
          this.addCarriageReturn = b;
       }
   
       /**
  -     *  Change the default timeout to wait for 
  -     *  valid responses
  +     * set a default timeout in seconds to wait for a response, 
  +     * zero means forever (the default) 
        */
       public void setTimeout(Integer i) {
          this.defaultTimeout = i;
       }
   
       /**
  +     *  A string to wait for from the server. 
        *  A subTask &lt;read&gt; tag was found.  Create the object, 
        *  Save it in our list, and return it.
        */
  @@ -218,6 +221,7 @@
       }
   
       /**
  +     *  Add text to send to the server
        *  A subTask &lt;write&gt; tag was found.  Create the object, 
        *  Save it in our list, and return it.
        */
  @@ -237,21 +241,24 @@
                   throws BuildException {
               throw new BuildException("Shouldn't be able instantiate a SubTask directly");
           }
  +        
           /**
  -         *  nested text elements need their properties explicitly expanded
  +         *  the message as nested text
            */
           public void addText(String s) {
               setString(getProject().replaceProperties(s));
           }
  +        
           /**
  -         * attribute assignment of properties
  +         * the message as an attribute
            */
           public void setString(String s) {
              taskString += s; 
           }
       }
  +    
       /**
  -     *  This class sends text to the connected server 
  +     *  Sends text to the connected server 
        */
       public class TelnetWrite extends TelnetSubTask {
           private boolean echoString = true;
  @@ -260,13 +267,17 @@
              telnet.sendString(taskString, echoString);
           }
           
  +        /**
  +         * should the message be echoed to the log? default=true.
  +         */
           public void setEcho(boolean b) {
              echoString = b;
           }
       }
  +    
       /**
  -     *  This class reads the output from the connected server
  -     *  until the required string is found. 
  +     *  Reads the output from the connected server
  +     *  until the required string is found or we time out. 
        */
       public class TelnetRead extends TelnetSubTask {
           private Integer timeout = null;
  @@ -275,13 +286,15 @@
               telnet.waitForString(taskString, timeout);
           }
           /**
  -         *  Override any default timeouts
  +         *  a timeout value that overrides any task wide timeout. 
            */
           public void setTimeout(Integer i) {
              this.timeout = i;
           }
  +        
           /**
  -         *  Sets the default timeout if none has been set already
  +         * Sets the default timeout if none has been set already
  +         * @ant.attribute ignore="true"
            */
           public void setDefaultTimeout(Integer defaultTimeout) {
              if (timeout == null) {
  @@ -289,6 +302,7 @@
              }
           }
       }
  +    
       /**
        *  This class handles the abstraction of the telnet protocol.
        *  Currently it is a wrapper around <a href="www.oroinc.com">ORO</a>'s

  
  
  

--
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