Commit graph

3168 commits

Author SHA1 Message Date
Richard Peter
4bdd9aa874 Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1
Former-commit-id: 4967854d11 [formerly dcaedf5d43] [formerly db4c6c8c22] [formerly 4967854d11 [formerly dcaedf5d43] [formerly db4c6c8c22] [formerly f19fda01ad [formerly db4c6c8c22 [formerly 052144dd9929d852543f4eaf959ca3ccce50c5a2]]]]
Former-commit-id: f19fda01ad
Former-commit-id: 1709bda041 [formerly 9faf57cf68] [formerly 8ebf47a2dd962ac3dcf82db35d6caac8cbe3b762 [formerly 02b136759b]]
Former-commit-id: f504137ff732272d60b7cf200e8b3c97f1bf0702 [formerly 79a88d24ef]
Former-commit-id: 680a584473
2014-05-20 17:14:29 -05:00
Brian Clements
20cb82cc98 Omaha #2536 merged edex.textdb into text plugins
Former-commit-id: c885bf9426 [formerly c55124bcc7] [formerly 5b5295e5ad] [formerly c885bf9426 [formerly c55124bcc7] [formerly 5b5295e5ad] [formerly da7d5888b0 [formerly 5b5295e5ad [formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]]]]
Former-commit-id: da7d5888b0
Former-commit-id: 39ab0e1a08 [formerly e4bb70cbe9] [formerly 909b50360144c1b7aaf549971a4592d7aee00d9c [formerly 003917f0ed]]
Former-commit-id: 21b6858b7cb89d1d240688b3c00b569a7c69d267 [formerly 30fb567666]
Former-commit-id: ebc9bfa351
2014-05-20 16:07:20 -05:00
Richard Peter
ed4d9a6467 Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1
Former-commit-id: 9df96cc326 [formerly ab3a7a2804] [formerly 13ac6e8337] [formerly 9df96cc326 [formerly ab3a7a2804] [formerly 13ac6e8337] [formerly 2d4d89b3f0 [formerly 13ac6e8337 [formerly 62674d17c73d8fdbbe26916aba7ecac572eca2eb]]]]
Former-commit-id: 2d4d89b3f0
Former-commit-id: 74de8945c0 [formerly 3264e7bd93] [formerly 52185ada2cfcc10553a7b9bec09caab66538337c [formerly 0b8c3e67a1]]
Former-commit-id: 055959a0e32f78a3f4d1d8670b525b15287f41a9 [formerly 580dd1ed1d]
Former-commit-id: 6bccbaccd1
2014-05-20 14:56:44 -05:00
Nate Jensen
fe94471068 Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1
Former-commit-id: 8dc3683186 [formerly 77c77c6b8f] [formerly 1e408e7017] [formerly 8dc3683186 [formerly 77c77c6b8f] [formerly 1e408e7017] [formerly 966cf1f96f [formerly 1e408e7017 [formerly 62054f8f2552058b0b53b79b077a4d7699cb41e9]]]]
Former-commit-id: 966cf1f96f
Former-commit-id: 8f0913851f [formerly eb086ff461] [formerly bd9f4b599f4e6435264b1b4987d6628cb9848470 [formerly 88aa9471e1]]
Former-commit-id: 91d875f7810f65ff96178ec3352630c12832b221 [formerly 95ed06119c]
Former-commit-id: 9d1afa6876
2014-05-20 14:51:05 -05:00
Brad Gonzales
ad3caf4a8f Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf.
Amend: updated manifest.
       Removed static imports.
       Refactored String constants to Pattern constants in TafConstants.
       Refactored com.raytheon.edex.plugin.taf to com.raytheon.uf.edex.taf.
       Renamed com.raytheon.edex.plugin.taf project to com.raytheon.uf.edex.taf.
       fixed .project.  Updated yet more Patterns.

Change-Id: Ia5db9d185c6c32e6ce25748ae4b3b6fb389b2acc

Former-commit-id: 35afb44d4b [formerly c4890beb96] [formerly 6b0e578fc1] [formerly 35afb44d4b [formerly c4890beb96] [formerly 6b0e578fc1] [formerly e560ce4880 [formerly 6b0e578fc1 [formerly f73ed1c8ee81f3ae1ffdf44ba4726453e7e0b9d2]]]]
Former-commit-id: e560ce4880
Former-commit-id: 3a75e82e7a [formerly 6825727400] [formerly 3e7024f11e766b0b3759f7dfe89c695683e8de9e [formerly e2412ecb43]]
Former-commit-id: 671ea5c32e2f34163202f6e31c76f0b42201d319 [formerly fea1c9febe]
Former-commit-id: 26953a7864
2014-05-20 14:13:18 -05:00
Ben Steffensmeier
7d9d7e3b8a Omaha #2913 Remove dead code using JAI
Former-commit-id: f010aa30b4 [formerly 59a108822e] [formerly d5d3f5605a] [formerly f010aa30b4 [formerly 59a108822e] [formerly d5d3f5605a] [formerly d48333444c [formerly d5d3f5605a [formerly 767fc083618827ad06beff9f6728ea9dd42528f6]]]]
Former-commit-id: d48333444c
Former-commit-id: e34301d284 [formerly a56f475076] [formerly 20fefb3d504c7cb0e078b3c05a039e91830abbc4 [formerly 98ad1b079e]]
Former-commit-id: 5839ab166d879036ef28743bba99bc2000581f2c [formerly 4b940cb599]
Former-commit-id: 58e5704651
2014-05-20 13:36:15 -05:00
Brian Clements
0f25e9985e Omaha #3172 fixed ui filtering for contacts and sessions
Former-commit-id: 83654c374a [formerly 455af3612f] [formerly b774503931] [formerly 83654c374a [formerly 455af3612f] [formerly b774503931] [formerly 8dce7e9b85 [formerly b774503931 [formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]]]
Former-commit-id: 8dce7e9b85
Former-commit-id: 99aa4f0609 [formerly c4447fc6c4] [formerly 37f456b3eef102abf5d925b72829fa1b004f3f65 [formerly 4078bbaa63]]
Former-commit-id: 96f3e9e0d2145c1f447ab45ea7213e6832a6a06b [formerly 213aab834f]
Former-commit-id: f0ce9a6ca8
2014-05-20 11:04:57 -05:00
Nate Jensen
cb5a4c33a7 Merge "Omaha #3180 fixed inviting strangers and multiple users in collaboration" into omaha_14.4.1
Former-commit-id: 8adbef2eb1 [formerly f3f64b1e5a] [formerly 8d7125544b] [formerly 8adbef2eb1 [formerly f3f64b1e5a] [formerly 8d7125544b] [formerly eff69410eb [formerly 8d7125544b [formerly 3c5d7d4f0cecf0ff0ab17a97a3bff5342bfb9569]]]]
Former-commit-id: eff69410eb
Former-commit-id: a443660d7d [formerly cc8ba31981] [formerly 992568714810b0ef9318a88418c257799eaef5a2 [formerly 7def9ead8e]]
Former-commit-id: e2223fc6604bf2193e94293987888702bc2dcaf5 [formerly 1b18fd4584]
Former-commit-id: 508d1a8224
2014-05-19 16:21:37 -05:00
Richard Peter
877097044b Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1
Former-commit-id: 48236cfcee [formerly 80a5f2fc1b] [formerly 40b7623c87] [formerly 48236cfcee [formerly 80a5f2fc1b] [formerly 40b7623c87] [formerly 87da8bd952 [formerly 40b7623c87 [formerly 1f786fd25cab2956c2cc3318a7adbabf6e8c306d]]]]
Former-commit-id: 87da8bd952
Former-commit-id: fb6f0d55cb [formerly c799f78f5d] [formerly 8788f9f737d6065baf0186a4f7db19dc442c4b07 [formerly 8baf897297]]
Former-commit-id: eed964b1439a8daace72f6a3b52823282676ce1e [formerly 1776389eb7]
Former-commit-id: 69fea4c8b3
2014-05-19 16:07:51 -05:00
Brian Clements
738a2c4513 Omaha #3180 fixed inviting strangers and multiple users in collaboration
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited


Former-commit-id: 5bf4c253f6 [formerly b5e961d6b4] [formerly 0e18d45bdf] [formerly 5bf4c253f6 [formerly b5e961d6b4] [formerly 0e18d45bdf] [formerly 573ffcb0bf [formerly 0e18d45bdf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]]]
Former-commit-id: 573ffcb0bf
Former-commit-id: bb827663c3 [formerly 6769aff618] [formerly 411223a0944f43546d208c57f0dc4a1e1af7c28d [formerly e4433c5e10]]
Former-commit-id: ed80a833a4a6585be47a91576eada507814b0659 [formerly 3c6a10e154]
Former-commit-id: 008c911f03
2014-05-19 15:54:36 -05:00
Ben Steffensmeier
b43c70b8c9 Omaha #3133 remove topo from alertviz feature.
Former-commit-id: a0ee307eaa [formerly c4f9bab999] [formerly 24b879764f] [formerly a0ee307eaa [formerly c4f9bab999] [formerly 24b879764f] [formerly 31c323151c [formerly 24b879764f [formerly d9ce5c7b78bc3483cd17e8896b9260e2c4f0a807]]]]
Former-commit-id: 31c323151c
Former-commit-id: 993d4eef85 [formerly 87118964b1] [formerly 6832b31f3fe574153feedb0de21e09ec9a1b84a5 [formerly 68aba0cdd5]]
Former-commit-id: c084cbfe1028c643222861ea3d1aa6f1217b1dfe [formerly 0e0229c560]
Former-commit-id: eeebf5ae7b
2014-05-19 14:21:23 -05:00
Nate Jensen
f82739a56a Merge "Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore." into omaha_14.4.1
Former-commit-id: 2213e727a5 [formerly 9996d67317] [formerly 76bfba5945] [formerly 2213e727a5 [formerly 9996d67317] [formerly 76bfba5945] [formerly 94d032dbc4 [formerly 76bfba5945 [formerly 353d0ddca384a33fe529c0b920595a99c0f40548]]]]
Former-commit-id: 94d032dbc4
Former-commit-id: 64bbc05d59 [formerly 6fb3e37a29] [formerly 5f078c4b443d0700579f8baea93b467a5c12c8b0 [formerly 65ecb7e926]]
Former-commit-id: b5519ce7829ea9a0fa009f22142c525449f05f59 [formerly 423bf2f21f]
Former-commit-id: 80b9e5ee6b
2014-05-19 13:36:26 -05:00
Richard Peter
cad8249e2c Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1
Former-commit-id: 5e9b10b8bf [formerly 1e9c2b27b6] [formerly 0f9015e824] [formerly 5e9b10b8bf [formerly 1e9c2b27b6] [formerly 0f9015e824] [formerly 0480bfa478 [formerly 0f9015e824 [formerly 4ca4b10fe7331282d32f0a21549f5e6eadc7e16c]]]]
Former-commit-id: 0480bfa478
Former-commit-id: 5a2f5b67ad [formerly f3e7d16402] [formerly bc1663d9924390592b3ba3a6621bf69d61d488b3 [formerly 802a043085]]
Former-commit-id: e3fae294998abb49d71e44f535bbea2d9cf2f6d8 [formerly fa926cd515]
Former-commit-id: 8a71079141
2014-05-19 12:12:05 -05:00
Nate Jensen
47def6ec0f Merge "Omaha #3163 Add support for reading colored text styles from future versions of collaboration." into omaha_14.4.1
Former-commit-id: 6acbf3b921 [formerly b93e410f60] [formerly cb6ef0e9a3] [formerly 6acbf3b921 [formerly b93e410f60] [formerly cb6ef0e9a3] [formerly d79ef53ad0 [formerly cb6ef0e9a3 [formerly 6f3d40c96cafe8f0f05d539534607067a2a37776]]]]
Former-commit-id: d79ef53ad0
Former-commit-id: 72f76d8ab8 [formerly c5d944c52f] [formerly dcff3b3cdb0eb2c3f3e967382ea0a1dd9cb38826 [formerly 8a31eaf6e1]]
Former-commit-id: d5ba7cfcdf041c0b65a97f29c000bda36d61d299 [formerly 0bc127a4e9]
Former-commit-id: b7f846ac6d
2014-05-19 11:46:10 -05:00
Brian Clements
8314a7e231 Omaha #2536 merged uf.edex.textdbsrv into text plugins
split into uf.common.dataplugin.text and uf.edex.plugin.text


Former-commit-id: 1d1f0ae9aa [formerly 4d40a98ad7] [formerly a06d332ff4] [formerly 1d1f0ae9aa [formerly 4d40a98ad7] [formerly a06d332ff4] [formerly 2f5cffbe15 [formerly a06d332ff4 [formerly 5f238c51d856984808dee0d2ba62b6a8fbdbd6a1]]]]
Former-commit-id: 2f5cffbe15
Former-commit-id: 09827edcad [formerly 7761b74112] [formerly fc7a13b2cb8827e53d044de3c6b67b9d95add1a1 [formerly 8ddae2fc54]]
Former-commit-id: 4f0420122d9abd475daba4372305eab7b23699b9 [formerly f61d1ac976]
Former-commit-id: de232ae55c
2014-05-19 10:53:37 -05:00
Ben Steffensmeier
e356891ae3 Omaha #3164 Disable thin client request compression when it doesn't work.
Former-commit-id: cc0f87de86 [formerly d697592de2] [formerly ccf53a4c99] [formerly cc0f87de86 [formerly d697592de2] [formerly ccf53a4c99] [formerly 25f901a102 [formerly ccf53a4c99 [formerly ce132a929437f18f531503701bb09e33261ae4c4]]]]
Former-commit-id: 25f901a102
Former-commit-id: 43ed1dafb4 [formerly 9ddc32ee05] [formerly ca8d47a8d381333b80270ff67200b979bcc06bdb [formerly 7f46683fb0]]
Former-commit-id: e753c025a8fa874c9043966c025abc39912d75c5 [formerly 92f4c86dac]
Former-commit-id: c85c8b6283
2014-05-19 10:40:50 -05:00
Ben Steffensmeier
696731cf74 Omaha #3163 Remove all references to WORD_WRAP in A2 plugins.
Former-commit-id: acf070aa0c [formerly 6a3d5f869e] [formerly 885448b04d] [formerly acf070aa0c [formerly 6a3d5f869e] [formerly 885448b04d] [formerly a52718783a [formerly 885448b04d [formerly 8e7fa0cdb864d95c70fe1859d9ef9a1851c0b123]]]]
Former-commit-id: a52718783a
Former-commit-id: 242f8e6c8b [formerly 5607277ae2] [formerly d5202aa11f582cc1e51a59059d428bb35845f3fb [formerly 68244ce2d7]]
Former-commit-id: 6f26383f43e147b592c941d74ac7cf074eba0595 [formerly 405e99e4ce]
Former-commit-id: eabe045d36
2014-05-16 14:40:50 -05:00
Ben Steffensmeier
24156d4084 Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore.
Former-commit-id: f5f6b5a31f [formerly 01379cd329] [formerly 748ecc5fac] [formerly f5f6b5a31f [formerly 01379cd329] [formerly 748ecc5fac] [formerly 8446ace149 [formerly 748ecc5fac [formerly bb8c1130a9da5cdb06590b20d7f5bde9e1d7c812]]]]
Former-commit-id: 8446ace149
Former-commit-id: 0f7ba1afa5 [formerly 2e88a0b800] [formerly b2c6edd65caf1b4176d193cc194ad5ab1ad18746 [formerly 82d9c403d2]]
Former-commit-id: a416f6e0840cf072c6117155143edd9080b9a848 [formerly 353b7c4090]
Former-commit-id: c347188e0a
2014-05-16 13:36:31 -05:00
Ben Steffensmeier
d5503166ba Omaha #3163 Add support for reading colored text styles from future versions of collaboration.
Former-commit-id: e8f63b5d91 [formerly 08f7d7b8dd] [formerly 67e68732d6] [formerly e8f63b5d91 [formerly 08f7d7b8dd] [formerly 67e68732d6] [formerly 79ef4a5301 [formerly 67e68732d6 [formerly 63d4e9f1e2bf95792fa82d101ce59f23e2cbdaf9]]]]
Former-commit-id: 79ef4a5301
Former-commit-id: 936cc0e3b0 [formerly fcbd4cc9ee] [formerly 8a94a819b3a9d0b493c500cfbf25c7be2d344a10 [formerly 126f47f725]]
Former-commit-id: 3af146f89fd6d70f609c6321a81d9537015fc1c4 [formerly e38c19dd1d]
Former-commit-id: 3ade0c85eb
2014-05-16 12:50:48 -05:00
Nate Jensen
6accd054a1 Omaha #3133 attempt to fix build
Change-Id: Ib6668229987cb136c16fb57128becb1624e0b212

Former-commit-id: cc342deec3 [formerly 7cfbc3d06c] [formerly 6240667b0f] [formerly cc342deec3 [formerly 7cfbc3d06c] [formerly 6240667b0f] [formerly 11c580549a [formerly 6240667b0f [formerly 661a24eafe2374970982a137146c77d9ec1a1406]]]]
Former-commit-id: 11c580549a
Former-commit-id: 121f0c9f2a [formerly d0fc6945fd] [formerly 5ba8dbe28d0564283c2b955cb00c73e369577c39 [formerly 94c289f944]]
Former-commit-id: e5a5be8f378b3fb3e0bf15ab9a124e70ef147bfb [formerly cedb413487]
Former-commit-id: 126af61500
2014-05-15 17:02:27 -05:00
Nate Jensen
aaae1d4534 Omaha #3133 remove unused dependencies
Change-Id: I9a0ac7d0b15f266ea8818ac0db82067887e59ec6

Former-commit-id: 34b0b5469a [formerly 63b925e17e] [formerly 3db92e6c0b] [formerly 34b0b5469a [formerly 63b925e17e] [formerly 3db92e6c0b] [formerly 1ae82b82db [formerly 3db92e6c0b [formerly 5a00869db4e7467e49e9a632150a8135ea32b569]]]]
Former-commit-id: 1ae82b82db
Former-commit-id: 1b05dd4752 [formerly 3f73399ab8] [formerly f0e8572a5573343081a923e4c4c22c7b47448e35 [formerly 4731b10575]]
Former-commit-id: c66733409037b1a73a4c41c9e688e288a79db03a [formerly 46767a2454]
Former-commit-id: f0b89d994f
2014-05-15 13:57:55 -05:00
Nate Jensen
456d0de07b Merge "Omaha #3061 added better checks for when to send invite/session payloads" into omaha_14.4.1
Former-commit-id: 6b812ef609 [formerly 7ed74b7242] [formerly 198a63cef8] [formerly 6b812ef609 [formerly 7ed74b7242] [formerly 198a63cef8] [formerly 2cd5c8cca9 [formerly 198a63cef8 [formerly b65ddc7f6f3831117ad3c0d517335289cba8ede0]]]]
Former-commit-id: 2cd5c8cca9
Former-commit-id: 016e1018f1 [formerly e0387c077e] [formerly cde0aa406a3031c4f1e48ad5b760f8ad0ac1a1de [formerly 01a5b4ba14]]
Former-commit-id: 983587e1f1dc75c1436ad7c383b3d5d25dc83666 [formerly 44df43cfa0]
Former-commit-id: cbc5cbfb77
2014-05-15 08:36:51 -05:00
Steve Harris
06a67b62d7 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Former-commit-id: 7f0f5eb7d2 [formerly 5e6b9943f1] [formerly 1a06d18686] [formerly 7f0f5eb7d2 [formerly 5e6b9943f1] [formerly 1a06d18686] [formerly c83753b4d3 [formerly 1a06d18686 [formerly 5c1f5dbf543c9cd27cf83158308a9ce34d057201]]]]
Former-commit-id: c83753b4d3
Former-commit-id: 69b7a4f424 [formerly 3337f2d6d1] [formerly 39d1a11174e4bc3e15c9f3fc5d6ccca4f431fadb [formerly 1b709fb6c3]]
Former-commit-id: e56b4024532ba4aa1ca898f4bf3ab5fdc16c3b3b [formerly 3e4e9365ca]
Former-commit-id: dfc96a2fae
2014-05-15 08:31:27 -05:00
Brian Clements
ab11c46c68 Omaha #3061 added better checks for when to send invite/session payloads
Former-commit-id: 88b8061039 [formerly ee51a84f50] [formerly a698d81571] [formerly 88b8061039 [formerly ee51a84f50] [formerly a698d81571] [formerly 01269cd989 [formerly a698d81571 [formerly 073d3c10ac7c5e9cd6f5e34864ec0261219cbfd5]]]]
Former-commit-id: 01269cd989
Former-commit-id: 087c307d26 [formerly c71459d36e] [formerly dc4bd59d0dc6a590abe89282b7c25721871aca99 [formerly 6bf803303e]]
Former-commit-id: 1509baa19621144275ef5088af4b6119c5053e71 [formerly 2da28330cb]
Former-commit-id: cac498a5d4
2014-05-14 17:00:09 -05:00
Richard Peter
1413f81c3c Merge "Omaha #2536 moved WMO Header into new common plugin" into omaha_14.4.1
Former-commit-id: 1ac9c3d93d [formerly 02d94c61fb] [formerly 7ae2b1299f] [formerly 1ac9c3d93d [formerly 02d94c61fb] [formerly 7ae2b1299f] [formerly f6d1e1012e [formerly 7ae2b1299f [formerly 1844df3fb769bccb3e5b19722e2fdeaec9c6bbe0]]]]
Former-commit-id: f6d1e1012e
Former-commit-id: dda3e8059e [formerly 72200f0892] [formerly 9f61b35027e8e93e62776c67cfc7fd4b708de514 [formerly 56d0cd836f]]
Former-commit-id: de2008cab841c0ca1aeaa9bfb9c8f76d4510477a [formerly e7bc7051df]
Former-commit-id: 29a58d9c6a
2014-05-14 16:25:16 -05:00
Ben Steffensmeier
454b0c3ff7 Omaha #2697 Collaboration will no longer use local maps.
Former-commit-id: ebfa5f5daf [formerly 270e8805cc] [formerly 3e23857dcc] [formerly ebfa5f5daf [formerly 270e8805cc] [formerly 3e23857dcc] [formerly 1db137a21e [formerly 3e23857dcc [formerly 7e10b6d308a3bb17692abaefd9a8e84cc5016621]]]]
Former-commit-id: 1db137a21e
Former-commit-id: 99e30ac110 [formerly fc54a7f697] [formerly a29ef2071bfc276e3293b4a194e4b553a2d44b4c [formerly 759b1460d4]]
Former-commit-id: 7c3c2d0c45be3c2ea5c422c078df6d75bd45a3f3 [formerly e8813c2f24]
Former-commit-id: 1ac0aeacc5
2014-05-14 13:53:29 -05:00
Brian Clements
2a628638f3 Omaha #2536 moved WMO Header into new common plugin
moved WMO time parsing code from TimeTools to WMOTimeParser


Former-commit-id: 95a233a3a0 [formerly 437d9bb781] [formerly 2b1c7eaa37] [formerly 95a233a3a0 [formerly 437d9bb781] [formerly 2b1c7eaa37] [formerly 6bd43f79ff [formerly 2b1c7eaa37 [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]]]
Former-commit-id: 6bd43f79ff
Former-commit-id: f291884a77 [formerly abd29bf492] [formerly b75f809dcbc407fb62db7fd2cd75e86e51c75269 [formerly ee9757ea39]]
Former-commit-id: 2b23fa6944d3b14df8bcd8b466b79df2877328aa [formerly e9ee0bcbde]
Former-commit-id: 7473191ba6
2014-05-14 13:45:09 -05:00
Nate Jensen
04ab5c3876 Omaha #3133 remove unused uf.common.cache from alertviz feature
Change-Id: Ib4a36a727e8b26a708f247e6263518786cc60832

Former-commit-id: d17505de35 [formerly bab916f2be] [formerly 68c8238275] [formerly d17505de35 [formerly bab916f2be] [formerly 68c8238275] [formerly 5eaa5d7b0e [formerly 68c8238275 [formerly e659b393f23e5e999c2b03ddad648f2748ee97e9]]]]
Former-commit-id: 5eaa5d7b0e
Former-commit-id: fe89471076 [formerly e8661182d0] [formerly f3445e11c9785ba8cfce7da200af30902b11db17 [formerly 2a6d25cf41]]
Former-commit-id: 39075eff029cf41fbb88f9bef28e481085f20447 [formerly 437d400966]
Former-commit-id: 5da8849cf5
2014-05-13 17:52:12 -05:00
Bryan Kowal
0f31d0f4e3 Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc

Former-commit-id: aacf4cd27a [formerly a352aadc90] [formerly 3535340136] [formerly aacf4cd27a [formerly a352aadc90] [formerly 3535340136] [formerly 8d5326cc1b [formerly 3535340136 [formerly 2b13221d7c644147f6eda1acb8b126667be00926]]]]
Former-commit-id: 8d5326cc1b
Former-commit-id: 1f5cd33be3 [formerly 1c64a47950] [formerly d3a06fdc9c2c6bb26a6dce8456bf87bd02b9492d [formerly 43eddea171]]
Former-commit-id: acd94bad9932a841706c10b0b8ac148bbe3c6f9f [formerly 4e3afb78fc]
Former-commit-id: ddf6cc758d
2014-05-13 14:43:04 -05:00
Nate Jensen
14c3cb008b Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851

Former-commit-id: 11db335c3a [formerly e464500dfc] [formerly 07426ce408] [formerly 11db335c3a [formerly e464500dfc] [formerly 07426ce408] [formerly 174fae77d1 [formerly 07426ce408 [formerly b842a78cdfb945767aecf7da3ad55b71c9d09bfb]]]]
Former-commit-id: 174fae77d1
Former-commit-id: 5b8f3aada2 [formerly c31080d705] [formerly 59ddbe2030bf3ffb614a1ba31e37cfb021339cfb [formerly ea7b123eef]]
Former-commit-id: d3e19b5f43cade3b4e741900facacc51b5142159 [formerly 4a18f1e24b]
Former-commit-id: 824c2f805d
2014-05-13 13:12:54 -05:00
Nate Jensen
fd67356371 Omaha #3133 remove edex dependencies from common.monitor plugin
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3

Former-commit-id: ec4768ed4b [formerly 88535c69f5] [formerly cc86f19bad] [formerly ec4768ed4b [formerly 88535c69f5] [formerly cc86f19bad] [formerly b05630b171 [formerly cc86f19bad [formerly d25e1bee210a084e17d4ee781eddb42c14735140]]]]
Former-commit-id: b05630b171
Former-commit-id: a057e5389c [formerly 5d099a3b4b] [formerly b39b5e72eb5dbb60bd6eb1dd766f167f0f6d7044 [formerly 3aff81313f]]
Former-commit-id: a18a00cd7490110d905197692cdd5acc993d45ba [formerly 363b019ceb]
Former-commit-id: dc2ac6e07b
2014-05-12 16:46:06 -05:00
Steve Harris
32c6a48a39 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
	edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java

Former-commit-id: 856f5bc3b7 [formerly b3bc71c8a4] [formerly 652fb19bc4] [formerly 856f5bc3b7 [formerly b3bc71c8a4] [formerly 652fb19bc4] [formerly 6964df0664 [formerly 652fb19bc4 [formerly a20833879f1a0434c562a22a874b1e1722278954]]]]
Former-commit-id: 6964df0664
Former-commit-id: 7f7e8e69a4 [formerly 77b2da7a4f] [formerly 9655787e1bc6f95e4e9dab9054aa147d706bdd37 [formerly 661eceea83]]
Former-commit-id: 343ac38383e296e3ae1f421f8cf6238df294b55b [formerly d33fbe7c31]
Former-commit-id: ae3bc184ce
2014-05-12 15:05:43 -05:00
Nate Jensen
cf95cc9b33 Merge "Omaha #3075 updates for pydev 3.4.1" into omaha_14.4.1
Former-commit-id: 17d9ff2607 [formerly 650edc41f3] [formerly eff5a8e32f] [formerly 17d9ff2607 [formerly 650edc41f3] [formerly eff5a8e32f] [formerly ab064743f4 [formerly eff5a8e32f [formerly a213a01ac89bf84a6a0d4dfea44073cb0b2a7fce]]]]
Former-commit-id: ab064743f4
Former-commit-id: baa755e914 [formerly c57623dc52] [formerly 94b65ff379509fa2a8147231bb03f64db8b50e59 [formerly 7afd18662d]]
Former-commit-id: d744b72f28ffbd07ba53b2c757123a9836e68dd1 [formerly 25216d1a2f]
Former-commit-id: 8b8cb81410
2014-05-12 11:56:34 -05:00
Bryan Kowal
722ea7e67a Issue #3026 - remove unnecessary hpe ffmp dependency
Former-commit-id: 163a517f0a [formerly 8f16f25cd7] [formerly 6e6a6a73ee] [formerly 163a517f0a [formerly 8f16f25cd7] [formerly 6e6a6a73ee] [formerly faa6b09ac9 [formerly 6e6a6a73ee [formerly c94c973ef6a663f93a6b1a6301f5553d4e88ac73]]]]
Former-commit-id: faa6b09ac9
Former-commit-id: cf491026b0 [formerly 9153d61b90] [formerly d118ff248800b223cac6d3532aa23ae410ceee1c [formerly 5f5987f57b]]
Former-commit-id: 234823b432ef08daec6a41228720df14f273fd48 [formerly 31d2290415]
Former-commit-id: 1578a42992
2014-05-12 11:46:35 -05:00
Nate Jensen
2df8a30b14 Omaha #3075 updates for pydev 3.4.1
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1

Former-commit-id: 7e3a38d473 [formerly 5fcc126e57] [formerly e6569b4a7d] [formerly 7e3a38d473 [formerly 5fcc126e57] [formerly e6569b4a7d] [formerly bb32858c04 [formerly e6569b4a7d [formerly a038aea9bb25e31b29b054e8899c0b51bc183fef]]]]
Former-commit-id: bb32858c04
Former-commit-id: b4747e1967 [formerly 651ce74777] [formerly 1c3c85d7dc8e6b4c5d374cb39021ba2a71dac98c [formerly 5d08184312]]
Former-commit-id: 1ecaca6a168a620d74a23e94527430feab94ee01 [formerly 9713ae6bf1]
Former-commit-id: 064894fe59
2014-05-09 16:45:39 -05:00
Brian Clements
693be79b38 Omaha #3107 added timeout handling logic for leader transfer verification
Former-commit-id: 7db361813c [formerly 26d206f780] [formerly 08a406ff18] [formerly 7db361813c [formerly 26d206f780] [formerly 08a406ff18] [formerly 7b7bc5be97 [formerly 08a406ff18 [formerly 294a489ba547bf90df9d6b6a5107c8993c5b8333]]]]
Former-commit-id: 7b7bc5be97
Former-commit-id: 87d24b248b [formerly 98e74677fd] [formerly 420481d439ea6530a366a6c1534bebf4d5ede131 [formerly 3d3d7f04bb]]
Former-commit-id: dc3be633fa9ff1642c27fe62a48e3c3cea46614e [formerly 5e739b598c]
Former-commit-id: 415ff47d51
2014-05-09 15:43:46 -05:00
Lee Venable
a26966b107 Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
Former-commit-id: bb5cc2c9ac [formerly cd5956d21a] [formerly 364f0d877a] [formerly bb5cc2c9ac [formerly cd5956d21a] [formerly 364f0d877a] [formerly e3c6407be3 [formerly 364f0d877a [formerly 06b3cb4dd8f07600e6513a15a2495b485b0812b6]]]]
Former-commit-id: e3c6407be3
Former-commit-id: 0fc85255e4 [formerly a46987ef36] [formerly c5990d4401145dd3609123f0dd6741e9a15c26ae [formerly b06e8e6e3e]]
Former-commit-id: f1e762a37c388902d6115e2fd3f7522b258d9e24 [formerly d23ba206c9]
Former-commit-id: fb58021364
2014-05-09 11:14:51 -05:00
Mike Duff
fb42111c6f Issue #3145 - Fix Scan threat labels, dispose font
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d

Former-commit-id: 279dd3dbad [formerly 158fb46b9f] [formerly 03356dd554] [formerly 279dd3dbad [formerly 158fb46b9f] [formerly 03356dd554] [formerly a81569849b [formerly 03356dd554 [formerly 84bd0800b2652b31c06015fa49f816f1402f461d]]]]
Former-commit-id: a81569849b
Former-commit-id: 4d00418164 [formerly 456038d161] [formerly 9842522c95a5493559d096bac98243e002212bfa [formerly 4ec26b6e31]]
Former-commit-id: 51810eecf351cd58e7502b561c71bf23d6c392e4 [formerly 32f6ad40ec]
Former-commit-id: e4e8e0fe8e
2014-05-09 10:32:04 -05:00
Nate Jensen
eda42bf1ce Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
Former-commit-id: 3330d7e72d [formerly d0d20849b6] [formerly 575360192a] [formerly 3330d7e72d [formerly d0d20849b6] [formerly 575360192a] [formerly e8c4279d10 [formerly 575360192a [formerly 25e500435693940e378df086739fce8eefdba3bb]]]]
Former-commit-id: e8c4279d10
Former-commit-id: f15db04d4f [formerly e0365dd4a3] [formerly 0b7be915c239ef7a407a8fcd6ca62efe41a54d6d [formerly 95ca77688a]]
Former-commit-id: c09794a593028767668796108549b63ebd3664fe [formerly 191d3a0d06]
Former-commit-id: db6d756ffd
2014-05-09 09:53:25 -05:00
Roger Ferrel
fb8d11aa51 Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.
Change-Id: Ibcd4c5389ba081b19a3134989c507b88b2d882b8

Former-commit-id: 487b66ffc4 [formerly 6bfacf85ab] [formerly 039f4826ea] [formerly 487b66ffc4 [formerly 6bfacf85ab] [formerly 039f4826ea] [formerly c226ef3596 [formerly 039f4826ea [formerly 909a3f42bdb9d8149013056f9956bf0c38b764c5]]]]
Former-commit-id: c226ef3596
Former-commit-id: 16106fe32a [formerly 672875baf9] [formerly 852cdc5cc5ce12eaddae5abc239f333bad66906e [formerly ce1ca8b4e3]]
Former-commit-id: 39b77f1a25e1d1c090b0b0116907d3b205523575 [formerly 940886ffae]
Former-commit-id: ea6ef4eb89
2014-05-09 09:34:49 -05:00
Mike Duff
433c3e5870 Issue #3026 - feature.xml fix
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794

Former-commit-id: 53d81818d3 [formerly 7e996909d1] [formerly 78f2a26903] [formerly 53d81818d3 [formerly 7e996909d1] [formerly 78f2a26903] [formerly 038b2b7500 [formerly 78f2a26903 [formerly a44e412190741fcb0a91dd451ae538277ae0d79f]]]]
Former-commit-id: 038b2b7500
Former-commit-id: b8696720cd [formerly b73e635162] [formerly a4741aa0a763cbbf63af15c647cd18f0d20c6fd6 [formerly c7f5379b78]]
Former-commit-id: f790e152dd4e3d3ff28d723c849c82663943c0fd [formerly 25638a5b40]
Former-commit-id: c984973464
2014-05-09 09:27:10 -05:00
Ben Steffensmeier
dd8846091f Issue #2920 Fix default color of BOXED text.
Former-commit-id: ee99dba933 [formerly 60479824d1] [formerly 87ea43cf0d] [formerly ee99dba933 [formerly 60479824d1] [formerly 87ea43cf0d] [formerly 9d4c33ba91 [formerly 87ea43cf0d [formerly 59f12cd4cc60f0908c106cbc0572d3f84d0d509b]]]]
Former-commit-id: 9d4c33ba91
Former-commit-id: ad64b8b197 [formerly 082a5c515d] [formerly faee1aa6dd05debf6ff2f60a54d18fa91ba9f91e [formerly 199a2df79e]]
Former-commit-id: 12720115fd4f8d9e4e99d1304dadb73ecc9e8f71 [formerly 2b4d783fd7]
Former-commit-id: f0c4cc03a0
2014-05-08 18:18:08 -05:00
Mike Duff
f924c12ec6 Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1

Former-commit-id: 03a2c17f36 [formerly a6e0ed67d1] [formerly b23473ee8a] [formerly 03a2c17f36 [formerly a6e0ed67d1] [formerly b23473ee8a] [formerly 335c02d2c6 [formerly b23473ee8a [formerly 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc]]]]
Former-commit-id: 335c02d2c6
Former-commit-id: 69e7cfa1ed [formerly 0df3f51c87] [formerly 66a76d720a0c13b3fdb3b03633d297e5d51e2487 [formerly 16a973372e]]
Former-commit-id: 5303ea642886a0d2399938a4719d496c60301888 [formerly 1dc95cf8de]
Former-commit-id: 718fc22e25
2014-05-08 15:02:54 -05:00
Lee Venable
1f7df07379 Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
Former-commit-id: b6cd70f862 [formerly 319073a795] [formerly 92517d3ca2] [formerly b6cd70f862 [formerly 319073a795] [formerly 92517d3ca2] [formerly 1496955e44 [formerly 92517d3ca2 [formerly a47409fd1673c9584c46aba496be1b7203d9c45d]]]]
Former-commit-id: 1496955e44
Former-commit-id: 892931b35d [formerly 0a45b07910] [formerly 119a16b3db169db721207a3f9638ba432a91fdca [formerly 0b25428b04]]
Former-commit-id: 2b7f8d7ee26b23e61bb5beb3148f45bc926cc808 [formerly 0075d2a450]
Former-commit-id: 70e31865be
2014-05-08 14:47:03 -05:00
Mike Duff
8904d8a501 Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13

Former-commit-id: f4062cd277 [formerly 0456fd0597] [formerly 8498235fd8] [formerly f4062cd277 [formerly 0456fd0597] [formerly 8498235fd8] [formerly 6a67638a94 [formerly 8498235fd8 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]]
Former-commit-id: 6a67638a94
Former-commit-id: 3966697849 [formerly f49192936a] [formerly 2876e8ca8c3ac5b87e9cb00735e694e84a5f8df9 [formerly 70c8135fde]]
Former-commit-id: 79e94a80e7729225dba251b67e17c3517adc7fc5 [formerly 916d90ee64]
Former-commit-id: 4adf657556
2014-05-08 14:36:54 -05:00
Nate Jensen
4371f25d2f Issue #2060 fix auto-update errors with grids in non-map displays
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de

Former-commit-id: 71603c2319 [formerly 84f9cd1dc8] [formerly 3e3035b6f1] [formerly 71603c2319 [formerly 84f9cd1dc8] [formerly 3e3035b6f1] [formerly ecc5c5849f [formerly 3e3035b6f1 [formerly a139113883f69be89a0e0a771f8d6f48d3948686]]]]
Former-commit-id: ecc5c5849f
Former-commit-id: 3084f2db9b [formerly d2070f782b] [formerly dbf49869a035aa878141a00faf9086e7e8f0b3ee [formerly 6c55f4832c]]
Former-commit-id: 3c69ed9e2d78d7ce30d54845811924f5c2bf2483 [formerly 93f71ec65c]
Former-commit-id: 1dc7cc875e
2014-05-08 14:08:06 -05:00
Steve Harris
a7c453801c Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
Former-commit-id: 9b4b0d5c01 [formerly a804a071c0] [formerly ce2b030743] [formerly 9b4b0d5c01 [formerly a804a071c0] [formerly ce2b030743] [formerly ff4a6b8122 [formerly ce2b030743 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]]
Former-commit-id: ff4a6b8122
Former-commit-id: bfd8f9b971 [formerly 532b861bce] [formerly 12b7c2d1dfdafd204880707993afeebf47eefe41 [formerly 988ad59a0d]]
Former-commit-id: 14bc990e4d26f4fcba9b4f047441d279289dbc89 [formerly 47991060bb]
Former-commit-id: 77030c2fc3
2014-05-08 09:50:34 -05:00
Steve Harris
36a5745de6 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml

Former-commit-id: 03908ba8ae [formerly ddd6e35478] [formerly e37e40ed19] [formerly 03908ba8ae [formerly ddd6e35478] [formerly e37e40ed19] [formerly b7a1bda98c [formerly e37e40ed19 [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]]
Former-commit-id: b7a1bda98c
Former-commit-id: f1032ccc05 [formerly 7a7c1167c2] [formerly d3c134610c7a2e642c723287f1d8135b292eb22c [formerly 9591532ffd]]
Former-commit-id: fab7d30fa99a5cbb15284899c9cda059f1e07992 [formerly 049716e54d]
Former-commit-id: 2b29fec8d6
2014-05-07 16:01:53 -05:00
Nate Jensen
e98ed9042a Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: e93e248f9a [formerly daac0701fc] [formerly d271dfb1a5] [formerly e93e248f9a [formerly daac0701fc] [formerly d271dfb1a5] [formerly 0f1cab916a [formerly d271dfb1a5 [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]]]
Former-commit-id: 0f1cab916a
Former-commit-id: 1adf6d304f [formerly 89621db281] [formerly 47226b181942be9b2bff4189674708a517376408 [formerly 70f70371b1]]
Former-commit-id: 2f4818061c868c793957c6720b9ab0b1d1c1a29f [formerly 12f88d14bf]
Former-commit-id: 76750c319a
2014-05-06 17:09:56 -05:00
Ben Steffensmeier
41fead7d98 Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: 34c4ce1630 [formerly e70a6999b7] [formerly bbbf957ba8] [formerly 34c4ce1630 [formerly e70a6999b7] [formerly bbbf957ba8] [formerly 70df0ee87e [formerly bbbf957ba8 [formerly 35845fa63be35661893d31510f83e2d9ab6f60af]]]]
Former-commit-id: 70df0ee87e
Former-commit-id: c83559ee61 [formerly 81916ecdb6] [formerly 4e4ce9614076e1c738d79e3feab9658310edbcb5 [formerly 945fe1db2f]]
Former-commit-id: 0e99b439ffe3cb3eb47009242d3ff465ec38fa5e [formerly a39b05ac71]
Former-commit-id: b978e0fc1d
2014-05-06 16:19:58 -05:00