diff options
author | Lazar Kirchev | 2012-04-30 09:56:56 +0000 |
---|---|---|
committer | Lazar Kirchev | 2012-04-30 09:56:56 +0000 |
commit | 49eeaa02e5e5dd9c3d92dfd7fcc2cd53e67c2bfb (patch) | |
tree | 5ce648baebecfc7fd62e4bd5a9ba22120103bc92 /bundles/org.eclipse.equinox.console.ssh | |
parent | b5bbb5ebdec5295187718a43e1de06dd5d5e547a (diff) | |
download | rt.equinox.bundles-49eeaa02e5e5dd9c3d92dfd7fcc2cd53e67c2bfb.tar.gz rt.equinox.bundles-49eeaa02e5e5dd9c3d92dfd7fcc2cd53e67c2bfb.tar.xz rt.equinox.bundles-49eeaa02e5e5dd9c3d92dfd7fcc2cd53e67c2bfb.zip |
bug 376744 - [console] some commands are listed multiple times in the help
Diffstat (limited to 'bundles/org.eclipse.equinox.console.ssh')
3 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF index ebd036df1..38ef0b3cd 100644 --- a/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Import-Package: javax.security.auth;resolution:=optional, org.apache.sshd.server.shell;version="0.5.0";resolution:=optional, org.eclipse.equinox.console.common, org.eclipse.equinox.console.common.terminal, - org.osgi.framework;version="1.7.0", + org.osgi.framework, org.osgi.service.cm;resolution:=optional, org.osgi.util.tracker Export-Package: org.eclipse.equinox.console.internal.ssh;x-internal:=true, diff --git a/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/Activator.java b/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/Activator.java index d982bac97..f91a31124 100755 --- a/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/Activator.java +++ b/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/Activator.java @@ -31,7 +31,7 @@ public class Activator implements BundleActivator { if (isFirstProcessor) { isFirstProcessor = false; sshConnection = new SshCommand(processor, context); - sshConnection.start(); + sshConnection.startService(); } else { sshConnection.addCommandProcessor(processor); } diff --git a/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/SshCommand.java b/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/SshCommand.java index 88ef0a78f..c193adb67 100755 --- a/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/SshCommand.java +++ b/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/SshCommand.java @@ -94,7 +94,7 @@ public class SshCommand { } } - public synchronized void start() { + public synchronized void startService() { Dictionary<String, Object> properties = new Hashtable<String, Object>(); properties.put("osgi.command.scope", "equinox"); properties.put("osgi.command.function", new String[] {"ssh"}); |