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

Merge "Omaha #3356 fix ingestGrib level factory initialization order" into omaha_14.4.1

Browse source 
Former-commit-id: 6ab08db5f5 [formerly a86ed5386d] [formerly 1716c4e3dc] [formerly d6b05aa608 [formerly 1716c4e3dc [formerly 5470de5efc2969ef47b177716bc3b2b72662b27c]]]
Former-commit-id: d6b05aa608
Former-commit-id: 5b12abcee1423fb3bffefe337946e2c974de7ccc [formerly 5b6b58ef83]
Former-commit-id: eedd77f22d
This commit is contained in:
Nate Jensen 2014-09-16 14:07:48 -05:00 • committed by Gerrit Code Review
commit 350575c63e
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
View file

@ -19,7 +19,7 @@
factory-method="getInstance" />
<bean id="gribTableLookup" class="com.raytheon.edex.util.grib.GribTableLookup"
factory-method="getInstance" depends-on="gridRegistered, queryDataRegistered" />
factory-method="getInstance" depends-on="gridRegistered, queryDataRegistered, levelFactoryInitialized" />
<bean id="gribModelLookup"
class="com.raytheon.edex.plugin.grib.util.GribModelLookup"

25
edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
View file

@ -29,18 +29,19 @@
<exclude>grid-staticdata-process.xml</exclude>
</mode>
<mode name="ingestGrib">
<include>time-common.xml</include>
<include>auth-common.xml</include>
<include>grib-decode.xml</include>
<include>ncgrib-file-endpoint.xml</include>
<include>grid-staticdata-process.xml</include>
<include>level-common.xml</include>
<include>grid-common.xml</include>
<include>gridcoverage-common.xml</include>
<include>parameter-common.xml</include>
<include>persist-ingest.xml</include>
<include>management-common.xml</include>
<include>database-common.xml</include>
<include>time-common.xml</include>
<include>auth-common.xml</include>
<include>grib-decode.xml</include>
<include>ncgrib-file-endpoint.xml</include>
<include>grid-staticdata-process.xml</include>
<include>level-common.xml</include>
<include>levelhandler-common.xml</include>
<include>grid-common.xml</include>
<include>gridcoverage-common.xml</include>
<include>parameter-common.xml</include>
<include>persist-ingest.xml</include>
<include>management-common.xml</include>
<include>database-common.xml</include>
<include>event-ingest.xml</include>
<includeMode>statsTemplate</includeMode>
</mode>