From f52902097458d33b988722615efbfe30ccb276c9 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 23 Feb 2007 12:08:08 +0000
Subject: [PATCH] Fix feature dependency pattern matching., and names of
 inferior features

---
 rse/examples/org.eclipse.rse.examples-feature/feature.xml | 2 +-
 .../org.eclipse.rse.dstore-feature/feature.properties     | 2 +-
 rse/features/org.eclipse.rse.dstore-feature/feature.xml   | 2 +-
 .../sourceTemplateFeature/feature.properties              | 2 +-
 .../sourceTemplatePlugin/about.properties                 | 2 +-
 .../sourceTemplatePlugin/plugin.properties                | 2 +-
 rse/features/org.eclipse.rse.efs-feature/feature.xml      | 2 +-
 .../org.eclipse.rse.ftp-feature/feature.properties        | 2 +-
 rse/features/org.eclipse.rse.ftp-feature/feature.xml      | 2 +-
 .../sourceTemplateFeature/feature.properties              | 2 +-
 .../sourceTemplatePlugin/about.properties                 | 2 +-
 .../sourceTemplatePlugin/plugin.properties                | 2 +-
 .../org.eclipse.rse.local-feature/feature.properties      | 2 +-
 rse/features/org.eclipse.rse.local-feature/feature.xml    | 2 +-
 .../sourceTemplateFeature/feature.properties              | 2 +-
 .../sourceTemplatePlugin/about.properties                 | 2 +-
 .../sourceTemplatePlugin/plugin.properties                | 2 +-
 .../org.eclipse.rse.remotecdt-feature/feature.xml         | 2 +-
 .../org.eclipse.rse.ssh-feature/feature.properties        | 2 +-
 rse/features/org.eclipse.rse.ssh-feature/feature.xml      | 2 +-
 .../sourceTemplateFeature/feature.properties              | 2 +-
 .../sourceTemplatePlugin/about.properties                 | 2 +-
 .../org.eclipse.rse.services.dstore/about.properties      | 2 +-
 .../org.eclipse.rse.services.dstore/plugin.properties     | 2 +-
 .../org.eclipse.rse.services.files.ftp/about.properties   | 2 +-
 .../org.eclipse.rse.services.files.ftp/plugin.properties  | 2 +-
 .../org.eclipse.rse.services.local/about.properties       | 2 +-
 .../org.eclipse.rse.services.local/plugin.properties      | 2 +-
 rse/plugins/org.eclipse.rse.services.ssh/about.properties | 2 +-
 .../org.eclipse.rse.services.ssh/plugin.properties        | 2 +-
 .../org.eclipse.rse.tests-feature/feature.properties      | 4 ++--
 rse/tests/org.eclipse.rse.tests-feature/feature.xml       | 8 ++++----
 .../sourceTemplatePlugin/plugin.properties                | 2 +-
 rse/tests/org.eclipse.rse.tests/about.properties          | 2 +-
 rse/tests/org.eclipse.rse.tests/plugin.properties         | 2 +-
 35 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.xml b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
index f4c4b362866..83657cf2893 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.xml
+++ b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
@@ -28,7 +28,7 @@
       <import plugin="org.eclipse.core.runtime"/>
       <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
       <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
+      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.properties b/rse/features/org.eclipse.rse.dstore-feature/feature.properties
index 503fdb093dd..94410d671f8 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.properties
@@ -13,7 +13,7 @@
 # NLS_ENCODING=UTF-8
 
 # "featureName" property - name of the feature
-featureName=Remote System Explorer DStore Services
+featureName=RSE DStore Services
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
index 75a2b188907..045d3870820 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
@@ -28,7 +28,7 @@
       <import plugin="org.eclipse.ui.views"/>
       <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
       <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
+      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
index 77fb6307efc..a06bc972fd4 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Remote System Explorer DStore Services Source
+featureName=RSE DStore Services Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
index 225f4926bf2..d5a574754d5 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
@@ -16,7 +16,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer DStore Services Source\n\
+blurb=RSE DStore Services Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties
index a4f081c85a8..b5881fb6fe2 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName=Remote System Explorer DStore Services Source
+pluginName=RSE DStore Services Source
 providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.efs-feature/feature.xml b/rse/features/org.eclipse.rse.efs-feature/feature.xml
index 6738d3aaa84..b77476fc221 100644
--- a/rse/features/org.eclipse.rse.efs-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.efs-feature/feature.xml
@@ -31,7 +31,7 @@
       <import plugin="org.eclipse.core.resources"/>
       <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
       <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
+      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.properties b/rse/features/org.eclipse.rse.ftp-feature/feature.properties
index 2512b1a5614..0879ef417c2 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.properties
@@ -13,7 +13,7 @@
 # NLS_ENCODING=UTF-8
 
 # "featureName" property - name of the feature
-featureName=Remote System Explorer FTP Services
+featureName=RSE FTP Services
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index 8a2fe5ad555..ac522de112d 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -35,7 +35,7 @@
       <import plugin="org.eclipse.core.runtime"/>
       <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
       <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
+      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
       <!--
       <import plugin="org.eclipse.rse.services"/>
       <import plugin="org.eclipse.rse.files.ui"/>
diff --git a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties
index c0955028b5c..a0e12be59e6 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Remote System Explorer FTP Services Source
+featureName=RSE FTP Services Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties
index 21711191d0a..1bd8b9ea633 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties
+++ b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties
@@ -16,7 +16,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer FTP Services Source\n\
+blurb=RSE FTP Services Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/plugin.properties
index 8516bcd9bbb..8bd6bf8c98e 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/plugin.properties
+++ b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName=Remote System Explorer FTP Services Source
+pluginName=RSE FTP Services Source
 providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.properties b/rse/features/org.eclipse.rse.local-feature/feature.properties
index f2d9aa75593..469302f689c 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.local-feature/feature.properties
@@ -13,7 +13,7 @@
 # NLS_ENCODING=UTF-8
 
 # "featureName" property - name of the feature
-featureName=Remote System Explorer Local Services
+featureName=RSE Local Services
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml
index 2844489055c..63cd37a079f 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.local-feature/feature.xml
@@ -27,7 +27,7 @@
       <import plugin="org.eclipse.core.runtime"/>
       <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
       <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
+      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
       <!--
       <import plugin="org.eclipse.rse.services"/>
       <import plugin="org.eclipse.rse.files.ui"/>
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
index 00f1607e38f..c1cb230ff98 100644
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Remote System Explorer Local Services Source
+featureName=RSE Local Services Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties
index e7c3b481fbc..f7268affd3d 100644
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties
+++ b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties
@@ -16,7 +16,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer Local Services Source\n\
+blurb=RSE Local Services Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties
index dc525456a19..67dfc69117f 100644
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties
+++ b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName=Remote System Explorer Local Services Source
+pluginName=RSE Local Services Source
 providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
index 73049483362..326dcc7c821 100644
--- a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
@@ -26,7 +26,7 @@
    <requires>
       <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
       <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
+      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
       <import feature="org.eclipse.cdt"/>
    </requires>
 
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.properties b/rse/features/org.eclipse.rse.ssh-feature/feature.properties
index e920501758a..f0fc480ec43 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.properties
@@ -13,7 +13,7 @@
 # NLS_ENCODING=UTF-8
 
 # "featureName" property - name of the feature
-featureName=Remote System Explorer SSH Services
+featureName=RSE SSH Services
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.xml b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
index 964976c61ae..5fe0b097577 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
@@ -27,7 +27,7 @@
       <import plugin="org.eclipse.ui"/>
       <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
       <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
+      <import feature="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
       <!--
       <import plugin="org.eclipse.rse.subsystems.files.core"/>
       <import plugin="org.eclipse.rse.files.ui"/>
diff --git a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
index 3e818ee059d..bdc5b784f75 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Remote System Explorer SSH Services Source
+featureName=RSE SSH Services Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.properties
index 20f88649523..d70ded6386e 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.properties
+++ b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.properties
@@ -16,7 +16,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer SSH Services Source\n\
+blurb=RSE SSH Services Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/about.properties b/rse/plugins/org.eclipse.rse.services.dstore/about.properties
index dad9ed48b3a..a466f28b5a7 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/about.properties
+++ b/rse/plugins/org.eclipse.rse.services.dstore/about.properties
@@ -20,7 +20,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer DStore Services\n\
+blurb=RSE DStore Services\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/plugin.properties b/rse/plugins/org.eclipse.rse.services.dstore/plugin.properties
index fc8f4dc9eaf..6f664eede0e 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.services.dstore/plugin.properties
@@ -12,5 +12,5 @@
 # NLS_MESSAGEFORMAT_NONE
 # NLS_ENCODING=UTF-8
 
-pluginName = Remote System Explorer DStore Services
+pluginName = RSE DStore Services
 providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/about.properties b/rse/plugins/org.eclipse.rse.services.files.ftp/about.properties
index 09fbdd0e306..3f8ac948860 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/about.properties
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/about.properties
@@ -20,7 +20,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer FTP Services\n\
+blurb=RSE FTP Services\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/plugin.properties b/rse/plugins/org.eclipse.rse.services.files.ftp/plugin.properties
index f5f69ea1ad2..a4ad54830c6 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/plugin.properties
@@ -12,5 +12,5 @@
 # NLS_MESSAGEFORMAT_NONE
 # NLS_ENCODING=UTF-8
 
-pluginName = Remote System Explorer FTP Services
+pluginName = RSE FTP Services
 providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.services.local/about.properties b/rse/plugins/org.eclipse.rse.services.local/about.properties
index 5533af3d80f..59512e16e24 100644
--- a/rse/plugins/org.eclipse.rse.services.local/about.properties
+++ b/rse/plugins/org.eclipse.rse.services.local/about.properties
@@ -20,7 +20,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer Local Services\n\
+blurb=RSE Local Services\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/plugins/org.eclipse.rse.services.local/plugin.properties b/rse/plugins/org.eclipse.rse.services.local/plugin.properties
index 42d5ea0adcc..50bd94dee3b 100644
--- a/rse/plugins/org.eclipse.rse.services.local/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.services.local/plugin.properties
@@ -12,5 +12,5 @@
 # NLS_MESSAGEFORMAT_NONE
 # NLS_ENCODING=UTF-8
 
-pluginName = Remote System Explorer Local Services
+pluginName = RSE Local Services
 providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/about.properties b/rse/plugins/org.eclipse.rse.services.ssh/about.properties
index 80b1ab2b48b..072fdd7c5e3 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/about.properties
+++ b/rse/plugins/org.eclipse.rse.services.ssh/about.properties
@@ -20,7 +20,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer SSH Services\n\
+blurb=RSE SSH Services\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/plugin.properties b/rse/plugins/org.eclipse.rse.services.ssh/plugin.properties
index b1d95b998d4..e8c36d37343 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.services.ssh/plugin.properties
@@ -12,6 +12,6 @@
 # NLS_MESSAGEFORMAT_NONE
 # NLS_ENCODING=UTF-8
 
-pluginName = Remote System Explorer SSH Services
+pluginName = RSE SSH Services
 providerName = Eclipse.org
  
\ No newline at end of file
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.properties b/rse/tests/org.eclipse.rse.tests-feature/feature.properties
index f65fc960a52..acd37257a87 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.properties
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Remote System Explorer Unit Tests
+featureName=RSE Unit Tests
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
@@ -24,7 +24,7 @@ providerName=Eclipse.org
 tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
-description=Remote System Explorer Unit Tests. Includes Source.
+description=RSE Unit Tests. Includes Source.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.xml b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
index 35f4e306436..c1cb2d756f1 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.xml
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
@@ -24,16 +24,16 @@
    <requires>
       <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
       <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="equivalent"/>
-      <import feature="org.eclipse.rse.local" version="2.0.0.qualifier" match="equivalent"/>
-      <import feature="org.eclipse.rse.ftp" version="2.0.0.qualifier" match="equivalent"/>
+      <import feature="org.eclipse.rse.core" version="2.0.0" match="equivalent"/>
+      <import feature="org.eclipse.rse.local" version="2.0.0" match="equivalent"/>
+      <import feature="org.eclipse.rse.ftp" version="2.0.0" match="equivalent"/>
       <!-- org.junit either comes with the JDT feature (org.eclipse.jdt),  -->
       <!-- or with the eclipse-test-framework download. So, don't put a    -->
       <!-- feature dependency here since it is no hard dependency          -->
       <!-- (although it would help Europa users to get their stuff, but    -->
       <!-- it could invalidate the configuration for Platform users:       --> 
       <!-- bug 151797)                                                     -->
-      <import plugin="org.junit" version="3.8.2" match="compatible"/>
+      <import plugin="org.junit" version="3.8.1" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/tests/org.eclipse.rse.tests-feature/sourceTemplatePlugin/plugin.properties b/rse/tests/org.eclipse.rse.tests-feature/sourceTemplatePlugin/plugin.properties
index 4b11da32169..4233cc0fb00 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/sourceTemplatePlugin/plugin.properties
+++ b/rse/tests/org.eclipse.rse.tests-feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors: 
 # Martin Oberhuber - initial API and implementation 
 ################################################################################
-pluginName=Remote System Explorer Unit Tests Source
+pluginName=RSE Unit Tests Source
 providerName=Eclipse.org
diff --git a/rse/tests/org.eclipse.rse.tests/about.properties b/rse/tests/org.eclipse.rse.tests/about.properties
index a05f2143db6..cee1ababd95 100644
--- a/rse/tests/org.eclipse.rse.tests/about.properties
+++ b/rse/tests/org.eclipse.rse.tests/about.properties
@@ -16,7 +16,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer Unit Tests\n\
+blurb=RSE Unit Tests\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/tests/org.eclipse.rse.tests/plugin.properties b/rse/tests/org.eclipse.rse.tests/plugin.properties
index d4d671d82bc..52aec4ad1a9 100644
--- a/rse/tests/org.eclipse.rse.tests/plugin.properties
+++ b/rse/tests/org.eclipse.rse.tests/plugin.properties
@@ -9,7 +9,7 @@
 #     IBM Corporation - initial API and implementation
 # Martin Oberhuber (Wind River) - fix ant build for "Assert", make consistent
 ###############################################################################
-pluginName=Remote System Explorer Unit Tests
+pluginName=RSE Unit Tests
 providerName=Eclipse.org
 
 testSubSystemName = Tests