From 342e5782db8a0f820ce7d0c6ff7330bd6b3abc8c Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Fri, 14 Dec 2018 11:43:44 +0100
Subject: [PATCH] adjusted features such that .runtime features pick target
 platform bundles only, other features pick workspace bundles only

Change-Id: Iaf6c28a083e3ea226160884b4a0c32217fbb95e8
---
 .../scripts/analyzeProduct.sh                 | 12 ++++
 .../feature.xml                               | 28 ----------
 java/com.sap.sailing.feature/feature.xml      | 15 +++++
 java/com.sap.sse.feature.runtime/feature.xml  |  8 ---
 java/com.sap.sse.feature/feature.xml          | 56 +++++++++++++++++++
 5 files changed, 83 insertions(+), 36 deletions(-)

diff --git a/java/com.sap.sailing.feature.p2build/scripts/analyzeProduct.sh b/java/com.sap.sailing.feature.p2build/scripts/analyzeProduct.sh
index 1f30c3039ae..f1c8b9248d8 100755
--- a/java/com.sap.sailing.feature.p2build/scripts/analyzeProduct.sh
+++ b/java/com.sap.sailing.feature.p2build/scripts/analyzeProduct.sh
@@ -2,3 +2,15 @@
 autostart_bundles=$(cat "$1" | grep "plugin id=.* startLevel=" | sed -e 's/^.* id="\(.*\)" autoStart="\(.*\)" startLevel="\([0-9]*\)".*$/\1 \3 \2/')
 echo " *** Autostart Bundles ***"
 echo "$autostart_bundles"
+# These autostart bundles need to be updated accordingly in the .launch configuration
+# so they have the correct startLevel and autostart settings. The autostart bundles
+# may occur either in the target_bundles or the workspace_bundles attribute in the .launch
+# configuration. All other entries in the .launch configuration are set to @default:default.
+
+# The product consists of the features and plugins it lists. Its <configuration> section overrides
+# the startLevel and autoStart defaults (4 / false) for a subset of the bundle list obtained from
+# the features and plugins lists. The features that our product consists of are partitioned into
+# ".runtime" and non-".runtime" features. The ".runtime" features obtain their bundles from the
+# target platform, whereas the non-".runtime" features take their features from the workspace.
+
+# In order to derive the target/workspace bundles for a launch configuration, the bun
\ No newline at end of file
diff --git a/java/com.sap.sailing.feature.runtime/feature.xml b/java/com.sap.sailing.feature.runtime/feature.xml
index 2726ec2984c..28408fd6d90 100644
--- a/java/com.sap.sailing.feature.runtime/feature.xml
+++ b/java/com.sap.sailing.feature.runtime/feature.xml
@@ -77,13 +77,6 @@
          version="2.1.0.v201105210652"
          unpack="false"/>
 
-   <plugin
-         id="com.googlecode.java-diff-utils"
-         download-size="0"
-         install-size="0"
-         version="1.3.0.qualifier"
-         unpack="false"/>
-
    <plugin
          id="org.apache.httpcomponents.httpclient"
          download-size="0"
@@ -147,25 +140,4 @@
          version="1.9.4"
          unpack="false"/>
 
-   <plugin
-         id="net.sf.marineapi"
-         download-size="0"
-         install-size="0"
-         version="0.5.0.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.mp4parser.isoparser"
-         download-size="0"
-         install-size="0"
-         version="1.9.37"/>
-
-   <plugin
-         id="com.sap.sailing.routeconverterjava11extension"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
 </feature>
diff --git a/java/com.sap.sailing.feature/feature.xml b/java/com.sap.sailing.feature/feature.xml
index 1a126624cb7..512f5a17b60 100755
--- a/java/com.sap.sailing.feature/feature.xml
+++ b/java/com.sap.sailing.feature/feature.xml
@@ -430,4 +430,19 @@ Computes leaderboard information for sailing races and offers RESTful APIs to al
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="net.sf.marineapi"
+         download-size="0"
+         install-size="0"
+         version="0.5.0.qualifier"
+         unpack="false"/>
+
+   <plugin
+         id="com.sap.sailing.routeconverterjava11extension"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
 </feature>
diff --git a/java/com.sap.sse.feature.runtime/feature.xml b/java/com.sap.sse.feature.runtime/feature.xml
index ed66eb42ca2..4d1ad3dfad3 100644
--- a/java/com.sap.sse.feature.runtime/feature.xml
+++ b/java/com.sap.sse.feature.runtime/feature.xml
@@ -417,14 +417,6 @@
          version="1.2.0.v20170105-1446"
          unpack="false"/>
 
-   <plugin
-         id="com.sap.sse.jersey.jaxbdependencyfragment"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="com.sun.istack.commons-runtime"
          download-size="0"
diff --git a/java/com.sap.sse.feature/feature.xml b/java/com.sap.sse.feature/feature.xml
index 13bff187ab2..d5ef10025be 100644
--- a/java/com.sap.sse.feature/feature.xml
+++ b/java/com.sap.sse.feature/feature.xml
@@ -164,4 +164,60 @@ Computes leaderboard information for sailing races and offers RESTful APIs to al
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.sap.sse.jersey.jaxbdependencyfragment"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.moxieapps.gwt.highcharts"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.google.gwt.servlet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.googlecode.mgwt"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.googlecode.java-diff-utils"
+         download-size="0"
+         install-size="0"
+         version="1.3.0.qualifier"
+         unpack="false"/>
+
+   <plugin
+         id="com.github.branflake2267.gwt-maps-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.google.gwt.ajaxloader"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.mp4parser.isoparser"
+         download-size="0"
+         install-size="0"
+         version="1.9.37"/>
+
 </feature>