Merge "Omaha #3622 Fix null pointer in ServiceBackupLockManager" into omaha_14.4.1
Former-commit-id:8e6a3af18c
[formerlyb81e0f4549
] [formerly9c0692f861
] [formerly8e6a3af18c
[formerlyb81e0f4549
] [formerly9c0692f861
] [formerly02fb12501e
[formerly9c0692f861
[formerly cac5f4e1c1f25ea1c5b9083410c1eeaf6b4af0f4]]]] Former-commit-id:02fb12501e
Former-commit-id:09f22628e7
[formerlya33c36417b
] [formerly b506c340003f665c31bceb5d0d8635dc508891b0 [formerly4e05ef95b6
]] Former-commit-id: 061db7299a8ad9ad52f5905f51fb665c135e05ef [formerly0e13f93da4
] Former-commit-id:27df0ccc12
This commit is contained in:
commit
56992359cb
1 changed files with 31 additions and 25 deletions
|
@ -1,7 +1,8 @@
|
|||
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
|
||||
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
|
||||
|
||||
|
||||
<bean id="ValidateConfigRequestHandler"
|
||||
class="com.raytheon.uf.edex.site.handlers.ValidateConfigRequestHandler" />
|
||||
<bean factory-bean="handlerRegistry" factory-method="register">
|
||||
|
@ -9,7 +10,7 @@
|
|||
value="com.raytheon.uf.common.site.requests.ValidateConfigRequest" />
|
||||
<constructor-arg ref="ValidateConfigRequestHandler" />
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="activateSiteHandler"
|
||||
class="com.raytheon.uf.edex.site.handlers.ActivateSiteHandler" />
|
||||
<bean factory-bean="handlerRegistry" factory-method="register">
|
||||
|
@ -17,7 +18,7 @@
|
|||
value="com.raytheon.uf.common.site.requests.ActivateSiteRequest" />
|
||||
<constructor-arg ref="activateSiteHandler" />
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="deactivateSiteHandler"
|
||||
class="com.raytheon.uf.edex.site.handlers.DeactivateSiteHandler" />
|
||||
<bean factory-bean="handlerRegistry" factory-method="register">
|
||||
|
@ -25,7 +26,7 @@
|
|||
value="com.raytheon.uf.common.site.requests.DeactivateSiteRequest" />
|
||||
<constructor-arg ref="deactivateSiteHandler" />
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="getActiveSitesHandler"
|
||||
class="com.raytheon.uf.edex.site.handlers.GetActiveSitesHandler" />
|
||||
<bean factory-bean="handlerRegistry" factory-method="register">
|
||||
|
@ -33,25 +34,30 @@
|
|||
value="com.raytheon.uf.common.site.requests.GetActiveSitesRequest" />
|
||||
<constructor-arg ref="getActiveSitesHandler" />
|
||||
</bean>
|
||||
|
||||
<bean id="siteActivateNotifyFilter"
|
||||
class="com.raytheon.uf.edex.site.notify.SiteActivateNotifyFilter" />
|
||||
<bean id="siteActivationMonitor" class="com.raytheon.uf.edex.site.SiteActivationMonitor" factory-method="getInstance"/>
|
||||
|
||||
<camelContext id="siteActivationMonitoring"
|
||||
xmlns="http://camel.apache.org/schema/spring"
|
||||
errorHandlerRef="errorHandler">
|
||||
|
||||
<route id="siteActivateNotify">
|
||||
<from uri="jms-generic:topic:siteActivateNotification" />
|
||||
<bean ref="serializationUtil" method="transformFromThrift"/>
|
||||
<filter>
|
||||
<method bean="siteActivateNotifyFilter" method="isSiteActivateNotification" />
|
||||
<bean ref="siteActivationMonitor" method="handleNotification"/>
|
||||
<bean ref="serializationUtil" method="transformToThrift" />
|
||||
<to uri="jms-generic:topic:edex.alerts.siteActivate?timeToLive=60000" />
|
||||
</filter>
|
||||
</route>
|
||||
</camelContext>
|
||||
|
||||
<bean id="siteActivateNotifyFilter"
|
||||
class="com.raytheon.uf.edex.site.notify.SiteActivateNotifyFilter" />
|
||||
<bean id="siteActivationMonitor" class="com.raytheon.uf.edex.site.SiteActivationMonitor"
|
||||
factory-method="getInstance" />
|
||||
|
||||
<camelContext id="siteActivationMonitoring"
|
||||
xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
|
||||
|
||||
<route id="siteActivateNotify">
|
||||
<from uri="jms-generic:topic:siteActivateNotification" />
|
||||
<bean ref="serializationUtil" method="transformFromThrift" />
|
||||
<filter>
|
||||
<method bean="siteActivateNotifyFilter" method="isSiteActivateNotification" />
|
||||
<bean ref="siteActivationMonitor" method="handleNotification" />
|
||||
<filter>
|
||||
<simple>${body} == null</simple>
|
||||
<stop />
|
||||
</filter>
|
||||
<bean ref="serializationUtil" method="transformToThrift" />
|
||||
<to
|
||||
uri="jms-generic:topic:edex.alerts.siteActivate?timeToLive=60000" />
|
||||
</filter>
|
||||
</route>
|
||||
</camelContext>
|
||||
</beans>
|
||||
|
Loading…
Add table
Reference in a new issue