You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/08/12 06:33:31 UTC
[1/2] karaf git commit: [KARAF-3911] Workaround on SshTerminal
resulting to a change in jline
Repository: karaf
Updated Branches:
refs/heads/master 2b820fee9 -> 8e7306af2
[KARAF-3911] Workaround on SshTerminal resulting to a change in jline
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a4213aef
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a4213aef
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a4213aef
Branch: refs/heads/master
Commit: a4213aef6e6db8ca7cf4168cca54b089df90cc2b
Parents: cea96fa
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Aug 12 06:32:28 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Aug 12 06:32:28 2015 +0200
----------------------------------------------------------------------
.../org/apache/karaf/shell/ssh/SshTerminal.java | 101 +++++++++++++++----
1 file changed, 81 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a4213aef/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
index 17291d0..36b9077 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
@@ -18,16 +18,27 @@
*/
package org.apache.karaf.shell.ssh;
+import jline.TerminalSupport;
import org.apache.karaf.shell.api.console.Signal;
+import org.apache.karaf.shell.api.console.SignalListener;
import org.apache.karaf.shell.api.console.Terminal;
-import org.apache.karaf.shell.support.terminal.SignalSupport;
import org.apache.sshd.server.Environment;
-public class SshTerminal extends SignalSupport implements Terminal {
+import java.util.EnumSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+public class SshTerminal extends TerminalSupport implements Terminal {
private Environment environment;
+ private final Map<Signal, Set<SignalListener>> listeners;
public SshTerminal(Environment environment) {
+ super(true);
+ setAnsiSupported(true);
+ listeners = new ConcurrentHashMap<>(3);
this.environment = environment;
this.environment.addSignalListener(new org.apache.sshd.server.SignalListener() {
@Override
@@ -37,6 +48,71 @@ public class SshTerminal extends SignalSupport implements Terminal {
}, org.apache.sshd.server.Signal.WINCH);
}
+ public void init() throws Exception {
+ }
+
+ public void restore() throws Exception {
+ }
+
+ public void addSignalListener(SignalListener listener, Signal... signals) {
+ if (signals == null) {
+ throw new IllegalArgumentException("signals may not be null");
+ }
+ if (listener == null) {
+ throw new IllegalArgumentException("listener may not be null");
+ }
+ for (Signal s : signals) {
+ getSignalListeners(s, true).add(listener);
+ }
+ }
+
+ public void addSignalListener(SignalListener listener) {
+ addSignalListener(listener, EnumSet.allOf(Signal.class));
+ }
+
+ public void addSignalListener(SignalListener listener, EnumSet<Signal> signals) {
+ if (signals == null) {
+ throw new IllegalArgumentException("signals may not be null");
+ }
+ addSignalListener(listener, signals.toArray(new Signal[signals.size()]));
+ }
+
+ public void removeSignalListener(SignalListener listener) {
+ if (listener == null) {
+ throw new IllegalArgumentException("listener may not be null");
+ }
+ for (Signal s : EnumSet.allOf(Signal.class)) {
+ final Set<SignalListener> ls = getSignalListeners(s, false);
+ if (ls != null) {
+ ls.remove(listener);
+ }
+ }
+ }
+
+ public void signal(Signal signal) {
+ final Set<SignalListener> ls = getSignalListeners(signal, false);
+ if (ls != null) {
+ for (SignalListener l : ls) {
+ l.signal(signal);
+ }
+ }
+ }
+
+ protected Set<SignalListener> getSignalListeners(Signal signal, boolean create) {
+ Set<SignalListener> ls = listeners.get(signal);
+ if (ls == null && create) {
+ synchronized (listeners) {
+ ls = listeners.get(signal);
+ if (ls == null) {
+ ls = new CopyOnWriteArraySet<>();
+ listeners.put(signal, ls);
+ }
+ }
+ }
+ // may be null in case create=false
+ return ls;
+ }
+
@Override
public int getWidth() {
int width = 0;
@@ -45,7 +121,7 @@ public class SshTerminal extends SignalSupport implements Terminal {
} catch (Throwable t) {
// Ignore
}
- return width > 0 ? width : 80;
+ return width > 0 ? width : super.getWidth();
}
@Override
@@ -56,22 +132,7 @@ public class SshTerminal extends SignalSupport implements Terminal {
} catch (Throwable t) {
// Ignore
}
- return height > 0 ? height : 24;
- }
-
- @Override
- public boolean isAnsiSupported() {
- return true;
- }
-
- @Override
- public boolean isEchoEnabled() {
- return true;
- }
-
- @Override
- public void setEchoEnabled(boolean enabled) {
- // TODO: how to disable echo over ssh ?
+ return height > 0 ? height : super.getHeight();
}
-}
+}
\ No newline at end of file
[2/2] karaf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/karaf
Posted by jb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8e7306af
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8e7306af
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8e7306af
Branch: refs/heads/master
Commit: 8e7306af2d7faf95e963820c83b2b28e7b242f59
Parents: a4213ae 2b820fe
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Aug 12 06:33:22 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Aug 12 06:33:22 2015 +0200
----------------------------------------------------------------------
.../itests/features/EnterpriseFeaturesTest.java | 15 ---------------
1 file changed, 15 deletions(-)
----------------------------------------------------------------------