ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh Scp.java
Date Mon, 14 Jun 2004 12:24:17 GMT
bodewig     2004/06/14 05:24:17

  Modified:    .        Tag: ANT_16_BRANCH TODO WHATSNEW
               docs/manual/OptionalTasks Tag: ANT_16_BRANCH scp.html
               src/main/org/apache/tools/ant/taskdefs/optional/ssh Tag:
                        ANT_16_BRANCH Scp.java
  Log:
  merge
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.3.2.15  +0 -2      ant/Attic/TODO
  
  Index: TODO
  ===================================================================
  RCS file: /home/cvs/ant/Attic/TODO,v
  retrieving revision 1.3.2.14
  retrieving revision 1.3.2.15
  diff -u -r1.3.2.14 -r1.3.2.15
  --- TODO	12 Jun 2004 17:10:34 -0000	1.3.2.14
  +++ TODO	14 Jun 2004 12:24:17 -0000	1.3.2.15
  @@ -21,8 +21,6 @@
   
   * gcj support in Path.addJavaRuntime [Stefan]
   
  -* toFile attribute in scp [Stefan]
  -
   * review claimed AntClassLoader memory leak [Stefan]
   
   * <junitreport> and JDK 1.5 [Stefan hopes that Stephane solves it for
  
  
  
  1.503.2.106 +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.105
  retrieving revision 1.503.2.106
  diff -u -r1.503.2.105 -r1.503.2.106
  --- WHATSNEW	14 Jun 2004 12:05:02 -0000	1.503.2.105
  +++ WHATSNEW	14 Jun 2004 12:24:17 -0000	1.503.2.106
  @@ -113,6 +113,9 @@
   * <scp> now properly handles remote files and directories with spaces
     in their names.  Bugzilla Report 26097.
   
  +* <scp> now has (local|remote)tofile attributes to rename files on the
  +  fly.  Bugzilla Report 26758.
  +
   Other changes:
   --------------
   * doc fix concerning the dependencies of the ftp task
  
  
  
  No                   revision
  No                   revision
  1.7.2.8   +14 -0     ant/docs/manual/OptionalTasks/scp.html
  
  Index: scp.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v
  retrieving revision 1.7.2.7
  retrieving revision 1.7.2.8
  diff -u -r1.7.2.7 -r1.7.2.8
  --- scp.html	13 Apr 2004 11:26:13 -0000	1.7.2.7
  +++ scp.html	14 Jun 2004 12:24:17 -0000	1.7.2.8
  @@ -76,10 +76,24 @@
       <td valian="top" align="center">Alternative to todir attribute.</td>
     </tr>
     <tr>
  +    <td valign="top">localTofile</td>
  +    <td valign="top">Changes the file name to the given name while
  +    receiving it, only useful if receiving a single file.  <em>since
  +    Ant 1.6.2</em></td>
  +    <td valian="top" align="center">Alternative to todir attribute.</td>
  +  </tr>
  +  <tr>
       <td valign="top">remoteTodir</td>
       <td valign="top">This is an alternative to the todir
       attribute. But this must always point to a remote directory.
       <em>since Ant 1.6.2</em></td>
  +    <td valian="top" align="center">Alternative to todir attribute.</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">remoteTofile</td>
  +    <td valign="top">Changes the file name to the given name while
  +    sending it, only useful if sending a single file.  <em>since
  +    Ant 1.6.2</em></td>
       <td valian="top" align="center">Alternative to todir attribute.</td>
     </tr>
     <tr>
  
  
  
  No                   revision
  No                   revision
  1.9.2.7   +22 -1     ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
  
  Index: Scp.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java,v
  retrieving revision 1.9.2.6
  retrieving revision 1.9.2.7
  diff -u -r1.9.2.6 -r1.9.2.7
  --- Scp.java	13 Apr 2004 11:26:13 -0000	1.9.2.6
  +++ Scp.java	14 Jun 2004 12:24:17 -0000	1.9.2.7
  @@ -116,6 +116,26 @@
       }
   
       /**
  +     * Changes the file name to the given name while receiving it,
  +     * only useful if receiving a single file.
  +     * @since Ant 1.6.2
  +     */
  +    public void setLocalTofile(String aToUri) {
  +        this.toUri = aToUri;
  +        this.isToRemote = false;
  +    }
  +
  +    /**
  +     * Changes the file name to the given name while sending it,
  +     * only useful if sending a single file.
  +     * @since Ant 1.6.2
  +     */
  +    public void setRemoteTofile(String aToUri) {
  +        this.toUri = aToUri;
  +        this.isToRemote = true;
  +    }
  +
  +    /**
        * Adds a FileSet tranfer to remote host.  NOTE: Either
        * addFileSet() or setFile() are required.  But, not both.
        *
  @@ -137,7 +157,8 @@
   
       public void execute() throws BuildException {
           if (toUri == null) {
  -            throw new BuildException("The 'todir' attribute is required.");
  +            throw new BuildException("Either 'todir' or 'tofile' attribute "
  +                                     + "is required.");
           }
   
           if (fromUri == null && fileSets == null) {
  
  
  

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


Mime
View raw message