Commit graph

5626 commits

Author SHA1 Message Date
Nate Jensen
0382243dfe Issue #3039 fix ifpImage class cast exception
Former-commit-id: 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 31fb61e824 [formerly 2b6db445c0 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]]
Former-commit-id: 31fb61e824
Former-commit-id: 17544a32ba [formerly 19f0be6afc] [formerly ab6962b9080189e0cbac802398d99762ae5982e2 [formerly a1dd7f24fa]]
Former-commit-id: 59458bd25850cd5eb277eabb12c6fc5b515b5cb1 [formerly 7e7bbfd784]
Former-commit-id: 64e7ac4225
2014-04-16 16:17:05 -05:00
Lee Venable
01c77f464c Issue #3037 - Add dispose check in runAsync call.
Change-Id: I13c7475f8c56f677f3dbdfab8d6000061db86f9f

Former-commit-id: 680f607c18 [formerly 6b0468f07e] [formerly 33fc376f33] [formerly 680f607c18 [formerly 6b0468f07e] [formerly 33fc376f33] [formerly 7386d4b318 [formerly 33fc376f33 [formerly c511ef6d5566f0e1d9ae3d5ea886abbf1159d41a]]]]
Former-commit-id: 7386d4b318
Former-commit-id: acd88d1d38 [formerly cc6380ba33] [formerly 414f3accd00b50fb116af44bd4097d3b89b5cb69 [formerly 98e9912a94]]
Former-commit-id: 9dd0222d16453b8a576d06adb41fb3abe19a8169 [formerly b47e0f7e87]
Former-commit-id: ea2db1a45d
2014-04-16 15:40:46 -05:00
Richard Peter
9fad9c06db Merge "Issue #2947 Redo satellite derived parameters to use an inventory to determine availability." into development
Former-commit-id: 825757e217 [formerly 0b82df7ad0] [formerly 852cb3cd46] [formerly 825757e217 [formerly 0b82df7ad0] [formerly 852cb3cd46] [formerly 8c190bd158 [formerly 852cb3cd46 [formerly 326b9ef83021ce71f715b6f352401dd936e992c7]]]]
Former-commit-id: 8c190bd158
Former-commit-id: d6359fa404 [formerly bed7035a67] [formerly 7f1e29571c0c37d84320ad1a27dfc62471139ce5 [formerly f8c75819bb]]
Former-commit-id: ee299c9b3060dd33427153a633a36284fe5fd6ee [formerly f6ec3782b6]
Former-commit-id: 56ee6e0240
2014-04-16 15:11:07 -05:00
Ben Steffensmeier
f1d28d027f Issue #2947 Redo satellite derived parameters to use an inventory to determine availability.
Former-commit-id: 2d8106bc5b [formerly bb51fb299a] [formerly 709e3411c4] [formerly 2d8106bc5b [formerly bb51fb299a] [formerly 709e3411c4] [formerly a8bb2c0dfd [formerly 709e3411c4 [formerly 1a041cb3be1141f4af116335e5b9540beda817cb]]]]
Former-commit-id: a8bb2c0dfd
Former-commit-id: 858deeaef5 [formerly a51b965c4f] [formerly 4a7f1c2296d79b72f15c1dafa088a798fe5a813e [formerly 119ced4a01]]
Former-commit-id: fc1291a1e39fed83821a2edd5ba3bf44aa962f2a [formerly cc6d858f47]
Former-commit-id: 3c1adead47
2014-04-16 14:54:59 -05:00
Brian Clements
cdd2dc4286 Issue #3021 increased width of create session dialog to fit error msg
Former-commit-id: 78c1b34cdf [formerly ef791fe481] [formerly 1112ca621e] [formerly 78c1b34cdf [formerly ef791fe481] [formerly 1112ca621e] [formerly bb915796ad [formerly 1112ca621e [formerly f0bcc20987d814a716994f712c6132bb79963457]]]]
Former-commit-id: bb915796ad
Former-commit-id: b8f40429ec [formerly 549941882e] [formerly fd6c03748bfb24190c526a992357f258a7c91630 [formerly 5c46c768d2]]
Former-commit-id: df9e17c1cd4d0111d5fb577725292b44c1b93fd4 [formerly f674aa07d7]
Former-commit-id: 9a8c3231c6
2014-04-16 14:33:02 -05:00
Brian Clements
40f77bde75 Issue #3020 fixed error message when attempting to create already accessible room
Former-commit-id: 0c203cfd07 [formerly 57d2f28d54] [formerly bfafb0d055] [formerly 0c203cfd07 [formerly 57d2f28d54] [formerly bfafb0d055] [formerly 4a8ee65cca [formerly bfafb0d055 [formerly 738e4cb06a549e6067274af033cc7ba725b1a8e2]]]]
Former-commit-id: 4a8ee65cca
Former-commit-id: 89741a1e62 [formerly 4829ef25bc] [formerly 58b38675284b585270d0e5118c40f102fbfd1852 [formerly 8861489810]]
Former-commit-id: e066a19d168bc05248c62b6e2648254969595cfd [formerly 63b9349843]
Former-commit-id: 0b7e067d96
2014-04-16 14:26:17 -05:00
Lee Venable
3f3a5c1241 Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e

Former-commit-id: 27b5524848 [formerly f4fb7b24f6] [formerly 7f068f164c] [formerly 27b5524848 [formerly f4fb7b24f6] [formerly 7f068f164c] [formerly ff3b42468f [formerly 7f068f164c [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]]]
Former-commit-id: ff3b42468f
Former-commit-id: 8380646a7a [formerly 885e17788d] [formerly aa35106e2bcb598175d4b13f4c68868a8f657f1d [formerly 4cdbf301f3]]
Former-commit-id: 65faea903b549640ea3eabe710a072be16df26cd [formerly 31c8e61cb6]
Former-commit-id: 9b085066c0
2014-04-16 13:15:31 -05:00
Brian Clements
572b7c221a Issue #2981 fixed NPE when cached shared group deleted on server
Former-commit-id: 9473f1f799 [formerly 8a4f212fdb] [formerly 7afb1e66f5] [formerly 9473f1f799 [formerly 8a4f212fdb] [formerly 7afb1e66f5] [formerly 7fd7817af4 [formerly 7afb1e66f5 [formerly 8ee453e3f5256d3ffed255aaebc792155001bc8e]]]]
Former-commit-id: 7fd7817af4
Former-commit-id: 3a6bb9f43c [formerly 1daf03844c] [formerly bd2ff121fc86675239805e4cf8a2decb18f093b2 [formerly 007ba2ae4d]]
Former-commit-id: ee4a3f153aa82d79e70068a61b4aa1d9c0a99965 [formerly 14084ee128]
Former-commit-id: 4979fe13df
2014-04-16 09:23:26 -05:00
Nate Jensen
c40115ef80 Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
Former-commit-id: 52e4a94bb3 [formerly 9ebedf0b98] [formerly d121f07e76] [formerly 52e4a94bb3 [formerly 9ebedf0b98] [formerly d121f07e76] [formerly e0ae9e5f8f [formerly d121f07e76 [formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]]]]
Former-commit-id: e0ae9e5f8f
Former-commit-id: ef5448e8f9 [formerly 736c2cc764] [formerly 77ce898f6def28352aefa08188156dd2bc89176b [formerly e0ffa7b6b4]]
Former-commit-id: 652809268dc177578cdc57e167bee3c9e728fe1b [formerly 700080e879]
Former-commit-id: 7031f73fe2
2014-04-16 08:41:54 -05:00
Nate Jensen
8695c7b8d1 Merge "Issue #2956 safety checks for GLShadedShapeBase" into development
Former-commit-id: 0b85a99337 [formerly 2fba1f36ef] [formerly 80434db98d] [formerly 0b85a99337 [formerly 2fba1f36ef] [formerly 80434db98d] [formerly 120d8429a7 [formerly 80434db98d [formerly 85aa7d53fdbbad696aa86e4fc992ff6288d199e3]]]]
Former-commit-id: 120d8429a7
Former-commit-id: 76f191192c [formerly 2e23ae75f4] [formerly ba3109c60afbaff247b963019ac0ea3cfd8248fb [formerly 62613ab33d]]
Former-commit-id: 4d4b944a581d2f1a4a6e54dea1d40dd9e991378e [formerly 2f2d965833]
Former-commit-id: 0e6fdab306
2014-04-16 08:41:43 -05:00
Nate Jensen
5d1e9f013a Merge "Issue #2822 only allow transfer leader if participant is using shared display" into development
Former-commit-id: 9dc2c1187c [formerly c723ec0bda] [formerly 771885f9a5] [formerly 9dc2c1187c [formerly c723ec0bda] [formerly 771885f9a5] [formerly c16bbb52e4 [formerly 771885f9a5 [formerly fb0c92951904565dbde6763cad15c6925265ccb2]]]]
Former-commit-id: c16bbb52e4
Former-commit-id: dc74920834 [formerly 79c3f5f3a8] [formerly 337b6a7e826170373ae4e133ca9ba41486c415c1 [formerly 550577806f]]
Former-commit-id: 8a9148b9de0b31de30312b69e0295eb4264e42de [formerly 267258647e]
Former-commit-id: baafe7f7da
2014-04-15 17:55:21 -05:00
Nate Jensen
a91ae99a19 Issue #2956 safety checks for GLShadedShapeBase
Change-Id: I7ec226af0de46ee3c7dffc34e82da9cf6846e451

Former-commit-id: 796efabc3b [formerly 66f4ce250a] [formerly 726c122dc7] [formerly 796efabc3b [formerly 66f4ce250a] [formerly 726c122dc7] [formerly 8b93dffb4f [formerly 726c122dc7 [formerly 1249c06521c5575960605176dcd46b77cbe1a1bc]]]]
Former-commit-id: 8b93dffb4f
Former-commit-id: e1b9c91df1 [formerly 2cf5941fe1] [formerly da7df5c1cb8add048021783ebafe66b2d4afe16b [formerly 56f645bbc7]]
Former-commit-id: a887e41953c30e6eb7aa46832fa3c060d21c5ddc [formerly 77cf2d682f]
Former-commit-id: c9a79bc2d5
2014-04-15 17:38:17 -05:00
Lee Venable
c846ae51fd Merge "Issue #3031 - Added dispose check in the runAsync calls." into development
Former-commit-id: 30c5233ae4 [formerly 14f0dc298e] [formerly cde3cdeed1] [formerly 30c5233ae4 [formerly 14f0dc298e] [formerly cde3cdeed1] [formerly 2a93e03117 [formerly cde3cdeed1 [formerly 05afe0e610860eca39453ddf12180466b48e43ea]]]]
Former-commit-id: 2a93e03117
Former-commit-id: 1c0b3bf7f7 [formerly a34e169792] [formerly 78f80c2eced18a183f677dcd92efee78aa09ec9c [formerly c9c845d5f2]]
Former-commit-id: 72a708eb716d8c1a86179fea9352c1c001b3261d [formerly 195a4dacfa]
Former-commit-id: 4d0bead6bd
2014-04-15 17:37:13 -05:00
Ron Anderson
861aaf0dfa Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b

Former-commit-id: d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly 9f085a0856 [formerly 6e0147169f [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]]
Former-commit-id: 9f085a0856
Former-commit-id: c263058e63 [formerly a6fa60f40d] [formerly 4b1dcfa5f1e94d0867e4b137f8e3643f96ecc196 [formerly 4622ad9b8a]]
Former-commit-id: c311f1a789e254f3b8d8c63514a373eb8b409c06 [formerly 56a1b8b682]
Former-commit-id: 072102dff0
2014-04-15 17:22:12 -05:00
Everett Kladstrup
7835bf98c7 Issue #2725 Move viirs derivparam python package to common_static
Former-commit-id: bc40caa959 [formerly 08dfcd9bd9] [formerly 5dbedee47a] [formerly bc40caa959 [formerly 08dfcd9bd9] [formerly 5dbedee47a] [formerly 200f8f461d [formerly 5dbedee47a [formerly e89895b8448e3eeb70f2850f84773e8345114c38]]]]
Former-commit-id: 200f8f461d
Former-commit-id: 2456ee3a86 [formerly 158e1fd086] [formerly 1eb42c2f057f83a9554ddd2f1f5814896fb645b5 [formerly fd2ddd24a7]]
Former-commit-id: bfa7660df47762c13223973354091f1711aa46e8 [formerly 6a2a88f75f]
Former-commit-id: 2470d81179
2014-04-15 16:53:07 -05:00
Lee Venable
fc2b4b81fa Issue #3031 - Added dispose check in the runAsync calls.
Change-Id: I7996f58995aa261a1a66acc755768c3489130d43

Former-commit-id: cdc1edef6b [formerly 39b9d94dc1] [formerly d4aafc69d9] [formerly cdc1edef6b [formerly 39b9d94dc1] [formerly d4aafc69d9] [formerly 2122b79416 [formerly d4aafc69d9 [formerly 72f2908000301dd025a2c801b1ab129460d8cdf9]]]]
Former-commit-id: 2122b79416
Former-commit-id: 9e662e2a21 [formerly e30c910657] [formerly 171f7d971779860672bb25dbda78f2ce0c6f989b [formerly c3f4bccbf9]]
Former-commit-id: a806a228ced048123098a238f08e3fc72641e725 [formerly ee78554540]
Former-commit-id: f51d2bf46d
2014-04-15 16:49:42 -05:00
Nate Jensen
f5c7a31e2f Merge "Issue #2726: Update endpoint pattern and remove System.out.printlns" into development
Former-commit-id: ce8daf4bda [formerly 2e58bacdcc] [formerly b5d832a35a] [formerly ce8daf4bda [formerly 2e58bacdcc] [formerly b5d832a35a] [formerly ec96b9a261 [formerly b5d832a35a [formerly 7c6bf2a9dd197896a1117c29928e6626a09826e3]]]]
Former-commit-id: ec96b9a261
Former-commit-id: 70c9cdd67d [formerly f6a99c5ec0] [formerly 15eb29dc0506c0896c2531b6e9a34647437427e5 [formerly d3714dd4e0]]
Former-commit-id: 615533ac7c90ef5e079dc55f1f7e8697728f049a [formerly eb5f56d312]
Former-commit-id: 3df8557fc4
2014-04-15 16:08:26 -05:00
Everett Kladstrup
7e7c1a8263 Issue #2725 Fix localization type for DerivParamLocalizationAdapter
Former-commit-id: 9f3f3f2b69 [formerly 4f1c7281d3] [formerly 27885c8296] [formerly 9f3f3f2b69 [formerly 4f1c7281d3] [formerly 27885c8296] [formerly 54db6ad9af [formerly 27885c8296 [formerly d9bd028d94f802e346a5396e9ae84a13b00691e3]]]]
Former-commit-id: 54db6ad9af
Former-commit-id: 133dff106f [formerly c2dfdf8cae] [formerly 5eaecc4538d5563c1f6b15d1ab3f3819ede97fdb [formerly ca7b672b52]]
Former-commit-id: 1f6d5efe6b8e28eb631f3e66355fbe46e41ec94c [formerly 6b1d0e6aa2]
Former-commit-id: 241387ba19
2014-04-15 15:18:09 -05:00
Brian Clements
2a8d66a9f7 Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: dc1d2d39f8 [formerly db67c03382] [formerly 5250f7a442] [formerly dc1d2d39f8 [formerly db67c03382] [formerly 5250f7a442] [formerly 6ccedc1182 [formerly 5250f7a442 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]]]
Former-commit-id: 6ccedc1182
Former-commit-id: 602794b56d [formerly 6f9ef9a515] [formerly fffe96d7c192b1e0ed78a1625828ff61c7efe072 [formerly e8907aa729]]
Former-commit-id: 05d59da434ed10fbd0f9d1601a73552672294e6c [formerly 9acb5a4a5b]
Former-commit-id: 8945b26e9b
2014-04-15 15:15:11 -05:00
Brian Clements
19d7cef419 Issue #2903 made xmpp reconnect an explicit action by user
moved non-session classes out of session package
connection classes moved to connection package
made separate classes for connection listeners
removed password from heap
login dialog remembers last server used
added reconnect handler to prompt user to re-login after disconnect


Former-commit-id: 3d8bcb8701 [formerly 6f7851d8c4] [formerly 8ab1bab974] [formerly 3d8bcb8701 [formerly 6f7851d8c4] [formerly 8ab1bab974] [formerly 6b22374046 [formerly 8ab1bab974 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]]
Former-commit-id: 6b22374046
Former-commit-id: 5b5669e1e1 [formerly ca5909e222] [formerly 3329c6cc7af41bc830f1a278385881ed9ff2d11c [formerly 7cf5f06f2a]]
Former-commit-id: 54da4997513795ce82cf53a0964eb73eee1095d9 [formerly 054b47951d]
Former-commit-id: 86081dda91
2014-04-15 15:12:33 -05:00
Richard Peter
b5a7c6659a Issue #2726: Update endpoint pattern and remove System.out.printlns
Change-Id: I6d54cf695b8e339f9ac84b0a901cd47118e1872d

Former-commit-id: 45121892a7 [formerly 294b02e2e5] [formerly ba1f83db17] [formerly 45121892a7 [formerly 294b02e2e5] [formerly ba1f83db17] [formerly 7e3d710367 [formerly ba1f83db17 [formerly a724d7a0ed98f8f2860325a8578cf38e71e3ffcf]]]]
Former-commit-id: 7e3d710367
Former-commit-id: c58fb27c2a [formerly e8db16d08b] [formerly 09f8e1ae46a1c33d27814d0fb0458b71dd76f203 [formerly 4736c51a10]]
Former-commit-id: 719f2c9c90cf9060d27492d3ca4a4e8567659a83 [formerly 9aa3af4227]
Former-commit-id: 84896dd87f
2014-04-15 14:28:21 -05:00
Ben Steffensmeier
76c12afbfe Issue #3017 Update SatSpatialFactory to have more specific methods.
Former-commit-id: 2c5ef01980 [formerly 49ca556b33] [formerly ecbe6fd2d7] [formerly 2c5ef01980 [formerly 49ca556b33] [formerly ecbe6fd2d7] [formerly 6ea38cfbb2 [formerly ecbe6fd2d7 [formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]]]]
Former-commit-id: 6ea38cfbb2
Former-commit-id: 68df2b0d29 [formerly 2f51d63032] [formerly 305f259935e7d3b0c4aa6d31fb2c63c47d11a7ad [formerly 3eebc7a864]]
Former-commit-id: 003a747a5ae4b41830eb3012aa75e88ce095a4b1 [formerly af826302a1]
Former-commit-id: 7dc8709a5b
2014-04-15 13:29:05 -05:00
Nate Jensen
4d5d6f8f16 Merge "Issue #2984 another attempt to fix build" into development
Former-commit-id: 8a1e3a9bef [formerly 7f56e20c03] [formerly 5424ffb850] [formerly 8a1e3a9bef [formerly 7f56e20c03] [formerly 5424ffb850] [formerly 26b20a770a [formerly 5424ffb850 [formerly 00ab3a620f85859976144f9cdddd52f4bc46c063]]]]
Former-commit-id: 26b20a770a
Former-commit-id: b63c42673f [formerly 0c82511428] [formerly 74e82875616825eaf646c27a93474963262f4aed [formerly cf3e9e9020]]
Former-commit-id: 13c36f6664a1f7ee9c7010895e5ea62e71775f93 [formerly 146d8259db]
Former-commit-id: 9621b9f8bf
2014-04-15 13:27:29 -05:00
Richard Peter
3bead51564 Merge "Issue #2726: Fix context mappings for topics" into development
Former-commit-id: a50b726e87 [formerly 794c329968] [formerly 632258a438] [formerly a50b726e87 [formerly 794c329968] [formerly 632258a438] [formerly 75b70b1b9c [formerly 632258a438 [formerly c2dd85043309b04203166adb2390c404db97c5c3]]]]
Former-commit-id: 75b70b1b9c
Former-commit-id: 3f9dd1e70c [formerly 7ea59ed1fc] [formerly ed0abb8a5c402199a10054b1d7ff866641bc1c7e [formerly eff13cc71f]]
Former-commit-id: 83b6bad9df35ac5ca3fd8e6ddc839d108344984d [formerly 8947939e42]
Former-commit-id: 6b67e16af7
2014-04-15 13:22:06 -05:00
Nate Jensen
7b1ac642f8 Issue #2984 another attempt to fix build
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb

Former-commit-id: fc8be532a1 [formerly cb406ef865] [formerly a2354a1d2a] [formerly fc8be532a1 [formerly cb406ef865] [formerly a2354a1d2a] [formerly 09305d263e [formerly a2354a1d2a [formerly 38195dc5de31cefd435f507a3aa9f7f60965c0ff]]]]
Former-commit-id: 09305d263e
Former-commit-id: f0ea970f51 [formerly 3186527f18] [formerly c383e23eae82fa10b3e1724bbc784d32fdfd1fee [formerly 60b8b6e4ad]]
Former-commit-id: 0ab807d694e5f70061683480aefc8ac501db90ab [formerly 529939f3d3]
Former-commit-id: eb9fba0305
2014-04-15 13:16:17 -05:00
Richard Peter
c37f234cb0 Issue #2726: Fix context mappings for topics
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f

Former-commit-id: bb04dd7885 [formerly f533275291] [formerly ecbd0d5720] [formerly bb04dd7885 [formerly f533275291] [formerly ecbd0d5720] [formerly 4ac996336e [formerly ecbd0d5720 [formerly b3d978d0e22b371eaa826d856156ba5360ee7be9]]]]
Former-commit-id: 4ac996336e
Former-commit-id: c54607083f [formerly d40449dae9] [formerly 39575ca8f26452d9d3cfc245c888d649d3dd6f86 [formerly 35b8b8bc15]]
Former-commit-id: f983f06d0cbe33c9d1879ab4b7133d99f068533d [formerly 100a0d3bbd]
Former-commit-id: c4edd6fd84
2014-04-15 12:49:15 -05:00
Nate Jensen
86eeecb95a Merge "Issue #2907 - Change directory name to match project name." into development
Former-commit-id: 40ce5fc478 [formerly 8dd1f37b81] [formerly 84cd761026] [formerly 40ce5fc478 [formerly 8dd1f37b81] [formerly 84cd761026] [formerly 632d21b7db [formerly 84cd761026 [formerly 7ab6cfb256e113023b73963b1b1ea1e9980655d1]]]]
Former-commit-id: 632d21b7db
Former-commit-id: 9b005aa219 [formerly 7e6010a865] [formerly 15fa386c82dc42c939744c2ce696f67b5947bb68 [formerly e1b9ec9c6a]]
Former-commit-id: eb20b15772913cbd9768ece3e9f832f5454cd16d [formerly 71150a8cdb]
Former-commit-id: 60d1c964bc
2014-04-15 12:38:39 -05:00
Mike Duff
71aba300df Issue #2907 - Change directory name to match project name.
Change-Id: I9f3cd8bc28047b1da295dcc6da5d91a2d3583848

Former-commit-id: 642f05a651 [formerly 903d10096c] [formerly b8b3b9eb8e] [formerly 642f05a651 [formerly 903d10096c] [formerly b8b3b9eb8e] [formerly 309bb97356 [formerly b8b3b9eb8e [formerly db7f966c43292a321793655fe283cc3feacfd9f1]]]]
Former-commit-id: 309bb97356
Former-commit-id: 61d72d1167 [formerly ce5363105b] [formerly 7aa943a76481061b458201ef5aef45697e58047f [formerly e03d319eaf]]
Former-commit-id: 3d0053911934d08af1990d7768a4135fdfa95df1 [formerly 7561832a2a]
Former-commit-id: c2779cf796
2014-04-15 12:14:58 -05:00
Richard Peter
47cfb79a36 Issue #2726: Fix edex_camel to wait for process to finish on stop, add logging of service calls to log files.
Change-Id: Ie1e8fce80e7e06b294e01deaf9174a6fb7180d5d

Former-commit-id: 63c484cf14 [formerly 45e6301b91] [formerly 4709e66b34] [formerly 63c484cf14 [formerly 45e6301b91] [formerly 4709e66b34] [formerly fa25d55384 [formerly 4709e66b34 [formerly dc798a7ca6badfcd6d732b43bb3e0175770398be]]]]
Former-commit-id: fa25d55384
Former-commit-id: a0c08e67ea [formerly 7e3e0fb984] [formerly 85a7299b471586523b314346c141f900d516f459 [formerly fa5c0f71ad]]
Former-commit-id: 19bc4fe78d6b4e9b55f97726a5c86ede5865c5b3 [formerly 4ed2eb3b03]
Former-commit-id: 64c9dbb764
2014-04-15 11:50:28 -05:00
Nate Jensen
dd609f2851 Issue #2984 remove dead ncep purge util plugin and web page
Change-Id: Ifca01d858586ce3bf968f4b1203eb9853be97829

Former-commit-id: 55ed6aa760 [formerly c81c44d15f] [formerly e081847225] [formerly 55ed6aa760 [formerly c81c44d15f] [formerly e081847225] [formerly 7726f144ed [formerly e081847225 [formerly 9f01e8a242ba44dec510fdc5ca75be566f8fa008]]]]
Former-commit-id: 7726f144ed
Former-commit-id: 6c02a78f95 [formerly 5ca97d5798] [formerly 65f09770f2a186fb119737c7f34c08d45089e7d3 [formerly 56e7b21e35]]
Former-commit-id: aaa258f18e8d3796d03ac56aab36317cfdb75639 [formerly f2a1345c0b]
Former-commit-id: 6a47b92f5a
2014-04-15 11:16:24 -05:00
Nate Jensen
4c5fe0b79f Issue #2907 fix datauri doc utility
Change-Id: Iafb1feb73e416acac28369c3c96acbc305928b22

Former-commit-id: cd6754fe7f [formerly 8a4e3b8088] [formerly 0845eef927] [formerly cd6754fe7f [formerly 8a4e3b8088] [formerly 0845eef927] [formerly 7e19d70363 [formerly 0845eef927 [formerly 948b1c1eb060963c943eccc31033af27b70804b0]]]]
Former-commit-id: 7e19d70363
Former-commit-id: 83e3028473 [formerly cdf8aeef79] [formerly 55452996b3a7cbca5069dc64642b3235e7c3d3b1 [formerly 27cfffb1ea]]
Former-commit-id: 56d54227251b4e4b65bfe037aa45bd57e9e1d607 [formerly 4b8bda3abf]
Former-commit-id: 2eccbcf3fe
2014-04-15 10:54:39 -05:00
Nate Jensen
05678bf2d7 Merge "Issue #2785 - Fix loading of groups in sub request dialog" into development
Former-commit-id: 237873479d [formerly 03f60e7989] [formerly b574103f0f] [formerly 237873479d [formerly 03f60e7989] [formerly b574103f0f] [formerly 70f35c6a31 [formerly b574103f0f [formerly 7643dcd902ee2ab068d30ff88774114636d545c9]]]]
Former-commit-id: 70f35c6a31
Former-commit-id: 027fc2d2a4 [formerly 78f6cc513c] [formerly 4f514ff26f7a8aedf19ebd3add90aee96d373484 [formerly 4c7b2c7f16]]
Former-commit-id: ab7de3bb834961bac49023c5fbf91c75e109ae65 [formerly dbf1afd01d]
Former-commit-id: 620fcebb18
2014-04-15 10:44:28 -05:00
Mike Duff
a2316806a5 Issue #2785 - Fix loading of groups in sub request dialog
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

Former-commit-id: c70da23f91 [formerly 3a6e718ff0] [formerly 81e4c9b05d] [formerly c70da23f91 [formerly 3a6e718ff0] [formerly 81e4c9b05d] [formerly d2a80ca966 [formerly 81e4c9b05d [formerly e72a852935dcb519604b37dc873645d4b419ee43]]]]
Former-commit-id: d2a80ca966
Former-commit-id: dceb75c423 [formerly 0bf14203ff] [formerly 97976d43b384551d73f379695ead9b9d54c82cb5 [formerly 4773c3722c]]
Former-commit-id: 8b2b23ba29774d082ea5cf0ea4bc20efdf754a73 [formerly ddeb7fe4d2]
Former-commit-id: 78a0ad33ef
2014-04-15 10:10:18 -05:00
Nate Jensen
784c79e673 Merge "Issue #2984 attempt to fix build" into development
Former-commit-id: a946c60c1f [formerly 37028f77b3] [formerly 9399b1a69f] [formerly a946c60c1f [formerly 37028f77b3] [formerly 9399b1a69f] [formerly 41e565f368 [formerly 9399b1a69f [formerly 41626c3c65aea888213bdf10e434e87dde793d97]]]]
Former-commit-id: 41e565f368
Former-commit-id: 969eac005a [formerly 23c3186365] [formerly 25ea39493ad97b8d18b309bdf5a095aadd56dd7c [formerly 0a8abf9808]]
Former-commit-id: 13bc75a9df1e120edcee8139ae0dc20bb7bd112b [formerly 6caa1986e8]
Former-commit-id: 6ccac4bbf8
2014-04-15 10:09:57 -05:00
Nate Jensen
e7c0adcec7 Issue #2984 attempt to fix build
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d

Former-commit-id: f39f61518f [formerly ce585ca9e4] [formerly 4aaa7c7096] [formerly f39f61518f [formerly ce585ca9e4] [formerly 4aaa7c7096] [formerly 456359ab1a [formerly 4aaa7c7096 [formerly 60dc6b2552cc2108f9c5c0bc25eae4a1829b62f9]]]]
Former-commit-id: 456359ab1a
Former-commit-id: e91352d8a8 [formerly 0177329d67] [formerly e7f43a47947a927cf841070a7c70e8a56b5e3f62 [formerly f6b3c3c05f]]
Former-commit-id: b961f3c4a6052627f06cb10b2b1510dca127b34c [formerly c5ad3ae2a2]
Former-commit-id: 24e970b87a
2014-04-15 09:57:11 -05:00
Steve Harris
1c13496912 Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
Former-commit-id: 9ff3077435 [formerly 9132d9004e] [formerly eb2f2865fe] [formerly 9ff3077435 [formerly 9132d9004e] [formerly eb2f2865fe] [formerly 5bf5bdb6b0 [formerly eb2f2865fe [formerly f4c8ce899d312b389aff32d052564559e79904be]]]]
Former-commit-id: 5bf5bdb6b0
Former-commit-id: 1f3584ce15 [formerly 6ed279d306] [formerly 336570a6f023ec3889bbe8c27489ce1f1e14b5f5 [formerly c361ccd531]]
Former-commit-id: 6ae45c7f072308154e9a43cc9868ef69a835f969 [formerly 9be8c87f87]
Former-commit-id: ac077b24a1
2014-04-15 09:39:33 -05:00
Mike Duff
078becc022 Issue #2907 - Rename com.raytheon.edex.dataplugin.redbook to com.raytheon.uf.edex.dataplugin.redbook
Change-Id: I375877b285671ef7a4d993b4c16ee3437fd0a32a

Former-commit-id: 150479174c [formerly 9c690f8ecc] [formerly 8d5486d1ff] [formerly 150479174c [formerly 9c690f8ecc] [formerly 8d5486d1ff] [formerly a072ce72bb [formerly 8d5486d1ff [formerly 4d37938e12c7803af84713f3e009f7e4f37f9c0d]]]]
Former-commit-id: a072ce72bb
Former-commit-id: b2826656af [formerly f749f9b8d6] [formerly 26877de5811915ce716d7845fc18f7b421b67ccd [formerly 25eff8dcf5]]
Former-commit-id: 56f0b7261a11ceab601a0eb11735f6c04f239269 [formerly 62d94d740b]
Former-commit-id: 0a77645dc2
2014-04-15 09:34:05 -05:00
Benjamin Phillippe
372ecda418 Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109

Former-commit-id: 575caa6238 [formerly 490413551b] [formerly 3db751fc5b] [formerly 575caa6238 [formerly 490413551b] [formerly 3db751fc5b] [formerly 62062bf288 [formerly 3db751fc5b [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]]]
Former-commit-id: 62062bf288
Former-commit-id: f731dbc847 [formerly 0b149f92d9] [formerly 9f938a2b9dba7afb0360199c813d48ea9302801b [formerly 035272360b]]
Former-commit-id: 001d47f93bc4e0c26d0f78e7d14ece5b5ef7a34f [formerly f6f51d3575]
Former-commit-id: f026a17b07
2014-04-15 09:15:12 -05:00
Richard Peter
6e3f331e4d Merge "Issue #2984 remove unnecessary plugins from features remove unnecessary uengine dependencies from manifests" into development
Former-commit-id: 200eeffffc [formerly 93d624d4d5] [formerly 4edf560b06] [formerly 200eeffffc [formerly 93d624d4d5] [formerly 4edf560b06] [formerly 909c44182b [formerly 4edf560b06 [formerly faa4e88621db7dd9cbc13048bfdf98cdb3ec26d2]]]]
Former-commit-id: 909c44182b
Former-commit-id: 7fca94fd26 [formerly 1a3df8b3a4] [formerly 23de5dfac28a093d97495f50319e37d023168764 [formerly e6112f7aeb]]
Former-commit-id: 6358244e1ebe22f61ceaaa91379ff734d02d7dc5 [formerly 80e4650796]
Former-commit-id: a0e14eda77
2014-04-14 17:13:57 -05:00
Nate Jensen
c693cb15c9 Merge "Issue #3019 modify JUtil to support sets and frozensets" into development
Former-commit-id: b326ca6964 [formerly f677b2123e] [formerly f11c71e083] [formerly b326ca6964 [formerly f677b2123e] [formerly f11c71e083] [formerly 5308cb61cc [formerly f11c71e083 [formerly 6a8cbb3713741df343daf3d128d7d3b4e29238ec]]]]
Former-commit-id: 5308cb61cc
Former-commit-id: ceba0ccc8c [formerly 46a070288b] [formerly c08f9830e2dbdbe6a50c595a773f8674bd643118 [formerly 0192d15ffb]]
Former-commit-id: a38aa0b660b8b58a5bb4df87b877edbd6ef27f30 [formerly 23c5b7a985]
Former-commit-id: 8c6d8e97f6
2014-04-14 16:53:28 -05:00
Nate Jensen
148a31d3ad Issue #2984 remove unnecessary plugins from features
remove unnecessary uengine dependencies from manifests

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

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

Former-commit-id: bb1f37da56 [formerly 1e3afba948] [formerly 02e801b359] [formerly bb1f37da56 [formerly 1e3afba948] [formerly 02e801b359] [formerly ef3879c4a3 [formerly 02e801b359 [formerly 795cba334038d920beab93f5c872b02acf29c7f9]]]]
Former-commit-id: ef3879c4a3
Former-commit-id: cb84437030 [formerly de47d76f3c] [formerly 2e5401d9cdc3b6f681ceb65bb28524b1fefca7f6 [formerly 7c6fe31032]]
Former-commit-id: 627d03cd49e6c90b49ee57ee14d5b0fc5a8205f2 [formerly 00a0a317c3]
Former-commit-id: cc940a91c7
2014-04-14 16:26:38 -05:00
Nate Jensen
c1ac719aa5 Merge "Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe plugin" into development
Former-commit-id: 7c58c1262a [formerly d741f996c6] [formerly c71205eb89] [formerly 7c58c1262a [formerly d741f996c6] [formerly c71205eb89] [formerly 111b7f4283 [formerly c71205eb89 [formerly bdc1863a9413301bb78c6e0ffdd630b62c48d627]]]]
Former-commit-id: 111b7f4283
Former-commit-id: b9be7343bf [formerly 9593960e9f] [formerly c249e01da13dd43a2a49740d644cfa02fc5f32ca [formerly 9917a8ef62]]
Former-commit-id: 47cef9e0d35252c6982470f4960c5885684930bf [formerly 37a6c292f7]
Former-commit-id: 9972baa000
2014-04-14 15:46:14 -05:00
Nate Jensen
ac52ff1529 Merge "Issue #2937 Moved presence/site determination from feed log to feed listener. Use MUCRoom to get presence and role because UserManager is not able to understand nicnames." into development
Former-commit-id: 7da3df1fdb [formerly c8da0cad7a] [formerly 8410d02508] [formerly 7da3df1fdb [formerly c8da0cad7a] [formerly 8410d02508] [formerly 23fc6b53db [formerly 8410d02508 [formerly 2ae8617d26a4d9d77ef439333d886883812e86ce]]]]
Former-commit-id: 23fc6b53db
Former-commit-id: b2f10da03d [formerly efc88926bc] [formerly ae7285c9f6b4eb7909d386ef835efe02a599ffc9 [formerly 985325091f]]
Former-commit-id: f2ad5204b65b063d393eb6d98c747faaea9ff552 [formerly cc9ad1496a]
Former-commit-id: dc7630131a
2014-04-14 15:35:43 -05:00
Nate Jensen
bcedd3f3d8 Merge "Issue #2937 Fixed from user in xmpp message." into development
Former-commit-id: b317a39484 [formerly 5ded9b0bae] [formerly 9aa730cfd8] [formerly b317a39484 [formerly 5ded9b0bae] [formerly 9aa730cfd8] [formerly 85c5f8f64f [formerly 9aa730cfd8 [formerly 9fc178c2b8cfcbafbe9848076998d29af0f55912]]]]
Former-commit-id: 85c5f8f64f
Former-commit-id: 33b59e6d7d [formerly 0e4305296c] [formerly 2cd90fa496e8fa22a82e7f64f7b9798c3b30c3fd [formerly 4c6151f4cb]]
Former-commit-id: b8ad16f05d213298f869051e3944d19eb8f38945 [formerly 390482aeba]
Former-commit-id: 6c20b25f21
2014-04-14 15:33:04 -05:00
Ron Anderson
96817b5c1f 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: 6063cdd984 [formerly d5ebb5a800] [formerly 46d5349940] [formerly 6063cdd984 [formerly d5ebb5a800] [formerly 46d5349940] [formerly fd79bd354b [formerly 46d5349940 [formerly 79a18e9077167087a9a3dce952f71a0c7e021e23]]]]
Former-commit-id: fd79bd354b
Former-commit-id: 9b2cd2d486 [formerly d2346699bb] [formerly 5456b75aa7d4a323625c887f487c61c54177d524 [formerly 5ab1b1b95c]]
Former-commit-id: 9e2c16b8d6d9d09c2266c603212fe89f59dd606d [formerly c7e1797dd4]
Former-commit-id: 07e6998fc6
2014-04-14 14:45:03 -05:00
Brad Gonzales
22395cc880 Issue #2937 Moved presence/site determination from feed log to feed listener.
Use MUCRoom to get presence and role because UserManager is not able to understand nicnames.

Change-Id: Ie27d804cfea37a27df7e3c0d4445b16f3f2c12a7

Former-commit-id: 10a8b59e4e [formerly 45264a2cde] [formerly 189282166d] [formerly 10a8b59e4e [formerly 45264a2cde] [formerly 189282166d] [formerly 535611f556 [formerly 189282166d [formerly e975a825046c8d0505223093e5765d5283425b2f]]]]
Former-commit-id: 535611f556
Former-commit-id: c67332f5c8 [formerly b18cefb6bd] [formerly 31d35028c1bb41e7e74a7a5b46e8631cb1b8dfcd [formerly 7384a458eb]]
Former-commit-id: 367c707f1bd822d87a28e02e2aab93478cdbc4b7 [formerly a347010ad4]
Former-commit-id: 7876b83c15
2014-04-14 14:30:18 -05:00
Brad Gonzales
8034ad83c3 Issue #2937 Fixed from user in xmpp message.
Change-Id: I9d7ad994a3f683f2fb3dce37a71ebdcec04f4890

Former-commit-id: 496a56dccb [formerly 98476d4813] [formerly 023622a2c5] [formerly 496a56dccb [formerly 98476d4813] [formerly 023622a2c5] [formerly f76e4e8fea [formerly 023622a2c5 [formerly 67ccbb2e7eb96028137b9f82bca550bfb9e89345]]]]
Former-commit-id: f76e4e8fea
Former-commit-id: 886d42182e [formerly 2812984f88] [formerly 272e6f46892b04f72888134b64bcf72189d571a5 [formerly 1f1806de88]]
Former-commit-id: 42f92b4b0b332859a72f27a74183f3c06841a34c [formerly 5f5ac23d05]
Former-commit-id: 7f09051250
2014-04-14 14:30:18 -05:00
brian.dyke
16be9500b9 Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: 33274850e3 [formerly 5fc07cafc8] [formerly fb1c399d4d] [formerly 33274850e3 [formerly 5fc07cafc8] [formerly fb1c399d4d] [formerly a6708cc174 [formerly fb1c399d4d [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]]]
Former-commit-id: a6708cc174
Former-commit-id: 627004af0a [formerly e8dffad9cb] [formerly c50a848c670c4b4d84b5ed17c503151cf6c6b7f1 [formerly 5b27f2987f]]
Former-commit-id: 4e673bda45fe4b6268410b72231d4d0d2ad7d4bb [formerly d148fbe645]
Former-commit-id: 6a5c7d7684
2014-04-14 15:29:23 -04:00
Nate Jensen
805ff08819 Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe
plugin

Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a

Former-commit-id: 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly f086bb0c9b [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]]
Former-commit-id: ceec3d48f0
Former-commit-id: 134f34c4df [formerly dfe50ee038] [formerly d97211d5385681fec6abca63498e85889f803dd8 [formerly 715932091e]]
Former-commit-id: 3e07e40b8dcad3da2eb07fe1e1fd1960476568c1 [formerly 1e5433c9c3]
Former-commit-id: c8c25d9224
2014-04-14 14:28:11 -05:00