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

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

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

2 files changed, 63 insertions, 56 deletions

diff --git a/packages/org.eclipse.epp.package.reporting.feature/feature.xml b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
index c77f883c..3d166a86 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
@@ -26,61 +26,14 @@
          search-location="both"/>
 
    <requires>
-      <import feature="org.eclipse.help"/>
-      <import feature="org.eclipse.jdt"/>
-      <import feature="org.eclipse.platform"/>
-      <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.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.jsf.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.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"/>
-      <!-- disabled in Luna SR1 RC2 https://bugs.eclipse.org/bugs/show_bug.cgi?id=443269
-      <import feature="org.eclipse.persistence.jpa"/>
-      <import feature="org.eclipse.persistence.moxy"/>
-      <import feature="org.eclipse.persistence.sdo"/>
-      -->
-      <import feature="org.eclipse.birt"/>
-      <import feature="org.eclipse.birt.chart.cshelp"/>
-      <import feature="org.eclipse.birt.cshelp"/>
-      <import feature="org.eclipse.birt.example"/>
-      <import feature="org.eclipse.birt.doc"/>
-      <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
+     -->
    </requires>
 
    <plugin
diff --git a/packages/org.eclipse.epp.package.reporting.product/epp.product b/packages/org.eclipse.epp.package.reporting.product/epp.product
index 03acf2fb..8a458095 100644
--- a/packages/org.eclipse.epp.package.reporting.product/epp.product
+++ b/packages/org.eclipse.epp.package.reporting.product/epp.product
@@ -186,7 +186,61 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
 
    <features>
       <feature id="org.eclipse.epp.package.reporting.feature" version="4.6.0.qualifier"/>
-   </features>
+      <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.birt.chart.cshelp" installMode="root"/>
+      <feature id="org.eclipse.birt.cshelp" installMode="root"/>
+      <feature id="org.eclipse.birt.doc" installMode="root"/>
+      <feature id="org.eclipse.birt.example" installMode="root"/>
+      <feature id="org.eclipse.birt" installMode="root"/>
+      <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"/>
+      <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.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.web_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.ws.axis2tools.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"/>
+      <!-- disabled in Luna SR1 RC2 https://bugs.eclipse.org/bugs/show_bug.cgi?id=443269
+      <feature id="org.eclipse.persistence.jpa" installMode="root"/>
+      <feature id="org.eclipse.persistence.moxy" installMode="root"/>
+      <feature id="org.eclipse.persistence.sdo" 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>
 
 
 </product>