Attachment #120944 for bug #259363

Lines 20-28 Link Here

(-).project (+6 lines)
20	<arguments>	20	<arguments>
21	</arguments>	21	</arguments>
22	</buildCommand>	22	</buildCommand>
		23	<buildCommand>
		24	<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
		25	<arguments>
		26	</arguments>
		27	</buildCommand>
23	</buildSpec>	28	</buildSpec>
24	<natures>	29	<natures>
25	<nature>org.eclipse.pde.PluginNature</nature>	30	<nature>org.eclipse.pde.PluginNature</nature>
26	<nature>org.eclipse.jdt.core.javanature</nature>	31	<nature>org.eclipse.jdt.core.javanature</nature>
		32	<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
27	</natures>	33	</natures>
28	</projectDescription>	34	</projectDescription>

Lines 2-8 Link Here

(-)feature.xml (-1 / +1 lines)
2	<feature	2	<feature
3	id="org.eclipse.rse.tests"	3	id="org.eclipse.rse.tests"
4	label="%featureName"	4	label="%featureName"
5	version="3.0.100.qualifier"	5	version="3.1.0.qualifier"
6	provider-name="%providerName">	6	provider-name="%providerName">
7		7
8	<description>	8	<description>

Lines 14-20 Link Here

(-)plugin.properties (-1 / +1 lines)
14	# NLS_MESSAGEFORMAT_NONE	14	# NLS_MESSAGEFORMAT_NONE
15	# NLS_ENCODING=UTF-8	15	# NLS_ENCODING=UTF-8
16		16
17	pluginName = RSE Terminals UI (Incubation)	17	pluginName = RSE Terminals UI
18	providerName = Eclipse.org	18	providerName = Eclipse.org
19		19
20	terminalsView.name = Terminals	20	terminalsView.name = Terminals

Lines 20-26 Link Here

(-)about.properties (-1 / +1 lines)
20	#	20	#
21	# Do not translate any values surrounded by {}	21	# Do not translate any values surrounded by {}
22		22
23	blurb=RSE Terminals UI (Incubation)\n\	23	blurb=RSE Terminals UI\n\
24	\n\	24	\n\
25	Version: {featureVersion}\n\	25	Version: {featureVersion}\n\
26	Build id: {0}\n\	26	Build id: {0}\n\

Lines 20-28 Link Here

(-).project (+6 lines)
20	<arguments>	20	<arguments>
21	</arguments>	21	</arguments>
22	</buildCommand>	22	</buildCommand>
		23	<buildCommand>
		24	<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
		25	<arguments>
		26	</arguments>
		27	</buildCommand>
23	</buildSpec>	28	</buildSpec>
24	<natures>	29	<natures>
25	<nature>org.eclipse.pde.PluginNature</nature>	30	<nature>org.eclipse.pde.PluginNature</nature>
26	<nature>org.eclipse.jdt.core.javanature</nature>	31	<nature>org.eclipse.jdt.core.javanature</nature>
		32	<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
27	</natures>	33	</natures>
28	</projectDescription>	34	</projectDescription>




Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.terminals.ui;singleton:=true
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.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="[1.0.0,2.0.0)",
 org.eclipse.tm.terminal;bundle-version="[2.0.0,2.1.0)"
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true

Lines 2-12 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.rse.subsystems.terminals.core;singleton:=true	4	Bundle-SymbolicName: org.eclipse.rse.subsystems.terminals.core;singleton:=true
5	Bundle-Version: 0.1.1.qualifier	5	Bundle-Version: 1.0.0.qualifier
6	Bundle-Localization: plugin	6	Bundle-Localization: plugin
7	Require-Bundle: org.eclipse.ui,	7	Require-Bundle: org.eclipse.ui,
8	org.eclipse.core.runtime,	8	org.eclipse.core.runtime,
9	org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)",	9	org.eclipse.rse.services;bundle-version="[3.1.0,4.0.0)",
10	org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",	10	org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
11	org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"	11	org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"
12	Eclipse-LazyStart: true	12	Eclipse-LazyStart: true

Lines 19-24 Link Here

(-)src/org/eclipse/rse/subsystems/terminals/core/elements/TerminalElement.java (-2 / +13 lines)
19		19
20	/**	20	/**
21	* An element in the RSE Tree that resembles a Terminal connection.	21	* An element in the RSE Tree that resembles a Terminal connection.
		22	*
		23	* <p>
		24	* <strong>EXPERIMENTAL</strong>. This class or interface has been added as part
		25	* of a work in progress. There is no guarantee that this API will work or that
		26	* it will remain the same. Please do not use this API without consulting with
		27	* the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
		28	* </p>
22	*/	29	*/
23	public class TerminalElement extends AbstractResource {	30	public class TerminalElement extends AbstractResource {
24	private String name;	31	private String name;
Lines 63-77 Link Here
63	return name.hashCode() ;	70	return name.hashCode() ;
64	}	71	}
65		72
66	/**	73	/**
67	* Return the back-end connection of this terminal instance.	74	* Return the back-end connection of this terminal instance.
		75	*
		76	* @since 1.0
68	*/	77	*/
69	public ITerminalShell getTerminalShell() {	78	public ITerminalShell getTerminalShell() {
70	return terminalShell;	79	return terminalShell;
71	}	80	}
72		81
73	/**	82	/**
74	* Set the back-end connection of this terminal instance.	83	* Set the back-end connection of this terminal instance.
		84	*
		85	* @since 1.0
75	*/	86	*/
76	public void setTerminalShell(ITerminalShell terminalShell) {	87	public void setTerminalShell(ITerminalShell terminalShell) {
77	this.terminalShell = terminalShell;	88	this.terminalShell = terminalShell;




import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.subsystems.terminals.core.elements.TerminalElement;

/**
 * Specialized interface for remote terminal subsystems.
 *
 * <p>
 * <strong>EXPERIMENTAL</strong>. 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 <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
 * </p>
 */
public interface ITerminalServiceSubSystem extends ISubSystem {
	public void addChild(TerminalElement element);


	/**
	 * @return parent subsystem factory, cast to a
	 *         ITerminalServiceSubSystemConfiguration
	 * @since 1.0
	 */
	public ITerminalServiceSubSystemConfiguration getParentRemoteTerminalSubSystemConfiguration();


Lines 19-24 Link Here

(-)src/org/eclipse/rse/subsystems/terminals/core/TerminalServiceSubSystemConfiguration.java (+16 lines)
19	import org.eclipse.rse.services.IService;	19	import org.eclipse.rse.services.IService;
20	import org.eclipse.rse.services.terminals.ITerminalService;	20	import org.eclipse.rse.services.terminals.ITerminalService;
21		21
		22	/**
		23	* The implementation of the ITerminalServiceSubSystemConfiguration interface
		24	* contains information about what features the subsystem supports, and creates
		25	* TerminalServiceSubSystem instances.
		26	*
		27	* <p>
		28	* <strong>EXPERIMENTAL</strong>. This class or interface has been added as part
		29	* of a work in progress. There is no guarantee that this API will work or that
		30	* it will remain the same. Please do not use this API without consulting with
		31	* the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
		32	* </p>
		33	*/
22	public abstract class TerminalServiceSubSystemConfiguration extends	34	public abstract class TerminalServiceSubSystemConfiguration extends
23	SubSystemConfiguration implements	35	SubSystemConfiguration implements
24	ITerminalServiceSubSystemConfiguration {	36	ITerminalServiceSubSystemConfiguration {
Lines 34-39 Link Here
34	return false;	46	return false;
35	}	47	}
36		48
		49	/**
		50	* @inheritDoc
		51	* @since 1.0
		52	*/
37	public final ITerminalService getTerminalService(IHost host) {	53	public final ITerminalService getTerminalService(IHost host) {
38	ITerminalService service = (ITerminalService) _services.get(host);	54	ITerminalService service = (ITerminalService) _services.get(host);
39	if (service == null) {	55	if (service == null) {

Lines 36-41 Link Here

(-)src/org/eclipse/rse/subsystems/terminals/core/TerminalServiceSubSystem.java (+17 lines)
36		36
37	/**	37	/**
38	* A Subsystem that has terminal instances as children.	38	* A Subsystem that has terminal instances as children.
		39	*
		40	* <p>
		41	* <strong>EXPERIMENTAL</strong>. This class or interface has been added as part
		42	* of a work in progress. There is no guarantee that this API will work or that
		43	* it will remain the same. Please do not use this API without consulting with
		44	* the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
		45	* </p>
39	*/	46	*/
40	public class TerminalServiceSubSystem extends SubSystem implements	47	public class TerminalServiceSubSystem extends SubSystem implements
41	ITerminalServiceSubSystem, ICommunicationsListener {	48	ITerminalServiceSubSystem, ICommunicationsListener {
Lines 46-51 Link Here
46		53
47	/**	54	/**
48	* Constructor.	55	* Constructor.
		56	*
		57	* @since 1.0
49	*/	58	*/
50	public TerminalServiceSubSystem(IHost host,	59	public TerminalServiceSubSystem(IHost host,
51	IConnectorService connectorService, ITerminalService hostService) {	60	IConnectorService connectorService, ITerminalService hostService) {
Lines 66-71 Link Here
66		75
67	/**	76	/**
68	* Return the Terminal Service associated with this subsystem.	77	* Return the Terminal Service associated with this subsystem.
		78	*
		79	* @since 1.0
69	*/	80	*/
70	public ITerminalService getTerminalService() {	81	public ITerminalService getTerminalService() {
71	return _hostService;	82	return _hostService;
Lines 122-127 Link Here
122		133
123	/**	134	/**
124	* Set the terminal service associated with this subsystem.	135	* Set the terminal service associated with this subsystem.
		136	*
		137	* @since 1.0
125	*/	138	*/
126	public void setTerminalService(ITerminalService service) {	139	public void setTerminalService(ITerminalService service) {
127	_hostService = service;	140	_hostService = service;
Lines 196-201 Link Here
196	return (configuration instanceof ITerminalServiceSubSystemConfiguration);	209	return (configuration instanceof ITerminalServiceSubSystemConfiguration);
197	}	210	}
198		211
		212	/**
		213	* @inheritDoc
		214	* @since 1.0
		215	*/
199	public ITerminalServiceSubSystemConfiguration getParentRemoteTerminalSubSystemConfiguration() {	216	public ITerminalServiceSubSystemConfiguration getParentRemoteTerminalSubSystemConfiguration() {
200	return (ITerminalServiceSubSystemConfiguration) super	217	return (ITerminalServiceSubSystemConfiguration) super
201	.getSubSystemConfiguration();	218	.getSubSystemConfiguration();

Lines 14-23 Link Here

(-)src/org/eclipse/rse/subsystems/terminals/core/ITerminalServiceSubSystemConfiguration.java (+25 lines)
14	import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;	14	import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
15	import org.eclipse.rse.services.terminals.ITerminalService;	15	import org.eclipse.rse.services.terminals.ITerminalService;
16		16
		17	/**
		18	* An interface representing factories for creating TerminalServiceSubSystem
		19	* objects.
		20	*
		21	* <p>
		22	* <strong>EXPERIMENTAL</strong>. This class or interface has been added as part
		23	* of a work in progress. There is no guarantee that this API will work or that
		24	* it will remain the same. Please do not use this API without consulting with
		25	* the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
		26	* </p>
		27	*/
17	public interface ITerminalServiceSubSystemConfiguration extends	28	public interface ITerminalServiceSubSystemConfiguration extends
18	ISubSystemConfiguration {	29	ISubSystemConfiguration {
		30	/**
		31	* Return the terminal service.
		32	*
		33	* @param host connection
		34	* @return the internal terminal service interface.
		35	* @since 1.0
		36	*/
19	public ITerminalService getTerminalService(IHost host);	37	public ITerminalService getTerminalService(IHost host);
20		38
		39	/**
		40	* Create the terminal service.
		41	*
		42	* @param host connection
		43	* @return the new terminal service interface.
		44	* @since 1.0
		45	*/
21	public ITerminalService createTerminalService(IHost host);	46	public ITerminalService createTerminalService(IHost host);
22		47
23	}	48	}

Lines 12-18 Link Here

(-)plugin.properties (-1 / +1 lines)
12	# NLS_MESSAGEFORMAT_NONE	12	# NLS_MESSAGEFORMAT_NONE
13	# NLS_ENCODING=UTF-8	13	# NLS_ENCODING=UTF-8
14		14
15	pluginName = RSE Terminals Core (Incubation)	15	pluginName = RSE Terminals Core
16	providerName = Eclipse.org	16	providerName = Eclipse.org
17		17
18	TerminalSubsystemName = Terminals	18	TerminalSubsystemName = Terminals

Lines 20-28 Link Here

(-).project (+6 lines)
20	<arguments>	20	<arguments>
21	</arguments>	21	</arguments>
22	</buildCommand>	22	</buildCommand>
		23	<buildCommand>
		24	<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
		25	<arguments>
		26	</arguments>
		27	</buildCommand>
23	</buildSpec>	28	</buildSpec>
24	<natures>	29	<natures>
25	<nature>org.eclipse.pde.PluginNature</nature>	30	<nature>org.eclipse.pde.PluginNature</nature>
26	<nature>org.eclipse.jdt.core.javanature</nature>	31	<nature>org.eclipse.jdt.core.javanature</nature>
		32	<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
27	</natures>	33	</natures>
28	</projectDescription>	34	</projectDescription>




/********************************************************************************
 * 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
 * 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.
 ********************************************************************************/

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.
 *
 * <p>
 * <strong>EXPERIMENTAL</strong>. 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 <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
 * </p>
 *
 * @since org.eclipse.rse.subsystems.terminals.core 1.0
 */
public class DelegatingTerminalService implements ITerminalService {

	private IHost _host;

Lines 2-8 Link Here

(-)feature.xml (-1 / +1 lines)
2	<feature	2	<feature
3	id="org.eclipse.rse.terminals"	3	id="org.eclipse.rse.terminals"
4	label="%featureName"	4	label="%featureName"
5	version="0.1.100.qualifier"	5	version="1.0.0.qualifier"
6	provider-name="%providerName"	6	provider-name="%providerName"
7	plugin="org.eclipse.rse.terminals.ui"	7	plugin="org.eclipse.rse.terminals.ui"
8	image="eclipse_update_120.jpg">	8	image="eclipse_update_120.jpg">

Lines 13-19 Link Here

(-)feature.properties (-1 / +1 lines)
13	# NLS_ENCODING=UTF-8	13	# NLS_ENCODING=UTF-8
14		14
15	# "featureName" property - name of the feature	15	# "featureName" property - name of the feature
16	featureName=RSE Terminals UI (Incubation)	16	featureName=RSE Terminals UI
17		17
18	# "providerName" property - name of the company that provides the feature	18	# "providerName" property - name of the company that provides the feature
19	providerName=Eclipse.org	19	providerName=Eclipse.org

Lines 12-16 Link Here

(-)sourceTemplatePlugin/plugin.properties (-1 / +1 lines)
12	# NLS_MESSAGEFORMAT_NONE	12	# NLS_MESSAGEFORMAT_NONE
13	# NLS_ENCODING=UTF-8	13	# NLS_ENCODING=UTF-8
14		14
15	pluginName=RSE Terminals UI Source (Incubation)	15	pluginName=RSE Terminals UI Source
16	providerName=Eclipse.org	16	providerName=Eclipse.org

Lines 20-26 Link Here

(-)sourceTemplatePlugin/about.properties (-1 / +1 lines)
20	#	20	#
21	# Do not translate any values surrounded by {}	21	# Do not translate any values surrounded by {}
22		22
23	blurb=RSE Terminals UI Source (Incubation)\n\	23	blurb=RSE Terminals UI Source\n\
24	\n\	24	\n\
25	Version: {featureVersion}\n\	25	Version: {featureVersion}\n\
26	Build id: {0}\n\	26	Build id: {0}\n\

Lines 19-25 Link Here

(-)sourceTemplateFeature/feature.properties (-1 / +1 lines)
19	# This file should be translated.	19	# This file should be translated.
20		20
21	# "featureName" property - name of the feature	21	# "featureName" property - name of the feature
22	featureName=RSE Terminals UI Source (Incubation)	22	featureName=RSE Terminals UI Source
23		23
24	# "providerName" property - name of the company that provides the feature	24	# "providerName" property - name of the company that provides the feature
25	providerName=Eclipse.org	25	providerName=Eclipse.org

Lines 61-67 Link Here

(-)topics_Reference.xml (-1 / +6 lines)
61	<topic label="org.eclipse.rse.services.processes" href="reference/api/org/eclipse/rse/services/processes/package-summary.html"/>	61	<topic label="org.eclipse.rse.services.processes" href="reference/api/org/eclipse/rse/services/processes/package-summary.html"/>
62	<topic label="org.eclipse.rse.services.search" href="reference/api/org/eclipse/rse/services/search/package-summary.html"/>	62	<topic label="org.eclipse.rse.services.search" href="reference/api/org/eclipse/rse/services/search/package-summary.html"/>
63	<topic label="org.eclipse.rse.services.shells" href="reference/api/org/eclipse/rse/services/shells/package-summary.html"/>	63	<topic label="org.eclipse.rse.services.shells" href="reference/api/org/eclipse/rse/services/shells/package-summary.html"/>
64	<topic label="org.eclipse.rse.internal.services.terminals" href="reference/api/org/eclipse/rse/internal/services/terminals/package-summary.html"/>	64	<topic label="org.eclipse.rse.services.terminals" href="reference/api/org/eclipse/rse/services/terminals/package-summary.html"/>
65	</topic>	65	</topic>
66	<topic label="Services Implementations" href="provisional_api.html">	66	<topic label="Services Implementations" href="provisional_api.html">
67	<topic label="org.eclipse.rse.services.dstore" href="reference/api/org/eclipse/rse/services/dstore/package-summary.html"/>	67	<topic label="org.eclipse.rse.services.dstore" href="reference/api/org/eclipse/rse/services/dstore/package-summary.html"/>
Lines 103-108 Link Here
103	<topic label="org.eclipse.rse.subsystems.shells.ssh" href="reference/api/org/eclipse/rse/subsystems/shells/ssh/package-summary.html"/>	103	<topic label="org.eclipse.rse.subsystems.shells.ssh" href="reference/api/org/eclipse/rse/subsystems/shells/ssh/package-summary.html"/>
104	<topic label="org.eclipse.rse.subsystems.shells.telnet" href="reference/api/org/eclipse/rse/subsystems/shells/telnet/package-summary.html"/>	104	<topic label="org.eclipse.rse.subsystems.shells.telnet" href="reference/api/org/eclipse/rse/subsystems/shells/telnet/package-summary.html"/>
105	</topic>	105	</topic>
		106	<topic label="Terminal Subsystem" href="provisional_api.html">
		107	<topic label="org.eclipse.rse.subsystems.terminals.core" href="reference/api/org/eclipse/rse/subsystems/terminals/core/package-summary.html"/>
		108	<topic label="org.eclipse.rse.subsystems.terminals.core.elements" href="reference/api/org/eclipse/rse/subsystems/terminals/core/elements/package-summary.html"/>
		109	<topic label="org.eclipse.rse.subsystems.terminals.ssh" href="reference/api/org/eclipse/rse/subsystems/terminals/ssh/package-summary.html"/>
		110	</topic>
106	<topic label="User Interface" href="provisional_api.html">	111	<topic label="User Interface" href="provisional_api.html">
107	<topic label="org.eclipse.rse.ui" href="reference/api/org/eclipse/rse/ui/package-summary.html"/>	112	<topic label="org.eclipse.rse.ui" href="reference/api/org/eclipse/rse/ui/package-summary.html"/>
108	<topic label="org.eclipse.rse.ui.actions" href="reference/api/org/eclipse/rse/ui/actions/package-summary.html"/>	113	<topic label="org.eclipse.rse.ui.actions" href="reference/api/org/eclipse/rse/ui/actions/package-summary.html"/>

Lines 25-30 Link Here

(-)options.txt (-1 / +6 lines)
25	;../org.eclipse.rse.subsystems.shells.local/src	25	;../org.eclipse.rse.subsystems.shells.local/src
26	;../org.eclipse.rse.subsystems.shells.ssh/src	26	;../org.eclipse.rse.subsystems.shells.ssh/src
27	;../org.eclipse.rse.subsystems.shells.telnet/src	27	;../org.eclipse.rse.subsystems.shells.telnet/src
		28	;../org.eclipse.rse.subsystems.terminals.core/src
		29	;../org.eclipse.rse.subsystems.terminals.ssh/src
28	;../org.eclipse.rse.ui/model	30	;../org.eclipse.rse.ui/model
29	;../org.eclipse.rse.ui/UI	31	;../org.eclipse.rse.ui/UI
30	;../org.eclipse.rse.ui/subsystems"	32	;../org.eclipse.rse.ui/subsystems"
Lines 72-78 Link Here
72	org.eclipse.rse.files.ui.resources	74	org.eclipse.rse.files.ui.resources
73	org.eclipse.rse.files.ui.widgets	75	org.eclipse.rse.files.ui.widgets
74	org.eclipse.rse.filters	76	org.eclipse.rse.filters
75	org.eclipse.rse.internal.services.terminals
76	org.eclipse.rse.logging	77	org.eclipse.rse.logging
77	org.eclipse.rse.model	78	org.eclipse.rse.model
78	org.eclipse.rse.persistence	79	org.eclipse.rse.persistence
Lines 92-97 Link Here
92	org.eclipse.rse.services.processes	93	org.eclipse.rse.services.processes
93	org.eclipse.rse.services.search	94	org.eclipse.rse.services.search
94	org.eclipse.rse.services.shells	95	org.eclipse.rse.services.shells
		96	org.eclipse.rse.services.terminals
95	org.eclipse.rse.shells.ui	97	org.eclipse.rse.shells.ui
96	org.eclipse.rse.shells.ui.view	98	org.eclipse.rse.shells.ui.view
97	org.eclipse.rse.subsystems.files.core	99	org.eclipse.rse.subsystems.files.core
Lines 117-122 Link Here
117	org.eclipse.rse.subsystems.shells.local	119	org.eclipse.rse.subsystems.shells.local
118	org.eclipse.rse.subsystems.shells.ssh	120	org.eclipse.rse.subsystems.shells.ssh
119	org.eclipse.rse.subsystems.shells.telnet	121	org.eclipse.rse.subsystems.shells.telnet
		122	org.eclipse.rse.subsystems.terminals.core
		123	org.eclipse.rse.subsystems.terminals.core.elements
		124	org.eclipse.rse.subsystems.terminals.ssh
120	org.eclipse.rse.ui	125	org.eclipse.rse.ui
121	org.eclipse.rse.ui.actions	126	org.eclipse.rse.ui.actions
122	org.eclipse.rse.ui.dialogs	127	org.eclipse.rse.ui.dialogs

Lines 12-18 Link Here

(-)plugin.properties (-1 / +1 lines)
12	# NLS_MESSAGEFORMAT_NONE	12	# NLS_MESSAGEFORMAT_NONE
13	# NLS_ENCODING=UTF-8	13	# NLS_ENCODING=UTF-8
14		14
15	pluginName = RSE SSH Terminals (Incubation)	15	pluginName = RSE SSH Terminals
16	providerName = Eclipse.org	16	providerName = Eclipse.org
17		17
18	SshTerminalSubsystemName=Ssh Terminals	18	SshTerminalSubsystemName=Ssh Terminals

Lines 20-28 Link Here

(-).project (+6 lines)
20	<arguments>	20	<arguments>
21	</arguments>	21	</arguments>
22	</buildCommand>	22	</buildCommand>
		23	<buildCommand>
		24	<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
		25	<arguments>
		26	</arguments>
		27	</buildCommand>
23	</buildSpec>	28	</buildSpec>
24	<natures>	29	<natures>
25	<nature>org.eclipse.pde.PluginNature</nature>	30	<nature>org.eclipse.pde.PluginNature</nature>
26	<nature>org.eclipse.jdt.core.javanature</nature>	31	<nature>org.eclipse.jdt.core.javanature</nature>
		32	<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
27	</natures>	33	</natures>
28	</projectDescription>	34	</projectDescription>




Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.subsystems.terminals.ssh;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
 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="[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

Lines 22-27 Link Here

(-)src/org/eclipse/rse/subsystems/terminals/ssh/SshTerminalSubSystemConfiguration.java (+14 lines)
22	import org.eclipse.rse.subsystems.terminals.core.TerminalServiceSubSystem;	22	import org.eclipse.rse.subsystems.terminals.core.TerminalServiceSubSystem;
23	import org.eclipse.rse.subsystems.terminals.core.TerminalServiceSubSystemConfiguration;	23	import org.eclipse.rse.subsystems.terminals.core.TerminalServiceSubSystemConfiguration;
24		24
		25	/**
		26	* An SSH Terminal Subsystem Factory.
		27	*
		28	* <p>
		29	* <strong>EXPERIMENTAL</strong>. This class or interface has been added as part
		30	* of a work in progress. There is no guarantee that this API will work or that
		31	* it will remain the same. Please do not use this API without consulting with
		32	* the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
		33	* </p>
		34	*/
25	public class SshTerminalSubSystemConfiguration extends	35	public class SshTerminalSubSystemConfiguration extends
26	TerminalServiceSubSystemConfiguration {	36	TerminalServiceSubSystemConfiguration {
27		37
Lines 47-52 Link Here
47	return subsys;	57	return subsys;
48	}	58	}
49		59
		60	/**
		61	* @inheritDoc
		62	* @since 1.0
		63	*/
50	public ITerminalService createTerminalService(IHost host) {	64	public ITerminalService createTerminalService(IHost host) {
51	SshConnectorService cserv = (SshConnectorService) getConnectorService(host);	65	SshConnectorService cserv = (SshConnectorService) getConnectorService(host);
52	return new SshTerminalService(cserv);	66	return new SshTerminalService(cserv);




Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.tests;singleton:=true
Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.eclipse.rse.tests.RSETestsPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin

 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.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)",

 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="[1.0.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4

Lines 435-444 Link Here

(-)site.xml (-2 / +2 lines)
435	<feature url="features/org.eclipse.rse.remotecdt_2.1.100.qualifier.jar" id="org.eclipse.rse.remotecdt" version="2.1.100.qualifier">	435	<feature url="features/org.eclipse.rse.remotecdt_2.1.100.qualifier.jar" id="org.eclipse.rse.remotecdt" version="2.1.100.qualifier">
436	<category name="TM and RSE 3.1"/>	436	<category name="TM and RSE 3.1"/>
437	</feature>	437	</feature>
438	<feature url="features/org.eclipse.rse.terminals_0.1.100.qualifier.jar" id="org.eclipse.rse.terminals" version="0.1.100.qualifier">	438	<feature url="features/org.eclipse.rse.terminals_1.0.0.qualifier.jar" id="org.eclipse.rse.terminals" version="1.0.0.qualifier">
439	<category name="TM and RSE 3.1"/>	439	<category name="TM and RSE 3.1"/>
440	</feature>	440	</feature>
441	<feature url="features/org.eclipse.rse.tests_3.0.100.qualifier.jar" id="org.eclipse.rse.tests" version="3.0.100.qualifier">	441	<feature url="features/org.eclipse.rse.tests_3.1.0.qualifier.jar" id="org.eclipse.rse.tests" version="3.1.0.qualifier">
442	<category name="TM and RSE 3.1"/>	442	<category name="TM and RSE 3.1"/>
443	</feature>	443	</feature>
444	<feature url="features/org.eclipse.rse.useractions_1.1.100.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.100.qualifier">	444	<feature url="features/org.eclipse.rse.useractions_1.1.100.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.100.qualifier">

Return to bug 259363

Lines 2-17 Link Here

(-)META-INF/MANIFEST.MF (-3 / +3 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.rse.terminals.ui;singleton:=true	4	Bundle-SymbolicName: org.eclipse.rse.terminals.ui;singleton:=true
5	Bundle-Version: 0.1.100.qualifier	5	Bundle-Version: 1.0.0.qualifier
6	Bundle-Activator: org.eclipse.rse.internal.terminals.ui.Activator	6	Bundle-Activator: org.eclipse.rse.internal.terminals.ui.Activator
7	Require-Bundle: org.eclipse.core.runtime,	7	Require-Bundle: org.eclipse.core.runtime,
8	org.eclipse.core.expressions,	8	org.eclipse.core.expressions,
9	org.eclipse.ui,	9	org.eclipse.ui,
10	org.eclipse.ui.views,	10	org.eclipse.ui.views,
11	org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)",	11	org.eclipse.rse.services;bundle-version="[3.1.0,4.0.0)",
12	org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",	12	org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
13	org.eclipse.rse.ui;bundle-version="[3.1.0,4.0.0)",	13	org.eclipse.rse.ui;bundle-version="[3.1.0,4.0.0)",
14	org.eclipse.rse.subsystems.terminals.core;bundle-version="[0.1.0,0.2.0)",	14	org.eclipse.rse.subsystems.terminals.core;bundle-version="[1.0.0,2.0.0)",
15	org.eclipse.tm.terminal;bundle-version="[2.0.0,2.1.0)"	15	org.eclipse.tm.terminal;bundle-version="[2.0.0,2.1.0)"
16	Bundle-ActivationPolicy: lazy	16	Bundle-ActivationPolicy: lazy
17	Eclipse-LazyStart: true	17	Eclipse-LazyStart: true

Lines 1-13 Link Here

(-)src/org/eclipse/rse/internal/subsystems/terminals/core/DelegatingTerminalService.java (-3 / +17 lines)
1	/********************************************************************************	1	/********************************************************************************
2	* Copyright (c) 2008 IBM Corporation. All rights reserved.	2	* Copyright (c) 2008 IBM Corporation. All rights reserved.
3	* This program and the accompanying materials are made available under the terms	3	* This program and the accompanying materials are made available under the terms
4	* of the Eclipse Public License v1.0 which accompanies this distribution, and is	4	* of the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html	5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*	6	*
7	* Initial Contributors:	7	* Initial Contributors:
8	* The following IBM employees contributed to the Remote System Explorer	8	* The following IBM employees contributed to the Remote System Explorer
9	* component that contains this file: David McKnight.	9	* component that contains this file: David McKnight.
10	*	10	*
11	* Contributors:	11	* Contributors:
12	* {Name} (company) - description of contribution.	12	* {Name} (company) - description of contribution.
13	********************************************************************************/	13	********************************************************************************/
Lines 21-26 Link Here
21	import org.eclipse.rse.services.terminals.ITerminalService;	21	import org.eclipse.rse.services.terminals.ITerminalService;
22	import org.eclipse.rse.services.terminals.ITerminalShell;	22	import org.eclipse.rse.services.terminals.ITerminalShell;
23		23
		24	/**
		25	* Base class that can be used for decorating an existing terminal service with
		26	* additional functionality. By default, all method calls are passed through to
		27	* the original service.
		28	*
		29	* <p>
		30	* <strong>EXPERIMENTAL</strong>. This class or interface has been added as part
		31	* of a work in progress. There is no guarantee that this API will work or that
		32	* it will remain the same. Please do not use this API without consulting with
		33	* the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
		34	* </p>
		35	*
		36	* @since org.eclipse.rse.subsystems.terminals.core 1.0
		37	*/
24	public class DelegatingTerminalService implements ITerminalService {	38	public class DelegatingTerminalService implements ITerminalService {
25		39
26	private IHost _host;	40	private IHost _host;