From 65430f2e6fd0ab3bb8290f61773ca8b38919bacd Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Mon, 7 Jan 2019 10:40:54 -0700
Subject: [PATCH] fix for building binlightning w ost dependency

---
 build/rsync.dirs                              |  1 +
 cave/build/p2-build.xml                       |  8 +++----
 .../feature.xml                               | 21 +++++++------------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/build/rsync.dirs b/build/rsync.dirs
index ad08ff741c..0e00b7ca18 100644
--- a/build/rsync.dirs
+++ b/build/rsync.dirs
@@ -17,6 +17,7 @@ javaUtilities/* rpms pythonPackages
 ../awips2-ncep/viz/* 
 ../awips2-ncep/features/* 
 ../awips2-ncep/edex/* 
+../awips2-nws/edex/* 
 ../awips2-goesr/edexOsgi/* 
 ../awips2-goesr/cave/* 
 ../awips2-unidata/*
diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index 66ce483f69..79d1f6549d 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -283,16 +283,16 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.gisdatastore.feature" />
 		</antcall>
-	<!--
-		<antcall target="p2.build.repo">
-			<param name="feature" value="gov.noaa.nws.mdl.viz.awipsref.feature" />
-		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="gov.noaa.nws.obs.viz.geodata.feature" />
 		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="gov.noaa.nws.ocp.uf.viz.gisdatastore.feature" />
 		</antcall>
+	<!--
+		<antcall target="p2.build.repo">
+			<param name="feature" value="gov.noaa.nws.mdl.viz.awipsref.feature" />
+		</antcall>
         	<antcall target="p2.build.repo">
         		<param name="feature" value="com.raytheon.uf.viz.server.edex.feature" />
         	</antcall>
diff --git a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
index aa54b8b06a..098134966f 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
@@ -218,6 +218,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+	 id="gov.noaa.nws.ost.edex.plugin.binlightning"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.edex.plugin.binlightning"
          download-size="0"
@@ -807,20 +814,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.obs.common.dataplugin.geodata"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="gov.noaa.nws.obs.edex.plugin.geodata"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.edex.menus.dataplugins"
          download-size="0"