From f5f05a7f4fea36258da5eb8b2b11590b7db04de8 Mon Sep 17 00:00:00 2001
From: Ben Steffensmeier <Benjamin.P.Steffensmeier@raytheon.com>
Date: Thu, 18 Oct 2012 13:27:37 -0500
Subject: [PATCH] Issue #189 fix unified grid problems found during
 install/upgrade on testbed

Former-commit-id: e557ea73c359196efc94c945c2bdb6856c912e1f [formerly f3331dc743135b96e3ef94ace1f60ccb0330c1ef] [formerly 830a8bd7c29c0c8acfbbe0e3707d277e2f94dc26] [formerly e557ea73c359196efc94c945c2bdb6856c912e1f [formerly f3331dc743135b96e3ef94ace1f60ccb0330c1ef] [formerly 830a8bd7c29c0c8acfbbe0e3707d277e2f94dc26] [formerly 90b815d41201b5e0b6fb4c5d33619d539b58616e [formerly 830a8bd7c29c0c8acfbbe0e3707d277e2f94dc26 [formerly 4c444ce1a007f844010eb43846070d97d6c811bf]]]]
Former-commit-id: 90b815d41201b5e0b6fb4c5d33619d539b58616e
Former-commit-id: 17d8918df837c167df413b9938af0a31b7caaae0 [formerly db2c9b41ec63a30c6a823d636e550deb9ffe07ff] [formerly 277a0c28dd34718cb8b2c32568f24ebe0b4531a4 [formerly ea2f15c0df85892ccc558481d100ce2da6d93107]]
Former-commit-id: c9e31e766fba4172e72caac122fe4ae01b182f53 [formerly e5679af21a361fcbc2b3168d612cfa386cba4fc0]
Former-commit-id: a225ea9cd9895f83853688be1512f09f54f6adc5
---
 deltaScripts/unified_grid/update_D2D_bundles.sh             | 1 +
 deltaScripts/unified_grid/update_D2D_procedures.sh          | 1 +
 deltaScripts/unified_grid_rollback/update_D2D_bundles.sh    | 1 +
 deltaScripts/unified_grid_rollback/update_D2D_procedures.sh | 1 +
 edexOsgi/build.edex/esb/conf/modes.xml                      | 4 +++-
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/deltaScripts/unified_grid/update_D2D_bundles.sh b/deltaScripts/unified_grid/update_D2D_bundles.sh
index e97e0fd8db..a9b9f09d8d 100644
--- a/deltaScripts/unified_grid/update_D2D_bundles.sh
+++ b/deltaScripts/unified_grid/update_D2D_bundles.sh
@@ -10,6 +10,7 @@ echo ""
 echo "Press Enter to perform the updates Ctrl-C to quit."
 read done
 
+IFS=$'\n'
 files=`find /awips2/edex/data/utility/cave_static/*/*/bundles/ -iname '*.xml'`
 
 if [ $? -ne 0 ]; then
diff --git a/deltaScripts/unified_grid/update_D2D_procedures.sh b/deltaScripts/unified_grid/update_D2D_procedures.sh
index be01266ac0..95070ec82d 100644
--- a/deltaScripts/unified_grid/update_D2D_procedures.sh
+++ b/deltaScripts/unified_grid/update_D2D_procedures.sh
@@ -9,6 +9,7 @@ echo ""
 echo "Press Enter to perform the updates Ctrl-C to quit."
 read done
 
+IFS=$'\n'
 files=`ls /awips2/edex/data/utility/cave_static/*/*/procedures/*.xml`
 
 if [ $? -ne 0 ]; then
diff --git a/deltaScripts/unified_grid_rollback/update_D2D_bundles.sh b/deltaScripts/unified_grid_rollback/update_D2D_bundles.sh
index c0fc99b9a1..93ab28558c 100644
--- a/deltaScripts/unified_grid_rollback/update_D2D_bundles.sh
+++ b/deltaScripts/unified_grid_rollback/update_D2D_bundles.sh
@@ -10,6 +10,7 @@ echo ""
 echo "Press Enter to undo the updates Ctrl-C to quit."
 read done
 
+IFS=$'\n'
 files=`find /awips2/edex/data/utility/cave_static/*/*/bundles/ -iname '*.xml'`
 
 if [ $? -ne 0 ]; then
diff --git a/deltaScripts/unified_grid_rollback/update_D2D_procedures.sh b/deltaScripts/unified_grid_rollback/update_D2D_procedures.sh
index fa39726707..36f170cc89 100644
--- a/deltaScripts/unified_grid_rollback/update_D2D_procedures.sh
+++ b/deltaScripts/unified_grid_rollback/update_D2D_procedures.sh
@@ -9,6 +9,7 @@ echo ""
 echo "Press Enter to undo the updates Ctrl-C to quit."
 read done
 
+IFS=$'\n'
 files=`ls /awips2/edex/data/utility/cave_static/*/*/procedures/*.xml`
 
 if [ $? -ne 0 ]; then
diff --git a/edexOsgi/build.edex/esb/conf/modes.xml b/edexOsgi/build.edex/esb/conf/modes.xml
index 98b0b40bd6..38b3028de9 100644
--- a/edexOsgi/build.edex/esb/conf/modes.xml
+++ b/edexOsgi/build.edex/esb/conf/modes.xml
@@ -110,7 +110,9 @@
 		<include>cpgsrv-spring.xml</include>
 	 	<include>persist-ingest.xml</include>
 		<include>binlightning-common.xml</include>
-		<include>grib-common.xml</include>
+		<include>parameter-common.xml</include>
+		<include>gridcoverage-common.xml</include>
+		<include>grid-common.xml</include>
 		<include>radar-common.xml</include>
 		<include>text-common.xml</include>
 		<include>level-common.xml</include>