From 0d2c947459a753fbebd59978df01b961cc6cad0a Mon Sep 17 00:00:00 2001
From: Markus Knauer
Date: Sun, 21 Feb 2016 16:57:56 +0100
Subject: RCP/RAP: Move package content definition from feature to product

By using the product definition (instead of the EPP package feature) for
defining the product content it is possible to install some of them as
root level feature that can be updated and/or removed independently from
the package.

Only cosmetic changes... the main part of the restructuring was done for
Eclipse Mars - this change removes unnecessary parts and cleans things
up.

Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989

Change-Id: Ia4919d0c38839b6ef5e17063dda6a89d36144788
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
---
 .../feature.xml                                    | 47 +++-------------------
 .../epp.product                                    | 20 ++++-----
 2 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.xml b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
index bd4fcb17..5da5462c 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
@@ -22,48 +22,13 @@
 
    <requires>
    <!--
-      <import feature="org.eclipse.egit"/>
-      <import feature="org.eclipse.egit.import"/>
-      <import feature="org.eclipse.egit.mylyn"/>
-      <import feature="org.eclipse.epp.package.common.feature"/>
-      <import feature="org.eclipse.help"/>
-      <import feature="org.eclipse.jdt"/>
-      <import feature="org.eclipse.m2e.feature"/>
-      <import feature="org.eclipse.m2e.logback.feature"/>
-      <import feature="org.eclipse.mylyn.bugzilla_feature"/>
-      <import feature="org.eclipse.mylyn.context_feature"/>
-      <import feature="org.eclipse.mylyn.gerrit.feature"/>
-      <import feature="org.eclipse.mylyn.git"/>
-      <import feature="org.eclipse.mylyn.hudson"/>
-      <import feature="org.eclipse.mylyn.ide_feature"/>
-      <import feature="org.eclipse.mylyn.java_feature"/>
-      <import feature="org.eclipse.mylyn.pde_feature"/>
-      <import feature="org.eclipse.mylyn.wikitext_feature"/>
-      <import feature="org.eclipse.pde"/>
-      <import feature="org.eclipse.platform.source"/>
-      <import feature="org.eclipse.rap.tools.feature"/>
-      <import feature="org.eclipse.rcp.source"/>
-      <import feature="org.eclipse.recommenders.rcp.feature"/>
-      <import feature="org.eclipse.recommenders.mylyn.rcp.feature"/>
-      <import feature="org.eclipse.recommenders.snipmatch.rcp.feature"/>
-      <import feature="org.eclipse.wb.core.ui.feature"/>
-      <import feature="org.eclipse.wb.rcp.feature"/>
-      <import feature="org.eclipse.wst.xml_ui.feature"/>
-      <import feature="org.eclipse.swtbot.eclipse"/>
-      <import feature="org.eclipse.swtbot.eclipse.gef"/>
-      <import feature="org.eclipse.swtbot.ide"/>
-   -->
+        All requirements to features and the content of the product are defined 
+        in the product configuration epp.product since Eclipse Neon. For further
+        details see the following bug:
 
-<!-- redundant features (already included in other features
-      <import feature="org.eclipse.mylyn_feature"/>
-      <import feature="org.eclipse.rcp"/>
-      <import feature="org.eclipse.wb.core.feature"/>
-      <import feature="org.eclipse.wb.swt.feature"/>
-      <import feature="org.eclipse.wb.layout.group.feature"/>
-      <import feature="org.eclipse.jgit"/>
-      <import feature="org.eclipse.platform"/>
-      <import feature="org.eclipse.equinox.p2.user.ui"/>
-  -->
+        Bug 332989 - Allow parts of a package to upgraded or removed
+        https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
+     -->
    </requires>
 
    <plugin
diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
index 458a21f9..7aed15a0 100644
--- a/packages/org.eclipse.epp.package.rcp.product/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -186,22 +186,23 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
 
    <features>
       <feature id="org.eclipse.epp.package.rcp.feature" version="4.6.0.qualifier"/>
-      <feature id="org.eclipse.epp.package.common.feature"/>
-      <feature id="org.eclipse.help"/>
+      <feature id="org.eclipse.epp.package.common.feature" version="4.6.0.qualifier"/>
+      <feature id="org.eclipse.platform" version="4.6.0.qualifier"/>
+
       <feature id="org.eclipse.jdt"/>
       <feature id="org.eclipse.pde"/>
       <feature id="org.eclipse.platform.source"/>
       <feature id="org.eclipse.rcp.source"/>
 
+      <feature id="org.eclipse.buildship" installMode="root"/>
       <feature id="org.eclipse.e4.core.tools.feature" installMode="root"/>
-      <feature id="org.eclipse.egit" installMode="root"/>
-      <!--
+      <!-- not available in Neon on 2016-02-21
       <feature id="org.eclipse.egit.import"/>
       -->
+      <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.egit.mylyn" installMode="root"/>
       <feature id="org.eclipse.m2e.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
-      <feature id="org.eclipse.buildship" installMode="root"/>
       <feature id="org.eclipse.mylyn.bugzilla_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.context_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.gerrit.feature" installMode="root"/>
@@ -212,16 +213,15 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.mylyn.pde_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
       <feature id="org.eclipse.rap.tools.feature" installMode="root"/>
-      <feature id="org.eclipse.recommenders.rcp.feature" installMode="root"/>
       <feature id="org.eclipse.recommenders.mylyn.rcp.feature" installMode="root"/>
+      <feature id="org.eclipse.recommenders.rcp.feature" installMode="root"/>
       <feature id="org.eclipse.recommenders.snipmatch.rcp.feature" installMode="root"/>
+      <feature id="org.eclipse.swtbot.eclipse.gef" installMode="root"/>
+      <feature id="org.eclipse.swtbot.eclipse" installMode="root"/>
+      <feature id="org.eclipse.swtbot.ide" installMode="root"/>
       <feature id="org.eclipse.wb.core.ui.feature" installMode="root"/>
       <feature id="org.eclipse.wb.rcp.feature" installMode="root"/>
       <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
-      <feature id="org.eclipse.swtbot.eclipse" installMode="root"/>
-      <feature id="org.eclipse.swtbot.eclipse.gef" installMode="root"/>
-      <feature id="org.eclipse.swtbot.ide" installMode="root"/>
-
    </features>
 
 
-- 
cgit v1.2.3