From 6bde6d2e31a56412128cda126aed4c086d8cb07a Mon Sep 17 00:00:00 2001
From: Kim Moir
Date: Fri, 16 May 2008 12:56:57 +0000
Subject: revert  Bug 226020 add ecf bundles to master feature

---
 .../org.eclipse.equinox.p2.user.ui/feature.xml     | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'org.eclipse.equinox.p2.releng')

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 153c1eed7..db02d447e 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,16 +21,6 @@
    <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"
@@ -81,7 +71,7 @@
          version="0.0.0"
          unpack="false"/>
 
-  <!-- <plugin
+   <plugin
          id="org.eclipse.ecf"
          download-size="0"
          install-size="0"
@@ -100,7 +90,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/> -->
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.p2.exemplarysetup"
@@ -144,12 +134,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"
@@ -249,7 +239,7 @@
          version="0.0.0"
          unpack="false"/>
 
- <!--  <plugin
+   <plugin
          id="org.eclipse.ecf.provider.filetransfer.ssl"
          download-size="0"
          install-size="0"
@@ -263,7 +253,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"
-         unpack="false"/> -->
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.p2.director.app"
-- 
cgit v1.2.3