From 4a7c625c190e8a00a2425441757c863c4e9e0cb7 Mon Sep 17 00:00:00 2001
From: AWIPS User <mjames@unidata.ucar.edu>
Date: Sun, 10 May 2015 13:14:25 -0500
Subject: [PATCH] EDEX deploy/debug through Eclipse remote Java Appliccation,
 with OHD features muted to not cause HydroApps to barf when starting ingest

---
 edexOsgi/build.edex/build.xml                 |  2 ++
 edexOsgi/build.edex/edex/common.properties    | 36 ++++++++++++-------
 .../feature.xml                               |  5 +--
 .../edex_static/base/distribution/radar.xml   |  2 +-
 .../feature.xml                               |  4 +--
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml
index 17926e1484..1d7b793647 100644
--- a/edexOsgi/build.edex/build.xml
+++ b/edexOsgi/build.edex/build.xml
@@ -74,10 +74,12 @@
 			<param name="feature"
 				value="com.raytheon.uf.edex.radar.feature" />
 		</antcall>
+		<!--
 		<antcall target="build">
 			<param name="feature"
 				value="com.raytheon.uf.edex.dat.feature" />
 		</antcall>
+		-->
 		<antcall target="build">
 			<param name="feature"
 				value="com.raytheon.uf.edex.ncep.feature" />
diff --git a/edexOsgi/build.edex/edex/common.properties b/edexOsgi/build.edex/edex/common.properties
index 1996d0ce4c..29d2bd6e3d 100644
--- a/edexOsgi/build.edex/edex/common.properties
+++ b/edexOsgi/build.edex/edex/common.properties
@@ -1,29 +1,39 @@
 edex.root.directory=/awips2/edex
 architecture=x86_64
 
-includegen.filter=raytheon|noaa\.nws|noaa\.gsd|gov\.nasa\.msfc|edu\.wisc\.ssec\.cimss
+#includegen.filter=raytheon|noaa\.nws|noaa\.gsd|gov\.nasa\.msfc|gov\.nasa\.gsfc|edu\.wisc\.ssec\.cimss
+includegen.filter=raytheon|noaa\.nws|gov.nasa.msfc|noaa\.gsd|edu\.wisc\.ssec\.cimss
 
 # AWIPSII core repositories required for build
-core.repositories=awips2-core,awips2-core-foss,awips2-foss
+core.repo=awips2-core
+core-foss.repo=awips2-core-foss
+awips2-foss.repo=awips2-foss
+
+awips2-ncep.repo=awips2-ncep
+awips2-cimss.repo=awips2-cimss
+awips2-gsd.repo=awips2-gsd
+awips2-ohd.repo=awips2-ohd
+
+core.repositories=${core.repo},${core-foss.repo},${awips2-foss.repo},${awips2-ncep.repo},${awips2-cimss.repo},${awips2-gsd.repo},${awips2-ohd.repo}
 
 # Note: currently, there is a limit of 99 plugin directories.
 dir.01=cave
 dir.02=cots
 dir.03=edexOsgi
-dir.04=ncep
-dir.05=RadarServer
-dir.06=edu
-dir.07=ost
-dir.08=ohd
+dir.04=RadarServer
+dir.05=edu
+dir.06=ost
+dir.07=ohd
 # directories from ufcore
-dir.09=common
-dir.10=edex
-dir.11=features
-dir.12=viz
+dir.08=common
+dir.09=edex
+dir.10=features
+dir.11=viz
 # directories from ufcore-foss
-dir.13=lib
+dir.12=lib
 # CIMSS plug-in directory
-dir.14=CIMSS
+dir.13=CIMSS
+
 
 
 # the directory that contains the localization projects
diff --git a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
index affbaf9697..13f2c22076 100644
--- a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
+++ b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
@@ -99,10 +99,11 @@
          id="com.raytheon.uf.edex.radar.feature"
          version="0.0.0"/>
 
-   <includes
+   <!--
+        <includes
          id="com.raytheon.uf.edex.dat.feature"
          version="0.0.0"/>
-
+   -->
    <includes
          id="com.raytheon.uf.edex.ncep.feature"
          version="0.0.0"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/utility/edex_static/base/distribution/radar.xml b/edexOsgi/com.raytheon.edex.plugin.radar/utility/edex_static/base/distribution/radar.xml
index 333386cca0..d3ee0046f0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/utility/edex_static/base/distribution/radar.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/utility/edex_static/base/distribution/radar.xml
@@ -20,5 +20,5 @@
     -->
 <requestPatterns >
     <regex>^SDUS[234578]. .*</regex>
-    <regex>^RadarServer.*</regex>
+    <regex>^Level2_.*</regex>
 </requestPatterns>
diff --git a/edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
index 778e02e080..f0550b3b88 100644
--- a/edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
@@ -83,13 +83,13 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+<!--
    <plugin
          id="gov.nasa.gsfc.fits"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
-
+-->
    <plugin
          id="ucar.nc2.bufrsplitter"
          download-size="0"