From 490b772aaf5a265dd565460b4614927cc31f090e Mon Sep 17 00:00:00 2001
From: Brad Gonzales <bradley_l_gonzales@raytheon.com>
Date: Wed, 14 Aug 2013 12:33:11 -0500
Subject: [PATCH] Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT
 to correspond to the port that the DPA looks for. Renamed registry mode to
 wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode.

Change-Id: I8793b2a5c6ebf0f2ce342103e81d48de1b3e2044

Former-commit-id: 50a10b3efb94fc60f17295c6091d2e1bc77f1086 [formerly 533deffd53fb4a919bbcae9b6b12c7d46e5e0714] [formerly 50a10b3efb94fc60f17295c6091d2e1bc77f1086 [formerly 533deffd53fb4a919bbcae9b6b12c7d46e5e0714] [formerly 5d169e4df152017d853cc693ac64585e3a7d94cc [formerly b4ee9c5753571a8cdd0720986c76723f4e646f0c]]]
Former-commit-id: 5d169e4df152017d853cc693ac64585e3a7d94cc
Former-commit-id: 88fdc1e56b7bcaf120ab3527b4a5df46584b02ae [formerly f3bc3d9185c248516e876874919c98d732a8b19f]
Former-commit-id: 526c244fc5a84332e8529635428104ca9a12e023
---
 edexOsgi/build.edex/esb/conf/modes.xml                | 11 ++++-------
 .../esb/etc/{devWfoRegistry.sh => devRegistry.sh}     |  0
 edexOsgi/build.edex/esb/etc/ncfRegistry.sh            |  2 +-
 .../esb/etc/{registry.sh => wfoRegistry.sh}           |  0
 4 files changed, 5 insertions(+), 8 deletions(-)
 rename edexOsgi/build.edex/esb/etc/{devWfoRegistry.sh => devRegistry.sh} (100%)
 rename edexOsgi/build.edex/esb/etc/{registry.sh => wfoRegistry.sh} (100%)

diff --git a/edexOsgi/build.edex/esb/conf/modes.xml b/edexOsgi/build.edex/esb/conf/modes.xml
index d83ce5a696..06bd183ce0 100644
--- a/edexOsgi/build.edex/esb/conf/modes.xml
+++ b/edexOsgi/build.edex/esb/conf/modes.xml
@@ -185,7 +185,7 @@
         <includeMode>excludeDpaAndOgc</includeMode>
         <includeMode>statsTemplate</includeMode>
 	</mode>
-	<mode name="registry">
+	<mode name="wfoRegistry">
         <!-- WFO Registry production mode -->
         <include>ebxml.*\.xml</include>
         <includeMode>statsTemplate</includeMode>
@@ -251,16 +251,13 @@
 
 	<!-- modes listed below are not supported in a production setting, they 
 		are for DEVELOPMENT purposes only -->
-    <mode name="devWfoRegistry">
-         <!-- This is the development WFO registry mode.
-         It runs the sbn simulator for development. -->
+    <mode name="devRegistry">
+         <!-- This is the development registry mode that acts as both
+         an NCF and WFO. It also runs the sbn simulator. -->
         <include>.*sbn-simulator.*</include>
         <include>ebxml.*\.xml</include>
         <includeMode>statsTemplate</includeMode>
         <includeMode>dataDeliveryTemplate</includeMode>
-        <exclude>.*datadelivery-ncf.*</exclude>
-        <exclude>harvester-*</exclude>
-        <exclude>crawler-*</exclude>
     </mode>
 	<mode name="grib">
 		<include>grib-common.xml</include>
diff --git a/edexOsgi/build.edex/esb/etc/devWfoRegistry.sh b/edexOsgi/build.edex/esb/etc/devRegistry.sh
similarity index 100%
rename from edexOsgi/build.edex/esb/etc/devWfoRegistry.sh
rename to edexOsgi/build.edex/esb/etc/devRegistry.sh
diff --git a/edexOsgi/build.edex/esb/etc/ncfRegistry.sh b/edexOsgi/build.edex/esb/etc/ncfRegistry.sh
index 011e0bf375..5c32e7ab57 100644
--- a/edexOsgi/build.edex/esb/etc/ncfRegistry.sh
+++ b/edexOsgi/build.edex/esb/etc/ncfRegistry.sh
@@ -31,4 +31,4 @@ export MGMT_PORT=9607
 export EBXML_REGISTRY_WEBSERVER_PORT=8084
 export EBXML_REGISTRY_WEBSERVER_CONFIDENTIAL_PORT=8446
 export EBXML_QUERY_SERVICE_SOAP_PORT=10146
-export EBXML_THRIFT_SERVICE_PORT=9590
\ No newline at end of file
+export EBXML_THRIFT_SERVICE_PORT=9588
diff --git a/edexOsgi/build.edex/esb/etc/registry.sh b/edexOsgi/build.edex/esb/etc/wfoRegistry.sh
similarity index 100%
rename from edexOsgi/build.edex/esb/etc/registry.sh
rename to edexOsgi/build.edex/esb/etc/wfoRegistry.sh