From 59468c61baff026ee89097496b1cdbc0c8e02aeb Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 2 Aug 2006 14:34:36 +0000 Subject: [PATCH] Bug 142968 - more IBM strings to change --- .../rseSamplesMessages.xml | 2 +- .../dstore/DStoreConnectorService.java | 4 +- .../org.eclipse.rse.files.ui/plugin.xml | 2 +- .../org.eclipse.rse.processes.ui/plugin.xml | 2 +- .../serverruntime/data/patterns.dat | 4 +- .../serverruntime/scripts/aix/server.sh | 2 +- .../patterns.dat | 4 +- .../shells/subsystems/RemoteCmdSubSystem.java | 10 +- rse/plugins/org.eclipse.rse.ui/plugin.xml | 47 +--- .../org.eclipse.rse.ui/schema/compile.exsd | 245 ------------------ .../org.eclipse.rse.ui/schema/popupMenus.exsd | 27 +- .../schema/propertyPages.exsd | 24 +- .../schema/subsystemConfiguration.exsd | 10 +- .../core/subsystems/RemoteServerLauncher.java | 24 +- .../rse/core/subsystems/SubSystem.java | 10 +- 15 files changed, 46 insertions(+), 371 deletions(-) delete mode 100644 rse/plugins/org.eclipse.rse.ui/schema/compile.exsd diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/rseSamplesMessages.xml b/rse/examples/org.eclipse.rse.examples.tutorial/rseSamplesMessages.xml index d498ef3b665..a5e6ff074d8 100644 --- a/rse/examples/org.eclipse.rse.examples.tutorial/rseSamplesMessages.xml +++ b/rse/examples/org.eclipse.rse.examples.tutorial/rseSamplesMessages.xml @@ -1,5 +1,5 @@ - + diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java index d19a67165c4..742da96e316 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java @@ -338,7 +338,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements } } - private IRemoteServerLauncher getIBMServerLauncher() + private IRemoteServerLauncher getDStoreServerLauncher() { IServerLauncherProperties sl = getRemoteServerLauncherProperties(); //System.out.println("in UniversalSystem#getServerLauncher: sl = "+sl); @@ -479,7 +479,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements // ISubSystem ss = getPrimarySubSystem(); getPrimarySubSystem(); - IRemoteServerLauncher serverLauncher = getIBMServerLauncher(); + IRemoteServerLauncher serverLauncher = getDStoreServerLauncher(); ServerLaunchType serverLauncherType = null; boolean autoDetectSSL = true; diff --git a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml index f59dc5cee8e..2fdeda9c1ba 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml +++ b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml @@ -69,7 +69,7 @@ Contributors: objectClass="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem" name="%PropertyPage.ServerLauncherSettings" class="org.eclipse.rse.ui.propertypages.ServerLauncherPropertyPage" - id="com.ibm.etools.universal.core.serverlauncher.PropertyPage"> + id="org.eclipse.rse.ui.propertypages.ServerLauncherPropertyPage"> diff --git a/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml b/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml index c9fd69b905d..172aade88da 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml +++ b/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml @@ -31,7 +31,7 @@ Contributors: category="processes" class="org.eclipse.rse.subsystems.processes.local.LocalProcessSubSystemConfiguration" vendor="IBM Corporation" - id="ibm.localprocesses"> + id="local.processes"> --> diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/patterns.dat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/patterns.dat index 0da3a742a44..f3c1963ebec 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/patterns.dat +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/patterns.dat @@ -201,9 +201,7 @@ command: ./configure.* # # where: # : The type of object that will be created in the Output View if -# a line of output matches this pattern. If you have put an -# icon called ".gif" in the com.ibm.etools.systems.dstore.core/icons -# directory, then the icon will be displayed in the view. +# a line of output matches this pattern. # # : This is some combination of the words "file" and "line" or nothing # at all. This is used to define how the backreferences in the diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh index 80fa0e7e692..f214b5af350 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh @@ -6,4 +6,4 @@ export serverpath=.; export PATH=/usr/java131/jre/bin:$PATH export CLASSPATH=/usr/java131/jre/lib/rt.jar:/usr/jdk_base/lib/classes.zip:$CLASSPATH export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH; -java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -DDSTORE_SPIRIT_ON=true com.ibm.etools.systems.dstore.core.server.Server 0 60000 & +java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 & diff --git a/rse/plugins/org.eclipse.rse.services.local/patterns.dat b/rse/plugins/org.eclipse.rse.services.local/patterns.dat index 0da3a742a44..0a084ac1a3a 100644 --- a/rse/plugins/org.eclipse.rse.services.local/patterns.dat +++ b/rse/plugins/org.eclipse.rse.services.local/patterns.dat @@ -201,9 +201,7 @@ command: ./configure.* # # where: # : The type of object that will be created in the Output View if -# a line of output matches this pattern. If you have put an -# icon called ".gif" in the com.ibm.etools.systems.dstore.core/icons -# directory, then the icon will be displayed in the view. +# a line of output matches this pattern. # # : This is some combination of the words "file" and "line" or nothing # at all. This is used to define how the backreferences in the diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java index 760ec9bf7cc..2c7e8c271d8 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java @@ -87,7 +87,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd public String getShellEncoding() { - IPropertySet set = getPropertySet("IBM"); + IPropertySet set = getPropertySet("Remote"); if (set != null) { return set.getPropertyValue("shell.encoding"); @@ -97,10 +97,10 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd public void setShellEncoding(String encoding) { - IPropertySet set = getPropertySet("IBM"); + IPropertySet set = getPropertySet("Remote"); if (set == null) { - set = createPropertySet("IBM", getDescription()); + set = createPropertySet("Remote", getDescription()); } set.addProperty("shell.encoding", encoding); setDirty(true); @@ -609,7 +609,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd } } - setIBMAttribute(COMMAND_SHELLS_MEMENTO, shellBuffer.toString()); + setRemoteAttribute(COMMAND_SHELLS_MEMENTO, shellBuffer.toString()); } protected void internalRemoveShell(Object command) throws java.lang.reflect.InvocationTargetException, @@ -639,7 +639,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd { this.shell = shellWindow; IRemoteCommandShell[] results = null; - String shellStr = getIBMAttribute(COMMAND_SHELLS_MEMENTO); + String shellStr = getRemoteAttribute(COMMAND_SHELLS_MEMENTO); int numShells = 0; if (shellStr != null && shellStr.length() > 0) { diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml index 9e38ba1df23..1641538e3ea 100644 --- a/rse/plugins/org.eclipse.rse.ui/plugin.xml +++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml @@ -132,10 +132,7 @@ Contributors: - - - - + @@ -149,16 +146,9 @@ Contributors: - - - - - - - - - - + + + @@ -168,7 +158,7 @@ Contributors: - + @@ -221,31 +211,18 @@ Contributors: - - - - + - - + - - - - + - - - - - - - - + + @@ -411,9 +388,7 @@ Contributors: - - - + diff --git a/rse/plugins/org.eclipse.rse.ui/schema/compile.exsd b/rse/plugins/org.eclipse.rse.ui/schema/compile.exsd deleted file mode 100644 index d2ec8d801a2..00000000000 --- a/rse/plugins/org.eclipse.rse.ui/schema/compile.exsd +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - - - This extension point is for defining compile commands that will appear in the compile menus for remote sources in the Remote Systems view of the Remote System Explorer perspective, and in the Work With Compile Commands dialog. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The id for the compile command. Must be unique over all plug-ins. It is suggested that the user qualify this with the plug-in id. - - - - - - - The label for the compile command. This is what users will see in the compile menus. - - - - - - - The actual command string that is to be executed on the remote server. This can include substitution variables, which allow runtime substitutions depending on the selected resource. -<p> -The following substitution variables are defined for the subsystems: -<p> -<ul> -<li><h4>ibm.files400</h4> (only for WebSphere Development Studio Client) - <ul> - <li><i>&L</i>: name of the library to which the selected member belogs.</li> - <li><i>&F</i>: name of the file to which the selected member belongs.</li> - <li><i>&N</i>: name of the selected member.</li> - <li><i>&O</i>: name of object library.</li> - <li><i>&R</i>: Replace object when compiling.</li> - <li><i>&X</i>: member text, in single quotes.</li> - </ul> -</li> -<p> -<li><h4>ibm.filesXXX</h4> - <ul> - <li><i>{system_filesep}</i>: file separator. "\\" on Windows, "/" on Unix and Linux.</li> - <li><i>{system_homedir}</i>: home directory on the target system, for the user ID used for the connection.</li> - <li><i>{system_pathsep}</i>: path separator. ";" on Windows, ":" on Unix and Linux.</li> - <li><i>{system_tempdir}</i>: temporary directory on the target system.</li> - <li><i>{resource_name}</i>: unqualified name of selected resource.</li> - <li><i>{resource_name_root}</i>: name of selected resource without the extension</li> - <li><i>{resource_path}</i>: path of selected resource including name.</li> - <li><i>{resource_path_root}</i>: root of selected file's path. "c:\\" on Windows, or "/" on others.</li> - <li><i>{resource_path_drive}</i>: drive letter on Windows, empty string on others.</li> - <li><i>{container_name}</i>: unqualified name of folder containing selected resource.</li> - <li><i>{container_path}</i>: path of folder containing selected resource including name.</li> - </ul> -</li> -<p> -</ul> - - - - - - - One of the optional filters to scope the remote resources for which the compile commands are to appear. Specify as many of these filters as needed to explicitly scope all the compile commands. -<p> -This filter specifies a subsystem factory id, such that these compile commands will only appear for remote resources returned from subsystems of the given subsystem factory. Note that the subsystem factory must support compile commands. -This ID can be scalar, or it can be generic to match on multiple subsystem factory IDs. The IDs of the IBM-supplied subsystem factories that support compile commands in the Remote Systems view are: -</p> -<ul> -<li><b>ibm.filesLocal</b>. For local file system resources, under the "Files" subsystem.</li> -<li><b>ibm.filesWindows</b>. For remote Windows file system resources, under the "Files" subsystem.</li> -<li><b>ibm.files</b>. For remote Unix and Linux file system resources, under the "Files" subsystem.</li> -<li><b>ibm.filesIFS</b>. For remote iSeries unix file system resources, under the "IFS Files" subsystem.</li> -<li><b>ibm.files400</b>. For remote iSeries native QSYS file system resources, under the "iSeries Objects" subsystem. (only for WebSphere Development Studio Client)</li> -<p> - - - - - - - One of the optional filters to scope the remote resources for -which the compile commands are to appear. -Specify as many of these filters as needed to explicitly scope -all the compile commands. -<p> -This filter specifies a simple or generic resource name. -Only resources whose name matches this filter will show the actions -defined within this object contribution element. -<h4>NOTE: The current implementation only accepts generic resource name, and names such as <i>*.extension</i>, e.g. *.java. Also, this filter must not be specified if subsystem factory is <b>ibm.files400</b>. -</h4> -</p> - - - - - - - One of the optional filters to scope the remote resources for -which the compile commands are to appear. -Specify as many of these filters as needed to explicitly scope -all the compile commands. - -<p> -This filter specifies a resource type, either simple or generic. -The resource types depend on the subsystem. The types -for IBM-supplied subsystems which support them are: -</p> -<ul> -<li><b>filesXXX</b>. Only <i>file</i>.</li> -<li><b>files400</b>. Member type. For example, <i>RPGLE</i>. (only for WebSphere Development Studio Client)</li> -</ul> -<br> - - - - - - - Indicates whether the label is editable by users in the Work With Compile Commands dialog. By default, it is <i>true</i>. -<p> - - - - - - - - - - - - 5.1.0 - - - - - - - - - <h3>Example One</h3> -The following is an example of adding a compile command for java files on remote Unix/Linux systems. -<p> -<pre> -<extension point="org.eclipse.rse.ui.compile"> - <compilecommand - id="com.mycomp.compileCommand1" - label="My Label 1" - commandstring="mycommand ${resource_name}" - subsystemfactoryid="ibm.files" - namefilter="*.java"> - </compilecommand> -</extension> -</pre> -</p> -<p> -<h3>Example Two</h3> -The following is an example of adding a compile command for RPGLE member types on iSeries servers. -<p> -<pre> -<extension point="org.eclipse.rse.ui.compile"> - <compilecommand - id="com.mycomp.compileCommand2" - label="My Label 2" - commandstring="CRTRPGMOD MODULE(&O/&N) SRCFILE(&L/&F) SRCMBR(&N) REPLACE(&R) OPTION(*EVENTF) DBGVIEW(*SOURCE) REPLACE(&R)" - subsystemfactoryid="ibm.files400" - typefilter="RPGLE"> - </compilecommand> -</extension> -</pre> -</p> - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) 2002, 2006 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 - -Contributors: -IBM Corporation - initial API and implementation - - - - diff --git a/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd b/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd index 75d99d2df9d..f8ef4cdbd53 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd @@ -167,24 +167,7 @@ all the actions defined in this objectContribution element. <p> This filter specifies a subsystem configuration id, such that these actions will only appear for remote resources returned from subsystems of the given subsystem configuration. -This ID can be scalar, or it can be generic to match on multiple subsystem configuration IDs. The -IDs of the IBM-supplied subsystem factories that display remote resources in the Remote -Systems view are: -</p> -<ul> -<li><b>ibm.filesLocal</b>. For local file system resources, under -the "Files" subsystem. -<li><b>ibm.filesWindows</b>. For remote Windows file system resources, -under the "Files" subsystem. -<li><b>ibm.files</b>. For remote Unix and Linux file system resources, -under the "Files" subsystem. -<li><b>ibm.filesIFS</b>. For remote iSeries unix file system resources, -under the "IFS Files" subsystem. -<li><b>ibm.files400</b>. For remote iSeries native QSYS file system -resources, under the "iSeries Objects" subsystem. -<li><b>ibm.cmds400</b>. For remote iSeries commands, under the "iSeries Commands" subsystem -<li><b>ibm.jobs400</b>. For remote iSeries jobs, under the "iSeries Jobs" subsystem.</ul> -<br> +This ID can be scalar, or it can be generic to match on multiple subsystem configuration IDs. @@ -634,7 +617,7 @@ Further, we show how to define multiple actions within one objectContribution: typecategoryfilter="files" typefilter="file" namefilter="*.java" - subsystemconfigurationid="ibm.filesLocal"> + subsystemconfigurationid="local.files"> <action id="com.acme.action2a" label="Test Action One for Local Java Files" class="com.acme.actions.Action2a" @@ -661,7 +644,7 @@ actions to our own single-cascading menu: typecategoryfilter="files" typefilter="file" namefilter="*.java" - subsystemconfigurationid="ibm.filesLocal"> + subsystemconfigurationid="local.files"> <menu id="com.acme.menu" label="Test Actions"> <separator name="taGroup"/> @@ -698,7 +681,7 @@ are unrelated to each other: typecategoryfilter="files" typefilter="file" namefilter="*.java" - subsystemconfigurationid="ibm.filesLocal"> + subsystemconfigurationid="local.files"> <menu id="com.acme.menu" label="Test Actions"> <separator name="taGroup"/> @@ -737,7 +720,7 @@ IBM-supplied cascading menu: typecategoryfilter="files" typefilter="file" namefilter="*.java" - subsystemconfigurationid="ibm.filesLocal"> + subsystemconfigurationid="local.files"> <action id="com.acme.action5a" label="Test Action One for Local Java Files" class="com.acme.actions.Action5a" diff --git a/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd b/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd index ffd7258aff7..7cb02824e26 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd @@ -154,25 +154,7 @@ Specify as many of these optional filters like this as needed to explicitly scop <p> This filter specifies a subsystem factory id, such that this property page will only appear for remote resources returned from subsystems of the given subsystem factory. -This ID can be scalar, or it can be generic to match on multiple subsystem factory IDs. The -IDs of the IBM-supplied subsystem factories that display remote resources in the Remote -Systems view are: -</p> -<ul> -<li><b>ibm.filesLocal</b>. For local file system resources, under -the "Files" subsystem. -<li><b>ibm.filesWindows</b>. For remote Windows file system resources, -under the "Files" subsystem. -<li><b>ibm.files</b>. For remote Unix and Linux file system resources, -under the "Files" subsystem. -<li><b>ibm.filesIFS</b>. For remote iSeries unix file system resources, -under the "IFS Files" subsystem. -<li><b>ibm.files400</b>. For remote iSeries native QSYS file system -resources, under the "iSeries Objects" subsystem. -<li><b>ibm.jobs400</b>. For remote iSeries jobs, under the "iSeries Jobs" subsystem. -<li><b>ibm.cmds400</b>. For remote iSeries jobs, under the "iSeries Jobs" subsystem. -</ul> -<br> +This ID can be scalar, or it can be generic to match on multiple subsystem factory IDs. @@ -378,7 +360,7 @@ to files, versus folders, and only for local files: name="Remote File Info" typecategoryfilter="files" typefilter="file" - subsystemfactoryid="ibm.filesLocal"> + subsystemfactoryid="local.files"> </page> </extension> </pre> @@ -396,7 +378,7 @@ to local Java files: name="Remote Java File Info" typecategoryfilter="files" typefilter="file" - subsystemfactoryid="ibm.filesLocal" + subsystemfactoryid="local.files" namefilter="*.java"> </page> </extension> diff --git a/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfiguration.exsd b/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfiguration.exsd index 528e735fd61..26a55d0fc19 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfiguration.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfiguration.exsd @@ -107,12 +107,8 @@ a path to the icon's .gif file, relative to your plugin directory. - A class that implements <samp>com.ibm.etools.systems.subsystems.SubSystemFactory</samp>, -or better yet extends <samp>com.ibm.etools.systems.dftsubsystem.impl.DefaultSubSystemFactoryImpl</samp>. + A class that implements <samp>org.eclipse.rse.core.subsystems.SubSystemConfiguration</samp> - - - @@ -162,11 +158,11 @@ IBM-supplied categories include "files", "cmds" and "jo - Optional. Only used when naming an IBM-supplied subsystem configuration in the <samp>class</samp> attribute, when you want to subclass or replace the IBM-supplied ISystem object used to manage the live connection with the remote system. Name a class that implements <samp>com.ibm.etools.systems.subsystems.ISystem</samp>, + Optional. Only used when naming an IBM-supplied subsystem configuration in the <samp>class</samp> attribute, when you want to subclass or replace the IBM-supplied ISystem object used to manage the live connection with the remote system. Name a class that implements <samp>org.eclipse.rse.core.subsystems.IConnectorService</samp>, or extends the appropriate IBM-supplied class such as <samp>com.ibm.etools.systems.universal.UniversalSystem</samp> for unix, windows and system types. - + diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java index e8d41e3729d..0a7c4e98242 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java @@ -29,14 +29,14 @@ import org.eclipse.rse.ui.SystemResources; /** * - * This subclass of {@link IServerLauncherProperties} is for use by IBM-supplied subsystems, although - * is possibly of value to vendors as well. The IBM-supplied subsystems use server code + * This subclass of {@link IServerLauncherProperties} is for use by some dstore-based subsystems, although + * is possibly of value to vendors as well. The dstore-based subsystems use server code * written in Java, on top of the datastore technology. You can read about this in the * developer guide for Remote System Explorer. The bottom line, however, is we offer the * user a number of ways to start that remote server from the client, as well to connect * to it if it is already running. This class encapsulates the properties to support that. *

- * Create instances via {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#createIBMServerLauncher(ISubSystem)} + * Create instances via {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#createRemoteServerLauncher(ISubSystem)} * *

* The following features are implemented: @@ -47,7 +47,7 @@ import org.eclipse.rse.ui.SystemResources; *

  • {@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getDaemonPort Daemon Port}
    • *
  • {@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getServerPath Server Path}
    • *
  • {@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getServerScript Server Script}
    • - *
  • {@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getIbmAttributes Ibm Attributes}
    • + *
  • {@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getRemoteAttributes Remote Attributes}
    • *
  • {@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getRestrictedTypes Restricted Types}
    • * *

    @@ -90,7 +90,7 @@ public class RemoteServerLauncher extends ServerLauncher implements IRemoteServe protected String _serverScript = SERVER_SCRIPT_EDEFAULT; - protected static final String IBM_ATTRIBUTES_EDEFAULT = null; + protected static final String REMOTE_ATTRIBUTES_EDEFAULT = null; protected static final String RESTRICTED_TYPES_EDEFAULT = null; @@ -447,18 +447,6 @@ public class RemoteServerLauncher extends ServerLauncher implements IRemoteServe } - /** - * @deprecated - */ - public void setIBMAttribute(String attributeName, String attributeValue) - { - IPropertySet set = getPropertySet("IBM"); - if (set == null) - { - set = createPropertySet("IBM", getDescription()); - } - set.addProperty(attributeName, attributeValue); - } /** @@ -479,4 +467,4 @@ public class RemoteServerLauncher extends ServerLauncher implements IRemoteServe } -} //IBMServerLauncherImpl \ No newline at end of file +} //RemoteServerLauncherImpl \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index a8dc67a4ac5..c1365244fde 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -912,21 +912,21 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS /** * @deprecated */ - public void setIBMAttribute(String attributeName, String attributeValue) + public void setRemoteAttribute(String attributeName, String attributeValue) { - IPropertySet set = getPropertySet("IBM"); + IPropertySet set = getPropertySet("Remote"); if (set == null) { - set = createPropertySet("IBM", getDescription()); + set = createPropertySet("Remote", getDescription()); } set.addProperty(attributeName, attributeValue); } /** * @deprecated */ - public String getIBMAttribute(String attributeName) + public String getRemoteAttribute(String attributeName) { - IPropertySet set = getPropertySet("IBM"); + IPropertySet set = getPropertySet("Remote"); if (set != null) { return set.getPropertyValue(attributeName);