commit 3dce8b7bf6b9fd54b84c66b4afcf725af1962408
author Kim Moir <kmoir> Fri May 09 13:10:26 2008 +0000
committer Kim Moir <kmoir> Fri May 09 13:10:26 2008 +0000
tree 44dd290deb92d39139769e7f6b77ed9ddce79c09
parent 5394393c112252b367582da12817e18b3b272dfc

Bug 225783 p2 feature should require ECF instead of including it

org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui/feature.xml

diff --git a/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui/feature.xml b/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui/feature.xml
index db02d44..153c1ee 100644
--- a/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui/feature.xml
+++ b/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui/feature.xml
@@ -21,6 +21,16 @@
    <url>
       <update label="%updateSiteName" url="http://download.eclipse.org/eclipse/updates/3.4"/>
    </url>
+   
+   <requires>
+      <import plugin="org.eclipse.ecf" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ecf.filetransfer" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ecf.identity" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ecf.provider.filetransfer" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ecf.provider.filetransfer.ssl" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ecf.ssl" version="1.0.0" match="compatible"/>
+   </requires>
+   
 
    <plugin
          id="org.eclipse.equinox.p2.director"
@@ -71,7 +81,7 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
+  <!-- <plugin
          id="org.eclipse.ecf"
          download-size="0"
          install-size="0"
@@ -90,7 +100,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="false"/> -->
 
    <plugin
          id="org.eclipse.equinox.p2.exemplarysetup"
@@ -134,12 +144,12 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
+   <!-- <plugin
          id="org.eclipse.ecf.provider.filetransfer"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="false"/> -->
 
    <plugin
          id="org.eclipse.equinox.simpleconfigurator.manipulator"
@@ -239,7 +249,7 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
+ <!--  <plugin
          id="org.eclipse.ecf.provider.filetransfer.ssl"
          download-size="0"
          install-size="0"
@@ -253,7 +263,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"
-         unpack="false"/>
+         unpack="false"/> -->
 
    <plugin
          id="org.eclipse.equinox.p2.director.app"