bodewig 2003/03/07 06:53:36
Modified: docs/manual/OptionalTasks scp.html
src/main/org/apache/tools/ant/taskdefs/optional/ssh Scp.java
Log:
.ssh is in ${user.home}, not ${user.dir}.
Revision Changes Path
1.2 +1 -1 ant/docs/manual/OptionalTasks/scp.html
Index: scp.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scp.html 6 Mar 2003 12:42:44 -0000 1.1
+++ scp.html 7 Mar 2003 14:53:36 -0000 1.2
@@ -54,7 +54,7 @@
the identity of the remote host. This must be a SSH2 format file.
SSH1 format is not supported.</td>
<td valian="top" align="center">No, defaults to
- ${user.dir}/.ssh/known_hosts.</td>
+ ${user.home}/.ssh/known_hosts.</td>
</tr>
<tr>
<td valign="top">failonerror</td>
1.2 +2 -2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Scp.java 6 Mar 2003 12:42:44 -0000 1.1
+++ Scp.java 7 Mar 2003 14:53:36 -0000 1.2
@@ -118,7 +118,7 @@
* Sets the path to the file that has the identities of
* all known hosts. This is used by SSH protocol to validate
* the identity of the host. The default is
- * <i>{$user.dir}/.ssh/known_hosts</i>.
+ * <i>${user.home}/.ssh/known_hosts</i>.
* @param knownHosts a path to the known hosts file.
*/
@@ -161,7 +161,7 @@
super.init();
this.toUri = null;
this.fromUri = null;
- this.knownHosts = System.getProperty("user.dir") +
"/.ssh/known_hosts";
+ this.knownHosts = System.getProperty("user.home") +
"/.ssh/known_hosts";
this.trust = false;
this.port = 22;
this.fileSets = null;