Commit graph

2647 commits

Author SHA1 Message Date
Mike Duff
3fcc04c229 Issue #2907 - Fix plugin FQN
Change-Id: I56e0001602c05218c881fbee9dc6ca32f9a1c092

Former-commit-id: 2c6e743c97 [formerly 07dd1a1994] [formerly 2c6e743c97 [formerly 07dd1a1994] [formerly 613c669727 [formerly cc21ff4025a5ea63f6bf211cb6aa49af8193db43]]]
Former-commit-id: 613c669727
Former-commit-id: d39c7634a5 [formerly 0fae972340]
Former-commit-id: eb12cbb59c
2014-04-18 13:30:08 -05:00
Richard Peter
8d4b22c3f8 Issue #2726: Add endpoint tracking to MessageProducer
Change-Id: I2368b112dd008dba6d699642b0b25abec781927d

Former-commit-id: 5860aa7fed [formerly 33c3a71df1] [formerly 5860aa7fed [formerly 33c3a71df1] [formerly d80fe56528 [formerly 7ceffcc229824730e54c34a38cf178a2282cd920]]]
Former-commit-id: d80fe56528
Former-commit-id: f319040439 [formerly 01eaeb6034]
Former-commit-id: a09972d3ce
2014-04-18 12:48:39 -05:00
Brian.Dyke
ddee08368a Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 3b90abdf7a [formerly 880329e4ae] [formerly 3b90abdf7a [formerly 880329e4ae] [formerly 9943a331c3 [formerly d07d06f5e4b3c1dbf7d165ad97b9b114a4819011]]]
Former-commit-id: 9943a331c3
Former-commit-id: 2c8e6ec2fc [formerly 62c2a8b843]
Former-commit-id: 989b873f6e
2014-04-18 07:53:10 -04:00
Richard Peter
953dd37865 Merge "Issue #3045 Code cleanup for CategoryConfig and ArchiveConfig," into development
Former-commit-id: c0ba0cf76b [formerly 61e75364dd] [formerly c0ba0cf76b [formerly 61e75364dd] [formerly b4af2bc502 [formerly 8166eaf9cda2c653bf348ff556af64151e6e70e5]]]
Former-commit-id: b4af2bc502
Former-commit-id: 75350194f6 [formerly 3e3fa94c65]
Former-commit-id: db4bb7b6c6
2014-04-17 16:50:32 -05:00
Richard Peter
2bf6b60253 Issue #2928: Limit thriftsrv and textdbsrv streams.
Change-Id: I5f59d3ac39f7e776f88d65f3d015862968c3e178

Former-commit-id: cd7e51a5a0 [formerly ed3d88c27a] [formerly cd7e51a5a0 [formerly ed3d88c27a] [formerly 861a7b0cd5 [formerly 96bf7347434344901965bd4510d14edb9bdcd62a]]]
Former-commit-id: 861a7b0cd5
Former-commit-id: 26fa572614 [formerly 1c6a4ef4b1]
Former-commit-id: 9c987a7710
2014-04-17 16:47:44 -05:00
Richard Peter
d2e58d0047 Merge "Issue #2906 added wx_past to bufr decoder" into development
Former-commit-id: 533de555a2 [formerly eb69f77657] [formerly 533de555a2 [formerly eb69f77657] [formerly d8303c10ee [formerly 36e07357e91d1b6140cdd6515a7255786ac6ebab]]]
Former-commit-id: d8303c10ee
Former-commit-id: c526a869f1 [formerly 7b842d72ad]
Former-commit-id: ba0f4b49ca
2014-04-17 16:46:54 -05:00
Roger Ferrel
785586d0b7 Issue #3045 Code cleanup for CategoryConfig and ArchiveConfig,
Former-commit-id: 8a1c15d7dc [formerly 1f6c21885d] [formerly 8a1c15d7dc [formerly 1f6c21885d] [formerly e07f655d1d [formerly aa99ca1708590f17f498651e86fe0ef8ea61e1e0]]]
Former-commit-id: e07f655d1d
Former-commit-id: 90a7ae6733 [formerly 4c879a876c]
Former-commit-id: 80c1c3fae7
2014-04-17 16:40:38 -05:00
Brian Clements
cd32d73b0f Issue #2906 added wx_past to bufr decoder
added aliases and bufr table mappings


Former-commit-id: acc185a952 [formerly da8e9f6442] [formerly acc185a952 [formerly da8e9f6442] [formerly 7c80552f73 [formerly 4a2ed02cfb1e0f024c82a73711887ae1149d0f5e]]]
Former-commit-id: 7c80552f73
Former-commit-id: 70ae82e9ed [formerly ec95d50aea]
Former-commit-id: 2e00883224
2014-04-17 15:24:08 -05:00
Richard Peter
d828e5c37c Issue #2726: Remove CPG forwarding route
Change-Id: Idf2238ddde88d2a88949c289302a73b8aaf752e9

Former-commit-id: e2fb948ddd [formerly c0df1b34bd] [formerly e2fb948ddd [formerly c0df1b34bd] [formerly 26bdab715a [formerly 3b29088641ed4b857b3eca55bc873b151dd86146]]]
Former-commit-id: 26bdab715a
Former-commit-id: 6b93e3bbe4 [formerly 0258f6a612]
Former-commit-id: 6a171e97ff
2014-04-17 15:07:11 -05:00
Brian.Dyke
8275f3907f Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 53ce26a9b6 [formerly 1aec3b3698] [formerly 53ce26a9b6 [formerly 1aec3b3698] [formerly 645fe64a4a [formerly 178acb792036869e903beea636c7216e1d3a4f58]]]
Former-commit-id: 645fe64a4a
Former-commit-id: 66974e17b9 [formerly 4eb3317f80]
Former-commit-id: 59cbfdf093
2014-04-17 14:42:44 -04:00
Brian.Dyke
de500c093f Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 9df6fb2d4d [formerly 12a482e1d7] [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 6f35818917 [formerly 0ea7c51ad7]
Former-commit-id: a925ba6219
2014-04-17 14:42:35 -04:00
Slav Korolev
1304746833 Issue #2942 - Updated throw exception.
Former-commit-id: cd2fa6f1c2 [formerly ae2275a0ee] [formerly cd2fa6f1c2 [formerly ae2275a0ee] [formerly 881adcb78f [formerly 1457190469ec62f7a7aa2fa8e62ee2012dd57c10]]]
Former-commit-id: 881adcb78f
Former-commit-id: b9279e643b [formerly b6685d6dcb]
Former-commit-id: 25a222268e
2014-04-17 10:44:38 -04:00
Nate Jensen
7b01116623 Merge "Issue #3001 Created com.raytheon.uf.common.dataplugin.ccfp. Moved CcfpLocation and CcfpRecord to that project. Updated feature and manifest references." into development
Former-commit-id: df1b5183c1 [formerly 6e49d78e0d] [formerly df1b5183c1 [formerly 6e49d78e0d] [formerly d26c150aa9 [formerly 6d713f6a8a563b49bd1e2fa8151591657bd6735c]]]
Former-commit-id: d26c150aa9
Former-commit-id: 23082fd637 [formerly 8bf12cc32a]
Former-commit-id: e28da969c6
2014-04-17 09:04:52 -05:00
Roger Ferrel
25c92e4b11 Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0

Former-commit-id: dc25ece75f [formerly 8ce590c31c] [formerly dc25ece75f [formerly 8ce590c31c] [formerly 3af564a653 [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]
Former-commit-id: 3af564a653
Former-commit-id: 56da257816 [formerly 1214aac2a2]
Former-commit-id: 2e98b24e91
2014-04-17 08:57:15 -05:00
Brad Gonzales
3081ab6276 Issue #3001 Created com.raytheon.uf.common.dataplugin.ccfp. Moved CcfpLocation and
CcfpRecord to that project.  Updated feature and manifest references.

Amend: Updates from peer review.

Change-Id: I5606bbf3ba1dc3d5ad7bdcf3341c57436f9485b3

Former-commit-id: fd0bb35109 [formerly ab2488b2db] [formerly fd0bb35109 [formerly ab2488b2db] [formerly 975a088945 [formerly b80a3b8d1c90b7fb8720171f16529edc81bc30a8]]]
Former-commit-id: 975a088945
Former-commit-id: 4ad01be9e1 [formerly 72b4b07fb4]
Former-commit-id: e06b46c765
2014-04-16 17:07:49 -05:00
Richard Peter
56ee6e0240 Merge "Issue #2947 Redo satellite derived parameters to use an inventory to determine availability." into development
Former-commit-id: 0b82df7ad0 [formerly 852cb3cd46] [formerly 0b82df7ad0 [formerly 852cb3cd46] [formerly 8c190bd158 [formerly 326b9ef83021ce71f715b6f352401dd936e992c7]]]
Former-commit-id: 8c190bd158
Former-commit-id: bed7035a67 [formerly f8c75819bb]
Former-commit-id: f6ec3782b6
2014-04-16 15:11:07 -05:00
Ben Steffensmeier
3c1adead47 Issue #2947 Redo satellite derived parameters to use an inventory to determine availability.
Former-commit-id: bb51fb299a [formerly 709e3411c4] [formerly bb51fb299a [formerly 709e3411c4] [formerly a8bb2c0dfd [formerly 1a041cb3be1141f4af116335e5b9540beda817cb]]]
Former-commit-id: a8bb2c0dfd
Former-commit-id: a51b965c4f [formerly 119ced4a01]
Former-commit-id: cc6d858f47
2014-04-16 14:54:59 -05:00
Nate Jensen
7031f73fe2 Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
Former-commit-id: 9ebedf0b98 [formerly d121f07e76] [formerly 9ebedf0b98 [formerly d121f07e76] [formerly e0ae9e5f8f [formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]]]
Former-commit-id: e0ae9e5f8f
Former-commit-id: 736c2cc764 [formerly e0ffa7b6b4]
Former-commit-id: 700080e879
2014-04-16 08:41:54 -05:00
Ron Anderson
072102dff0 Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b

Former-commit-id: 2a68e875a5 [formerly 6e0147169f] [formerly 2a68e875a5 [formerly 6e0147169f] [formerly 9f085a0856 [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]
Former-commit-id: 9f085a0856
Former-commit-id: a6fa60f40d [formerly 4622ad9b8a]
Former-commit-id: 56a1b8b682
2014-04-15 17:22:12 -05:00
Everett Kladstrup
2470d81179 Issue #2725 Move viirs derivparam python package to common_static
Former-commit-id: 08dfcd9bd9 [formerly 5dbedee47a] [formerly 08dfcd9bd9 [formerly 5dbedee47a] [formerly 200f8f461d [formerly e89895b8448e3eeb70f2850f84773e8345114c38]]]
Former-commit-id: 200f8f461d
Former-commit-id: 158e1fd086 [formerly fd2ddd24a7]
Former-commit-id: 6a2a88f75f
2014-04-15 16:53:07 -05:00
Richard Peter
84896dd87f Issue #2726: Update endpoint pattern and remove System.out.printlns
Change-Id: I6d54cf695b8e339f9ac84b0a901cd47118e1872d

Former-commit-id: 294b02e2e5 [formerly ba1f83db17] [formerly 294b02e2e5 [formerly ba1f83db17] [formerly 7e3d710367 [formerly a724d7a0ed98f8f2860325a8578cf38e71e3ffcf]]]
Former-commit-id: 7e3d710367
Former-commit-id: e8db16d08b [formerly 4736c51a10]
Former-commit-id: 9aa3af4227
2014-04-15 14:28:21 -05:00
Ben Steffensmeier
7dc8709a5b Issue #3017 Update SatSpatialFactory to have more specific methods.
Former-commit-id: 49ca556b33 [formerly ecbe6fd2d7] [formerly 49ca556b33 [formerly ecbe6fd2d7] [formerly 6ea38cfbb2 [formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]]]
Former-commit-id: 6ea38cfbb2
Former-commit-id: 2f51d63032 [formerly 3eebc7a864]
Former-commit-id: af826302a1
2014-04-15 13:29:05 -05:00
Richard Peter
6b67e16af7 Merge "Issue #2726: Fix context mappings for topics" into development
Former-commit-id: 794c329968 [formerly 632258a438] [formerly 794c329968 [formerly 632258a438] [formerly 75b70b1b9c [formerly c2dd85043309b04203166adb2390c404db97c5c3]]]
Former-commit-id: 75b70b1b9c
Former-commit-id: 7ea59ed1fc [formerly eff13cc71f]
Former-commit-id: 8947939e42
2014-04-15 13:22:06 -05:00
Richard Peter
c4edd6fd84 Issue #2726: Fix context mappings for topics
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f

Former-commit-id: f533275291 [formerly ecbd0d5720] [formerly f533275291 [formerly ecbd0d5720] [formerly 4ac996336e [formerly b3d978d0e22b371eaa826d856156ba5360ee7be9]]]
Former-commit-id: 4ac996336e
Former-commit-id: d40449dae9 [formerly 35b8b8bc15]
Former-commit-id: 100a0d3bbd
2014-04-15 12:49:15 -05:00
Mike Duff
c2779cf796 Issue #2907 - Change directory name to match project name.
Change-Id: I9f3cd8bc28047b1da295dcc6da5d91a2d3583848

Former-commit-id: 903d10096c [formerly b8b3b9eb8e] [formerly 903d10096c [formerly b8b3b9eb8e] [formerly 309bb97356 [formerly db7f966c43292a321793655fe283cc3feacfd9f1]]]
Former-commit-id: 309bb97356
Former-commit-id: ce5363105b [formerly e03d319eaf]
Former-commit-id: 7561832a2a
2014-04-15 12:14:58 -05:00
Nate Jensen
6a47b92f5a Issue #2984 remove dead ncep purge util plugin and web page
Change-Id: Ifca01d858586ce3bf968f4b1203eb9853be97829

Former-commit-id: c81c44d15f [formerly e081847225] [formerly c81c44d15f [formerly e081847225] [formerly 7726f144ed [formerly 9f01e8a242ba44dec510fdc5ca75be566f8fa008]]]
Former-commit-id: 7726f144ed
Former-commit-id: 5ca97d5798 [formerly 56e7b21e35]
Former-commit-id: f2a1345c0b
2014-04-15 11:16:24 -05:00
Steve Harris
ac077b24a1 Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
Former-commit-id: 9132d9004e [formerly eb2f2865fe] [formerly 9132d9004e [formerly eb2f2865fe] [formerly 5bf5bdb6b0 [formerly f4c8ce899d312b389aff32d052564559e79904be]]]
Former-commit-id: 5bf5bdb6b0
Former-commit-id: 6ed279d306 [formerly c361ccd531]
Former-commit-id: 9be8c87f87
2014-04-15 09:39:33 -05:00
Mike Duff
0a77645dc2 Issue #2907 - Rename com.raytheon.edex.dataplugin.redbook to com.raytheon.uf.edex.dataplugin.redbook
Change-Id: I375877b285671ef7a4d993b4c16ee3437fd0a32a

Former-commit-id: 9c690f8ecc [formerly 8d5486d1ff] [formerly 9c690f8ecc [formerly 8d5486d1ff] [formerly a072ce72bb [formerly 4d37938e12c7803af84713f3e009f7e4f37f9c0d]]]
Former-commit-id: a072ce72bb
Former-commit-id: f749f9b8d6 [formerly 25eff8dcf5]
Former-commit-id: 62d94d740b
2014-04-15 09:34:05 -05:00
Benjamin Phillippe
f026a17b07 Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109

Former-commit-id: 490413551b [formerly 3db751fc5b] [formerly 490413551b [formerly 3db751fc5b] [formerly 62062bf288 [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]]
Former-commit-id: 62062bf288
Former-commit-id: 0b149f92d9 [formerly 035272360b]
Former-commit-id: f6f51d3575
2014-04-15 09:15:12 -05:00
Richard Peter
a0e14eda77 Merge "Issue #2984 remove unnecessary plugins from features remove unnecessary uengine dependencies from manifests" into development
Former-commit-id: 93d624d4d5 [formerly 4edf560b06] [formerly 93d624d4d5 [formerly 4edf560b06] [formerly 909c44182b [formerly faa4e88621db7dd9cbc13048bfdf98cdb3ec26d2]]]
Former-commit-id: 909c44182b
Former-commit-id: 1a3df8b3a4 [formerly e6112f7aeb]
Former-commit-id: 80e4650796
2014-04-14 17:13:57 -05:00
Nate Jensen
8c6d8e97f6 Merge "Issue #3019 modify JUtil to support sets and frozensets" into development
Former-commit-id: f677b2123e [formerly f11c71e083] [formerly f677b2123e [formerly f11c71e083] [formerly 5308cb61cc [formerly 6a8cbb3713741df343daf3d128d7d3b4e29238ec]]]
Former-commit-id: 5308cb61cc
Former-commit-id: 46a070288b [formerly 0192d15ffb]
Former-commit-id: 23c5b7a985
2014-04-14 16:53:28 -05:00
Nate Jensen
697a7f5b9b Issue #2984 remove unnecessary plugins from features
remove unnecessary uengine dependencies from manifests

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

Former-commit-id: e24940ead6 [formerly 6e2d68e102] [formerly e24940ead6 [formerly 6e2d68e102] [formerly 57f2357f10 [formerly c59a5d99ce31464bacd7c266543f10f523719a07]]]
Former-commit-id: 57f2357f10
Former-commit-id: 97f09968b3 [formerly d435258fce]
Former-commit-id: 9ad8236b8d
2014-04-14 16:50:54 -05:00
Matt Nash
cc940a91c7 Issue #3019 modify JUtil to support sets and frozensets
Change-Id: Ia72d8c1670c0adb1529937b1943fa9e2d1195692

Former-commit-id: 1e3afba948 [formerly 02e801b359] [formerly 1e3afba948 [formerly 02e801b359] [formerly ef3879c4a3 [formerly 795cba334038d920beab93f5c872b02acf29c7f9]]]
Former-commit-id: ef3879c4a3
Former-commit-id: de47d76f3c [formerly 7c6fe31032]
Former-commit-id: 00a0a317c3
2014-04-14 16:26:38 -05:00
Nate Jensen
9972baa000 Merge "Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe plugin" into development
Former-commit-id: d741f996c6 [formerly c71205eb89] [formerly d741f996c6 [formerly c71205eb89] [formerly 111b7f4283 [formerly bdc1863a9413301bb78c6e0ffdd630b62c48d627]]]
Former-commit-id: 111b7f4283
Former-commit-id: 9593960e9f [formerly 9917a8ef62]
Former-commit-id: 37a6c292f7
2014-04-14 15:46:14 -05:00
Ron Anderson
07e6998fc6 Merge changes Ic5c0dcaa,Iae10909e into development
* changes:
  Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
  Issue #2947 Make GridCoverage implement IGridGeometryProvider.


Former-commit-id: d5ebb5a800 [formerly 46d5349940] [formerly d5ebb5a800 [formerly 46d5349940] [formerly fd79bd354b [formerly 79a18e9077167087a9a3dce952f71a0c7e021e23]]]
Former-commit-id: fd79bd354b
Former-commit-id: d2346699bb [formerly 5ab1b1b95c]
Former-commit-id: c7e1797dd4
2014-04-14 14:45:03 -05:00
brian.dyke
6a5c7d7684 Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: 5fc07cafc8 [formerly fb1c399d4d] [formerly 5fc07cafc8 [formerly fb1c399d4d] [formerly a6708cc174 [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]]
Former-commit-id: a6708cc174
Former-commit-id: e8dffad9cb [formerly 5b27f2987f]
Former-commit-id: d148fbe645
2014-04-14 15:29:23 -04:00
Nate Jensen
c8c25d9224 Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe
plugin

Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a

Former-commit-id: 40d1fda798 [formerly f086bb0c9b] [formerly 40d1fda798 [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]
Former-commit-id: ceec3d48f0
Former-commit-id: dfe50ee038 [formerly 715932091e]
Former-commit-id: 1e5433c9c3
2014-04-14 14:28:11 -05:00
Nate Jensen
70c02c5163 Merge "Issue #2726: Add BoundedMap" into development
Former-commit-id: c53d411da1 [formerly 2ed5535235] [formerly c53d411da1 [formerly 2ed5535235] [formerly 797eb5e8cf [formerly bf775eff602039caa654ab2f810befd3a89e3808]]]
Former-commit-id: 797eb5e8cf
Former-commit-id: b31de05482 [formerly 450ceb3149]
Former-commit-id: b1d98aeec0
2014-04-14 14:07:49 -05:00
Richard Peter
6ef84cf3c4 Merge "Issue #2862 Implements locks on case creation." into development
Former-commit-id: 22a01edbb7 [formerly 19755418f8] [formerly 22a01edbb7 [formerly 19755418f8] [formerly 181ffee3db [formerly e2c246299716bc2eba90a16c2c69cf1e0a9a6913]]]
Former-commit-id: 181ffee3db
Former-commit-id: c4853e7982 [formerly 0abb97820b]
Former-commit-id: 48c8415382
2014-04-14 13:28:26 -05:00
Richard Peter
839f3d4161 Issue #2726: Add BoundedMap
Former-commit-id: 33707d4c7d [formerly 7c618f20d7] [formerly 33707d4c7d [formerly 7c618f20d7] [formerly 9f91e47338 [formerly bf56d51e161d00b3f5156b957203d616e971c23e]]]
Former-commit-id: 9f91e47338
Former-commit-id: 0956165881 [formerly 6b57e9339f]
Former-commit-id: 28e26ff1b1
2014-04-14 13:25:53 -05:00
Richard Peter
de624d87d3 Issue #2726: Edex graceful shutdown.
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: e4be1f24e7 [formerly dbba727f3d] [formerly e4be1f24e7 [formerly dbba727f3d] [formerly 17196b5dcd [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]
Former-commit-id: 17196b5dcd
Former-commit-id: ff87317bd4 [formerly 8b279966d1]
Former-commit-id: b3fd8e5480
2014-04-14 13:10:11 -05:00
Everett Kladstrup
6dd24d32a1 Issue #2725 Fix imports in python after derived param move
Former-commit-id: e36ac5e32a [formerly 7e8e756798] [formerly e36ac5e32a [formerly 7e8e756798] [formerly 46c55750f1 [formerly 1680849c4b86113b74228d54b058d6af89311514]]]
Former-commit-id: 46c55750f1
Former-commit-id: 3a08b8d2ad [formerly 0768b55e79]
Former-commit-id: d121859de1
2014-04-14 09:36:57 -05:00
Nate Jensen
ab27edef3f Merge "Issue #2675 - Change GAFF to be called from Quartz. Added spring file." into development
Former-commit-id: 507e7f9ede [formerly 26aea6d880] [formerly 507e7f9ede [formerly 26aea6d880] [formerly 8b1543c60c [formerly f50ab285eb616ec2867907410deb3862875304e9]]]
Former-commit-id: 8b1543c60c
Former-commit-id: 3147ae5d77 [formerly 4a85486395]
Former-commit-id: 8734154946
2014-04-14 08:58:55 -05:00
Lee Venable
e6afce6288 Merge "Issue #2940 Better error message for bad XMRG config in FFMP Change-Id: I0ed88a33dc7fe78dcccb7af212a3180d3124ca4f" into development
Former-commit-id: 5b0ce64d6c [formerly e90d3e6617] [formerly 5b0ce64d6c [formerly e90d3e6617] [formerly a757e93e34 [formerly b5bfbf426454f6a08c0d5a4498b99830ddf3d49e]]]
Former-commit-id: a757e93e34
Former-commit-id: fd6c60d719 [formerly 3962aafa98]
Former-commit-id: b7204aff82
2014-04-14 08:57:37 -05:00
Nate Jensen
6442f9bfc2 Merge "Issue #2971 - Added condition to avoid malformed parts in the message." into development
Former-commit-id: 3329bd8cd1 [formerly 9604225111] [formerly 3329bd8cd1 [formerly 9604225111] [formerly ce2fc531d9 [formerly 0a0e5357f34f0513a78a3cdae922283a3cc183bb]]]
Former-commit-id: ce2fc531d9
Former-commit-id: f6dd8af04d [formerly d9807d5fa3]
Former-commit-id: dc92670211
2014-04-14 08:56:57 -05:00
Richard Peter
4ca584c465 Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
Former-commit-id: 97fb03df02 [formerly 91e941f60a] [formerly 97fb03df02 [formerly 91e941f60a] [formerly 9ef8347f23 [formerly 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52]]]
Former-commit-id: 9ef8347f23
Former-commit-id: a4eba6e6df [formerly ffd74e6787]
Former-commit-id: c072d0d0ca
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
25c850b9d8 Issue #2947 Minor satellite and derived parameter improvements.
Former-commit-id: 2d66e58671 [formerly dd794a3c12] [formerly 2d66e58671 [formerly dd794a3c12] [formerly 428f3a2d8b [formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]]
Former-commit-id: 428f3a2d8b
Former-commit-id: b120feab6f [formerly 6c92b645f0]
Former-commit-id: 0b6ca56417
2014-04-11 17:37:59 -05:00
Ben Steffensmeier
43e975b11e Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
Former-commit-id: ca78a04d95 [formerly d5b91d8846] [formerly ca78a04d95 [formerly d5b91d8846] [formerly 1ad8396366 [formerly c5c0dcaab8e495970438f134625ac2847f9bcf9f]]]
Former-commit-id: 1ad8396366
Former-commit-id: b707e3b6db [formerly fb85857ff5]
Former-commit-id: 7ca12d26a9
2014-04-11 17:34:38 -05:00
Ben Steffensmeier
04579d1398 Issue #2947 Make GridCoverage implement IGridGeometryProvider.
Former-commit-id: 22f068481f [formerly 037ed878b7] [formerly 22f068481f [formerly 037ed878b7] [formerly e911a4c917 [formerly f2a204c593f65c67c87e16fa513d00383ad568e5]]]
Former-commit-id: e911a4c917
Former-commit-id: a741091a55 [formerly 6666898f1d]
Former-commit-id: 3555e7767e
2014-04-11 17:33:55 -05:00
Richard Peter
a22345ea6b Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: cd51f3fa87 [formerly 3575d6586f] [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: d65b11d404 [formerly a7ec0bcf66]
Former-commit-id: b6482f2e54
2014-04-11 16:23:09 -05:00