Bug 249862 Remove org.eclipse.pde.p2.ui plug-in and feature

7 files changed, 46 insertions, 52 deletions

diff --git a/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF
index cc2bc8ea5..989a82ea3 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF
@@ -15,11 +15,10 @@ Export-Package: org.eclipse.equinox.internal.frameworkadmin.utils;
    org.eclipse.equinox.simpleconfigurator.manipulator",
  org.eclipse.equinox.internal.provisional.configuratormanipulator;x-friends:="org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.simpleconfigurator.manipulator",
  org.eclipse.equinox.internal.provisional.frameworkadmin;
-  x-friends:="org.eclipse.pde.p2.ui,
-   org.eclipse.equinox.p2.touchpoint.eclipse,
+  x-friends:="org.eclipse.equinox.frameworkadmin.equinox,
    org.eclipse.equinox.p2.metadata.generator,
    org.eclipse.equinox.p2.publisher,
-   org.eclipse.equinox.frameworkadmin.equinox,
+   org.eclipse.equinox.p2.touchpoint.eclipse,
    org.eclipse.equinox.simpleconfigurator.manipulator"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4,
  CDC-1.1/Foundation-1.1
diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
index 10f0537cf..ff6bc031a 100644
--- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
@@ -50,29 +50,28 @@ Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equ
    org.eclipse.equinox.p2.publisher",
  org.eclipse.equinox.internal.p2.persistence;x-friends:="org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.metadata.repository",
  org.eclipse.equinox.internal.provisional.p2.core;
-  x-friends:="org.eclipse.equinox.p2.artifact.repository,
+  x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
+   org.eclipse.equinox.p2.artifact.processors,
+   org.eclipse.equinox.p2.artifact.repository,
+   org.eclipse.equinox.p2.console,
+   org.eclipse.equinox.p2.director,
    org.eclipse.equinox.p2.director.app,
+   org.eclipse.equinox.p2.directorywatcher,
+   org.eclipse.equinox.p2.engine,
    org.eclipse.equinox.p2.extensionlocation,
+   org.eclipse.equinox.p2.installer,
+   org.eclipse.equinox.p2.metadata.generator,
    org.eclipse.equinox.p2.metadata.repository,
-   org.eclipse.equinox.p2.ui,
-   org.eclipse.equinox.p2.updatesite,
-   org.eclipse.equinox.p2.console,
-   org.eclipse.equinox.p2.director,
+   org.eclipse.equinox.p2.publisher,
+   org.eclipse.equinox.p2.reconciler.dropins,
    org.eclipse.equinox.p2.touchpoint.eclipse,
    org.eclipse.equinox.p2.touchpoint.natives,
+   org.eclipse.equinox.p2.ui,
    org.eclipse.equinox.p2.ui.admin,
    org.eclipse.equinox.p2.ui.sdk,
-   org.eclipse.equinox.p2.artifact.optimizers,
-   org.eclipse.equinox.p2.artifact.processors,
-   org.eclipse.equinox.p2.reconciler.dropins,
-   org.eclipse.equinox.p2.engine,
-   org.eclipse.equinox.p2.metadata.generator,
-   org.eclipse.equinox.p2.installer,
-   org.eclipse.equinox.p2.directorywatcher,
    org.eclipse.equinox.p2.updatechecker,
-   org.eclipse.pde.p2.ui,
-   org.eclipse.pde.ui,
-   org.eclipse.equinox.p2.publisher",
+   org.eclipse.equinox.p2.updatesite,
+   org.eclipse.pde.ui",
  org.eclipse.equinox.internal.provisional.p2.core.eventbus;
   x-friends:="org.eclipse.equinox.p2.metadata,
    org.eclipse.equinox.p2.metadata.generator,
diff --git a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
index 6ce2f76a0..611b572ec 100644
--- a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
@@ -23,15 +23,14 @@ Export-Package: org.eclipse.equinox.internal.p2.director;x-friends:="org.eclipse
  org.eclipse.equinox.internal.p2.resolution;x-internal:=true,
  org.eclipse.equinox.internal.p2.rollback;x-friends:="org.eclipse.equinox.p2.ui",
  org.eclipse.equinox.internal.provisional.p2.director;
-  x-friends:="org.eclipse.equinox.p2.reconciler.dropins,
+  x-friends:="org.eclipse.equinox.p2.console,
+   org.eclipse.equinox.p2.director.app,
+   org.eclipse.equinox.p2.installer,
+   org.eclipse.equinox.p2.reconciler.dropins,
    org.eclipse.equinox.p2.ui,
    org.eclipse.equinox.p2.ui.admin,
    org.eclipse.equinox.p2.ui.sdk,
-   org.eclipse.equinox.p2.director.app,
-   org.eclipse.equinox.p2.installer,
-   org.eclipse.equinox.p2.console,
    org.eclipse.equinox.p2.updatechecker,
-   org.eclipse.pde.p2.ui,
    org.eclipse.pde.ui"
 Bundle-Activator: org.eclipse.equinox.internal.p2.director.DirectorActivator
 Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
index a10705105..c86d6b560 100644
--- a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
@@ -7,20 +7,19 @@ Bundle-Localization: plugin
 Bundle-Version: 1.0.100.qualifier
 Export-Package: org.eclipse.equinox.internal.p2.engine;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.touchpoint.natives",
  org.eclipse.equinox.internal.provisional.p2.engine;
-  x-friends:="org.eclipse.equinox.p2.director.app,
-   org.eclipse.equinox.p2.ui,
-   org.eclipse.equinox.p2.reconciler.dropins,
-   org.eclipse.equinox.p2.console,
+  x-friends:="org.eclipse.equinox.p2.console,
    org.eclipse.equinox.p2.director,
-   org.eclipse.equinox.p2.ui.sdk,
-   org.eclipse.equinox.p2.updatechecker,
+   org.eclipse.equinox.p2.director.app,
+   org.eclipse.equinox.p2.extensionlocation,
+   org.eclipse.equinox.p2.garbagecollector,
    org.eclipse.equinox.p2.installer,
-   org.eclipse.equinox.p2.ui.admin,
+   org.eclipse.equinox.p2.reconciler.dropins,
    org.eclipse.equinox.p2.touchpoint.eclipse,
    org.eclipse.equinox.p2.touchpoint.natives,
-   org.eclipse.equinox.p2.extensionlocation,
-   org.eclipse.equinox.p2.garbagecollector,
-   org.eclipse.pde.p2.ui,
+   org.eclipse.equinox.p2.ui,
+   org.eclipse.equinox.p2.ui.admin,
+   org.eclipse.equinox.p2.ui.sdk,
+   org.eclipse.equinox.p2.updatechecker,
    org.eclipse.pde.ui",
  org.eclipse.equinox.internal.provisional.p2.engine.phases;x-friends:="org.eclipse.equinox.p2.ui"
 Import-Package: javax.xml.parsers,
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
index fbb900e9e..a86dbaea3 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
@@ -14,23 +14,22 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata.mirror,
    org.eclipse.equinox.p2.publisher",
  org.eclipse.equinox.internal.p2.metadata.repository.io;x-friends:="org.eclipse.equinox.p2.engine",
  org.eclipse.equinox.internal.provisional.p2.metadata.repository;
-  x-friends:="org.eclipse.equinox.p2.ui,
-   org.eclipse.equinox.p2.ui.admin,
-   org.eclipse.equinox.p2.ui.sdk,
-   org.eclipse.equinox.p2.updatechecker,
-   org.eclipse.equinox.p2.console,
+  x-friends:="org.eclipse.equinox.p2.console,
    org.eclipse.equinox.p2.director,
    org.eclipse.equinox.p2.director.app,
    org.eclipse.equinox.p2.directorywatcher,
    org.eclipse.equinox.p2.engine,
-   org.eclipse.equinox.p2.metadata.generator,
-   org.eclipse.equinox.p2.updatesite,
    org.eclipse.equinox.p2.extensionlocation,
    org.eclipse.equinox.p2.installer,
+   org.eclipse.equinox.p2.metadata.generator,
+   org.eclipse.equinox.p2.publisher,
    org.eclipse.equinox.p2.reconciler.dropins,
-   org.eclipse.pde.p2.ui,
-   org.eclipse.pde.ui,
-   org.eclipse.equinox.p2.publisher",
+   org.eclipse.equinox.p2.ui,
+   org.eclipse.equinox.p2.ui.admin,
+   org.eclipse.equinox.p2.ui.sdk,
+   org.eclipse.equinox.p2.updatechecker,
+   org.eclipse.equinox.p2.updatesite,
+   org.eclipse.pde.ui",
  org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository;x-friends:="org.eclipse.equinox.p2.extensionlocation,org.eclipse.equinox.p2.updatesite"
 Import-Package: org.eclipse.equinox.app;resolution:=optional,
  org.eclipse.equinox.internal.p2.core.helpers,
diff --git a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
index 66915167e..35b33fd55 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
@@ -32,17 +32,16 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata;
    org.eclipse.equinox.p2.metadata,
    org.eclipse.equinox.p2.metadata.generator,
    org.eclipse.equinox.p2.metadata.repository,
+   org.eclipse.equinox.p2.publisher,
    org.eclipse.equinox.p2.reconciler.dropins,
    org.eclipse.equinox.p2.touchpoint.eclipse,
    org.eclipse.equinox.p2.touchpoint.natives,
    org.eclipse.equinox.p2.ui,
+   org.eclipse.equinox.p2.ui.admin,
    org.eclipse.equinox.p2.ui.sdk,
    org.eclipse.equinox.p2.updatechecker,
    org.eclipse.equinox.p2.updatesite,
-   org.eclipse.equinox.p2.ui.admin,
-   org.eclipse.pde.p2.ui,
-   org.eclipse.pde.ui,
-   org.eclipse.equinox.p2.publisher",
+   org.eclipse.pde.ui",
  org.eclipse.equinox.internal.provisional.p2.metadata.query;
   x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
    org.eclipse.equinox.p2.artifact.processors,
diff --git a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
index a3009b349..bbf930baa 100644
--- a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
@@ -39,28 +39,28 @@ Export-Package: org.eclipse.equinox.internal.p2.ui;x-internal:=true,
   x-friends:="org.eclipse.equinox.p2.ui.admin,
    org.eclipse.equinox.p2.ui.admin.rcp,
    org.eclipse.equinox.p2.ui.sdk,
-   org.eclipse.pde.p2.ui",
+   org.eclipse.pde.ui",
  org.eclipse.equinox.internal.provisional.p2.ui.actions;
   x-friends:="org.eclipse.equinox.p2.ui.admin,
    org.eclipse.equinox.p2.ui.admin.rcp,
    org.eclipse.equinox.p2.ui.sdk,
-   org.eclipse.pde.p2.ui",
+   org.eclipse.pde.ui",
  org.eclipse.equinox.internal.provisional.p2.ui.dialogs;
   x-friends:="org.eclipse.equinox.p2.ui.admin,
    org.eclipse.equinox.p2.ui.admin.rcp,
    org.eclipse.equinox.p2.ui.sdk,
-   org.eclipse.pde.p2.ui",
+   org.eclipse.pde.ui",
  org.eclipse.equinox.internal.provisional.p2.ui.model;x-friends:="org.eclipse.equinox.p2.ui.admin,org.eclipse.equinox.p2.ui.admin.rcp,org.eclipse.equinox.p2.ui.sdk",
  org.eclipse.equinox.internal.provisional.p2.ui.operations;
   x-friends:="org.eclipse.equinox.p2.ui.admin,
    org.eclipse.equinox.p2.ui.admin.rcp,
    org.eclipse.equinox.p2.ui.sdk,
-   org.eclipse.pde.p2.ui",
+   org.eclipse.pde.ui",
  org.eclipse.equinox.internal.provisional.p2.ui.policy;
   x-friends:="org.eclipse.equinox.p2.ui.admin,
    org.eclipse.equinox.p2.ui.admin.rcp,
    org.eclipse.equinox.p2.ui.sdk,
-   org.eclipse.pde.p2.ui",
+   org.eclipse.pde.ui",
  org.eclipse.equinox.internal.provisional.p2.ui.viewers;x-friends:="org.eclipse.equinox.p2.ui.admin,org.eclipse.equinox.p2.ui.admin.rcp,org.eclipse.equinox.p2.ui.sdk"
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,