Merge "Issue #1322 Fix ingestGrib modes.xml to include router spring file" into development

Former-commit-id: b71c022247 [formerly b71c022247 [formerly d846e934736d3e68f65620640ae2699dfb3c7530]]
Former-commit-id: 657c7a35c5
Former-commit-id: e2f026a6a8

edexOsgi/build.edex/esb/conf/modes.xml

@@ -163,6 +163,7 @@
 		<include>management-common.xml</include>
 	 	<include>database-common.xml</include>
 		<include>auth-common.xml</include>
+        <include>router-common.xml</include>
         <include>event-ingest.xml</include>
 		<!-- ncep excludes until tested -->
 		<exclude>ncgrib-common.xml</exclude>

edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml

@@ -26,7 +26,8 @@
         <!-- This bean will cause all RequestRouter.route(request) calls to be processed internally to EDEX -->
     </bean>
 
-    <bean factory-bean="requestRouterRegistry" factory-method="register">
+    <bean id="registerRequestServiceRouter" factory-bean="requestRouterRegistry"
+        factory-method="register">
         <constructor-arg value="request.server" />
         <constructor-arg ref="requestServiceRouter" />
     </bean>

edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml

@@ -22,7 +22,7 @@
 	<bean id="gridcoveragelookup"
 		class="com.raytheon.uf.common.gridcoverage.lookup.GridCoverageLookup"
 		factory-method="getInstance"
-		depends-on="serializeServer,getGridCoverageHandlerRegistered,queryDataRegistered"
+		depends-on="serializeServer,getGridCoverageHandlerRegistered,queryDataRegistered,registerRequestServiceRouter"
 		lazy-init="true" />
 
 	<bean id="gridcoverageRegistered" factory-bean="dbPluginRegistry"