aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLazar Kirchev2012-04-30 05:56:56 (EDT)
committerLazar Kirchev2012-04-30 05:56:56 (EDT)
commit49eeaa02e5e5dd9c3d92dfd7fcc2cd53e67c2bfb (patch)
tree5ce648baebecfc7fd62e4bd5a9ba22120103bc92
parentb5bbb5ebdec5295187718a43e1de06dd5d5e547a (diff)
downloadrt.equinox.bundles-49eeaa02e5e5dd9c3d92dfd7fcc2cd53e67c2bfb.zip
rt.equinox.bundles-49eeaa02e5e5dd9c3d92dfd7fcc2cd53e67c2bfb.tar.gz
rt.equinox.bundles-49eeaa02e5e5dd9c3d92dfd7fcc2cd53e67c2bfb.tar.bz2
bug 376744 - [console] some commands are listed multiple times in the help
-rw-r--r--bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/Activator.java2
-rwxr-xr-xbundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/SshCommand.java2
-rwxr-xr-xbundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetCommandTests.java2
-rwxr-xr-xbundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetCommandWithConfigAdminTests.java4
-rwxr-xr-xbundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetDisconnectionTest.java1
-rwxr-xr-xbundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java12
-rwxr-xr-xbundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/DisconnectCommand.java2
-rwxr-xr-xbundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java4
-rwxr-xr-xbundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java2
-rwxr-xr-xbundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/ManCommand.java2
-rwxr-xr-xbundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/telnet/TelnetCommand.java2
12 files changed, 19 insertions, 18 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 ebd036d..38ef0b3 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 d982bac..f91a311 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 88ef0a7..c193adb 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"});
diff --git a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetCommandTests.java b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetCommandTests.java
index b32a55b..4982d74 100755
--- a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetCommandTests.java
+++ b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetCommandTests.java
@@ -56,7 +56,7 @@ public class TelnetCommandTests {
EasyMock.replay(context);
TelnetCommand command = new TelnetCommand(processor, context);
- command.start();
+ command.startService();
Socket socketClient = null;
try {
diff --git a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetCommandWithConfigAdminTests.java b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetCommandWithConfigAdminTests.java
index 2eb2072..104bdef 100755
--- a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetCommandWithConfigAdminTests.java
+++ b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetCommandWithConfigAdminTests.java
@@ -85,7 +85,7 @@ public class TelnetCommandWithConfigAdminTests {
EasyMock.replay(context);
TelnetCommand command = new TelnetCommand(processor, context);
- command.start();
+ command.startService();
Dictionary props = new Hashtable();
props.put("port", TELNET_PORT);
props.put("host", HOST);
@@ -165,7 +165,7 @@ public class TelnetCommandWithConfigAdminTests {
EasyMock.replay(context);
TelnetCommand command = new TelnetCommand(processor, context);
- command.start();
+ command.startService();
Dictionary props = new Hashtable();
props.put("port", TELNET_PORT);
props.put("host", HOST);
diff --git a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetDisconnectionTest.java b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetDisconnectionTest.java
index 810d1f5..066f5c3 100755
--- a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetDisconnectionTest.java
+++ b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/telnet/TelnetDisconnectionTest.java
@@ -52,6 +52,7 @@ public class TelnetDisconnectionTest {
EasyMock.replay(processor);
connection.start();
+ Thread.sleep(60000);
BundleContext context = EasyMock.createMock(BundleContext.class);
final DisconnectCommand command = new DisconnectCommand(context);
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java
index fc12e65..bf9928d 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java
@@ -81,7 +81,7 @@ public class Activator implements BundleActivator {
if (isFirstProcessor) {
isFirstProcessor = false;
telnetConnection = new TelnetCommand(processor, context);
- telnetConnection.start();
+ telnetConnection.startService();
} else {
telnetConnection.addCommandProcessor(processor);
}
@@ -223,16 +223,16 @@ public class Activator implements BundleActivator {
platformAdminTracker.open();
equinoxCmdProvider = new EquinoxCommandProvider(context, this);
- equinoxCmdProvider.start();
+ equinoxCmdProvider.startService();
HelpCommand helpCommand = new HelpCommand(context);
- helpCommand.start();
+ helpCommand.startService();
ManCommand manCommand = new ManCommand(context);
- manCommand.start();
+ manCommand.startService();
DisconnectCommand disconnectCommand = new DisconnectCommand(context);
- disconnectCommand.start();
+ disconnectCommand.startService();
startBundle("org.apache.felix.gogo.runtime", true);
startBundle("org.apache.felix.gogo.shell", true);
@@ -315,7 +315,7 @@ public class Activator implements BundleActivator {
commandProviderTracker.close();
commandProcessorTracker.close();
if (equinoxCmdProvider != null) {
- equinoxCmdProvider.stop();
+ equinoxCmdProvider.stopService();
}
try {
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/DisconnectCommand.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/DisconnectCommand.java
index 69acc77..68b2c1f 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/DisconnectCommand.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/DisconnectCommand.java
@@ -25,7 +25,7 @@ public class DisconnectCommand {
this.context = context;
}
- public void start() {
+ public void startService() {
Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put(CommandProcessor.COMMAND_SCOPE, "equinox");
props.put(CommandProcessor.COMMAND_FUNCTION, new String[] {"disconnect"});
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java
index 717d894..1e35b01 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java
@@ -156,7 +156,7 @@ public class EquinoxCommandProvider implements SynchronousBundleListener {
* Registers this object as a service providing commands
* Adds this object as a SynchronousBundleListener.
*/
- public void start() {
+ public void startService() {
EquinoxCommandsConverter converter = new EquinoxCommandsConverter(context);
converterReg = context.registerService(Converter.class.getName(), converter, null);
@@ -168,7 +168,7 @@ public class EquinoxCommandProvider implements SynchronousBundleListener {
context.addBundleListener(this);
}
- public void stop() {
+ public void stopService() {
if (converterReg != null) {
converterReg.unregister();
}
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java
index e1e3ac3..0a87326 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java
@@ -78,7 +78,7 @@ public class HelpCommand {
commandProvidersTracker.open();
}
- public void start() {
+ public void startService() {
Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put(Constants.SERVICE_RANKING, new Integer(Integer.MAX_VALUE));
props.put(CommandProcessor.COMMAND_SCOPE, "equinox");
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/ManCommand.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/ManCommand.java
index da5441f..a0a3fba 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/ManCommand.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/ManCommand.java
@@ -14,7 +14,7 @@ public class ManCommand {
this.context = context;
}
- public void start() {
+ public void startService() {
Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put(CommandProcessor.COMMAND_SCOPE, "equinox");
props.put(CommandProcessor.COMMAND_FUNCTION, new String[] {"man"});
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/telnet/TelnetCommand.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/telnet/TelnetCommand.java
index 2874c1b..5a0e743 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/telnet/TelnetCommand.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/telnet/TelnetCommand.java
@@ -89,7 +89,7 @@ public class TelnetCommand {
}
}
- 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[] {"telnet"});