[234274][api] Launch Shell / Terminal commands menu placement and category (Apply patch from Anna Dushistova)

rse/plugins/org.eclipse.rse.shells.ui/plugin.xml

@@ -16,6 +16,7 @@ Martin Oberhuber (Wind River) - [180519] declaratively register adapter factorie
 Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
 Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
 Anna Dushistova  (MontaVista) - [226550] [api] Launch Shell and Launch Terminal actions should be contributed declaratively
+Anna Dushistova  (MontaVista) - [234274][api] Launch Shell / Terminal commands menu placement and category
 -->
 <?eclipse version="3.0"?>
 <plugin>
@@ -165,12 +166,8 @@ Anna Dushistova  (MontaVista) - [226550] [api] Launch Shell and Launch Terminal
              </menuContribution>  
             </extension>      
      <extension point="org.eclipse.ui.commands">
-        <category
-              id="org.eclipse.rse.shells.ui.commands.category"
-              name="Shells">
-        </category>
         <command
-              categoryId="org.eclipse.rse.shells.ui.commands.category"
+              categoryId="org.eclipse.rse.ui.commands.category"
               id="org.eclipse.rse.shells.ui.actions.LaunchShellCommand"
               name="%Launch_Shell">
         </command>

rse/plugins/org.eclipse.rse.terminals.ui/plugin.xml

@@ -15,6 +15,7 @@ Contributors:
 Martin Oberhuber (Wind River) - [180519] declaratively register adapter factories
 Yu-Fen Kuo (MontaVista) - [170910] Integrate Terminal with RSE
 Anna Dushistova  (MontaVista) - [227535] [rseterminal][api] terminals.ui should not depend on files.core
+Anna Dushistova  (MontaVista) - [234274][api] Launch Shell / Terminal commands menu placement and category
 -->
 <?eclipse version="3.2"?>
 <plugin>
@@ -83,12 +84,8 @@ Anna Dushistova  (MontaVista) - [227535] [rseterminal][api] terminals.ui should
              </menuContribution>  
             </extension>      
      <extension point="org.eclipse.ui.commands">
-        <category
-              id="org.eclipse.rse.terminals.ui.commands.category"
-              name="%terminalsCategory.name">
-        </category>
         <command
-              categoryId="org.eclipse.rse.terminals.ui.commands.category"
+              categoryId="org.eclipse.rse.ui.commands.category"
               id="org.eclipse.rse.terminals.ui.actions.LaunchTerminalCommand"
               name="%Launch_Terminal_Label">
         </command>

rse/plugins/org.eclipse.rse.ui/plugin.xml

@@ -17,6 +17,7 @@ Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
 Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core
 Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point
 Anna Dushistova  (MontaVista) - [227535] [rseterminal][api] terminals.ui should not depend on files.core
+Anna Dushistova  (MontaVista) - [234274][api] Launch Shell / Terminal commands menu placement and category
 -->
 <?eclipse version="3.1"?>
 <plugin>
@@ -502,4 +503,10 @@ Anna Dushistova  (MontaVista) - [227535] [rseterminal][api] terminals.ui should
         </propertyTester>
     </extension>
 
+     <extension point="org.eclipse.ui.commands">
+        <category
+              id="org.eclipse.rse.ui.commands.category"
+              name="%View.Category.RemoteSystems">
+        </category>
+      </extension>  
 </plugin>