From 82da8850cb8430762cd4e126f28450838f904195 Mon Sep 17 00:00:00 2001
From: Brian Clements <brian.d.clements@raytheon.com>
Date: Fri, 9 May 2014 14:23:12 -0500
Subject: [PATCH] Omaha #2733 changes to match ufcore distribution pattern
 changes

this change depends on changes from #3151
required plugins will prevent edex from starting if there are no valid dist patterns
removed distribution registration from geomag since it did not contain any valid patterns


Former-commit-id: 9b7496f4a0bbc69a3ec0c0098d043c8aff0d1102 [formerly 4d2d5f81df7b31eaa1d0049f59667fac34495aba] [formerly 243ba8476afb35dbda1f3ddb1a20eb2de8c5bded] [formerly 243ba8476afb35dbda1f3ddb1a20eb2de8c5bded [formerly 8b07016f25bbc6a9ad186a9054203ae3aab894b8]] [formerly 9b7496f4a0bbc69a3ec0c0098d043c8aff0d1102 [formerly 4d2d5f81df7b31eaa1d0049f59667fac34495aba] [formerly 243ba8476afb35dbda1f3ddb1a20eb2de8c5bded] [formerly 243ba8476afb35dbda1f3ddb1a20eb2de8c5bded [formerly 8b07016f25bbc6a9ad186a9054203ae3aab894b8]] [formerly 316bfe3b6f9a450396fce348a85b1687cfd8315c [formerly 243ba8476afb35dbda1f3ddb1a20eb2de8c5bded [formerly 8b07016f25bbc6a9ad186a9054203ae3aab894b8] [formerly 316bfe3b6f9a450396fce348a85b1687cfd8315c [formerly e917569da8e837a1c340b0e992a0c59f0a3507f3]]]]]
Former-commit-id: 316bfe3b6f9a450396fce348a85b1687cfd8315c
Former-commit-id: 2ac121aa6ddf62a21ff663b002c30971f75b8dcb [formerly 26064a9629cbbbb09f29bcd6484959a0ab37ac69] [formerly 546cf300df3c3ecc4d692f007c2b15079377f838] [formerly 988bb888422e43c28df764261f1d8e0193b7e87f [formerly fbf8cffad16b3edb70ad15a4742dcdc5c87e748c] [formerly 546cf300df3c3ecc4d692f007c2b15079377f838 [formerly 9cc5ee88b52c82f2aa283c4e8df613eb767e7529]]]
Former-commit-id: 8196129e5b812c31863ae13096cb91ae8386234d [formerly 1acad5dacb5b2d6f53d36dcf979d6af776115058] [formerly 4a6011ce6ccb7fab8fae8d644349f7345457862d [formerly a1f23d2c7b62a3b79c742caa99a16bfef0d1cc1e]]
Former-commit-id: 4a6011ce6ccb7fab8fae8d644349f7345457862d
Former-commit-id: c0df43a64db590f4c4564dfb5963fc06bf46eb3d
---
 .../res/spring/grib-distribution.xml                        | 1 +
 .../com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml  | 1 +
 .../res/spring/radar-ingest.xml                             | 1 +
 .../res/spring/satellite-ingest.xml                         | 1 +
 .../res/spring/warning-ingest.xml                           | 1 +
 .../res/spring/geomag-ingest.xml                            | 6 ------
 .../utility/edex_static/base/distribution/geomag.xml        | 3 ---
 7 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/edex_static/base/distribution/geomag.xml

diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
index cdd021b194..59b26f0f93 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
@@ -5,5 +5,6 @@
 		factory-method="register">
 		<constructor-arg value="grib" />
 		<constructor-arg value="jms-durable:queue:Ingest.GribSplit" />
+        <constructor-arg value="true" /> <!-- require valid distribution file for startup -->
   	</bean>
 </beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
index ef1a7969e7..5547059240 100644
--- a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
@@ -12,6 +12,7 @@
     <bean id="obsDistRegistry" factory-bean="distributionSrv" factory-method="register">
         <constructor-arg value="obs" />
         <constructor-arg value="jms-durable:queue:Ingest.obs" />
+        <constructor-arg value="true" /> <!-- require valid distribution file for startup -->
     </bean>
   
     <bean id="mtrListener" class="com.raytheon.edex.plugin.obs.ingest.MTRSubscriber" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
index d5c429776b..0c2a9bed1a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
@@ -15,6 +15,7 @@
 		factory-method="register">
 		<constructor-arg value="radar" />
 		<constructor-arg value="jms-durable:queue:Ingest.Radar" />
+        <constructor-arg value="true" /> <!-- require valid distribution file for startup -->
 	</bean>
 	
 	<bean id="radarRadarServerDistRegistry" factory-bean="radarserverDistributionSrv"
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
index e4661cf6e4..f79ab24bff 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
@@ -20,6 +20,7 @@
 		factory-method="register">
 		<constructor-arg value="satellite" />
 		<constructor-arg value="jms-durable:queue:Ingest.Satellite" />
+        <constructor-arg value="true" /> <!-- require valid distribution file for startup -->
 	</bean>
 
 	<camelContext id="sat-camel"
diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
index 306f173f74..30c3990723 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
@@ -15,6 +15,7 @@
 		factory-method="register">
 		<constructor-arg value="warning" />
 		<constructor-arg value="jms-durable:queue:Ingest.Warning"/>
+        <constructor-arg value="true" /><!-- require valid distribution file for startup -->
 	</bean>
 
 	<camelContext id="warning-camel"
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
index e1c61ec17e..ae419da81f 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
@@ -11,12 +11,6 @@
 		<property name="dao" ref="geomagDao" />
 	</bean>
 	
-	<bean id="geomagDistRegistry" factory-bean="distributionSrv"
-		factory-method="register">
-		<constructor-arg ref="geomagPluginName" />
-		<constructor-arg value="jms-durable:queue:Ingest.GeoMag"/>
-	</bean>
-
   	<bean id="trig1minCalc" class="gov.noaa.nws.ncep.edex.plugin.geomag.TrigKCalculation" />	
 	
     <camelContext id="geomag-camel"
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/edex_static/base/distribution/geomag.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/edex_static/base/distribution/geomag.xml
deleted file mode 100644
index 405e30cfe4..0000000000
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/utility/edex_static/base/distribution/geomag.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<requestPatterns xmlns:ns2="group">
-</requestPatterns>