From 5f525ee17c2579f24bd31c31463c06f3e4f8949e Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Wed, 14 Oct 2015 12:32:19 -0500
Subject: [PATCH] Omaha #4759 - pre-order features for now.

amend: rebase

Change-Id: Iab7d4772394e82ac86d6f23d8bef2ce774223466

Former-commit-id: 64ce95e78663ea1757b414c046458981708564cb
---
 cave/build/features.txt                       | 49 +++++++++++++++++
 .../awips.product                             | 53 +++++++++++++++++--
 rpms/awips2.cave/deploy.builder/build.sh      |  6 +--
 3 files changed, 101 insertions(+), 7 deletions(-)
 create mode 100644 cave/build/features.txt

diff --git a/cave/build/features.txt b/cave/build/features.txt
new file mode 100644
index 0000000000..a4cb221da3
--- /dev/null
+++ b/cave/build/features.txt
@@ -0,0 +1,49 @@
+com.raytheon.uf.common.base.feature
+com.raytheon.uf.viz.dataplugin.obs.feature
+com.raytheon.uf.viz.sounding.feature
+com.raytheon.uf.viz.cots.feature
+com.raytheon.uf.viz.registry.feature
+com.raytheon.uf.viz.common.core.feature
+com.raytheon.uf.viz.dataplugins.feature
+com.raytheon.viz.feature.awips
+com.raytheon.uf.viz.application.feature
+com.raytheon.uf.viz.base.feature
+com.raytheon.uf.viz.nwsauth.feature
+com.raytheon.uf.viz.archive.feature
+com.raytheon.uf.viz.gisdatastore.feature
+com.raytheon.uf.viz.useradmin.feature
+com.raytheon.viz.dataaccess.feature
+com.raytheon.uf.viz.localization.perspective.feature
+com.raytheon.uf.viz.core.feature
+com.raytheon.uf.viz.ncep.core.feature
+com.raytheon.uf.viz.aviation.advisory.feature
+com.raytheon.uf.viz.d2d.core.feature
+com.raytheon.viz.radar.feature
+com.raytheon.uf.viz.grid.feature
+com.raytheon.uf.viz.displays.feature
+com.raytheon.viz.hydro.feature
+com.raytheon.uf.viz.kml.export.feature
+com.raytheon.uf.viz.d2d.damagepath.feature
+com.raytheon.uf.viz.d2d.xy.feature
+com.raytheon.viz.volumebrowser.feature
+com.raytheon.uf.viz.core.maps.feature
+com.raytheon.uf.viz.thinclient.feature
+com.raytheon.uf.viz.npp.feature
+com.raytheon.viz.text.feature
+com.raytheon.viz.warngen.feature
+com.raytheon.viz.gfe.feature
+com.raytheon.uf.viz.dat.feature
+com.raytheon.uf.viz.d2d.ui.awips.feature
+com.raytheon.uf.viz.d2d.gfe.feature
+com.raytheon.uf.viz.ncep.dataplugins.feature
+com.raytheon.uf.viz.alertview.feature
+com.raytheon.viz.satellite.feature
+com.raytheon.uf.viz.ncep.displays.feature
+com.raytheon.uf.viz.ncep.nsharp.feature
+com.raytheon.uf.viz.d2d.nsharp.feature
+com.raytheon.uf.viz.acarssounding.feature
+com.raytheon.viz.avnfps.feature
+com.raytheon.uf.viz.npp.sounding.feature
+com.raytheon.uf.viz.ncep.npp.feature
+com.raytheon.uf.viz.ncep.perspective.feature
+com.raytheon.uf.viz.d2d.skewt.feature
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.product.awips/awips.product b/cave/com.raytheon.viz.product.awips/awips.product
index c08455d3cf..01f6d8aaba 100644
--- a/cave/com.raytheon.viz.product.awips/awips.product
+++ b/cave/com.raytheon.viz.product.awips/awips.product
@@ -1,6 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
 <product name="CAVE" id="com.raytheon.viz.product.awips.CAVE" application="com.raytheon.uf.viz.application.application" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
@@ -70,7 +67,55 @@
    </plugins>
 
    <features>
-      <feature id="com.raytheon.viz.feature.awips" version="1.9.0.qualifier"/>
+      <feature id="com.raytheon.uf.common.base.feature"/>
+      <feature id="com.raytheon.uf.viz.dataplugin.obs.feature"/>
+      <feature id="com.raytheon.uf.viz.sounding.feature"/>
+      <feature id="com.raytheon.uf.viz.cots.feature"/>
+      <feature id="com.raytheon.uf.viz.registry.feature"/>
+      <feature id="com.raytheon.uf.viz.common.core.feature"/>
+      <feature id="com.raytheon.uf.viz.dataplugins.feature"/>
+      <feature id="com.raytheon.viz.feature.awips"/>
+      <feature id="com.raytheon.uf.viz.application.feature"/>
+      <feature id="com.raytheon.uf.viz.base.feature"/>
+      <feature id="com.raytheon.uf.viz.nwsauth.feature"/>
+      <feature id="com.raytheon.uf.viz.archive.feature"/>
+      <feature id="com.raytheon.uf.viz.gisdatastore.feature"/>
+      <feature id="com.raytheon.uf.viz.useradmin.feature"/>
+      <feature id="com.raytheon.viz.dataaccess.feature"/>
+      <feature id="com.raytheon.uf.viz.localization.perspective.feature"/>
+      <feature id="com.raytheon.uf.viz.core.feature"/>
+      <feature id="com.raytheon.uf.viz.ncep.core.feature"/>
+      <feature id="com.raytheon.uf.viz.aviation.advisory.feature"/>
+      <feature id="com.raytheon.uf.viz.d2d.core.feature"/>
+      <feature id="com.raytheon.viz.radar.feature"/>
+      <feature id="com.raytheon.uf.viz.grid.feature"/>
+      <feature id="com.raytheon.uf.viz.displays.feature"/>
+      <feature id="com.raytheon.viz.hydro.feature"/>
+      <feature id="com.raytheon.uf.viz.kml.export.feature"/>
+      <feature id="com.raytheon.uf.viz.d2d.damagepath.feature"/>
+      <feature id="com.raytheon.uf.viz.d2d.xy.feature"/>
+      <feature id="com.raytheon.viz.volumebrowser.feature"/>
+      <feature id="com.raytheon.uf.viz.core.maps.feature"/>
+      <feature id="com.raytheon.uf.viz.thinclient.feature"/>
+      <feature id="com.raytheon.uf.viz.npp.feature"/>
+      <feature id="com.raytheon.viz.text.feature"/>
+      <feature id="com.raytheon.viz.warngen.feature"/>
+      <feature id="com.raytheon.viz.gfe.feature"/>
+      <feature id="com.raytheon.uf.viz.dat.feature"/>
+      <feature id="com.raytheon.uf.viz.d2d.ui.awips.feature"/>
+      <feature id="com.raytheon.uf.viz.d2d.gfe.feature"/>
+      <feature id="com.raytheon.uf.viz.ncep.dataplugins.feature"/>
+      <feature id="com.raytheon.uf.viz.alertview.feature"/>
+      <feature id="com.raytheon.viz.satellite.feature"/>
+      <feature id="com.raytheon.uf.viz.ncep.displays.feature"/>
+      <feature id="com.raytheon.uf.viz.ncep.nsharp.feature"/>
+      <feature id="com.raytheon.uf.viz.d2d.nsharp.feature"/>
+      <feature id="com.raytheon.uf.viz.acarssounding.feature"/>
+      <feature id="com.raytheon.viz.avnfps.feature"/>
+      <feature id="com.raytheon.uf.viz.npp.sounding.feature"/>
+      <feature id="com.raytheon.uf.viz.ncep.npp.feature"/>
+      <feature id="com.raytheon.uf.viz.ncep.perspective.feature"/>
+      <feature id="com.raytheon.uf.viz.d2d.skewt.feature"/>
    </features>
 
    <configurations>
diff --git a/rpms/awips2.cave/deploy.builder/build.sh b/rpms/awips2.cave/deploy.builder/build.sh
index b61f25eb6c..2ce4b0b632 100644
--- a/rpms/awips2.cave/deploy.builder/build.sh
+++ b/rpms/awips2.cave/deploy.builder/build.sh
@@ -126,7 +126,7 @@ cd ${prepare_dir}
 /awips2/java/bin/java -jar -DbaseLocation=${UFRAME_ECLIPSE} \
     -DbuildDirectory=${pde_build_dir} -DstagingDirectory=${WORKSPACE} -DbuildFeatures=* \
     -DexcludeFeatures=com.raytheon.viz.feature.awips.developer,com.raytheon.uf.viz.feature.alertviz \
-    -DbuildProduct=${awips_product} AwipsDependencyEvaluator.jar
+    AwipsDependencyEvaluator.jar
 if [ $? -ne 0 ]; then
     exit 1
 fi
@@ -142,6 +142,7 @@ _pde_product_xml=${UFRAME_ECLIPSE}/plugins/org.eclipse.pde.build_3.8.2.v20121114
 if [ $? -ne 0 ]; then
     exit 1
 fi
+
 # Copy the CAVE binary to the location expected by the RPM build
 cp ${pde_build_dir}/I.CAVE/CAVE-linux.gtk.x86_64.zip ${WORKSPACE}/rpms/awips2.cave/setup/dist/
 
@@ -152,7 +153,6 @@ pde_base_dir=${pde_base_dir}/p2
 /awips2/java/bin/java -jar -DbaseLocation=${UFRAME_ECLIPSE} \
     -DbuildDirectory=${pde_build_dir} -DstagingDirectory=${WORKSPACE} -DbuildFeatures=* \
     -DexcludeFeatures=com.raytheon.viz.feature.awips.developer,com.raytheon.uf.viz.feature.alertviz \
-    -DoutputFile=${prepare_dir}/repositoriesToBuild.txt \
     AwipsDependencyEvaluator.jar
 if [ $? -ne 0 ]; then
     exit 1
@@ -170,7 +170,7 @@ fi
 mkdir -p ${REPO_DEST}
 
 cp -v ${build_project_dir}/build.properties.p2 ${pde_base_dir}/build.properties
-for feature in `cat ${prepare_dir}/repositoriesToBuild.txt`; do
+for feature in `cat ${build_project_dir}/features.txt`; do
 /awips2/java/bin/java -jar ${_pde_launcher_jar} -application org.eclipse.ant.core.antRunner \
     -buildfile ${_pde_build_xml} -DbaseLocation=${UFRAME_ECLIPSE} \
     -Dbuilder=${pde_base_dir} -DbuildDirectory=${pde_build_dir} \