From f3a31e1d172eb55a16151b2f24d03dbc05680675 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 10 Mar 2003 10:05:43 +0000
Subject: [PATCH] Upgrade to jsch-0.1.2

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274219 13f79535-47bb-0310-9956-ffa450edef68
---
 .../ant/taskdefs/optional/ssh/AbstractSshMessage.java    | 7 ++++---
 .../org/apache/tools/ant/taskdefs/optional/ssh/Scp.java  | 4 ++--
 .../tools/ant/taskdefs/optional/ssh/ScpFromMessage.java  | 2 +-
 .../tools/ant/taskdefs/optional/ssh/ScpToMessage.java    | 9 +++++----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java
index 0cbde846b..35df31ba0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java
@@ -54,9 +54,10 @@
 
 package org.apache.tools.ant.taskdefs.optional.ssh;
 
-import com.jcraft.jsch.Session;
 import com.jcraft.jsch.Channel;
 import com.jcraft.jsch.ChannelExec;
+import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -76,7 +77,7 @@ public abstract class AbstractSshMessage {
         this.session = session;
     }
 
-    protected Channel openExecChannel( String command ) {
+    protected Channel openExecChannel( String command ) throws JSchException {
         ChannelExec channel = (ChannelExec) session.openChannel( "exec" );
         channel.setCommand( command );
 
@@ -97,7 +98,7 @@ public abstract class AbstractSshMessage {
         } while (b > 0);
     }
 
-    public abstract void execute() throws IOException;
+    public abstract void execute() throws IOException, JSchException;
 
     public void setLogListener( LogListener aListener ) {
         listener = aListener;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
index 7f3e6470b..77558ac31 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
@@ -201,7 +201,7 @@ public class Scp extends Task implements LogListener {
             if( failOnError ) {
                 throw new BuildException(e);
             } else {
-                e.printStackTrace();
+                log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
             }
         }
     }
@@ -317,7 +317,7 @@ public class Scp extends Task implements LogListener {
     }
 
     private Directory createDirectory( FileSet set ) {
-        DirectoryScanner scanner = set.getDirectoryScanner( project );
+        DirectoryScanner scanner = set.getDirectoryScanner( getProject() );
         Directory root = new Directory( scanner.getBasedir() );
         String[] files = scanner.getIncludedFiles();
         for (int j = 0; j < files.length; j++) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
index 50ad8537e..1d48e20d0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
@@ -76,7 +76,7 @@ public class ScpFromMessage extends AbstractSshMessage {
         this.isRecursive = recursive;
     }
 
-    public void execute() throws IOException {
+    public void execute() throws IOException, JSchException {
         String command = "scp -f ";
         if( isRecursive )
             command += "-r ";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
index afda37a96..692c81b29 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
@@ -54,8 +54,9 @@
 
 package org.apache.tools.ant.taskdefs.optional.ssh;
 
-import com.jcraft.jsch.Session;
 import com.jcraft.jsch.Channel;
+import com.jcraft.jsch.Session;
+import com.jcraft.jsch.JSchException;
 
 import java.io.*;
 import java.util.*;
@@ -85,7 +86,7 @@ public class ScpToMessage extends AbstractSshMessage {
         this.remotePath = aRemotePath;
     }
 
-    public void execute() throws IOException {
+    public void execute() throws IOException, JSchException {
         if( directoryList != null ) {
             doMultipleTransfer();
         }
@@ -95,7 +96,7 @@ public class ScpToMessage extends AbstractSshMessage {
         log("done.\n");
     }
 
-    private void doSingleTransfer() throws IOException {
+    private void doSingleTransfer() throws IOException, JSchException {
         String cmd = "scp -t " + remotePath;
         Channel channel = openExecChannel( cmd );
         try {
@@ -114,7 +115,7 @@ public class ScpToMessage extends AbstractSshMessage {
         }
     }
 
-    private void doMultipleTransfer() throws IOException {
+    private void doMultipleTransfer() throws IOException, JSchException {
         Channel channel = openExecChannel( "scp -d -t " + remotePath );
         try {
             OutputStream out = channel.getOutputStream();