From cff287fd9ccc3a4b910a7dae30bccb8d4f5bc122 Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Wed, 30 Jan 2019 12:13:18 -0700
Subject: [PATCH] build and feature set updates for text.subscription removal,
 building gfe

---
 .../feature.xml                               |  7 -------
 edexOsgi/build.edex/build.xml                 | 10 ++++-----
 .../feature.xml                               |  7 -------
 .../feature.xml                               | 21 ++++++++++++-------
 4 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.common.core.feature/feature.xml b/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
index 01302cd784..b883e1ecda 100644
--- a/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
@@ -44,13 +44,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.common.dataplugin.text.subscription"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.wmo"
          download-size="0"
diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml
index 176245cbe8..864aeba9eb 100644
--- a/edexOsgi/build.edex/build.xml
+++ b/edexOsgi/build.edex/build.xml
@@ -54,29 +54,29 @@
 			<param name="feature" value="com.raytheon.uf.edex.dataplugins.feature" />
 		</antcall>
 		<!-- optional builds -->
+		<antcall target="build">
+			<param name="feature" value="com.raytheon.uf.edex.gfe.feature" />
+		</antcall>
+	<!--
 		<antcall target="build">
 			<param name="feature" value="com.raytheon.uf.edex.ogc.feature" />
 		</antcall>
 		<antcall target="build">
 			<param name="feature" value="com.raytheon.uf.edex.datadelivery.feature" />
 		</antcall>
-	<!--
                 <antcall target="build">
                         <param name="feature" value="com.raytheon.uf.edex.dat.feature" />
                 </antcall>
 		<antcall target="build">
 			<param name="feature" value="gov.noaa.nws.ncep.uf.edex.swpc.feature" />
 		</antcall>
-		<antcall target="build">
-			<param name="feature" value="com.raytheon.uf.edex.gfe.feature" />
-		</antcall>
 		<antcall target="build">
 			<param name="feature" value="com.raytheon.uf.edex.hazards.feature" />
 		</antcall>
-	-->
 		<antcall target="build">
 			<param name="feature" value="edu.ucar.unidata.uf.edex.upc.feature" />
 		</antcall>
+	-->
 		<!-- end optional builds -->
 	</target>
 
diff --git a/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
index f06419f235..1602ddd4f6 100644
--- a/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
@@ -84,13 +84,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.common.dataplugin.text.subscription"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.edex.decodertools"
          download-size="0"
diff --git a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
index 098134966f..656c0cf9a1 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
@@ -87,6 +87,20 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.common.damagepath"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.edex.damagepath"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.uf.common.registry.schemas.iso19115"
          download-size="0"
@@ -772,13 +786,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.edex.plugin.text.subscription"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.edex.plugin.radar"
          download-size="0"