JavaEE: 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.

The JavaEE package defines some additional dependencies to bundles in
its feature; these dependencies haven't been changed as part of this
change.

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

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

2 files changed, 88 insertions, 69 deletions

diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.xml b/packages/org.eclipse.epp.package.jee.feature/feature.xml
index 54361555..b9f42c28 100644
--- a/packages/org.eclipse.epp.package.jee.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/feature.xml
@@ -26,75 +26,18 @@
          search-location="both"/>
 
    <requires>
-      <import feature="org.eclipse.help"/>
-      <import feature="org.eclipse.jdt"/>
-      <import feature="org.eclipse.platform"/>
-      <import feature="org.eclipse.pde"/>
-      <import feature="org.eclipse.mylyn.ide_feature"/>
-      <import feature="org.eclipse.mylyn.java_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.wikitext_feature"/>
-      <import feature="org.eclipse.egit"/>
-      <import feature="org.eclipse.egit.import"/>
-      <import feature="org.eclipse.egit.mylyn"/>
-      <import feature="org.eclipse.rse"/>
-      <import feature="org.eclipse.rse.useractions"/>
-      <import feature="org.eclipse.tm.terminal.feature"/>
-      <import feature="org.eclipse.datatools.modelbase.feature"/>
-      <import feature="org.eclipse.datatools.connectivity.feature"/>
-      <import feature="org.eclipse.datatools.sqldevtools.feature"/>
-      <import feature="org.eclipse.datatools.intro"/>
-      <import feature="org.eclipse.datatools.doc.user"/>
-      <import feature="org.eclipse.datatools.common.doc.user"/>
-      <import feature="org.eclipse.datatools.connectivity.doc.user"/>
-      <import feature="org.eclipse.datatools.sqltools.doc.user"/>
-      <import feature="org.eclipse.datatools.enablement.feature"/>
-      <import feature="org.eclipse.wst.common.fproj"/>
-      <import feature="org.eclipse.wst.jsdt.feature"/>
-      <import feature="org.eclipse.wst.xml_ui.feature"/>
-      <import feature="org.eclipse.wst.web_ui.feature"/>
-      <import feature="org.eclipse.wst.server_adapters.feature"/>
-      <import feature="org.eclipse.wst.xsl.feature"/>
-      <import feature="org.eclipse.jst.common.fproj.enablement.jdt"/>
-      <import feature="org.eclipse.jst.server_ui.feature"/>
-      <import feature="org.eclipse.jst.server_adapters.feature"/>
-      <import feature="org.eclipse.jst.server_adapters.ext.feature"/>
-      <import feature="org.eclipse.jst.web_ui.feature"/>
-      <import feature="org.eclipse.jst.enterprise_ui.feature"/>
-      <import feature="org.eclipse.jst.webpageeditor.feature"/>
-      <import feature="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"/>
-      <import feature="org.eclipse.jst.ws.axis2tools.feature"/>
-      <import feature="org.eclipse.jst.ws.axis2tools.feature"/>
-
-      <import feature="org.eclipse.jpt.common.feature"/>
-      <import feature="org.eclipse.jpt.common.eclipselink.feature"/>
-      <import feature="org.eclipse.jpt.dbws.eclipselink.feature"/>
-      <import feature="org.eclipse.jpt.jaxb.eclipselink.feature"/>
-      <import feature="org.eclipse.jpt.jaxb.feature"/>
-      <import feature="org.eclipse.jpt.jpa.eclipselink.feature"/>
-      <import feature="org.eclipse.jpt.jpa.feature"/>
-
-      <import feature="org.eclipse.jsf.feature" />
-      <import feature="org.eclipse.jst.webpageeditor.feature"/>
-      <import feature="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"/>
-
-      <import feature="org.eclipse.jst.ws.jaxws.feature" />
-      <import feature="org.eclipse.jst.ws.cxf.feature" />
-      <import feature="org.eclipse.jst.ws.jaxws.dom.feature" />
-
-      <import feature="org.eclipse.m2e.feature"/>
-      <import feature="org.eclipse.m2e.logback.feature"/>
-      <import feature="org.eclipse.m2e.wtp.feature"/>
-      <import feature="org.eclipse.m2e.wtp.jaxrs.feature"/>
-      <import feature="org.eclipse.m2e.wtp.jpa.feature"/>
-      <import feature="org.eclipse.m2e.wtp.jsf.feature"/>
-
-      <import feature="org.eclipse.recommenders.rcp.feature"/>
-      <import feature="org.eclipse.recommenders.mylyn.rcp.feature"/>
-
-      <import feature="org.eclipse.epp.package.common.feature"/>
+   <!--
+        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:
+
+        Bug 332989 - Allow parts of a package to upgraded or removed
+        https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
+
+        Please note that there are some additional dependencies to certain
+        plugins defined within this feature; these dependencies haven't been
+        changed.
+     -->
    </requires>
 
    <plugin
diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
index 99dae35a..bdff3c77 100644
--- a/packages/org.eclipse.epp.package.jee.product/epp.product
+++ b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -186,6 +186,82 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
 
    <features>
       <feature id="org.eclipse.epp.package.jee.feature" version="4.6.0.qualifier"/>
+      <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.datatools.common.doc.user" installMode="root"/>
+      <feature id="org.eclipse.datatools.connectivity.doc.user" installMode="root"/>
+      <feature id="org.eclipse.datatools.connectivity.feature" installMode="root"/>
+      <feature id="org.eclipse.datatools.doc.user" installMode="root"/>
+      <feature id="org.eclipse.datatools.enablement.feature" installMode="root"/>
+      <feature id="org.eclipse.datatools.intro" installMode="root"/>
+      <feature id="org.eclipse.datatools.modelbase.feature" installMode="root"/>
+      <feature id="org.eclipse.datatools.sqldevtools.feature" installMode="root"/>
+      <feature id="org.eclipse.datatools.sqltools.doc.user" installMode="root"/>
+
+      <!-- not available in Neon on 2016-02-21
+      <feature id="org.eclipse.egit.import" installMode="root"/>
+      -->
+      <feature id="org.eclipse.egit" installMode="root"/>
+      <feature id="org.eclipse.egit.mylyn" installMode="root"/>
+
+      <feature id="org.eclipse.jdt" installMode="root"/>
+
+      <feature id="org.eclipse.jpt.common.eclipselink.feature" installMode="root"/>
+      <feature id="org.eclipse.jpt.common.feature" installMode="root"/>
+      <feature id="org.eclipse.jpt.dbws.eclipselink.feature" installMode="root"/>
+      <feature id="org.eclipse.jpt.jaxb.eclipselink.feature" installMode="root"/>
+      <feature id="org.eclipse.jpt.jaxb.feature" installMode="root"/>
+      <feature id="org.eclipse.jpt.jpa.eclipselink.feature" installMode="root"/>
+      <feature id="org.eclipse.jpt.jpa.feature" installMode="root"/>
+
+      <feature id="org.eclipse.jsf.feature"  installMode="root"/>
+
+      <feature id="org.eclipse.jst.common.fproj.enablement.jdt" installMode="root"/>
+      <feature id="org.eclipse.jst.enterprise_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.server_adapters.ext.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.server_adapters.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.server_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.webpageeditor.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.webpageeditor.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.web_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.ws.axis2tools.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.ws.axis2tools.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.ws.cxf.feature"  installMode="root"/>
+      <feature id="org.eclipse.jst.ws.jaxws.dom.feature"  installMode="root"/>
+      <feature id="org.eclipse.jst.ws.jaxws.feature"  installMode="root"/>
+
+      <feature id="org.eclipse.m2e.feature" installMode="root"/>
+      <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
+      <feature id="org.eclipse.m2e.wtp.feature" installMode="root"/>
+      <feature id="org.eclipse.m2e.wtp.jaxrs.feature" installMode="root"/>
+      <feature id="org.eclipse.m2e.wtp.jpa.feature" installMode="root"/>
+      <feature id="org.eclipse.m2e.wtp.jsf.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_feature" 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.wikitext_feature" installMode="root"/>
+
+      <feature id="org.eclipse.pde" 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.rse" installMode="root"/>
+      <feature id="org.eclipse.rse.useractions" installMode="root"/>
+      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+
+      <feature id="org.eclipse.wst.common.fproj" installMode="root"/>
+      <feature id="org.eclipse.wst.jsdt.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.server_adapters.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.web_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.xsl.feature" installMode="root"/>
    </features>