xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #4999 Remove uri-less endpoints for Camel 2.16.0 compatibility." into omaha_16.3.1

Browse source 
Former-commit-id: e4d38b3271e54bd573257a6f2cb57f2b1c4eec96
This commit is contained in:
Nate Jensen 2015-11-03 09:31:12 -06:00 • committed by Gerrit Code Review
commit 38860950de
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml
View file

@ -4,11 +4,10 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="metarToHMDB" class="com.raytheon.uf.edex.metartohmdb.MetarToHMDBSrv" />
<camelContext id="metarToHMDB-camel"
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">
<endpoint id="metarToHMDBEndpoint" />
<route id="metarToHMDBRoute">
<from uri="direct-vm:metarToHMDB"/>

13
edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml
View file

@ -5,7 +5,7 @@
<bean id="acarsAirports" class="com.raytheon.uf.edex.plugin.acarssounding.tools.AirportsBean" depends-on="acarsSoundingPluginName" >
</bean>
<bean id="acarsPersistObs" class="com.raytheon.uf.edex.plugin.acarssounding.ACARSPersistObs" depends-on="acarsRegistered, acarsAirports" >
<constructor-arg ref="acarsAirports" />
</bean>
@ -21,16 +21,15 @@
<camelContext id="acarsSoundingSrv-camel"
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">
<endpoint id="acarsSoundingEndpoint"/>
<endpoint id="scheduledSoundingCron" uri="clusteredquartz://acars/createSounding/?cron=${acarssounding.cron}"/>
<!-- Schedule sounding creation -->
<route id="scheduledSounding">
<!-- Set the minutes explicitly -->
<!-- Deployed time slots -->
<from uri="scheduledSoundingCron" />
<!-- Development time slots
<from uri="clusteredquartz://acars/createSounding/?cron=00+0,5,10,15,20,25,30,35,40,45,50,55+*+*+*+?" />
-->
@ -53,7 +52,7 @@
</doTry>
</split>
</route>
<route id="acarsSoundingProcessing">
<from uri="jms-durable:queue:acarssounding" />
<doTry>
@ -68,7 +67,7 @@
</doTry>
</route>
<route id="acarsSoundingRoute">
<route id="acarsSoundingRoute">
<from uri="direct-vm:acarsSounding"/>
<bean ref="acarsPersistObs" method="process" />
</route>