From d8e14ca6e9d96673e4d8022cc6517def465b77bb Mon Sep 17 00:00:00 2001
From: Jonathan Sanchez <jpsanchez1@raytheon.com>
Date: Thu, 24 Oct 2013 12:22:02 -0500
Subject: [PATCH] Issue #2496 Updated gfe spring files to support GFE grids in
 hazard services.

Change-Id: Icd58f77266a9e6c67c001badcdd1f7590640b162

Former-commit-id: c289f77965567773f8249e49d51738e1dc311fac [formerly ec2f7c8ce79faeff12238a70285a555fb6f4f532] [formerly cb5ac5c83541ecab55ff52d6dc2167c6b5c13fe5 [formerly 0946721292171cc2d14b173a60c273731b73af12]]
Former-commit-id: cb5ac5c83541ecab55ff52d6dc2167c6b5c13fe5
Former-commit-id: 2420f1a2312c96d787455baf57edb0c08c529f94
---
 .../com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml  | 4 ++--
 .../com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
index 139cafdda7..bfeb234ee6 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
@@ -28,13 +28,13 @@
     </bean>
 
     <bean id="gfeSiteActivation" class="com.raytheon.edex.plugin.gfe.config.GFESiteActivation" factory-method="getInstance"
-        depends-on="commonTimeRegistered">
+        depends-on="commonTimeRegistered, gfeRegistered">
     </bean>
 
     <bean id="gfeNotifyFilter" class="com.raytheon.edex.plugin.gfe.server.notify.GfeNotificationFilter"/>
 
     <bean id="ifpServer" class="com.raytheon.edex.plugin.gfe.server.IFPServer.Wrapper"/>
-
+    
     <camelContext id="gfe-common-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
 
         <route id="gfeNotify">
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
index 6e5fa55886..1e0eefeb4f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
@@ -65,17 +65,17 @@
         <constructor-arg ref="pythonGridDataHandler"/>
     </bean>
     <bean id="gridInventoryHandler" class="com.raytheon.edex.plugin.gfe.server.handler.GetGridInventoryHandler"/>
-    <bean factory-bean="handlerRegistry" factory-method="register">
+    <bean id="getGridInventoryRequestRegister" factory-bean="handlerRegistry" factory-method="register">
         <constructor-arg value="com.raytheon.uf.common.dataplugin.gfe.request.GetGridInventoryRequest"/>
         <constructor-arg ref="gridInventoryHandler"/>
     </bean>
     <bean id="gridHistoryHandler" class="com.raytheon.edex.plugin.gfe.server.handler.GetGridHistoryHandler"/>
-    <bean factory-bean="handlerRegistry" factory-method="register">
+    <bean id="getGridHistoryRequestRegister" factory-bean="handlerRegistry" factory-method="register">
         <constructor-arg value="com.raytheon.uf.common.dataplugin.gfe.request.GetGridHistoryRequest"/>
         <constructor-arg ref="gridHistoryHandler"/>
     </bean>
     <bean id="gridParmInfoHandler" class="com.raytheon.edex.plugin.gfe.server.handler.GetGridParmInfoHandler"/>
-    <bean factory-bean="handlerRegistry" factory-method="register">
+    <bean id="getGridParmInfoRequestRegister" factory-bean="handlerRegistry" factory-method="register">
         <constructor-arg value="com.raytheon.uf.common.dataplugin.gfe.request.GetGridParmInfoRequest"/>
         <constructor-arg ref="gridParmInfoHandler"/>
     </bean>