Author: gnodet
Date: Mon Mar 21 17:00:25 2016
New Revision: 1736060
URL: http://svn.apache.org/viewvc?rev=1736060&view=rev
Log:
Upgrade to SSHD 1.2.0
Move ssh / telnet support to test
Fix exported packages
Added:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellCommand.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellCommand.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellCommandFactory.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellCommandFactory.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellFactoryImpl.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellFactoryImpl.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/Ssh.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/Ssh.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/BootException.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/BootException.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/Connection.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/Connection.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionData.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionData.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionEvent.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionEvent.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionFilter.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionFilter.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionManager.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionManager.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/PortListener.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/PortListener.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/Telnet.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/Telnet.java
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/TelnetIO.java
- copied, changed from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/TelnetIO.java
Removed:
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellCommand.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellCommandFactory.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellFactoryImpl.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/Ssh.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/BootException.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/Connection.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionData.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionEvent.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionFilter.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionManager.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/PortListener.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/Telnet.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/TelnetIO.java
Modified:
felix/trunk/gogo/jline/pom.xml
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java
Modified: felix/trunk/gogo/jline/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/pom.xml?rev=1736060&r1=1736059&r2=1736060&view=diff
==============================================================================
--- felix/trunk/gogo/jline/pom.xml (original)
+++ felix/trunk/gogo/jline/pom.xml Mon Mar 21 17:00:25 2016
@@ -60,8 +60,9 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>1.0.0</version>
+ <version>1.2.0</version>
<optional>true</optional>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -74,7 +75,7 @@
<configuration>
<instructions>
<Export-Package>
- *
+ org.apache.felix.gogo.jline
</Export-Package>
<Import-Package>
*
Modified:
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java?rev=1736060&r1=1736059&r2=1736060&view=diff
==============================================================================
---
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java
(original)
+++
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java
Mon Mar 21 17:00:25 2016
@@ -28,7 +28,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.felix.gogo.jline.Shell.Context;
-import org.apache.felix.gogo.jline.telnet.Telnet;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
import org.apache.felix.service.command.Converter;
@@ -103,9 +102,6 @@ public class Activator implements Bundle
dict.put(CommandProcessor.COMMAND_FUNCTION, Posix.functions);
regs.add(context.registerService(Posix.class.getName(), new
Posix(processor), dict));
- dict.put(CommandProcessor.COMMAND_FUNCTION, Telnet.functions);
- regs.add(context.registerService(Telnet.class.getName(), new
Telnet(processor), dict));
-
Shell shell = new Shell(new ShellContext(), processor);
dict.put(CommandProcessor.COMMAND_FUNCTION, Shell.functions);
regs.add(context.registerService(Shell.class.getName(), shell, dict));
Modified:
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java?rev=1736060&r1=1736059&r2=1736060&view=diff
==============================================================================
--- felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java
(original)
+++ felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java
Mon Mar 21 17:00:25 2016
@@ -23,8 +23,6 @@ import java.io.InputStream;
import java.io.PrintStream;
import org.apache.felix.gogo.jline.Shell.Context;
-import org.apache.felix.gogo.jline.ssh.Ssh;
-import org.apache.felix.gogo.jline.telnet.Telnet;
import org.apache.felix.gogo.runtime.CommandProcessorImpl;
import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
import org.apache.felix.service.command.CommandSession;
@@ -57,6 +55,7 @@ public class Main {
register(processor, new Procedural(), Procedural.functions);
register(processor, new Posix(processor), Posix.functions);
register(processor, shell, Shell.functions);
+ /*
try {
register(processor, new Telnet(processor),
Telnet.functions);
} catch (Throwable t) {
@@ -67,6 +66,7 @@ public class Main {
} catch (Throwable t) {
// ignore
}
+ */
CommandSession session =
processor.createSession(terminal.input(), terminal.output(), terminal.output());
session.put(Shell.VAR_CONTEXT, context);
session.put(Shell.VAR_TERMINAL, terminal);
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellCommand.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellCommand.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellCommand.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellCommand.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellCommand.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellCommandFactory.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellCommandFactory.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellCommandFactory.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellCommandFactory.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellCommandFactory.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellFactoryImpl.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellFactoryImpl.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellFactoryImpl.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellFactoryImpl.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellFactoryImpl.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
---
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/ShellFactoryImpl.java
(original)
+++
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/ShellFactoryImpl.java
Mon Mar 21 17:00:25 2016
@@ -36,7 +36,6 @@ import org.apache.sshd.server.Environmen
import org.apache.sshd.server.ExitCallback;
import org.apache.sshd.server.SessionAware;
import org.apache.sshd.server.Signal;
-import org.apache.sshd.server.SignalListener;
import org.apache.sshd.server.session.ServerSession;
import org.jline.terminal.Attributes;
import org.jline.terminal.Attributes.ControlChar;
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/Ssh.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/Ssh.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/Ssh.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/Ssh.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/Ssh.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
---
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/ssh/Ssh.java
(original)
+++
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/ssh/Ssh.java
Mon Mar 21 17:00:25 2016
@@ -28,8 +28,8 @@ import org.apache.sshd.common.NamedFacto
import org.apache.sshd.server.Command;
import org.apache.sshd.server.ServerBuilder;
import org.apache.sshd.server.SshServer;
-import org.apache.sshd.server.command.ScpCommandFactory;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
+import org.apache.sshd.server.scp.ScpCommandFactory;
import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
import org.jline.builtins.Options;
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/BootException.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/BootException.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/BootException.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/BootException.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/BootException.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/Connection.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/Connection.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/Connection.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/Connection.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/Connection.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionData.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionData.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionData.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionData.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionData.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionEvent.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionEvent.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionEvent.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionEvent.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionEvent.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionFilter.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionFilter.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionFilter.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionFilter.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionFilter.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionManager.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionManager.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionManager.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionManager.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/ConnectionManager.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/PortListener.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/PortListener.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/PortListener.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/PortListener.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/PortListener.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/Telnet.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/Telnet.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/Telnet.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/Telnet.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/Telnet.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
Copied:
felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/TelnetIO.java
(from r1736059,
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/TelnetIO.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/TelnetIO.java?p2=felix/trunk/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/TelnetIO.java&p1=felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/telnet/TelnetIO.java&r1=1736059&r2=1736060&rev=1736060&view=diff
==============================================================================
(empty)
