From ca07e0d25ae896cee2ed308c78c74bb91eca5859 Mon Sep 17 00:00:00 2001 From: Shikhar Bhushan Date: Fri, 21 May 2010 21:40:59 +0100 Subject: [PATCH] logback instead of log4j --- pom.xml | 87 +++++-------------- src/main/java/examples/Exec.java | 6 +- src/main/java/examples/LocalPF.java | 5 -- src/main/java/examples/RemotePF.java | 4 - src/main/java/examples/RudimentaryPTY.java | 4 - src/main/java/examples/SCPDownload.java | 4 - src/main/java/examples/SCPUpload.java | 4 - src/main/java/examples/SFTPDownload.java | 4 - src/main/java/examples/SFTPUpload.java | 5 -- src/main/java/examples/X11.java | 4 - src/test/java/net/schmizz/sshj/SmokeTest.java | 6 -- 11 files changed, 23 insertions(+), 110 deletions(-) diff --git a/pom.xml b/pom.xml index edd5f171..5a15b408 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -45,57 +46,35 @@ 1.45 provided + + junit + junit + 4.8.1 + test + com.jcraft jzlib 1.0.7 provided - - junit - junit - 4.6 - test - org.apache.sshd sshd-core - 0.3.0 + 0.4.0 test - org.slf4j - slf4j-log4j12 - 1.5.11 + ch.qos.logback + logback-core + 0.9.20 test - log4j - log4j - 1.2.15 + ch.qos.logback + logback-classic + 0.9.20 test - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - javax.jms - jms - - - javax.mail - mail - - - oro - oro - - @@ -172,7 +151,7 @@ - dev + full-deps org.bouncycastle @@ -185,36 +164,14 @@ 1.0.7 - org.slf4j - slf4j-log4j12 - 1.5.11 + ch.qos.logback + logback-core + 0.9.20 - log4j - log4j - 1.2.15 - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - javax.jms - jms - - - javax.mail - mail - - - oro - oro - - + ch.qos.logback + logback-classic + 0.9.20 diff --git a/src/main/java/examples/Exec.java b/src/main/java/examples/Exec.java index 01c4f46d..658cb7b9 100644 --- a/src/main/java/examples/Exec.java +++ b/src/main/java/examples/Exec.java @@ -23,10 +23,6 @@ import java.io.IOException; /** This examples demonstrates how a remote command can be executed. */ public class Exec { - // static { - // BasicConfigurator.configure(new ConsoleAppender(new PatternLayout("%d [%-15.15t] %-5p %-30.30c{1} - %m%n"))); - // } - public static void main(String... args) throws IOException { SSHClient ssh = new SSHClient(); @@ -37,7 +33,7 @@ public class Exec { ssh.authPublickey(System.getProperty("user.name")); - Command cmd = ssh.startSession().exec("ping google.com -n 1"); + Command cmd = ssh.startSession().exec("ping -c 1 google.com"); // Pipe.pipe(cmd.getInputStream(), System.out, cmd.getLocalMaxPacketSize(), false); System.out.print(cmd.getOutputAsString()); diff --git a/src/main/java/examples/LocalPF.java b/src/main/java/examples/LocalPF.java index 557f6fac..354d0652 100644 --- a/src/main/java/examples/LocalPF.java +++ b/src/main/java/examples/LocalPF.java @@ -26,11 +26,6 @@ import java.net.InetSocketAddress; */ public class LocalPF { - // static - // { - // BasicConfigurator.configure(new ConsoleAppender(new PatternLayout("%d [%-15.15t] %-5p %-30.30c{1} - %m%n"))); - // } - public static void main(String... args) throws IOException { SSHClient ssh = new SSHClient(); diff --git a/src/main/java/examples/RemotePF.java b/src/main/java/examples/RemotePF.java index 3694427e..0b93bd36 100644 --- a/src/main/java/examples/RemotePF.java +++ b/src/main/java/examples/RemotePF.java @@ -28,10 +28,6 @@ import java.net.InetSocketAddress; */ public class RemotePF { -// static { -// BasicConfigurator.configure(new ConsoleAppender(new PatternLayout("%d [%-15.15t] %-5p %-30.30c{1} - %m%n"))); -// } - public static void main(String... args) throws IOException { SSHClient client = new SSHClient(); diff --git a/src/main/java/examples/RudimentaryPTY.java b/src/main/java/examples/RudimentaryPTY.java index 887aaac1..a2a57190 100644 --- a/src/main/java/examples/RudimentaryPTY.java +++ b/src/main/java/examples/RudimentaryPTY.java @@ -28,10 +28,6 @@ import java.io.IOException; /** A very rudimentary psuedo-terminal based on console I/O. */ class RudimentaryPTY { -// static { -// BasicConfigurator.configure(new ConsoleAppender(new PatternLayout("%d [%-15.15t] %-5p %-30.30c{1} - %m%n"))); -// } - public static void main(String... args) throws IOException { diff --git a/src/main/java/examples/SCPDownload.java b/src/main/java/examples/SCPDownload.java index 99c07fe8..9501f247 100644 --- a/src/main/java/examples/SCPDownload.java +++ b/src/main/java/examples/SCPDownload.java @@ -22,10 +22,6 @@ import java.io.IOException; /** This example demonstrates downloading of a file over SCP from the SSH server. */ public class SCPDownload { -// static { -// BasicConfigurator.configure(new ConsoleAppender(new PatternLayout("%d [%-15.15t] %-5p %-30.30c{1} - %m%n"))); -// } - public static void main(String[] args) throws IOException { SSHClient ssh = new SSHClient(); diff --git a/src/main/java/examples/SCPUpload.java b/src/main/java/examples/SCPUpload.java index 1be7820d..54a8bb11 100644 --- a/src/main/java/examples/SCPUpload.java +++ b/src/main/java/examples/SCPUpload.java @@ -22,10 +22,6 @@ import java.io.IOException; /** This example demonstrates uploading of a file over SCP to the SSH server. */ public class SCPUpload { -// static { -// BasicConfigurator.configure(new ConsoleAppender(new PatternLayout("%d [%-15.15t] %-5p %-30.30c{1} - %m%n"))); -// } - public static void main(String[] args) throws IOException, ClassNotFoundException { SSHClient ssh = new SSHClient(); diff --git a/src/main/java/examples/SFTPDownload.java b/src/main/java/examples/SFTPDownload.java index 97c9f7db..1a28f6f6 100644 --- a/src/main/java/examples/SFTPDownload.java +++ b/src/main/java/examples/SFTPDownload.java @@ -22,10 +22,6 @@ import java.io.IOException; /** This example demonstrates downloading of a file over SFTP from the SSH server. */ public class SFTPDownload { -// static { -// BasicConfigurator.configure(new ConsoleAppender(new PatternLayout("%d [%-15.15t] %-5p %-30.30c{1} - %m%n"))); -// } - public static void main(String[] args) throws IOException { SSHClient ssh = new SSHClient(); diff --git a/src/main/java/examples/SFTPUpload.java b/src/main/java/examples/SFTPUpload.java index 7b08a0d5..005211eb 100644 --- a/src/main/java/examples/SFTPUpload.java +++ b/src/main/java/examples/SFTPUpload.java @@ -22,11 +22,6 @@ import java.io.IOException; /** This example demonstrates uploading of a file over SFTP to the SSH server. */ public class SFTPUpload { - // static - // { - // BasicConfigurator.configure(new ConsoleAppender(new PatternLayout("%d [%-15.15t] %-5p %-30.30c{1} - %m%n"))); - // } - public static void main(String[] args) throws IOException { SSHClient ssh = new SSHClient(); diff --git a/src/main/java/examples/X11.java b/src/main/java/examples/X11.java index db26c509..01f0a343 100644 --- a/src/main/java/examples/X11.java +++ b/src/main/java/examples/X11.java @@ -27,10 +27,6 @@ import java.net.InetSocketAddress; /** This example demonstrates how forwarding X11 connections from a remote host can be accomplished. */ public class X11 { - // static { - // BasicConfigurator.configure(new ConsoleAppender(new PatternLayout("%d [%-15.15t] %-5p %-30.30c{1} - %m%n"))); - // } - public static void main(String... args) throws IOException, InterruptedException { SSHClient ssh = new SSHClient(); diff --git a/src/test/java/net/schmizz/sshj/SmokeTest.java b/src/test/java/net/schmizz/sshj/SmokeTest.java index 6b1fc29e..07684a66 100644 --- a/src/test/java/net/schmizz/sshj/SmokeTest.java +++ b/src/test/java/net/schmizz/sshj/SmokeTest.java @@ -18,9 +18,6 @@ package net.schmizz.sshj; import net.schmizz.sshj.transport.TransportException; import net.schmizz.sshj.userauth.UserAuthException; import net.schmizz.sshj.util.BogusPasswordAuthenticator; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.PatternLayout; import org.apache.sshd.SshServer; import org.apache.sshd.common.keyprovider.FileKeyPairProvider; import org.junit.After; @@ -35,9 +32,6 @@ import static org.junit.Assert.assertTrue; /* Kinda basic right now */ public class SmokeTest { - static { - BasicConfigurator.configure(new ConsoleAppender(new PatternLayout("%d [%-15.15t] %-5p %-30.30c{1} - %m%n"))); - } private SSHClient ssh; private SshServer sshd;