From 48a0171523a07bfaf64e0991d072aeb778c57ee0 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 22 Feb 2007 14:15:27 +0000
Subject: [PATCH] [175108] fix feature dependencies for Europa "Select
 Required" (workaround UM bug 175004)

---
 .../feature.xml                                 |  4 ++++
 .../feature.xml                                 |  4 +++-
 .../org.eclipse.rse.dstore-feature/feature.xml  |  4 +++-
 .../org.eclipse.rse.efs-feature/feature.xml     |  4 +++-
 .../org.eclipse.rse.ftp-feature/feature.xml     |  6 +++++-
 .../org.eclipse.rse.local-feature/feature.xml   |  6 +++++-
 .../feature.xml                                 |  4 +++-
 .../org.eclipse.rse.ssh-feature/feature.xml     | 17 ++++++++++++++---
 .../org.eclipse.rse.tests-feature/feature.xml   | 11 ++++++++++-
 9 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.xml b/discovery/org.eclipse.tm.discovery-feature/feature.xml
index 321741d31f1..d187c90a333 100644
--- a/discovery/org.eclipse.tm.discovery-feature/feature.xml
+++ b/discovery/org.eclipse.tm.discovery-feature/feature.xml
@@ -25,7 +25,10 @@
    </url>
 
    <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.emf" version="2.2.0" match="compatible"/>
+      <!--
       <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
       <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
       <import plugin="org.eclipse.emf.ecore.edit" version="2.2.0" match="compatible"/>
@@ -33,6 +36,7 @@
       <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" match="compatible"/>
       <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
       <import plugin="org.eclipse.emf.common.ui" version="2.2.0" match="compatible"/>
+      -->
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.xml b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
index ed3389d83a0..8400a702e87 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.xml
+++ b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
@@ -24,9 +24,11 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.rse.core"/>
       <import plugin="org.eclipse.ui"/>
       <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"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
index ae1ac0fed4c..7f23523715b 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
@@ -24,10 +24,12 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.rse.core"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
       <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"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.efs-feature/feature.xml b/rse/features/org.eclipse.rse.efs-feature/feature.xml
index e8d3847333a..e8fc4a731ff 100644
--- a/rse/features/org.eclipse.rse.efs-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.efs-feature/feature.xml
@@ -25,12 +25,14 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.rse.core"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.filesystem"/>
       <import plugin="org.eclipse.core.runtime"/>
       <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"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index 4f8e36cafc8..7037eaeba45 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -32,13 +32,17 @@
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.rse.core"/>
       <import plugin="org.eclipse.ui"/>
       <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 plugin="org.eclipse.rse.services"/>
       <import plugin="org.eclipse.rse.files.ui"/>
       <import plugin="org.eclipse.rse.subsystems.files.core"/>
       <import plugin="org.eclipse.rse.ui"/>
+      -->
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml
index 2c909e74ec1..318b7b4b331 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.local-feature/feature.xml
@@ -24,9 +24,12 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.rse.core"/>
       <import plugin="org.eclipse.ui"/>
       <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 plugin="org.eclipse.rse.services"/>
       <import plugin="org.eclipse.rse.files.ui"/>
       <import plugin="org.eclipse.rse.subsystems.files.core"/>
@@ -35,6 +38,7 @@
       <import plugin="org.eclipse.rse.processes.ui"/>
       <import plugin="org.eclipse.rse.shells.ui"/>
       <import plugin="org.eclipse.rse.subsystems.shells.core"/>
+      -->
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
index a0a1e56de07..074779e0eab 100644
--- a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
@@ -25,7 +25,9 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.rse.core"/>
+      <!-- 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.cdt"/>
    </requires>
 
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.xml b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
index 2359d252f20..dd3ccb9bcf1 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
@@ -25,14 +25,25 @@
 
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.rse.services"/>
-      <import plugin="com.jcraft.jsch" version="0.1.28" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui"/>
       <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 plugin="org.eclipse.rse.subsystems.files.core"/>
       <import plugin="org.eclipse.rse.files.ui"/>
       <import plugin="org.eclipse.rse.subsystems.shells.core"/>
       <import plugin="org.eclipse.rse.shells.ui"/>
+      <import plugin="org.eclipse.rse.services"/>
+      <import plugin="org.eclipse.rse.ui"/>
+      -->
+      <!-- Bug 175108: Excplicit dependency on CVS for SSH -->
+      <!-- TM Site users can deselect SSH if they have Platform Only -->
+      <!-- Europa Users should be able to do "Select Required" -->
+      <import feature="org.eclipse.cvs" version="1.0.0" match="greaterOrEqual"/>
+      <!--
+      <import plugin="com.jcraft.jsch" version="0.1.28" match="compatible"/>
+      -->
    </requires>
 
    <plugin
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.xml b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
index 6f9a5f6e784..4cfd7a0c8dc 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.xml
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
@@ -23,9 +23,18 @@
    </url>
 
    <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 plugin="org.junit"/>
+      <import feature="org.eclipse.rse.ftp" version="2.0.0.qualifier" 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"/>
    </requires>
 
    <plugin