From a9f122b7ad5a72a6ff02649e6cbeb1c4b27f1a78 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 22 Mar 2007 10:49:56 +0000
Subject: [PATCH] [cleanup] organize Manifests: remove obsolete property keys

---
 .../plugin.properties                         |  5 +----
 .../plugin.properties                         |  4 +---
 .../org.eclipse.rse.shells.ui/plugin.xml      | 11 ++++++++++-
 .../org.eclipse.rse.ui/plugin.properties      | 19 ++-----------------
 4 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties b/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties
index 4161adb2164..fcc7918bb93 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties
+++ b/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties
@@ -15,8 +15,5 @@ providerName = Eclipse.org
 DaytimeSystemLabel=Daytime
 DaytimeSystemDescription=Daytime System Type
 
-Files=Files
-FilesDescription=Files via FTP
-
 DaytimeSubsystemName=Daytime
-DaytimeDescription=This configuration allows you get the current time at a remote system via TCP port 13.
\ No newline at end of file
+DaytimeDescription=This configuration allows you get the current time at a remote system via TCP port 13.
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/plugin.properties b/rse/plugins/org.eclipse.rse.shells.ui/plugin.properties
index 6155e545670..0478c6f9aeb 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.shells.ui/plugin.properties
@@ -20,15 +20,13 @@
 pluginName = RSE Shells UI
 providerName = Eclipse.org
 
-View.Commands = Commands
 View.RemoteCommands = Remote Shell
 
 PropertyPage.ShellSettings = Shell Settings
 
 PropertyPage.ServerLauncherSettings = Server Launcher Settings
-PropertyPage.ServerConnectionSecurity = Server Connection Security
 PropertyPage.Service = Service
 PropertyPage.EnvVariables = Environment Variables
 
 Launch_Shell=Launch Shell
-Launch_Shell_Tooltip=Launch a command shell from the selected directory
\ No newline at end of file
+Launch_Shell_Tooltip=Launch a command shell from the selected directory
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml b/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
index c3e05792af7..2574a3e266a 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
@@ -56,7 +56,16 @@ Contributors:
          </enabledWhen>
       </page>
 
-        <page
+      <page
+            name="%PropertyPage.ServerLauncherSettings" 
+            class="org.eclipse.rse.ui.propertypages.ServerLauncherPropertyPage"
+            id="org.eclipse.rse.ui.propertypages.serverLauncherPropertyPage">
+            <filter name="serverLaunchPP" value="true"/>
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem"/>
+         </enabledWhen>
+      </page>
+      <page
             name="%PropertyPage.Service"
             class="org.eclipse.rse.shells.ui.propertypages.ShellServicesPropertyPage"
             id="org.eclipse.rse.shells.ui.propertypages.ShellServicesPropertyPage">
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.properties b/rse/plugins/org.eclipse.rse.ui/plugin.properties
index 6612afff92a..be8ba8e2bc3 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.properties
@@ -23,10 +23,8 @@ providerName = Eclipse.org
 
 extPoint.newConnectionWizard = New Connection Wizard
 extPoint.subsystemConfigurations = Remote Subsystem Configurations
-extPoint.popupMenus = Remote Object Popup Menu Actions
-extPoint.propertyPages = Remote Object Property Pages
 extPoint.remoteSystemsViewPreferencesActions = Remote Systems View Preferences Actions
-extPoint.compile = Remote Compile Commands
+#extPoint.compile = Remote Compile Commands
 extPoint.mountPathMappers = Mount Path Mappers
 
 systemType.windows.label=Windows
@@ -48,7 +46,7 @@ systemType.local.description = Local file system on this computer
 #PropertyPage.Info = Info
 #PropertyPage.Team = Team
 PropertyPage.Connection = Host
-PropertyPage.Connection.SubSystems = Subsystems
+#PropertyPage.Connection.SubSystems = Subsystems
 PropertyPage.Connection.ConnectorServices = Connector Services
 PropertyPage.SubSystem = Subsystem
 PropertyPage.ReferencedFilterPool = Referenced Filter Pool
@@ -64,23 +62,14 @@ PropertyPage.TeamViewUserActionNode = User Action Information
 PropertyPage.TeamViewCompileTypeNode = Compile Type Information
 PropertyPage.TeamViewCompileCommandNode = Compile Command Information
 
-PropertyPage.ServerLauncherSettings = Server Launcher Settings
-PropertyPage.ServerConnectionSecurity = Server Connection Security
-PropertyPage.Service = Service
-
-
 View.Category.RemoteSystems = Remote Systems
 View.RemoteSystems = Remote Systems
 View.RemoteSystemsDetails = Remote System Details
 
 View.Team = Team
-View.RemoteErrorList = Remote Error List
 
 Perspective.Explorer = Remote System Explorer
 
-Factory.LocalFiles = Local Files
-Factory.LocalCmds = Local Shells
-
 PreferencePage.Logging = Logging
 PreferencePage.RemoteSystems = Remote Systems
 PreferencePage.Signon = Passwords
@@ -89,10 +78,6 @@ PreferencePage.Communications = Communications
 Nature.RemoteSystemsNature = Remote System Nature
 Nature.RemoteSystemsTempNature = Remote System Temp Nature
 
-Editor.Editor = LPEX Editor
-Editor.RSEEditor = Remote Systems LPEX Editor
-Editor.RSEBrowser = Remote Systems LPEX Browser
-
 View.Search = Remote Search
 
 View.Scratchpad = Remote Scratchpad