svn commit: r720395 - in /servicemix/smx4/kernel/trunk: client/src/main/java/org/apache/servicemix/kernel/client/ gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/

[ff...@apache.org]

Author: ffang
Date: Mon Nov 24 19:13:04 2008
New Revision: 720395

URL: http://svn.apache.org/viewvc?rev=720395&view=rev
Log:
[SMX4KNL-149]Build failure due to new sshd snapshot

Modified:
    servicemix/smx4/kernel/trunk/client/src/main/java/org/apache/servicemix/kernel/client/Main.java
    servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/GShellShellFactory.java
    servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/SshAction.java

Modified: servicemix/smx4/kernel/trunk/client/src/main/java/org/apache/servicemix/kernel/client/Main.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/client/src/main/java/org/apache/servicemix/kernel/client/Main.java?rev=720395&r1=720394&r2=720395&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/client/src/main/java/org/apache/servicemix/kernel/client/Main.java (original)
+++ servicemix/smx4/kernel/trunk/client/src/main/java/org/apache/servicemix/kernel/client/Main.java Mon Nov 24 19:13:04 2008
@@ -16,9 +16,9 @@
  */
 package org.apache.servicemix.kernel.client;
 
-import com.google.code.sshd.SshClient;
+import com.google.code.sshd.ClientChannel;
 import com.google.code.sshd.ClientSession;
-import com.google.code.sshd.Channel;
+import com.google.code.sshd.SshClient;
 import jline.ConsoleReader;
 
 /**
@@ -69,12 +69,12 @@
             client.start();
             ClientSession session = client.connect(host, port);
             session.authPassword(user, password);
-            Channel channel = session.createChannel("shell");
+            ClientChannel channel = session.createChannel("shell");
             channel.setIn(new ConsoleReader().getInput());
             channel.setOut(System.out);
             channel.setErr(System.err);
             channel.open();
-            channel.waitFor(Channel.CLOSED, 0);
+            channel.waitFor(ClientChannel.CLOSED, 0);
         } catch (Throwable t) {
             t.printStackTrace();
             System.exit(1);

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/GShellShellFactory.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/GShellShellFactory.java?rev=720395&r1=720394&r2=720395&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/GShellShellFactory.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/GShellShellFactory.java Mon Nov 24 19:13:04 2008
@@ -131,7 +131,7 @@
             this.err = err;
         }
 
-        public void start(Map<String,String> env) throws Exception {
+        public void start(Map<String,String> env) throws IOException {
             this.io = new IO(in, out, err, false);
             this.variables = new Variables((Map) env);
             new Thread(this).start();

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/SshAction.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/SshAction.java?rev=720395&r1=720394&r2=720395&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/SshAction.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/SshAction.java Mon Nov 24 19:13:04 2008
@@ -34,9 +34,9 @@
 import java.net.URI;
 import java.util.List;
 
-import com.google.code.sshd.SshClient;
+import com.google.code.sshd.ClientChannel;
 import com.google.code.sshd.ClientSession;
-import com.google.code.sshd.Channel;
+import com.google.code.sshd.SshClient;
 
 /**
  * Connect to a remote shell server.
@@ -134,12 +134,12 @@
         ClientSession session = client.connect(remote.getHost(), remote.getPort());
         io.info(messages.getMessage("info.connected"));
         session.authPassword(username, password);
-        Channel channel = session.createChannel("shell");
+        ClientChannel channel = session.createChannel("shell");
         channel.setIn(io.inputStream);
         channel.setOut(io.outputStream);
         channel.setErr(io.errorStream);
         channel.open();
-        channel.waitFor(Channel.CLOSED, 0);
+        channel.waitFor(ClientChannel.CLOSED, 0);
 
 //        RemoteShellProxy shell = new RemoteShellProxy(client, io, instance, username);
 //
@@ -167,4 +167,4 @@
 
         return Result.SUCCESS;
     }
-}
\ No newline at end of file
+}