From 4baf7c172932c80fa53c465b446b21f3f1e06eb1 Mon Sep 17 00:00:00 2001
From: Kim Moir
Date: Thu, 8 May 2008 18:37:24 +0000
Subject: test build only for Bug 225783 p2 feature should require ECF instead
 of including it

---
 .../org.eclipse.equinox.p2.user.ui/feature.xml      | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 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 db02d447e..322924d70 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,15 @@
    <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 +80,7 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
+  <!-- <plugin
          id="org.eclipse.ecf"
          download-size="0"
          install-size="0"
@@ -90,7 +99,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="false"/> -->
 
    <plugin
          id="org.eclipse.equinox.p2.exemplarysetup"
@@ -134,12 +143,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 +248,7 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
+ <!--  <plugin
          id="org.eclipse.ecf.provider.filetransfer.ssl"
          download-size="0"
          install-size="0"
@@ -253,7 +262,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.1