Move feature dependencies in RCP/RAP from root feature to product

- Reduce number of installed features be excluding redundant features 
  from the RCP/RAP root feature
- Move all other features except source features from package root 
  feature to product
- Install all features as root feature

Change-Id: I2a4af4619cbea96d304e5ad77e36dc5990b3b053
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>

2 files changed, 46 insertions, 8 deletions

diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.xml b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
index 7336740f..dde019e3 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
@@ -27,19 +27,17 @@
 
 
    <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.equinox.p2.user.ui"/>
       <import feature="org.eclipse.help"/>
       <import feature="org.eclipse.jdt"/>
-      <import feature="org.eclipse.jgit"/>
       <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_feature"/>
       <import feature="org.eclipse.mylyn.gerrit.feature"/>
       <import feature="org.eclipse.mylyn.git"/>
       <import feature="org.eclipse.mylyn.hudson"/>
@@ -48,23 +46,30 @@
       <import feature="org.eclipse.mylyn.pde_feature"/>
       <import feature="org.eclipse.mylyn.wikitext_feature"/>
       <import feature="org.eclipse.pde"/>
-      <import feature="org.eclipse.platform"/>
       <import feature="org.eclipse.platform.source"/>
       <import feature="org.eclipse.rap.tools.feature"/>
-      <import feature="org.eclipse.rcp"/>
       <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.feature"/>
       <import feature="org.eclipse.wb.core.ui.feature"/>
-      <import feature="org.eclipse.wb.layout.group.feature"/>
       <import feature="org.eclipse.wb.rcp.feature"/>
-      <import feature="org.eclipse.wb.swt.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"/>
+   -->
+
+<!-- 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"/>
+  -->
    </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 d3d14914..6b49e39d 100644
--- a/packages/org.eclipse.epp.package.rcp.product/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -182,6 +182,39 @@ 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.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.common.feature"/>
+      <feature id="org.eclipse.help"/>
+      <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.egit" installMode="root"/>
+      <!--
+      <feature id="org.eclipse.egit.import"/>
+      -->
+      <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.mylyn.bugzilla_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.context_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.gerrit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.java_feature" installMode="root"/>
+      <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.snipmatch.rcp.feature" 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>