diff options
| author | Thomas Watson | 2011-10-25 18:25:17 +0000 |
|---|---|---|
| committer | Thomas Watson | 2011-10-25 18:25:17 +0000 |
| commit | 43b9413b7e4dbb019f3e42eac54681d121f70e73 (patch) | |
| tree | a79f5a500cae0ff150629b982f88a20524bba009 | |
| parent | 5b71981bc75234281d9606dfa0b9e373f6c756cf (diff) | |
| download | rt.equinox.framework-43b9413b7e4dbb019f3e42eac54681d121f70e73.tar.gz rt.equinox.framework-43b9413b7e4dbb019f3e42eac54681d121f70e73.tar.xz rt.equinox.framework-43b9413b7e4dbb019f3e42eac54681d121f70e73.zip | |
Bug 361986 - Enable external console bundle by defaultv20111025-1330
2 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java index 751e4cd0e..97085a49a 100644 --- a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java +++ b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java @@ -85,7 +85,7 @@ public class ConsoleManager implements ServiceTrackerCustomizer<ConsoleSession, public static final String PROP_CONSOLE = "osgi.console"; //$NON-NLS-1$ private static final String PROP_SYSTEM_IN_OUT = "console.systemInOut"; //$NON-NLS-1$ private static final String CONSOLE_NAME = "OSGi Console"; //$NON-NLS-1$ - private static final String CONSOLE_BUNDLE = "org.eclipse.equinox.console"; //$NON-NLS-1$ + public static final String CONSOLE_BUNDLE = "org.eclipse.equinox.console"; //$NON-NLS-1$ public static final String PROP_CONSOLE_ENABLED = "osgi.console.enable.builtin"; //$NON-NLS-1$ final Framework framework; private final ServiceTracker<CommandProvider, CommandProvider> cpTracker; @@ -113,7 +113,7 @@ public class ConsoleManager implements ServiceTrackerCustomizer<ConsoleSession, this.framework = framework; this.consoleHost = host != null ? host.trim() : host; this.consolePort = port != null ? port.trim() : port; - String enabled = FrameworkProperties.getProperty(PROP_CONSOLE_ENABLED, "true"); //$NON-NLS-1$ + String enabled = FrameworkProperties.getProperty(PROP_CONSOLE_ENABLED, CONSOLE_BUNDLE); if (!"true".equals(enabled) || "none".equals(port)) { //$NON-NLS-1$ //$NON-NLS-2$ isEnabled = false; this.cpTracker = null; diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java index c4443c0b3..d8c88d684 100644 --- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java +++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java @@ -92,7 +92,7 @@ public class EclipseAdaptorHook implements AdaptorHook, HookConfigurator { if (converter == null) converter = new PluginConverterImpl(adaptor, context); registrations.add(AdaptorUtil.register(PluginConverter.class.getName(), converter, context)); - String builtinEnabled = FrameworkProperties.getProperty(ConsoleManager.PROP_CONSOLE_ENABLED, "true"); //$NON-NLS-1$ + String builtinEnabled = FrameworkProperties.getProperty(ConsoleManager.PROP_CONSOLE_ENABLED, ConsoleManager.CONSOLE_BUNDLE); if ("true".equals(builtinEnabled)) { //$NON-NLS-1$ registrations.add(AdaptorUtil.register(CommandProvider.class.getName(), new EclipseCommandProvider(context), context)); } |