Commit graph

3135 commits

Author SHA1 Message Date
Brian Clements
719f2ef0c4 Omaha #2926 moved TextDBRequest to common
Change-Id: I8f18b6e24d1c27feb5713d4c4f80341fd5d0b67c

Former-commit-id: b7e4139fbf [formerly 652f170810] [formerly c89a74943e] [formerly c89a74943e [formerly 1b248efb54]] [formerly b7e4139fbf [formerly 652f170810] [formerly c89a74943e] [formerly c89a74943e [formerly 1b248efb54]] [formerly c77b4f4e8b [formerly c89a74943e [formerly 1b248efb54] [formerly c77b4f4e8b [formerly 924e512c327c838d866b353ec8da8f7e5534db49]]]]]
Former-commit-id: c77b4f4e8b
Former-commit-id: 11d2935f67 [formerly 6d5857a186] [formerly 8cc7d1e36d] [formerly 6862987982a560b995e8d769edb6a8a9d73c2a70 [formerly 4fc5898aeae8ad53c3480f9cacbedc076a61ae69] [formerly 8cc7d1e36d [formerly 3a0da3d8d5]]]
Former-commit-id: f746ef9a902dd39945b3e4ec3b2f75e788753463 [formerly 2d12d65c846c8555abf98036255ed540a16271b2] [formerly a5e8e94411 [formerly 4640945dc7]]
Former-commit-id: a5e8e94411
Former-commit-id: 6956dec0c5
2014-09-05 12:56:04 -05:00
Greg Armendariz
602a0610c1 Omaha #3545 - Add log and fail message when directories are missing
Former-commit-id: 76a3d3f337 [formerly 764e29316b] [formerly e8a75882ee] [formerly e8a75882ee [formerly 0a988d64e4]] [formerly 76a3d3f337 [formerly 764e29316b] [formerly e8a75882ee] [formerly e8a75882ee [formerly 0a988d64e4]] [formerly a5359e4547 [formerly e8a75882ee [formerly 0a988d64e4] [formerly a5359e4547 [formerly 05d45b0c005ce7c8cca51c367754e7e6bca6c085]]]]]
Former-commit-id: a5359e4547
Former-commit-id: 6f20d8a1f4 [formerly f493685a94] [formerly b7535cb9ac] [formerly 38a3f559cba7bf3bcce01bfd73b0d379d7c02655 [formerly ce36ec4cd7e2be03a04e189033d06eff987da597] [formerly b7535cb9ac [formerly e658278545]]]
Former-commit-id: 95cc33481fcf7f5ae61f90c535a447f445e0b08c [formerly dbf1bfb765fae46c2cdc61fa24560813ebd1c048] [formerly 98c50cb61e [formerly 08b5040650]]
Former-commit-id: 98c50cb61e
Former-commit-id: a29dfd6937
2014-09-04 11:52:13 -05:00
Nate Jensen
d6622a1414 Merge "Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way" into omaha_14.4.1
Former-commit-id: f20f42faeb [formerly 3ea3cfe6c3] [formerly d977dbfcb0] [formerly d977dbfcb0 [formerly 1fd0ed2de6]] [formerly f20f42faeb [formerly 3ea3cfe6c3] [formerly d977dbfcb0] [formerly d977dbfcb0 [formerly 1fd0ed2de6]] [formerly 3a2558eac8 [formerly d977dbfcb0 [formerly 1fd0ed2de6] [formerly 3a2558eac8 [formerly fbc9b64a0c0734e46ec9db10e0760aa8f2b27c24]]]]]
Former-commit-id: 3a2558eac8
Former-commit-id: ae370d9bed [formerly 3232793b13] [formerly 2781d227f3] [formerly 76a31b9af46cc8cf2971170d3488be46b527b61d [formerly e5bf64a127cdcb0adf234dadad07bb06b81d9133] [formerly 2781d227f3 [formerly bb8918e96b]]]
Former-commit-id: d03716732f198da3e5423ce04ee5a782f7fadef3 [formerly 79a0713872acbe95fc630723465ae35f1c39bf91] [formerly 6140da7ee6 [formerly 577e3341f6]]
Former-commit-id: 6140da7ee6
Former-commit-id: 1cf26bf578
2014-09-03 17:13:06 -05:00
Matt Nash
d884664010 Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way
Former-commit-id: 3c68001f6f [formerly 1454e1272c] [formerly 90b0619656] [formerly 90b0619656 [formerly 118d811eee]] [formerly 3c68001f6f [formerly 1454e1272c] [formerly 90b0619656] [formerly 90b0619656 [formerly 118d811eee]] [formerly 980d7bf5ad [formerly 90b0619656 [formerly 118d811eee] [formerly 980d7bf5ad [formerly dd691896f03ba16d683a284a26b8ef923e364834]]]]]
Former-commit-id: 980d7bf5ad
Former-commit-id: 07c4f94932 [formerly fe8590a5ad] [formerly 23d1a555a7] [formerly c730bbf6c193ddc91397c749a02de3f9cdee051c [formerly 07db45d8c2f90726ce2ca244d474b22e41d26939] [formerly 23d1a555a7 [formerly bce9e0595c]]]
Former-commit-id: a88fd9525f80640ed9009358923a34df05977627 [formerly 731b6187aa3cf4c1ec5f86cd015cfafb90225a50] [formerly 667ce84a62 [formerly a1ea03c29b]]
Former-commit-id: 667ce84a62
Former-commit-id: e0b5070083
2014-09-03 14:11:15 -05:00
Nate Jensen
55f773658c Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1
Former-commit-id: 9b3bc09c96 [formerly 48635d9239] [formerly a0830d06d5] [formerly a0830d06d5 [formerly 5b80aadbac]] [formerly 9b3bc09c96 [formerly 48635d9239] [formerly a0830d06d5] [formerly a0830d06d5 [formerly 5b80aadbac]] [formerly 80cc58cf25 [formerly a0830d06d5 [formerly 5b80aadbac] [formerly 80cc58cf25 [formerly e393e1f0455d466edde925608b6f0f1e35351141]]]]]
Former-commit-id: 80cc58cf25
Former-commit-id: 475d5a6fc6 [formerly aef95b0ef6] [formerly 8e6f1c0b05] [formerly cecb810e1fc74f289cb817a53f018340171d4f09 [formerly 17298aec038f0c2d03fd69b55853b6df1cfc0a47] [formerly 8e6f1c0b05 [formerly db8517a576]]]
Former-commit-id: b4fea281945f50b6708ab6713e7f38be5c3667dd [formerly 57f8e79e6c013e8057dd10f5433c56f49ccc7328] [formerly 8248f2f5ab [formerly d717f13039]]
Former-commit-id: 8248f2f5ab
Former-commit-id: 0d60d10dba
2014-09-03 09:21:28 -05:00
Richard Peter
9515cb95ce Merge "Omaha #3549 improve error message" into omaha_14.4.1
Former-commit-id: aa8f74d663 [formerly a9c5622575] [formerly d968b5085d] [formerly d968b5085d [formerly 3c874e1aa1]] [formerly aa8f74d663 [formerly a9c5622575] [formerly d968b5085d] [formerly d968b5085d [formerly 3c874e1aa1]] [formerly 7dc4327ffa [formerly d968b5085d [formerly 3c874e1aa1] [formerly 7dc4327ffa [formerly 6e8ad4c9e2046ac950bbf166a09492a69c88cb7e]]]]]
Former-commit-id: 7dc4327ffa
Former-commit-id: 46aabac98e [formerly 87ee958c33] [formerly b9db837e14] [formerly 077c855fb232ed10e78a5076ec5a8f42deda5c3f [formerly 432a6dbd7a4b5d78c1acca24871270eef299a2fd] [formerly b9db837e14 [formerly 388c1ca919]]]
Former-commit-id: 2fd5e4a764b1caba79b40a72b01aa70b6a99596c [formerly 018c5716f877ec1e71fd31c419bd6d8e83649817] [formerly d9acda4485 [formerly 6bee61c16f]]
Former-commit-id: d9acda4485
Former-commit-id: 1fe19c7c4a
2014-09-02 14:25:18 -05:00
Richard Peter
1f041d62ca Merge "Omaha #2926 switched textdb to thrift client" into omaha_14.4.1
Former-commit-id: 00d3d6b2ba [formerly 8e191c2c60] [formerly 612990b3ed] [formerly 612990b3ed [formerly 7628a0a56a]] [formerly 00d3d6b2ba [formerly 8e191c2c60] [formerly 612990b3ed] [formerly 612990b3ed [formerly 7628a0a56a]] [formerly 0f94b663a4 [formerly 612990b3ed [formerly 7628a0a56a] [formerly 0f94b663a4 [formerly 80294bbd891edde5b190941175f73d634f1a3e08]]]]]
Former-commit-id: 0f94b663a4
Former-commit-id: 9af8ba35b2 [formerly 58222f5a6a] [formerly e3e9368411] [formerly abf3d13fec83aa3b36cea1d087fc081d7476a57e [formerly d01294032fb4e66d3e529c0bea83d466743d41aa] [formerly e3e9368411 [formerly 6151d549ce]]]
Former-commit-id: ccc3ceccaaa65c6c5da09d3eab153073a341f2e9 [formerly a6d9f52fdb26021f877a9cd9e5aa53e3c3c8c52e] [formerly bb5b769b96 [formerly eca48d7b90]]
Former-commit-id: c2051495bcdcaa2436a98cb164e8a0c42bc8b39e [formerly bb5b769b96]
Former-commit-id: 02e6cd89bf
2014-09-02 12:45:37 -05:00
Nate Jensen
ff83e34c61 Omaha #3549 improve error message
Change-Id: I54cdefd3b77fa5ad8eba9aad6ae8c93b7bd0a67d

Former-commit-id: c546dd6366 [formerly 32e40b5903] [formerly 3cf81ab39e] [formerly 3cf81ab39e [formerly fa330b698d]] [formerly c546dd6366 [formerly 32e40b5903] [formerly 3cf81ab39e] [formerly 3cf81ab39e [formerly fa330b698d]] [formerly 37501b884a [formerly 3cf81ab39e [formerly fa330b698d] [formerly 37501b884a [formerly 369867e18b5209895137f5e4121fa06bfa2858c7]]]]]
Former-commit-id: 37501b884a
Former-commit-id: fcc4e873a2 [formerly bec31cf645] [formerly 635604b7a9] [formerly d2646217fb2376ac2d60d80cbc3d430926a23f92 [formerly 295230b31262a47d94f4c22e8e5459e6e428d04e] [formerly 635604b7a9 [formerly 11b4f270e6]]]
Former-commit-id: cca30689f17d1ccebf90a0a9039b90b35d713a27 [formerly f9f2016ad6a5c4cbe565f5de2707ff227cca22eb] [formerly 78b9181a68 [formerly 7336cbb500]]
Former-commit-id: 78b9181a68
Former-commit-id: a1b7bb9215
2014-09-02 12:38:04 -05:00
Mark Peters
4b5212dff1 Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: Ib0aa88dd3341ae65aef9b2b02ffbd1645510b95e

Former-commit-id: 642f778822 [formerly 5f08576217] [formerly be6dae0cf9] [formerly be6dae0cf9 [formerly ad994bc4c6]] [formerly 642f778822 [formerly 5f08576217] [formerly be6dae0cf9] [formerly be6dae0cf9 [formerly ad994bc4c6]] [formerly 53869a4b0b [formerly be6dae0cf9 [formerly ad994bc4c6] [formerly 53869a4b0b [formerly 07b54b870e36f37b909d9e7da1f1da4d181b06b0]]]]]
Former-commit-id: 53869a4b0b
Former-commit-id: 8380873256 [formerly d999c9b971] [formerly 6ddbbc366a] [formerly e5749a82f4ad7c5e2745b6254400b80c92a46e09 [formerly 352eadb0bfcd10c4a3285b275cd239dde33fbc0b] [formerly 6ddbbc366a [formerly 2c02132ec0]]]
Former-commit-id: 3c72f1050b925562017c4ba51844d86b3a7769a8 [formerly 7c5ff5e2e0a4d9dfc3584b9b8c912a58cb941ae6] [formerly 3a8e2b71fd [formerly ae87858e3d]]
Former-commit-id: 3a8e2b71fd
Former-commit-id: fc1bf53dd8
2014-09-02 11:38:06 -05:00
Nate Jensen
2617871f06 Omaha #3549 improve acarssounding error message
Change-Id: I850eb6bbcd825bee26f0e93226b10d077378dacf

Former-commit-id: 9aa49f2068 [formerly 85696fe8d4] [formerly 6838a4d8cc] [formerly 6838a4d8cc [formerly 8570cad6c6]] [formerly 9aa49f2068 [formerly 85696fe8d4] [formerly 6838a4d8cc] [formerly 6838a4d8cc [formerly 8570cad6c6]] [formerly 82ef4c1646 [formerly 6838a4d8cc [formerly 8570cad6c6] [formerly 82ef4c1646 [formerly 16e66726bd5a8f20d6de21708c7f3372a046cea8]]]]]
Former-commit-id: 82ef4c1646
Former-commit-id: ba38f43dd3 [formerly 6e328368a3] [formerly c7fdb67228] [formerly fdc51e76503f29acbdb4271362688b640b04518a [formerly ee661ee4461cd4664ce88dce5e2346ddcda5f2bd] [formerly c7fdb67228 [formerly eed90eceeb]]]
Former-commit-id: 52677c55551cd02b1f1cd4213b2bb9fab4f910c4 [formerly b62a17c7a5fd322d3802ea707765eb9d65910d12] [formerly 0189b9da69 [formerly fddcabac0a]]
Former-commit-id: 2598b70f6a2537b975fbaf2fb843ff07dc1fe1e4 [formerly 0189b9da69]
Former-commit-id: 75dac9ed3b
2014-09-02 11:21:10 -05:00
Steve Harris
aeef8875da Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly 5d58625abc [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]]
Former-commit-id: 5d58625abc
Former-commit-id: bdf54d6c9b [formerly 10070d2762] [formerly 66b485c000] [formerly ae5df07fa69c767a230e2a3c9b71b0100d0048c1 [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54] [formerly 66b485c000 [formerly d984dd538f]]]
Former-commit-id: 529333408e5e144c649cd66c50031cc56795aa1e [formerly ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4] [formerly ecf26b3ac5 [formerly e681e0a457]]
Former-commit-id: e61b05086c2c01b59d4b8382331f85c7ecd4efa2 [formerly ecf26b3ac5]
Former-commit-id: 3c8bfc8160
2014-08-29 10:17:52 -05:00
Nate Jensen
46c374db69 Merge "Omaha #3356 inject spatial query through spring" into omaha_14.4.1
Former-commit-id: ef378fe862 [formerly dc6e307895] [formerly 8f0bd2bb84] [formerly 8f0bd2bb84 [formerly 67d5cb52ae]] [formerly ef378fe862 [formerly dc6e307895] [formerly 8f0bd2bb84] [formerly 8f0bd2bb84 [formerly 67d5cb52ae]] [formerly 822f1a20b0 [formerly 8f0bd2bb84 [formerly 67d5cb52ae] [formerly 822f1a20b0 [formerly afd5131062926a78942db59f35a5c2e719a542da]]]]]
Former-commit-id: 822f1a20b0
Former-commit-id: 3ab40ede64 [formerly 5d22759e9d] [formerly 975f93d6cf] [formerly c220e07d428f412cf9b156aa2aca962a673c7ec4 [formerly 0cf3789fe064185f8bdfb1456506f24980b4e4f4] [formerly 975f93d6cf [formerly 0a8312b09d]]]
Former-commit-id: 519e16b445bc447a5fdbee9549de261200fa7fb5 [formerly 988fbe5f0aef36ed0052fad8077ea02e6a7ba815] [formerly 7e2f184332 [formerly 1aa74a38d8]]
Former-commit-id: 7e2f184332
Former-commit-id: be47d6a454
2014-08-28 14:32:57 -05:00
Nate Jensen
836163b5e0 Omaha #3356 inject spatial query through spring
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d

Former-commit-id: 71796ce168 [formerly c383a50c2c] [formerly baece22d79] [formerly baece22d79 [formerly 58c85c76ef]] [formerly 71796ce168 [formerly c383a50c2c] [formerly baece22d79] [formerly baece22d79 [formerly 58c85c76ef]] [formerly 8f226399f7 [formerly baece22d79 [formerly 58c85c76ef] [formerly 8f226399f7 [formerly 0b7ea786593f963ad1464c3426bcec7ac59914ae]]]]]
Former-commit-id: 8f226399f7
Former-commit-id: d046a38b43 [formerly fcc794c395] [formerly 244395af69] [formerly 6ee47b473e3ae1deaad1ad8391d234ec5590c2f6 [formerly 8fb5e2190df56d7947f5fa01937f377db2b2b918] [formerly 244395af69 [formerly 9843865254]]]
Former-commit-id: 35b04a896dcad26faca224676c0f1dd390f00b42 [formerly 1078ebed9c14b2f160ab76ef1d6cb10d34c627c0] [formerly fe0cd768ad [formerly 2b829dc66b]]
Former-commit-id: fe0cd768ad
Former-commit-id: f6b45f075d
2014-08-28 11:46:25 -05:00
Nate Jensen
f766ab7ddd Merge "Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily" into omaha_14.4.1
Former-commit-id: a02dc32d32 [formerly 637dbddd2f] [formerly 9fe0e6df69] [formerly 9fe0e6df69 [formerly 625f0db18f]] [formerly a02dc32d32 [formerly 637dbddd2f] [formerly 9fe0e6df69] [formerly 9fe0e6df69 [formerly 625f0db18f]] [formerly 0ee832fc2f [formerly 9fe0e6df69 [formerly 625f0db18f] [formerly 0ee832fc2f [formerly 0a6287431cbcc43ad6f42898a94d173fe451566e]]]]]
Former-commit-id: 0ee832fc2f
Former-commit-id: 9d8fd22a2a [formerly 37b7936b7c] [formerly 2a7cd5957d] [formerly 601de259e2e851605b0dbfeccb2381be722e6366 [formerly d2c0d3d4439d68fab0f781b1b347ece53b4e57ad] [formerly 2a7cd5957d [formerly ce138b3e31]]]
Former-commit-id: 6d5e3d44cf2093563895893fe1cad1b6b6567d97 [formerly 76b6da7d01c1d7b06ed1902c25101c4523e98f84] [formerly 91ae999120 [formerly 0e0cf3ba67]]
Former-commit-id: 91ae999120
Former-commit-id: 4f7f573aee
2014-08-28 11:30:45 -05:00
Ron Anderson
10a990bf6a Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34

Former-commit-id: 30fe527dcf [formerly 1e05b981fa] [formerly dc185b8dd1] [formerly dc185b8dd1 [formerly bb1e80b844]] [formerly 30fe527dcf [formerly 1e05b981fa] [formerly dc185b8dd1] [formerly dc185b8dd1 [formerly bb1e80b844]] [formerly 2b88ade974 [formerly dc185b8dd1 [formerly bb1e80b844] [formerly 2b88ade974 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]]]]
Former-commit-id: 2b88ade974
Former-commit-id: a9eba9a4b7 [formerly c6eb33afcc] [formerly 39d00a72ce] [formerly 947512bb8d28a87aaad34761595c276f633b4cb0 [formerly 36188db03ab5afd51b2833d61639eaa10519a6f7] [formerly 39d00a72ce [formerly 0962c75d18]]]
Former-commit-id: 6d6add5e8e7bcb5ea5f98446e62aafc97aaaf08e [formerly 86f00e159c29c3c94d7aa9fffb6a0183327a64c0] [formerly 932d9e2783 [formerly 56b56ea4f3]]
Former-commit-id: 932d9e2783
Former-commit-id: 7cc1ad7088
2014-08-28 10:43:54 -05:00
Nate Jensen
66ac6b0344 Merge "Omaha #3503 Composite product generators init after spring beans are loaded" into omaha_14.4.1
Former-commit-id: 444c8048df [formerly b036c5b851] [formerly fb0829fd4d] [formerly fb0829fd4d [formerly de69231d3a]] [formerly 444c8048df [formerly b036c5b851] [formerly fb0829fd4d] [formerly fb0829fd4d [formerly de69231d3a]] [formerly afe94aca08 [formerly fb0829fd4d [formerly de69231d3a] [formerly afe94aca08 [formerly 1eb554cd30d53daf44de42e0ddd3f35bf8f37bae]]]]]
Former-commit-id: afe94aca08
Former-commit-id: d1dede0011 [formerly fc25b7f583] [formerly da6259a198] [formerly 3a81b5d04df6c1ebd6d97f4bdbc98b9ceff5a24b [formerly e28bfa9a0c5522e752aaeb4c6e11382a37536cf8] [formerly da6259a198 [formerly 8952d15b12]]]
Former-commit-id: 64899ce16da983b750f7940b3946b6c17567790b [formerly 67f566ba56399bcd07518bba90cd28fae82f4abc] [formerly 2db6fa9583 [formerly f3454a7941]]
Former-commit-id: 2db6fa9583
Former-commit-id: 921ff430f2
2014-08-28 10:40:50 -05:00
Brian.Dyke
d238fe909f Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly aa83bf804f [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]]
Former-commit-id: aa83bf804f
Former-commit-id: a19455a35a [formerly 4a56b6f6e1] [formerly f90649d7e7] [formerly 68463cb724c8468f8978b5fb07a99445cf027313 [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3] [formerly f90649d7e7 [formerly f7f16ff9eb]]]
Former-commit-id: 44ca35c910c7065b51dd3a76485e002ac8fcb63b [formerly 2b5f667a78842762d60c8ab0ba442f22b9229095] [formerly 7e4ab705cc [formerly c0dc594eda]]
Former-commit-id: 1cde9cd7bdfb3330564a42c1fce83730b50bbe4c [formerly 7e4ab705cc]
Former-commit-id: 2da6c7b93b
2014-08-27 11:19:19 -04:00
Nate Jensen
f083ebbba6 Omaha #3132 fix compilation issue from merge
Change-Id: I76e189ff871c2ca8f99806e035abb07087626fba

Former-commit-id: 4def094756 [formerly a70df06392] [formerly 2f0b209e10] [formerly 2f0b209e10 [formerly 0160955244]] [formerly 4def094756 [formerly a70df06392] [formerly 2f0b209e10] [formerly 2f0b209e10 [formerly 0160955244]] [formerly 3f7170f862 [formerly 2f0b209e10 [formerly 0160955244] [formerly 3f7170f862 [formerly b45249baec6c6d4f77e5aeb23b910689df192c8a]]]]]
Former-commit-id: 3f7170f862
Former-commit-id: fb77240563 [formerly c508bb668c] [formerly 66c0933713] [formerly 4650ba749d5f5365bd885abbb57b38987d15049f [formerly fc3a206bb36805ff0ce8c40da5b9af5501e60372] [formerly 66c0933713 [formerly 281f360487]]]
Former-commit-id: b028768472a94b2f0f5ee91b6490ce4997814070 [formerly 735a41226d8d651ce153b2fe62599a50ad374487] [formerly 728da699ad [formerly 909bc9c412]]
Former-commit-id: 728da699ad
Former-commit-id: e9d2de9c48
2014-08-26 18:22:26 -05:00
Brian Clements
3b0f769f94 Omaha #3503 Composite product generators init after spring beans are loaded
Change-Id: I894adbc14e1bfe183a3f7717d95dba85291a2a09

Former-commit-id: d287ab06c3 [formerly 11fa1b962c] [formerly 5dc5530120] [formerly 5dc5530120 [formerly 095f84e71f]] [formerly d287ab06c3 [formerly 11fa1b962c] [formerly 5dc5530120] [formerly 5dc5530120 [formerly 095f84e71f]] [formerly b88f012e69 [formerly 5dc5530120 [formerly 095f84e71f] [formerly b88f012e69 [formerly f6109e74ff5e26547c8fc03d7bb5ecde1046f689]]]]]
Former-commit-id: b88f012e69
Former-commit-id: dc6e045756 [formerly 2540fa9a95] [formerly f29fb0a656] [formerly 52b8fde5470a3aee2327f90a8a32db9e082c2923 [formerly f52e0674ecdaac7e697e849aef805d1954d0f156] [formerly f29fb0a656 [formerly e6b2143a6b]]]
Former-commit-id: c649ed7e8d625ebfd8772ad780b5f222d856f5b4 [formerly 2b18d20744bbddd9a580553d65302bd310fc36a0] [formerly a08ebbe0c7 [formerly 237bdc0e2a]]
Former-commit-id: a08ebbe0c7
Former-commit-id: 6948aec9cd
2014-08-26 17:12:34 -05:00
Steve Harris
298fb6fc84 Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 52b2c70c7b [formerly 33b4901c09] [formerly 8c5026314c] [formerly 8c5026314c [formerly 99ae9bdc10]] [formerly 52b2c70c7b [formerly 33b4901c09] [formerly 8c5026314c] [formerly 8c5026314c [formerly 99ae9bdc10]] [formerly 038b284066 [formerly 8c5026314c [formerly 99ae9bdc10] [formerly 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]]]
Former-commit-id: 038b284066
Former-commit-id: b7e9afde18 [formerly 00b3ad8eb6] [formerly 1da31a86dc] [formerly ee767ef8495ee8de670f1acbae84552ce983603d [formerly c9abc2fce0e20d37683d43d809074ccd92db5423] [formerly 1da31a86dc [formerly c8ba2b1ae6]]]
Former-commit-id: 013fcf0643fa8ac69b47e283848a777c2528c73c [formerly c07303fea0c9c3e107dabbeefbd395be90d9018f] [formerly 9d263bc542 [formerly 84edac842e]]
Former-commit-id: 9d263bc542
Former-commit-id: 146dc3aec7
2014-08-26 16:25:21 -05:00
Nate Jensen
fcce378df5 Merge "Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env" into omaha_14.4.1
Former-commit-id: 9d7d6bc73f [formerly 9060f82413] [formerly e4df37dd05] [formerly e4df37dd05 [formerly 46fc72804a]] [formerly 9d7d6bc73f [formerly 9060f82413] [formerly e4df37dd05] [formerly e4df37dd05 [formerly 46fc72804a]] [formerly 448887b913 [formerly e4df37dd05 [formerly 46fc72804a] [formerly 448887b913 [formerly 59c4919564db8f8ebf61fbac6ce2bdd29095479e]]]]]
Former-commit-id: 448887b913
Former-commit-id: 4c8e11ea30 [formerly ef810f2d9e] [formerly ac814cc6c9] [formerly bb2351a6fffcc560633857155c4ccaccd2de6fd4 [formerly 321a097fc9e5a18ceee0ca4fe7a03aed77dead94] [formerly ac814cc6c9 [formerly 88ac1c057c]]]
Former-commit-id: 6efc4c3d20de0550be10f189bbe890f35ee3f838 [formerly 43b335a6aafd4eb481385999fce7db1ccabc7ca3] [formerly 10980c927d [formerly 6c93e01bda]]
Former-commit-id: 10980c927d
Former-commit-id: a96eca2d29
2014-08-26 13:39:15 -05:00
Brian.Dyke
5851fb235d Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 89044a96eb [formerly acc3321457] [formerly 489fec4b25] [formerly 489fec4b25 [formerly 86f0ed23c1]] [formerly 89044a96eb [formerly acc3321457] [formerly 489fec4b25] [formerly 489fec4b25 [formerly 86f0ed23c1]] [formerly b3767167c7 [formerly 489fec4b25 [formerly 86f0ed23c1] [formerly b3767167c7 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]]]]
Former-commit-id: b3767167c7
Former-commit-id: 9f66f958e5 [formerly ef2afe4f88] [formerly 1b9a28cc62] [formerly 01cd756b7e21e488ad80088cd45376d1281f1be7 [formerly dfa43aa5c4d4a07843b46cd3b23eed8a26739086] [formerly 1b9a28cc62 [formerly f2b9203001]]]
Former-commit-id: 3ac0ccec04d23373bda6397d91ebf1314fa9725f [formerly ab64fc858eafb7e5c8697e4fe618a1b8621ed5d0] [formerly 16dc3b41de [formerly 677ce2fb94]]
Former-commit-id: 16dc3b41de
Former-commit-id: bcdb3d4c19
2014-08-26 13:31:34 -04:00
Max Schenkelberg
fcb2cac753 Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea

Former-commit-id: ebad28ddfd [formerly d9536b7161] [formerly dacc10bcbc] [formerly dacc10bcbc [formerly 63967fbc78]] [formerly ebad28ddfd [formerly d9536b7161] [formerly dacc10bcbc] [formerly dacc10bcbc [formerly 63967fbc78]] [formerly 78b87b7a63 [formerly dacc10bcbc [formerly 63967fbc78] [formerly 78b87b7a63 [formerly 3aff99e787a7368f40cdd161581ead2d3552118c]]]]]
Former-commit-id: 78b87b7a63
Former-commit-id: 88fd0fb5e5 [formerly 8b2b1013da] [formerly 0a7a2fadec] [formerly a5a74e5f4a961402669c2703cdd3f7c363594a7a [formerly 69cfa06cf3110cf0b0a3f06464a492b6de6bcd56] [formerly 0a7a2fadec [formerly 7cfc26d1d7]]]
Former-commit-id: 5b6d34f4073173bfac1ff78bc5e6f229b029dcb2 [formerly 72bd8b39877326d1d084f39ad3ad4a274f7c39de] [formerly 0368097265 [formerly 9048064741]]
Former-commit-id: 0368097265
Former-commit-id: 8d3657ed54
2014-08-26 11:32:20 -05:00
Max Schenkelberg
4a355a0a44 Omaha #3541 fixed grid coverage spring
Change-Id: I6c69cbe530daee61127e05d7f94a0e2c92ebe2e7

Former-commit-id: 5539746852 [formerly 4b23f802ba] [formerly ac67bd42b9] [formerly ac67bd42b9 [formerly f7620471da]] [formerly 5539746852 [formerly 4b23f802ba] [formerly ac67bd42b9] [formerly ac67bd42b9 [formerly f7620471da]] [formerly df50024b63 [formerly ac67bd42b9 [formerly f7620471da] [formerly df50024b63 [formerly f2a76dfda110e231539474bffbde123fbe6313c9]]]]]
Former-commit-id: df50024b63
Former-commit-id: 4caf994ee6 [formerly 929fe3f461] [formerly 87e1c1a257] [formerly 81d75624d0a6cebedbadf4c0d6f2258ec155c329 [formerly ac6ae681f3cb5b8dfaa6cf752f341c7d25e7a784] [formerly 87e1c1a257 [formerly 6aff7b7a4c]]]
Former-commit-id: 443aae6dfa7df65a9f0e1616668729f706228357 [formerly 27c5e28c63d0587f2b277681844df9e3f1acf599] [formerly 2b110b1141 [formerly 47f4520d7c]]
Former-commit-id: 2b110b1141
Former-commit-id: dab59fed84
2014-08-26 11:28:42 -05:00
Richard Peter
6c08563b4c Omaha #3541 Fix request jvm startup and build
Change-Id: I6141ef1d74430fc43ea11f296c6ab95fc4276d6f

Former-commit-id: e37d893f72 [formerly eeb9dd1a0e] [formerly 64683e5784] [formerly 64683e5784 [formerly bf5f1c27a7]] [formerly e37d893f72 [formerly eeb9dd1a0e] [formerly 64683e5784] [formerly 64683e5784 [formerly bf5f1c27a7]] [formerly f478b42e61 [formerly 64683e5784 [formerly bf5f1c27a7] [formerly f478b42e61 [formerly 1c698d67a2c0ed3b11f910b593b1bbbdb2f46a86]]]]]
Former-commit-id: f478b42e61
Former-commit-id: 5a73e2d577 [formerly cc964bbb16] [formerly 832bd8d5e7] [formerly 6805a37c928a8ab7b6c6ec26b640babaa8e9ca21 [formerly 568786a138efec77effe0e633ede4a9ebea149c7] [formerly 832bd8d5e7 [formerly ef45928158]]]
Former-commit-id: 4cea0e4aabb65bf5b2b993be21e7dd2c7473391e [formerly 8d4d356508cafe54bb42446d9560c53d32e1de74] [formerly 7964c0697d [formerly 820fb0085e]]
Former-commit-id: 7964c0697d
Former-commit-id: f3e79fbd6f
2014-08-25 21:21:04 -05:00
Richard Peter
b4cf0ab541 Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
Former-commit-id: 60fa525bd3 [formerly c1f0cfdcc0] [formerly 64848acf9d] [formerly 64848acf9d [formerly 5cce505b7f]] [formerly 60fa525bd3 [formerly c1f0cfdcc0] [formerly 64848acf9d] [formerly 64848acf9d [formerly 5cce505b7f]] [formerly 651a10715a [formerly 64848acf9d [formerly 5cce505b7f] [formerly 651a10715a [formerly e2ed1054e382de6e3656fd9335dedc5af3692c17]]]]]
Former-commit-id: 651a10715a
Former-commit-id: 14c754aa17 [formerly 8156239a5d] [formerly 0992358153] [formerly a91ab880ec085dffa49d4f8b993091cf011ebd87 [formerly 1468621a0d8c9d41a9402e27a2253c61db3b31cf] [formerly 0992358153 [formerly eafe010aa1]]]
Former-commit-id: 5855438ac759433ea4ad8281f4714d050028342f [formerly de8b93ba75ee1bdae448adb782a9fa135eff4f41] [formerly 147856f43d [formerly ac192a5d86]]
Former-commit-id: 147856f43d
Former-commit-id: 028aac838f
2014-08-25 20:43:28 -05:00
Nate Jensen
faf5146c2f Omaha #3368 fix deploy-install for developers without ohd repo
Change-Id: Ib1738ed5e11022f5fd154ea85b29019e7c290f65

Former-commit-id: 19c68bfe00 [formerly e3244ce993] [formerly db84f25bfd] [formerly db84f25bfd [formerly 86f64337ff]] [formerly 19c68bfe00 [formerly e3244ce993] [formerly db84f25bfd] [formerly db84f25bfd [formerly 86f64337ff]] [formerly d43f0589f7 [formerly db84f25bfd [formerly 86f64337ff] [formerly d43f0589f7 [formerly e9d7e258c60d39ab0d043f1e1cdc0ebcaf998ccc]]]]]
Former-commit-id: d43f0589f7
Former-commit-id: 06e666f2c2 [formerly 1be8735d1b] [formerly d4f3d09f11] [formerly 6c965c83236e03cd41ec5e0a4df715a9343b6db7 [formerly ed5ad972dec2dba196ff6ea2e0d3138e9c949ca8] [formerly d4f3d09f11 [formerly aed159a1e2]]]
Former-commit-id: cebd3f69634b55dd4991af82e59a8d7a8570ebe0 [formerly 232fe10cbbb29a00c518ffea135b21c5e4584bc1] [formerly cbd7d00d1f [formerly abec6e86d9]]
Former-commit-id: cbd7d00d1f
Former-commit-id: 8e1b968959
2014-08-25 16:16:34 -05:00
Brian Clements
e62f0a0ed9 Omaha #2926 switched textdb to thrift client
Change-Id: I80a55506fa1e6d8780c0d3dbfb4b3c82b1aac9f1

Former-commit-id: 53873d8d8f [formerly 8a930b582a] [formerly 344ba01102] [formerly 344ba01102 [formerly 1bbf5d7346]] [formerly 53873d8d8f [formerly 8a930b582a] [formerly 344ba01102] [formerly 344ba01102 [formerly 1bbf5d7346]] [formerly c05e535cc8 [formerly 344ba01102 [formerly 1bbf5d7346] [formerly c05e535cc8 [formerly 856ef48bab005bdb7de9dd4145fafc7fe12084f5]]]]]
Former-commit-id: c05e535cc8
Former-commit-id: bd86106ae1 [formerly e15b5156db] [formerly 65d5085dcf] [formerly a827f9b346960822a12b349bb40445c9480df1a5 [formerly a8b681ac9858375a256beaf3b32523c39c49ac43] [formerly 65d5085dcf [formerly 09d7136915]]]
Former-commit-id: b1f67dd682d85107833a22f60254e848c5a817ff [formerly 288f3433a4af74bb77a665775881963c0bb9365d] [formerly 9992138ebe [formerly 7730ba55d4]]
Former-commit-id: 9992138ebe
Former-commit-id: 928f96021a
2014-08-25 10:28:48 -05:00
Roger Ferrel
a548b0f17f Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790

Former-commit-id: 94dc629314 [formerly 20362833cf] [formerly a610e0a34b] [formerly a610e0a34b [formerly ca3a0595d2]] [formerly 94dc629314 [formerly 20362833cf] [formerly a610e0a34b] [formerly a610e0a34b [formerly ca3a0595d2]] [formerly d0779ef059 [formerly a610e0a34b [formerly ca3a0595d2] [formerly d0779ef059 [formerly f16a8ff2c51c392957e13ef63423abe9f99b3301]]]]]
Former-commit-id: d0779ef059
Former-commit-id: f290a66ab9 [formerly 248bd0a393] [formerly be7d387a4b] [formerly fca32c3f37b620c775dc88c09312813ee7d51721 [formerly 1fd4b3451da3ccea875b5e6dc43fa6eacddc8994] [formerly be7d387a4b [formerly cfe1212590]]]
Former-commit-id: 0a1c8182b6fbcdc7f946de8a98f095062e884d54 [formerly 745fe2a291852f43240cb02cd4c30d6024a6d7fa] [formerly c534338504 [formerly a9d8c8f3f5]]
Former-commit-id: c534338504
Former-commit-id: b3d2996e76
2014-08-25 07:59:26 -05:00
Brian.Dyke
6a99c2269e Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py

Former-commit-id: e6e748f80c [formerly 6402cb7d89] [formerly 2ddc920a4a] [formerly 2ddc920a4a [formerly 325887e605]] [formerly e6e748f80c [formerly 6402cb7d89] [formerly 2ddc920a4a] [formerly 2ddc920a4a [formerly 325887e605]] [formerly dd9d7133d9 [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]]]
Former-commit-id: dd9d7133d9
Former-commit-id: b1125b7ead [formerly e348a6abc7] [formerly c8e9153884] [formerly aeb4c05a55d78fcd7c75024d8266f07f6153e495 [formerly 7dbc20e2697aab4991870bf8493b74b08acbe56b] [formerly c8e9153884 [formerly 1839b614df]]]
Former-commit-id: 4ebaf1487954a27857fde0b53c4ede7217a27c50 [formerly 85ccff40908964b07fef1c572de049c609434728] [formerly 27372f098c [formerly cd1b914f50]]
Former-commit-id: 27372f098c
Former-commit-id: 272905b186
2014-08-22 14:16:22 -04:00
Max Schenkelberg
632549b75a Omaha #3541 Updated A2 baseline to reflect request service split
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93

Former-commit-id: 5c157bf266 [formerly 0419aeea52] [formerly 88ea402947] [formerly 88ea402947 [formerly 896e353950]] [formerly 5c157bf266 [formerly 0419aeea52] [formerly 88ea402947] [formerly 88ea402947 [formerly 896e353950]] [formerly e90bdb6fce [formerly 88ea402947 [formerly 896e353950] [formerly e90bdb6fce [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]]]]]
Former-commit-id: e90bdb6fce
Former-commit-id: 1d8ff90d7d [formerly 9da9d7fe27] [formerly ee4d9a965c] [formerly 9a1549b052d2b3667c9f64f995ea6c2a68f18516 [formerly 2cd1dab291464f00d51c5d42351d92f81defb05b] [formerly ee4d9a965c [formerly 68221174c4]]]
Former-commit-id: a15ffb71b6c1ad293cbe4f57502a3a457bdcefc5 [formerly e6903f6858697e0f9f7137372b3aac308d58ed18] [formerly 395dcaa255 [formerly e864d8a275]]
Former-commit-id: 395dcaa255
Former-commit-id: 3fe9b3a357
2014-08-22 13:15:42 -05:00
Brian.Dyke
bf565e384f Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: f25f86cf2a [formerly 64effd458c] [formerly 5b2b0d2bd9] [formerly 5b2b0d2bd9 [formerly a830b6d94c]] [formerly f25f86cf2a [formerly 64effd458c] [formerly 5b2b0d2bd9] [formerly 5b2b0d2bd9 [formerly a830b6d94c]] [formerly 94577a1626 [formerly 5b2b0d2bd9 [formerly a830b6d94c] [formerly 94577a1626 [formerly b2674ef57183706feb2bb17175d730bb2e213281]]]]]
Former-commit-id: 94577a1626
Former-commit-id: b8c9e37b47 [formerly 9c119c8431] [formerly 0cbbceb7e3] [formerly 4b3916f49cdc4aeb92e16f6e74ebe2a73cf4d094 [formerly 5ebef4a85e30ac73432bcaf6ac7df852b8d06f7e] [formerly 0cbbceb7e3 [formerly a0af10ff2e]]]
Former-commit-id: 3e7908a6f5da8bbc3a094c74d7400063addb06b4 [formerly 522edbdb9ffeff69b90b3db092cedb88b93eea4b] [formerly 5a878760f1 [formerly d0a2060e84]]
Former-commit-id: 5a878760f1
Former-commit-id: 348b4c12e9
2014-08-22 14:13:48 -04:00
Richard Peter
d9333ed401 Issue #3534 Update ThreadBasedAppender to extend UnsychronizedAppenderBase.
Change-Id: I6b01acd59f7fde5e98dcfe1f1221f8725fc0540b

Former-commit-id: ca6aef280e [formerly ae3aa358e9] [formerly 4cebb22560] [formerly 4cebb22560 [formerly ce238544d1]] [formerly ca6aef280e [formerly ae3aa358e9] [formerly 4cebb22560] [formerly 4cebb22560 [formerly ce238544d1]] [formerly a9af2314d3 [formerly 4cebb22560 [formerly ce238544d1] [formerly a9af2314d3 [formerly 31e9cb1cfc15d79b204d4d16c1f7afa614bb9ca2]]]]]
Former-commit-id: a9af2314d3
Former-commit-id: 2d78f2a7c3 [formerly 1c62a83ae8] [formerly a1abde3669] [formerly d9a63de4f596eaa0b20c5b0096b3430d095b9699 [formerly 4aeafb30d7dcfb61f9b17c635129ad6d8eddb705] [formerly a1abde3669 [formerly 7c74a4110e]]]
Former-commit-id: 1e5e619eda84a1580d60be04434b1edc4d08ef88 [formerly bbcf27cd1f3d9988aa5ef39112f7bbb21e734e53] [formerly 6fe6ecc60f [formerly 0119aea767]]
Former-commit-id: a28c47ab267122a817dab2c9cf00d67669839806 [formerly 6fe6ecc60f]
Former-commit-id: 4bf9570210
2014-08-22 10:47:05 -05:00
Nate Jensen
dade9c5355 Merge "Omaha #1664 Fixed invalid thread access in several GFE dialogs" into omaha_14.4.1
Former-commit-id: 1576b55f91 [formerly 4eb3534709] [formerly a3b1d88af3] [formerly a3b1d88af3 [formerly b4a3d550b5]] [formerly 1576b55f91 [formerly 4eb3534709] [formerly a3b1d88af3] [formerly a3b1d88af3 [formerly b4a3d550b5]] [formerly 72ce7a78b2 [formerly a3b1d88af3 [formerly b4a3d550b5] [formerly 72ce7a78b2 [formerly e59e5c327a8ba0488092d8774ecf65fd6b298a5b]]]]]
Former-commit-id: 72ce7a78b2
Former-commit-id: 5331ec4059 [formerly e9017bf8c5] [formerly 2c324e4faa] [formerly dab85511084dc97ac1adaf953dbb3fd8adbdf8f4 [formerly c7b8c110f7d8a886afea234f888f3f5d792722f6] [formerly 2c324e4faa [formerly 64979aec42]]]
Former-commit-id: 8ac2f4dc35c5a10ef5922dc6018a057532566790 [formerly 33000181c42bb1b35ba777db0fae0b1b1030fd2f] [formerly c980e9f532 [formerly ece7abf55d]]
Former-commit-id: c980e9f532
Former-commit-id: df7e2b5b7c
2014-08-21 11:26:59 -05:00
Richard Peter
e492af965d Merge "Omaha #3393 Add request/response for RadarDataRecord. Remove broken RadarDao override. Convert a2_rad scripts." into omaha_14.4.1
Former-commit-id: 40fce92757 [formerly a56cc473fc] [formerly 399dd380e0] [formerly 399dd380e0 [formerly 92ed88ac90]] [formerly 40fce92757 [formerly a56cc473fc] [formerly 399dd380e0] [formerly 399dd380e0 [formerly 92ed88ac90]] [formerly b6b7c6e67e [formerly 399dd380e0 [formerly 92ed88ac90] [formerly b6b7c6e67e [formerly b2dba13e2c22cecf1afe70632106d4fcb5340829]]]]]
Former-commit-id: b6b7c6e67e
Former-commit-id: e92946fa92 [formerly e37290feee] [formerly 0fc07f6b08] [formerly f6ef6345b8de33cd9e188d6265580df132255e89 [formerly 1519c67baad5bc6422f721fc3041e0e43ead98cf] [formerly 0fc07f6b08 [formerly 2959869b71]]]
Former-commit-id: 899b47e15ea3c8be6286f48991f02542325da107 [formerly 12e08f06dd600a42039005d87adfc0d76e1c8c27] [formerly 23de0e4f9c [formerly 037cd12921]]
Former-commit-id: 2b0c9fcefefdeb8ecb9a419d90e43b709069cda6 [formerly 23de0e4f9c]
Former-commit-id: 8ee7552883
2014-08-21 11:12:17 -05:00
Brian.Dyke
44b2d7affc Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 850fee7d70 [formerly d4d26aaf75] [formerly f6748f1e28] [formerly f6748f1e28 [formerly 14d21b336d]] [formerly 850fee7d70 [formerly d4d26aaf75] [formerly f6748f1e28] [formerly f6748f1e28 [formerly 14d21b336d]] [formerly aaabfa6cd0 [formerly f6748f1e28 [formerly 14d21b336d] [formerly aaabfa6cd0 [formerly 614b2bb59424f01d2608cd2db3a14dbcd77c90e6]]]]]
Former-commit-id: aaabfa6cd0
Former-commit-id: 930435a07d [formerly 41b4a9a504] [formerly 5b188a713b] [formerly df92a7a7ad0677ae336434b8e403df4c1b65df68 [formerly 2bb78d3c5817cd77bb1da9ea0f462ed769072ce7] [formerly 5b188a713b [formerly d419fc59ff]]]
Former-commit-id: 972809034bddfc9ecc26d07e2b5637ee8db5e77d [formerly 040f26f492eaea82f769d1ff4ae1fc168100f2f9] [formerly 5b4d83e8a5 [formerly a29865b064]]
Former-commit-id: 5b4d83e8a5
Former-commit-id: 1d5e5f779f
2014-08-21 12:07:16 -04:00
Brian.Dyke
85c3afe720 VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag
Former-commit-id: e9defe3c93 [formerly e9cd8aba20] [formerly 93be1a54c7] [formerly 93be1a54c7 [formerly 7b8fef0fa3]] [formerly e9defe3c93 [formerly e9cd8aba20] [formerly 93be1a54c7] [formerly 93be1a54c7 [formerly 7b8fef0fa3]] [formerly ae5656ca46 [formerly 93be1a54c7 [formerly 7b8fef0fa3] [formerly ae5656ca46 [formerly 1b83b788aee082b489ce0fe5dc6d775e2f621e01]]]]]
Former-commit-id: ae5656ca46
Former-commit-id: f6bfb4b18f [formerly 1382e07119] [formerly 17b9ae1418] [formerly 8f8f6856215e8c8c61e73c0af2008ab5513ce337 [formerly b70337fe76136addade0078d2a3e33f5ca57b9cf] [formerly 17b9ae1418 [formerly bcf53f53da]]]
Former-commit-id: f5c55e88793e2d3766a90faee6c5c62e7d55bd02 [formerly ece4562da20dabf5134e7571432e44bc329487c2] [formerly aa4fad07e8 [formerly d5bcfff431]]
Former-commit-id: aa4fad07e8
Former-commit-id: 00b3705149
2014-08-21 11:07:02 -04:00
Nathan Bowler
bb92cb9b84 Omaha #3393 Add request/response for RadarDataRecord. Remove broken RadarDao override. Convert a2_rad scripts.
Change-Id: Ie3ea761920c1ecec233e1fc586f3cbcd5914f1c6

Former-commit-id: 234c05ec07 [formerly 10f163ec37] [formerly f70776903c] [formerly f70776903c [formerly 2fcc25bb9b]] [formerly 234c05ec07 [formerly 10f163ec37] [formerly f70776903c] [formerly f70776903c [formerly 2fcc25bb9b]] [formerly 8fdc47855e [formerly f70776903c [formerly 2fcc25bb9b] [formerly 8fdc47855e [formerly 44ca6fb8a26cc9af7267ce635a200eb3c26ce9f8]]]]]
Former-commit-id: 8fdc47855e
Former-commit-id: 5d0fbe9e7b [formerly 7a50028eff] [formerly b1fbb4e678] [formerly 5b7dddf8cf41948f7ae180b79732ca5500dd62a3 [formerly 774f44cab9d2b4fee8d681e9226c84c8f3a3bc47] [formerly b1fbb4e678 [formerly f2be9c044e]]]
Former-commit-id: 47c83bee8094b59ad79ba2de77ae43f31e9ea906 [formerly 68fbb736180cfea0a6a71068cb181a3ebac73827] [formerly d68602eadd [formerly d398fdca21]]
Former-commit-id: d68602eadd
Former-commit-id: d0df1e49ce
2014-08-21 10:55:28 -04:00
Ron Anderson
c25cce5fee Omaha #1664 Fixed invalid thread access in several GFE dialogs
Change-Id: Ib40e6928c61a0f9e4f9fad9d8e7a06a66af292e3

Former-commit-id: aace65a7f3 [formerly cbb5d9302f] [formerly a9d580647e] [formerly a9d580647e [formerly 4178dac741]] [formerly aace65a7f3 [formerly cbb5d9302f] [formerly a9d580647e] [formerly a9d580647e [formerly 4178dac741]] [formerly bb124e7fa2 [formerly a9d580647e [formerly 4178dac741] [formerly bb124e7fa2 [formerly 93aa457f4918cd16edd21422819cda12af26250f]]]]]
Former-commit-id: bb124e7fa2
Former-commit-id: ef98e12eae [formerly 3a66751078] [formerly ca2f709ce1] [formerly 31318cfebb7ae19328950893813176a5e551dfca [formerly 5bbb2e79ae0e9484811156c4a769a4b70f2d3bee] [formerly ca2f709ce1 [formerly ff31c11e02]]]
Former-commit-id: 7226ec3939f057200d1ee08907e9afbdaa2252ed [formerly 4e320f8aa08746f98e8fd8ec758e45047cacc254] [formerly 8a9d464a81 [formerly 1cabf1b3cd]]
Former-commit-id: ab55be34a9cbc11924b21c945acd76f29adf41f4 [formerly 8a9d464a81]
Former-commit-id: e957b37b5a
2014-08-21 09:25:14 -05:00
Ron Anderson
7ae571cad7 Merge "Omaha #3549 fix spelling in exceptions" into omaha_14.4.1
Former-commit-id: 976932d6c9 [formerly b77eb54d1f] [formerly 2cd98dcd89] [formerly 2cd98dcd89 [formerly df66067c53]] [formerly 976932d6c9 [formerly b77eb54d1f] [formerly 2cd98dcd89] [formerly 2cd98dcd89 [formerly df66067c53]] [formerly 029d66274b [formerly 2cd98dcd89 [formerly df66067c53] [formerly 029d66274b [formerly 47531ae8a49c5d2c6900a4c557339b2b3f179802]]]]]
Former-commit-id: 029d66274b
Former-commit-id: 206442775f [formerly b0b4fdcd22] [formerly 2308d63dbd] [formerly a0a75167dd68a812432b3356c0d255b4e8606460 [formerly ad7d3a1538de95a55673baed21963ac736c47965] [formerly 2308d63dbd [formerly f6cffc642d]]]
Former-commit-id: 1f566c7ac2581ffa34e2df82952b92d113f25f44 [formerly cba2395c53b56e65c57096fe99768472975fc327] [formerly 5eb08e9aa2 [formerly 9aacb9979f]]
Former-commit-id: 5eb08e9aa2
Former-commit-id: 6344e2a355
2014-08-21 08:44:49 -05:00
Nate Jensen
e05062a752 Omaha #3549 fix spelling in exceptions
Change-Id: I4f9689cd0311b2e257b0d2150a8ffb06028e1a13

Former-commit-id: a0914595a9 [formerly 120258f93b] [formerly 162c33aa6c] [formerly 162c33aa6c [formerly 9ef69e115b]] [formerly a0914595a9 [formerly 120258f93b] [formerly 162c33aa6c] [formerly 162c33aa6c [formerly 9ef69e115b]] [formerly 8c5802837e [formerly 162c33aa6c [formerly 9ef69e115b] [formerly 8c5802837e [formerly 6b301dfa92787488394a868c3fb28d0cea6fae3a]]]]]
Former-commit-id: 8c5802837e
Former-commit-id: 08b941d75c [formerly 92f846ccd6] [formerly 93c98a88bb] [formerly 3b574c23674678f0df4043a56bbd6d1f3914e22d [formerly fb4670aefadf180dc0025a26c03b9b4ff62c862d] [formerly 93c98a88bb [formerly 8631eaa71a]]]
Former-commit-id: b890fc7e58069a55dd7fc4bb4005e57869381839 [formerly 25ea62c3f9e3587f12a3b4bd8a05511174483fd4] [formerly ec91401ad2 [formerly 1008544c39]]
Former-commit-id: 673c2b480c65f839dc8c68b698162511f11117df [formerly ec91401ad2]
Former-commit-id: 0aa93ed580
2014-08-20 13:28:03 -05:00
Ron Anderson
56961d4f2c Issue #3526 Fix bug in WECache that caused ISC grids to be removed
Change-Id: I49feb0d093a75c83b9a09deeed15e81cf0ed967b

Former-commit-id: f7d1610250 [formerly 07ea3be623] [formerly a19f819e44] [formerly a19f819e44 [formerly 62236ee92a]] [formerly f7d1610250 [formerly 07ea3be623] [formerly a19f819e44] [formerly a19f819e44 [formerly 62236ee92a]] [formerly 8c4cb3b4ae [formerly a19f819e44 [formerly 62236ee92a] [formerly 8c4cb3b4ae [formerly edd1c5d77ec7a84b5807134d863d59147a846405]]]]]
Former-commit-id: 8c4cb3b4ae
Former-commit-id: ad92d7a3d7 [formerly 366e6688de] [formerly 11dd687ef7] [formerly c907b5716ee221522947d72fdda011131c1f8268 [formerly e89e5bdd4418ddd0fe42f0316f4e3cd080733fb4] [formerly 11dd687ef7 [formerly a41384e4d6]]]
Former-commit-id: a113e7fe887fa3d36a9190732b5182fd1da7d273 [formerly 9732798c71cdf2ff6f51cf8349775ec115430dc1] [formerly f112c5e056 [formerly 2fa509c56f]]
Former-commit-id: f112c5e056
Former-commit-id: d5fc7cb86a
2014-08-20 11:03:03 -05:00
Benjamin Phillippe
785230778f Omaha #3509 Fixed XACML processing to work properly with DPA
Change-Id: I6b66cfe4217c8a9bc2dec1d7e97b7f5203b518fe

Former-commit-id: 850f5411d0 [formerly e230d38e13] [formerly defe9d1c42] [formerly defe9d1c42 [formerly 201962c6fc]] [formerly 850f5411d0 [formerly e230d38e13] [formerly defe9d1c42] [formerly defe9d1c42 [formerly 201962c6fc]] [formerly 02719e9f90 [formerly defe9d1c42 [formerly 201962c6fc] [formerly 02719e9f90 [formerly 4661d8ec3ed187b2ccf270a2acbcd55cc5ef359c]]]]]
Former-commit-id: 02719e9f90
Former-commit-id: 03000e90dd [formerly dbd6d18200] [formerly 3e1b3f180c] [formerly c37701e0feb56ffe74ceceb9cf69a6a8ae5f00ac [formerly 25a7792436d9cc0eddebd8721e813a557e22d7f6] [formerly 3e1b3f180c [formerly f8ee1ce801]]]
Former-commit-id: 40ba7798907bde73f0075208bdfa72af0827b248 [formerly 6fcbb461641f247db2f49252dfbad358b72261a3] [formerly b56bf7055a [formerly b8c4bb918e]]
Former-commit-id: 72eaafd5cf1de0f0f7b15db54ecdbf0cda9199a3 [formerly b56bf7055a]
Former-commit-id: 80bb517683
2014-08-20 09:30:16 -05:00
Roger Ferrel
d92f408a9f Issue #3439 Name change per suggestions in email.
Former-commit-id: fa8d00cfef [formerly c7cf1e9273] [formerly d76722987e] [formerly d76722987e [formerly fb54b80ed5]] [formerly fa8d00cfef [formerly c7cf1e9273] [formerly d76722987e] [formerly d76722987e [formerly fb54b80ed5]] [formerly f110ca1f3d [formerly d76722987e [formerly fb54b80ed5] [formerly f110ca1f3d [formerly 44c3b86c9dc0b978acc66c5f79255270ce0acb41]]]]]
Former-commit-id: f110ca1f3d
Former-commit-id: a03121ef49 [formerly 2526e08600] [formerly 09f4d1b53b] [formerly 9deec0d9d377bf77616f6b49bbb1db624cc9b9be [formerly 82eec68c447814da19339fe2e7f976abf7da8f86] [formerly 09f4d1b53b [formerly 9adb8c5d35]]]
Former-commit-id: 5ce4276f78bb8c08b47630a752be6bf9ceb1d834 [formerly 91d40ea44812f95de0783494436f282e09531fa1] [formerly d4db0fc5fd [formerly 4d0c25e71d]]
Former-commit-id: d4db0fc5fd
Former-commit-id: c5df26572a
2014-08-19 16:41:06 -05:00
Slav Korolev
e75e96158d Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761

This reverts commit fe4b0de79bdc9f7d9251320f16b6046314117f1f [formerly e5af41fa86] [formerly cf682f2787 [formerly f4eec5a328] [formerly 55a1120bdb] [formerly 55a1120bdb [formerly dd9d117f90]] [formerly cf682f2787 [formerly f4eec5a328] [formerly 55a1120bdb] [formerly 55a1120bdb [formerly dd9d117f90]] [formerly e5af41fa86 [formerly 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]]]].

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: a9b64e0531 [formerly 7c336276f4] [formerly 1c896cedab] [formerly 1c896cedab [formerly a9bed4c6fd]] [formerly a9b64e0531 [formerly 7c336276f4] [formerly 1c896cedab] [formerly 1c896cedab [formerly a9bed4c6fd]] [formerly a779c786f1 [formerly 1c896cedab [formerly a9bed4c6fd] [formerly a779c786f1 [formerly aee044437492438381db98cc6fd3a917f6c05659]]]]]
Former-commit-id: a779c786f1
Former-commit-id: bcf0550d90 [formerly 14193d9f0d] [formerly d080af879e] [formerly d4b94ac51bd268016bf9d4cca48c43d9d55f4b07 [formerly 03e43cde864d9e501745b3af41e7db422c82dcbe] [formerly d080af879e [formerly 407be3d26f]]]
Former-commit-id: e04085e48440fe8779e5a601710717859a5d2138 [formerly 78f747829f22eb099862b93f26e70021a2f10294] [formerly 9d0e31155f [formerly 99a8258e86]]
Former-commit-id: 9d0e31155f
Former-commit-id: 255c2b2b9e
2014-08-19 10:12:36 -05:00
Brian Clements
9ea4e920d4 Omaha #3530 cleanup of acarssounding, bufrua and fssobs
Change-Id: I99814bcb781c03e466ca4b499f90f2421651042f

Former-commit-id: 463ffa1db8 [formerly 228f97ccc8] [formerly f62c51c532] [formerly f62c51c532 [formerly 96b395a19e]] [formerly 463ffa1db8 [formerly 228f97ccc8] [formerly f62c51c532] [formerly f62c51c532 [formerly 96b395a19e]] [formerly fdf20738b9 [formerly f62c51c532 [formerly 96b395a19e] [formerly fdf20738b9 [formerly 10607d3f8363a63fbf60a68c2ec746b8a8536644]]]]]
Former-commit-id: fdf20738b9
Former-commit-id: 892fa24885 [formerly 11a921db6a] [formerly 19a1d786b6] [formerly 9aa52b90f6b6f286d84c8349062c194ee5909f76 [formerly b1461f89391e97c3d83a4e25deeb70c0359b870b] [formerly 19a1d786b6 [formerly 75b8b34169]]]
Former-commit-id: 6349eb4382ac8cb1cfbc7ccbeab93152c10fee50 [formerly 1211e269abb17ee2a1e00c254352811aa79f9e7d] [formerly 644910ab87 [formerly 1baa3b851e]]
Former-commit-id: 644910ab87
Former-commit-id: 3659b37555
2014-08-18 15:25:13 -05:00
Brian.Dyke
a158f2c1ba Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 7008a8e65b [formerly 867b82ca10] [formerly 2054d6f844] [formerly 2054d6f844 [formerly 9a212410b5]] [formerly 7008a8e65b [formerly 867b82ca10] [formerly 2054d6f844] [formerly 2054d6f844 [formerly 9a212410b5]] [formerly d82d58d38e [formerly 2054d6f844 [formerly 9a212410b5] [formerly d82d58d38e [formerly 5c9880c3179bf376798bb5658aec3666bddd7d3e]]]]]
Former-commit-id: d82d58d38e
Former-commit-id: 5ea1c8e527 [formerly 1d75000b56] [formerly 1d297de174] [formerly 82cb4fe006f37498758f9f6464f09861fab23aa6 [formerly a54b0882b92b48538ae981eea35265d473f09d9b] [formerly 1d297de174 [formerly 9b1b39f3be]]]
Former-commit-id: da366ed1b19f9e24d035a4d9bb6077bd71c55e54 [formerly 417d137abb4a91e7c87dcbe3b13c48447942570e] [formerly 3e914c01fc [formerly d96b05a86e]]
Former-commit-id: 3e914c01fc
Former-commit-id: 7788eed97a
2014-08-18 11:47:38 -04:00
Brian Clements
51efbc0bed Omaha #3503 added geo-common to ingestDat mode
Change-Id: Ie54816eea4a7255d47fd806d706334ce7833a641

Former-commit-id: fa9f61f3c2 [formerly 36b6be08e5] [formerly 854cabd8b4] [formerly 854cabd8b4 [formerly 97e99c4007]] [formerly fa9f61f3c2 [formerly 36b6be08e5] [formerly 854cabd8b4] [formerly 854cabd8b4 [formerly 97e99c4007]] [formerly a7e0e0632f [formerly 854cabd8b4 [formerly 97e99c4007] [formerly a7e0e0632f [formerly 6ba373164afcb47d8c85e16696a55eb57b28d157]]]]]
Former-commit-id: a7e0e0632f
Former-commit-id: 10e7d5456b [formerly 2b556a937e] [formerly 155758ab4b] [formerly 5354eb82866ca96722ddb01fcaf7ee4cab19e846 [formerly b8468d64b1cf75a7cfa20f431be737a853a9e5c7] [formerly 155758ab4b [formerly 9ec25792a5]]]
Former-commit-id: 93c40e0247ca535048956eefbbb97a7657047dbe [formerly 67b471112eb528fa956e4d66c9193bf0e354eddd] [formerly 27778d4798 [formerly d65179b38d]]
Former-commit-id: 27778d4798
Former-commit-id: 178ab3e634
2014-08-18 10:00:19 -05:00
Brian Clements
c1c2374d91 Omaha #3530 fixed dependencies on qc and ldadmesonet
Change-Id: Ida090030fa029633e2f1e8b967131a4806c8ebe2

Former-commit-id: ce6dd4b6a7 [formerly 3c126ff72b] [formerly 056593d3c8] [formerly 056593d3c8 [formerly af2554f364]] [formerly ce6dd4b6a7 [formerly 3c126ff72b] [formerly 056593d3c8] [formerly 056593d3c8 [formerly af2554f364]] [formerly 7d17345f53 [formerly 056593d3c8 [formerly af2554f364] [formerly 7d17345f53 [formerly 3fa55526310ca6cfa7b2b054296ced7321f86480]]]]]
Former-commit-id: 7d17345f53
Former-commit-id: 7d09a58333 [formerly 50531a9848] [formerly 1d31072b48] [formerly 4da9e2a1f67e4c61b099beb7e82c172462df7597 [formerly a48b7b7ea370d7322bbafcf934136378d45f1a1d] [formerly 1d31072b48 [formerly 1a4215eb8a]]]
Former-commit-id: b5ca489f56c54c2fe23170c53eead26fbd7f2aae [formerly f09b69b1ccd166b086a804b20208663e4f436395] [formerly ab032e7ea4 [formerly fabc057a53]]
Former-commit-id: ab032e7ea4
Former-commit-id: d1b97a5acf
2014-08-15 16:13:25 -05:00
Nate Jensen
41e2cc7543 Omaha #3356 move EbxmlNamespaces and RegrepUtil to unique package name
to allow removal of duplicate package name of com.raytheon.uf.common.registry

Change-Id: I502e14e8c729d606f6122aa969eef7d8761181c4

Former-commit-id: ca950a3e13 [formerly 6b51b46952] [formerly c612ca234c] [formerly c612ca234c [formerly 83b666c0df]] [formerly ca950a3e13 [formerly 6b51b46952] [formerly c612ca234c] [formerly c612ca234c [formerly 83b666c0df]] [formerly 1d3047f3d8 [formerly c612ca234c [formerly 83b666c0df] [formerly 1d3047f3d8 [formerly 9adcbd81d10aa3d464d6dcb0b79b7500f0796cbd]]]]]
Former-commit-id: 1d3047f3d8
Former-commit-id: 1f7efaae14 [formerly 76e977eaa4] [formerly af101e7bb6] [formerly 441c4c95bfb8280aa53c9f9cb9cd3dbcd22c29cf [formerly 4b2829fe53aef19ba82f912bd39e3a208ebc1e41] [formerly af101e7bb6 [formerly 84e1265370]]]
Former-commit-id: dd566c2f0953da0bdd9ddaae757cb26ba364fdee [formerly cd56fa72109c4184bd8af7916eb969518fefe877] [formerly fb4c498c2e [formerly 4f5ce115d2]]
Former-commit-id: fb4c498c2e
Former-commit-id: cbebfda472
2014-08-15 15:54:08 -05:00