From 24c87c49f8b86dbe9cf4a9df057abfde60bb35d1 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 19 Dec 2008 14:26:08 +0000 Subject: [PATCH] [259363][api][rseterminals] Move RSE-Terminals out of incubation --- releng/org.eclipse.rse.updatesite/site.xml | 4 +-- rse/doc/org.eclipse.rse.doc.isv/options.txt | 7 +++++- .../topics_Reference.xml | 7 +++++- .../feature.properties | 2 +- .../feature.xml | 2 +- .../sourceTemplateFeature/feature.properties | 2 +- .../sourceTemplatePlugin/about.properties | 2 +- .../sourceTemplatePlugin/plugin.properties | 2 +- .../.project | 6 +++++ .../META-INF/MANIFEST.MF | 4 +-- .../plugin.properties | 2 +- .../core/DelegatingTerminalService.java | 20 ++++++++++++--- .../core/ITerminalServiceSubSystem.java | 11 ++++++++ ...TerminalServiceSubSystemConfiguration.java | 25 +++++++++++++++++++ .../core/TerminalServiceSubSystem.java | 17 +++++++++++++ ...TerminalServiceSubSystemConfiguration.java | 16 ++++++++++++ .../core/elements/TerminalElement.java | 15 +++++++++-- .../.project | 6 +++++ .../META-INF/MANIFEST.MF | 6 ++--- .../plugin.properties | 2 +- .../SshTerminalSubSystemConfiguration.java | 14 +++++++++++ .../org.eclipse.rse.terminals.ui/.project | 6 +++++ .../META-INF/MANIFEST.MF | 6 ++--- .../about.properties | 2 +- .../plugin.properties | 2 +- .../org.eclipse.rse.tests-feature/feature.xml | 2 +- .../org.eclipse.rse.tests.framework/.project | 6 +++++ .../META-INF/MANIFEST.MF | 6 ++--- 28 files changed, 172 insertions(+), 30 deletions(-) diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml index 9bbb95dd539..ebe381e7325 100644 --- a/releng/org.eclipse.rse.updatesite/site.xml +++ b/releng/org.eclipse.rse.updatesite/site.xml @@ -435,10 +435,10 @@ - + - + diff --git a/rse/doc/org.eclipse.rse.doc.isv/options.txt b/rse/doc/org.eclipse.rse.doc.isv/options.txt index 03020d6936b..b5c2ff49e76 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/options.txt +++ b/rse/doc/org.eclipse.rse.doc.isv/options.txt @@ -25,6 +25,8 @@ ;../org.eclipse.rse.subsystems.shells.local/src ;../org.eclipse.rse.subsystems.shells.ssh/src ;../org.eclipse.rse.subsystems.shells.telnet/src +;../org.eclipse.rse.subsystems.terminals.core/src +;../org.eclipse.rse.subsystems.terminals.ssh/src ;../org.eclipse.rse.ui/model ;../org.eclipse.rse.ui/UI ;../org.eclipse.rse.ui/subsystems" @@ -72,7 +74,6 @@ org.eclipse.rse.files.ui.dialogs org.eclipse.rse.files.ui.resources org.eclipse.rse.files.ui.widgets org.eclipse.rse.filters -org.eclipse.rse.internal.services.terminals org.eclipse.rse.logging org.eclipse.rse.model org.eclipse.rse.persistence @@ -92,6 +93,7 @@ org.eclipse.rse.services.files org.eclipse.rse.services.processes org.eclipse.rse.services.search org.eclipse.rse.services.shells +org.eclipse.rse.services.terminals org.eclipse.rse.shells.ui org.eclipse.rse.shells.ui.view org.eclipse.rse.subsystems.files.core @@ -117,6 +119,9 @@ org.eclipse.rse.subsystems.shells.dstore org.eclipse.rse.subsystems.shells.local org.eclipse.rse.subsystems.shells.ssh org.eclipse.rse.subsystems.shells.telnet +org.eclipse.rse.subsystems.terminals.core +org.eclipse.rse.subsystems.terminals.core.elements +org.eclipse.rse.subsystems.terminals.ssh org.eclipse.rse.ui org.eclipse.rse.ui.actions org.eclipse.rse.ui.dialogs diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml index 0fb88f44285..52f81cfe0d8 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml +++ b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml @@ -61,7 +61,7 @@ - + @@ -103,6 +103,11 @@ + + + + + diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.properties b/rse/features/org.eclipse.rse.terminals-feature/feature.properties index a6aeed83118..26d05cea236 100644 --- a/rse/features/org.eclipse.rse.terminals-feature/feature.properties +++ b/rse/features/org.eclipse.rse.terminals-feature/feature.properties @@ -13,7 +13,7 @@ # NLS_ENCODING=UTF-8 # "featureName" property - name of the feature -featureName=RSE Terminals UI (Incubation) +featureName=RSE Terminals UI # "providerName" property - name of the company that provides the feature providerName=Eclipse.org diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml index b343762df7b..f71966605c8 100644 --- a/rse/features/org.eclipse.rse.terminals-feature/feature.xml +++ b/rse/features/org.eclipse.rse.terminals-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties index 66d3496debb..b8d475f9916 100644 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties +++ b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties @@ -19,7 +19,7 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=RSE Terminals UI Source (Incubation) +featureName=RSE Terminals UI Source # "providerName" property - name of the company that provides the feature providerName=Eclipse.org diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties index 29bd173e364..a496c6ede58 100644 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties +++ b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties @@ -20,7 +20,7 @@ # # Do not translate any values surrounded by {} -blurb=RSE Terminals UI Source (Incubation)\n\ +blurb=RSE Terminals UI Source\n\ \n\ Version: {featureVersion}\n\ Build id: {0}\n\ diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties index 5b01a1af0bf..c84d750951b 100644 --- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties +++ b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties @@ -12,5 +12,5 @@ # NLS_MESSAGEFORMAT_NONE # NLS_ENCODING=UTF-8 -pluginName=RSE Terminals UI Source (Incubation) +pluginName=RSE Terminals UI Source providerName=Eclipse.org diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/.project b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/.project index 421b86dd130..f5a8f08ff90 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/.project +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/META-INF/MANIFEST.MF index 7c449ed1dc2..81d2e84aa1d 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.subsystems.terminals.core;singleton:=true -Bundle-Version: 0.1.1.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)", + org.eclipse.rse.services;bundle-version="[3.1.0,4.0.0)", org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)" Eclipse-LazyStart: true diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/plugin.properties index d1c92d2902b..0f1b4466b20 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/plugin.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/plugin.properties @@ -12,7 +12,7 @@ # NLS_MESSAGEFORMAT_NONE # NLS_ENCODING=UTF-8 -pluginName = RSE Terminals Core (Incubation) +pluginName = RSE Terminals Core providerName = Eclipse.org TerminalSubsystemName = Terminals diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/internal/subsystems/terminals/core/DelegatingTerminalService.java b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/internal/subsystems/terminals/core/DelegatingTerminalService.java index a9e7ddb292a..3e18e42d2e4 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/internal/subsystems/terminals/core/DelegatingTerminalService.java +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/internal/subsystems/terminals/core/DelegatingTerminalService.java @@ -1,13 +1,13 @@ /******************************************************************************** * Copyright (c) 2008 IBM Corporation. All rights reserved. * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html - * + * * Initial Contributors: * The following IBM employees contributed to the Remote System Explorer * component that contains this file: David McKnight. - * + * * Contributors: * {Name} (company) - description of contribution. ********************************************************************************/ @@ -21,6 +21,20 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.terminals.ITerminalService; import org.eclipse.rse.services.terminals.ITerminalShell; +/** + * Base class that can be used for decorating an existing terminal service with + * additional functionality. By default, all method calls are passed through to + * the original service. + * + *

+ * EXPERIMENTAL. This class or interface has been added as part + * of a work in progress. There is no guarantee that this API will work or that + * it will remain the same. Please do not use this API without consulting with + * the Target Management team. + *

+ * + * @since org.eclipse.rse.subsystems.terminals.core 1.0 + */ public class DelegatingTerminalService implements ITerminalService { private IHost _host; diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/ITerminalServiceSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/ITerminalServiceSubSystem.java index 66061ec3d72..fc8238ab85e 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/ITerminalServiceSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/ITerminalServiceSubSystem.java @@ -14,6 +14,16 @@ package org.eclipse.rse.subsystems.terminals.core; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.subsystems.terminals.core.elements.TerminalElement; +/** + * Specialized interface for remote terminal subsystems. + * + *

+ * EXPERIMENTAL. This class or interface has been added as part + * of a work in progress. There is no guarantee that this API will work or that + * it will remain the same. Please do not use this API without consulting with + * the Target Management team. + *

+ */ public interface ITerminalServiceSubSystem extends ISubSystem { public void addChild(TerminalElement element); @@ -26,6 +36,7 @@ public interface ITerminalServiceSubSystem extends ISubSystem { /** * @return parent subsystem factory, cast to a * ITerminalServiceSubSystemConfiguration + * @since 1.0 */ public ITerminalServiceSubSystemConfiguration getParentRemoteTerminalSubSystemConfiguration(); diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/ITerminalServiceSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/ITerminalServiceSubSystemConfiguration.java index 5a1b91cf26a..9f029a7a7a7 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/ITerminalServiceSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/ITerminalServiceSubSystemConfiguration.java @@ -14,10 +14,35 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.services.terminals.ITerminalService; +/** + * An interface representing factories for creating TerminalServiceSubSystem + * objects. + * + *

+ * EXPERIMENTAL. This class or interface has been added as part + * of a work in progress. There is no guarantee that this API will work or that + * it will remain the same. Please do not use this API without consulting with + * the Target Management team. + *

+ */ public interface ITerminalServiceSubSystemConfiguration extends ISubSystemConfiguration { + /** + * Return the terminal service. + * + * @param host connection + * @return the internal terminal service interface. + * @since 1.0 + */ public ITerminalService getTerminalService(IHost host); + /** + * Create the terminal service. + * + * @param host connection + * @return the new terminal service interface. + * @since 1.0 + */ public ITerminalService createTerminalService(IHost host); } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/TerminalServiceSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/TerminalServiceSubSystem.java index 9602a6d9d8a..05eed58d48c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/TerminalServiceSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/TerminalServiceSubSystem.java @@ -36,6 +36,13 @@ import org.eclipse.swt.widgets.Display; /** * A Subsystem that has terminal instances as children. + * + *

+ * EXPERIMENTAL. This class or interface has been added as part + * of a work in progress. There is no guarantee that this API will work or that + * it will remain the same. Please do not use this API without consulting with + * the Target Management team. + *

*/ public class TerminalServiceSubSystem extends SubSystem implements ITerminalServiceSubSystem, ICommunicationsListener { @@ -46,6 +53,8 @@ public class TerminalServiceSubSystem extends SubSystem implements /** * Constructor. + * + * @since 1.0 */ public TerminalServiceSubSystem(IHost host, IConnectorService connectorService, ITerminalService hostService) { @@ -66,6 +75,8 @@ public class TerminalServiceSubSystem extends SubSystem implements /** * Return the Terminal Service associated with this subsystem. + * + * @since 1.0 */ public ITerminalService getTerminalService() { return _hostService; @@ -122,6 +133,8 @@ public class TerminalServiceSubSystem extends SubSystem implements /** * Set the terminal service associated with this subsystem. + * + * @since 1.0 */ public void setTerminalService(ITerminalService service) { _hostService = service; @@ -196,6 +209,10 @@ public class TerminalServiceSubSystem extends SubSystem implements return (configuration instanceof ITerminalServiceSubSystemConfiguration); } + /** + * @inheritDoc + * @since 1.0 + */ public ITerminalServiceSubSystemConfiguration getParentRemoteTerminalSubSystemConfiguration() { return (ITerminalServiceSubSystemConfiguration) super .getSubSystemConfiguration(); diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/TerminalServiceSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/TerminalServiceSubSystemConfiguration.java index 9b67f47c98a..655d0c0f5ee 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/TerminalServiceSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/TerminalServiceSubSystemConfiguration.java @@ -19,6 +19,18 @@ import org.eclipse.rse.core.subsystems.SubSystemConfiguration; import org.eclipse.rse.services.IService; import org.eclipse.rse.services.terminals.ITerminalService; +/** + * The implementation of the ITerminalServiceSubSystemConfiguration interface + * contains information about what features the subsystem supports, and creates + * TerminalServiceSubSystem instances. + * + *

+ * EXPERIMENTAL. This class or interface has been added as part + * of a work in progress. There is no guarantee that this API will work or that + * it will remain the same. Please do not use this API without consulting with + * the Target Management team. + *

+ */ public abstract class TerminalServiceSubSystemConfiguration extends SubSystemConfiguration implements ITerminalServiceSubSystemConfiguration { @@ -34,6 +46,10 @@ public abstract class TerminalServiceSubSystemConfiguration extends return false; } + /** + * @inheritDoc + * @since 1.0 + */ public final ITerminalService getTerminalService(IHost host) { ITerminalService service = (ITerminalService) _services.get(host); if (service == null) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/elements/TerminalElement.java b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/elements/TerminalElement.java index 5f976065701..61ffb125be3 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/elements/TerminalElement.java +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/src/org/eclipse/rse/subsystems/terminals/core/elements/TerminalElement.java @@ -19,6 +19,13 @@ import org.eclipse.rse.subsystems.terminals.core.ITerminalServiceSubSystem; /** * An element in the RSE Tree that resembles a Terminal connection. + * + *

+ * EXPERIMENTAL. This class or interface has been added as part + * of a work in progress. There is no guarantee that this API will work or that + * it will remain the same. Please do not use this API without consulting with + * the Target Management team. + *

*/ public class TerminalElement extends AbstractResource { private String name; @@ -63,15 +70,19 @@ public class TerminalElement extends AbstractResource { return name.hashCode() ; } - /** + /** * Return the back-end connection of this terminal instance. + * + * @since 1.0 */ public ITerminalShell getTerminalShell() { return terminalShell; } - /** + /** * Set the back-end connection of this terminal instance. + * + * @since 1.0 */ public void setTerminalShell(ITerminalShell terminalShell) { this.terminalShell = terminalShell; diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/.project b/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/.project index d03300ed99b..7b37bf204c2 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/.project +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/META-INF/MANIFEST.MF index 71457bda8cd..07af74776c2 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.subsystems.terminals.ssh;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, - org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)", + org.eclipse.rse.services;bundle-version="[3.1.0,4.0.0)", org.eclipse.rse.connectorservice.ssh;bundle-version="[2.1.0,3.0.0)", org.eclipse.rse.services.ssh;bundle-version="[2.1.0,2.2.0)", - org.eclipse.rse.subsystems.terminals.core;bundle-version="[0.1.0,0.2.0)", + org.eclipse.rse.subsystems.terminals.core;bundle-version="[1.0.0,2.0.0)", org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)" Eclipse-LazyStart: true diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/plugin.properties index fead6e4d205..90f3c503b12 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/plugin.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/plugin.properties @@ -12,7 +12,7 @@ # NLS_MESSAGEFORMAT_NONE # NLS_ENCODING=UTF-8 -pluginName = RSE SSH Terminals (Incubation) +pluginName = RSE SSH Terminals providerName = Eclipse.org SshTerminalSubsystemName=Ssh Terminals diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/src/org/eclipse/rse/subsystems/terminals/ssh/SshTerminalSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/src/org/eclipse/rse/subsystems/terminals/ssh/SshTerminalSubSystemConfiguration.java index c4537b766a2..3d9119273ad 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/src/org/eclipse/rse/subsystems/terminals/ssh/SshTerminalSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/src/org/eclipse/rse/subsystems/terminals/ssh/SshTerminalSubSystemConfiguration.java @@ -22,6 +22,16 @@ import org.eclipse.rse.services.terminals.ITerminalService; import org.eclipse.rse.subsystems.terminals.core.TerminalServiceSubSystem; import org.eclipse.rse.subsystems.terminals.core.TerminalServiceSubSystemConfiguration; +/** + * An SSH Terminal Subsystem Factory. + * + *

+ * EXPERIMENTAL. This class or interface has been added as part + * of a work in progress. There is no guarantee that this API will work or that + * it will remain the same. Please do not use this API without consulting with + * the Target Management team. + *

+ */ public class SshTerminalSubSystemConfiguration extends TerminalServiceSubSystemConfiguration { @@ -47,6 +57,10 @@ public class SshTerminalSubSystemConfiguration extends return subsys; } + /** + * @inheritDoc + * @since 1.0 + */ public ITerminalService createTerminalService(IHost host) { SshConnectorService cserv = (SshConnectorService) getConnectorService(host); return new SshTerminalService(cserv); diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/.project b/rse/plugins/org.eclipse.rse.terminals.ui/.project index 593168ee3af..75d1acacb81 100644 --- a/rse/plugins/org.eclipse.rse.terminals.ui/.project +++ b/rse/plugins/org.eclipse.rse.terminals.ui/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF index 89b3ef9a4f3..3a255b423f1 100644 --- a/rse/plugins/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.terminals.ui;singleton:=true -Bundle-Version: 0.1.100.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.rse.internal.terminals.ui.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.expressions, org.eclipse.ui, org.eclipse.ui.views, - org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)", + org.eclipse.rse.services;bundle-version="[3.1.0,4.0.0)", org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.rse.ui;bundle-version="[3.1.0,4.0.0)", - org.eclipse.rse.subsystems.terminals.core;bundle-version="[0.1.0,0.2.0)", + org.eclipse.rse.subsystems.terminals.core;bundle-version="[1.0.0,2.0.0)", org.eclipse.tm.terminal;bundle-version="[2.0.0,2.1.0)" Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/about.properties b/rse/plugins/org.eclipse.rse.terminals.ui/about.properties index 11c785f3fc7..c7c385a9475 100644 --- a/rse/plugins/org.eclipse.rse.terminals.ui/about.properties +++ b/rse/plugins/org.eclipse.rse.terminals.ui/about.properties @@ -20,7 +20,7 @@ # # Do not translate any values surrounded by {} -blurb=RSE Terminals UI (Incubation)\n\ +blurb=RSE Terminals UI\n\ \n\ Version: {featureVersion}\n\ Build id: {0}\n\ diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/plugin.properties b/rse/plugins/org.eclipse.rse.terminals.ui/plugin.properties index 5690ba53642..54671cda47d 100644 --- a/rse/plugins/org.eclipse.rse.terminals.ui/plugin.properties +++ b/rse/plugins/org.eclipse.rse.terminals.ui/plugin.properties @@ -14,7 +14,7 @@ # NLS_MESSAGEFORMAT_NONE # NLS_ENCODING=UTF-8 -pluginName = RSE Terminals UI (Incubation) +pluginName = RSE Terminals UI providerName = Eclipse.org terminalsView.name = Terminals diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.xml b/rse/tests/org.eclipse.rse.tests-feature/feature.xml index f7f59021eb6..6dcfb5c3aaa 100644 --- a/rse/tests/org.eclipse.rse.tests-feature/feature.xml +++ b/rse/tests/org.eclipse.rse.tests-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/rse/tests/org.eclipse.rse.tests.framework/.project b/rse/tests/org.eclipse.rse.tests.framework/.project index 12cad5589da..686cb5dca5d 100644 --- a/rse/tests/org.eclipse.rse.tests.framework/.project +++ b/rse/tests/org.eclipse.rse.tests.framework/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF index af2532f56f3..67d4df4cd2d 100644 --- a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF +++ b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.tests;singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Activator: org.eclipse.rse.tests.RSETestsPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -18,7 +18,7 @@ Require-Bundle: org.junit, org.eclipse.rse.subsystems.files.local;bundle-version="[2.1.0,3.0.0)", org.eclipse.rse.subsystems.processes.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)", - org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)", + org.eclipse.rse.services;bundle-version="[3.1.0,4.0.0)", org.eclipse.rse.services.files.ftp;bundle-version="[3.0.0,4.0.0)", org.eclipse.rse.services.ssh;bundle-version="[2.1.0,3.0.0)", org.eclipse.rse.subsystems.files.ftp;bundle-version="[2.1.0,3.0.0)", @@ -26,7 +26,7 @@ Require-Bundle: org.junit, org.eclipse.rse.efs, org.eclipse.rse.tests.framework;bundle-version="[2.0.0,3.0.0)", org.apache.commons.net;bundle-version="[1.4.1,2.0.0)", - org.eclipse.rse.subsystems.terminals.core;bundle-version="0.1.1" + org.eclipse.rse.subsystems.terminals.core;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4