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

Merge remote-tracking branch 'origin/unidata_16.2.2' into unidata_16.2.2-el7

Browse source
This commit is contained in:
Michael James 2016-12-15 18:37:41 +00:00
commit bc75339984
3 changed files with 2 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
View file

@ -18,31 +18,11 @@
<constructor-arg value="true" /> <!-- require valid distribution file for startup --> <constructor-arg value="true" /> <!-- require valid distribution file for startup -->
</bean> </bean>
<bean id="radarRadarServerDistRegistry" factory-bean="radarserverDistributionSrv"
factory-method="register">
<constructor-arg value="radar" />
<constructor-arg value="jms-durable:queue:Ingest.RadarRadarServer" />
</bean>
<camelContext id="radar-camel" <camelContext id="radar-camel"
xmlns="http://camel.apache.org/schema/spring" xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler"> errorHandlerRef="errorHandler">
<!--
<endpoint id="radarFileEndpoint" uri="file:${edex.home}/data/sbn/radar?noop=true&amp;idempotent=false" />
<route id="radarFileConsumerRoute">
<from ref="radarFileEndpoint" />
<bean ref="fileToString" />
<setHeader headerName="pluginName">
<constant>radar</constant>
</setHeader>
<to uri="jms-durable:queue:Ingest.Radar" />
</route>
-->
<endpoint id="radarJmsEndpoint" uri="jms-durable:queue:Ingest.Radar?concurrentConsumers=${radar-decode.sbn.threads}"/> <endpoint id="radarJmsEndpoint" uri="jms-durable:queue:Ingest.Radar?concurrentConsumers=${radar-decode.sbn.threads}"/>
<endpoint id="radarRadarServerJmsEndpoint" uri="jms-durable:queue:Ingest.RadarRadarServer?concurrentConsumers=${radar-decode.local.threads}"/>
<!-- Begin Radar routes --> <!-- Begin Radar routes -->
<route id="radarIngestRoute"> <route id="radarIngestRoute">
<from ref="radarJmsEndpoint"/> <from ref="radarJmsEndpoint"/>
@ -52,14 +32,6 @@
<to uri="direct:radarcommon" /> <to uri="direct:radarcommon" />
</route> </route>
<route id="radarRadarServerIngestRoute">
<from ref="radarRadarServerJmsEndpoint"/>
<setHeader headerName="dataType">
<constant>radar-local</constant>
</setHeader>
<to uri="direct:radarcommon" />
</route>
<route id="radarCommonIngestRoute"> <route id="radarCommonIngestRoute">
<from uri="direct:radarcommon" /> <from uri="direct:radarcommon" />
<setHeader headerName="pluginName"> <setHeader headerName="pluginName">
@ -84,14 +56,6 @@
</route> </route>
</camelContext> </camelContext>
<bean id="radarServerConnectionHandler"
class="com.raytheon.edex.rpgenvdata.RadarServerConnectionHandler" />
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg
value="com.raytheon.uf.common.dataplugin.radar.request.RadarServerConnectionRequest" />
<constructor-arg ref="radarServerConnectionHandler" />
</bean>
<bean id="import88dLocations" class="com.raytheon.edex.plugin.radar.util.Import88DLocationsUtil"/> <bean id="import88dLocations" class="com.raytheon.edex.plugin.radar.util.Import88DLocationsUtil"/>
<bean factory-bean="ndmProc" factory-method="registerListener"> <bean factory-bean="ndmProc" factory-method="registerListener">

1
edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radar/radarsInUse.txt
View file

@ -1,5 +1,6 @@
# DO NOT EDIT LINES BEGINNING WITH '#' # DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE # LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
kftg
# TDWR_RADARS - MUST HAVE THIS LINE # TDWR_RADARS - MUST HAVE THIS LINE
tadw tadw

2
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
View file

@ -8,7 +8,7 @@
xmlns="http://camel.apache.org/schema/spring" xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler"> errorHandlerRef="errorHandler">
<endpoint id="manualFileEndpoint" <endpoint id="manualFileEndpoint"
uri="file:${edex.home}/data/manual?delete=true&amp;delay=5000&amp;maxMessagesPerPoll=1000&amp;exclusiveReadLockStrategy=#fileChangedStrategy&amp;recursive=true" /> uri="file:${data.archive.root}/manual?delete=true&amp;delay=5000&amp;maxMessagesPerPoll=1000&amp;exclusiveReadLockStrategy=#fileChangedStrategy&amp;recursive=true" />
<route id="manualFileScan"> <route id="manualFileScan">
<from ref="manualFileEndpoint" /> <from ref="manualFileEndpoint" />