Commit graph

4902 commits

Author SHA1 Message Date
Brian Clements
911d6407e6 Issue #2702 replaced openfire source tarball with 3.9.1
removed 3.7.1 source from git
added 3.9.1 tarballs to /awipscm/awips2-static (coordinated with CM)
tweaked ant build to fetch source tarball when building plugins
replaced openfire cots jar with new version (only used for eclipse)


Former-commit-id: 66840a1bdd [formerly e4d22971bd] [formerly bc8ac5e051] [formerly bc8ac5e051 [formerly ad3d10074a]] [formerly e1819cd4e2 [formerly bc8ac5e051 [formerly ad3d10074a] [formerly e1819cd4e2 [formerly d8f30a7af43faa2fd4ac18769d2313ae6008cfd1]]]]
Former-commit-id: e1819cd4e2
Former-commit-id: 01db24e1fbcc79bebe3149dc25ef088e84469a1b [formerly 3beb79dabe2b4fee26bcf793ea28d3ef4e8cebb4] [formerly 410ebf65f5 [formerly 3f0115d329]]
Former-commit-id: 410ebf65f5
Former-commit-id: 2267c2bb0b
2014-03-05 15:29:27 -06:00
Nate Jensen
26adad4aba Merge "Issue #2843 Harden recycle." into development
Former-commit-id: c9855b5e4c [formerly c65bb2a011] [formerly 09311b8270] [formerly 09311b8270 [formerly 7a2a489c77]] [formerly 308ab7c314 [formerly 09311b8270 [formerly 7a2a489c77] [formerly 308ab7c314 [formerly c36359b0aaa1540f6d941e9445b41ed929a91e14]]]]
Former-commit-id: 308ab7c314
Former-commit-id: 811378d1cbd674950fccc5f6132a118b5339f8b1 [formerly 60f7401ff670afef592b5d2107984da7668e6b19] [formerly d07da4c425 [formerly d82a7d3640]]
Former-commit-id: d07da4c425
Former-commit-id: b6d570e336
2014-03-05 11:41:05 -06:00
Greg Armendariz
6e0c58a58e Merge "Issue #2627 shorten wrapper arg for retaining failed data" into development
Former-commit-id: 60df12139d [formerly d3fcc8caeb] [formerly 7d9cc2361e] [formerly 7d9cc2361e [formerly a9e861834b]] [formerly d2510ab641 [formerly 7d9cc2361e [formerly a9e861834b] [formerly d2510ab641 [formerly ae3372772795cda39176223231d354d776feb1a3]]]]
Former-commit-id: d2510ab641
Former-commit-id: b496726edb0ffa023e63e44e7d6e9b6a743da146 [formerly 2cc268b0b69739edfd85a8a1d255874387caa9b7] [formerly 8239129e29 [formerly d67748198f]]
Former-commit-id: 8239129e29
Former-commit-id: 1066106b30
2014-03-05 11:29:43 -06:00
Ben Steffensmeier
606e549b35 Issue #2843 Harden recycle.
Former-commit-id: 3c8625ba40 [formerly 291d5f55df] [formerly 22adc336df] [formerly 22adc336df [formerly 26c1a8e494]] [formerly 3cd6b29e75 [formerly 22adc336df [formerly 26c1a8e494] [formerly 3cd6b29e75 [formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]]]
Former-commit-id: 3cd6b29e75
Former-commit-id: 06c2af7244c0852f56cf6ac9f32e099cf6ffac24 [formerly 202049adf2dd36c8c9f4cee72fdf77a6f408f169] [formerly ed0ec90407 [formerly af1bdf1b53]]
Former-commit-id: ed0ec90407
Former-commit-id: be60a9564d
2014-03-05 11:16:12 -06:00
Nate Jensen
cf4019a6c8 Issue #2627 shorten wrapper arg for retaining failed data
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7

Former-commit-id: 1871beecf3 [formerly ee84466b3c] [formerly ad7d5a745b] [formerly ad7d5a745b [formerly c07f2e829d]] [formerly 0dc5dfae82 [formerly ad7d5a745b [formerly c07f2e829d] [formerly 0dc5dfae82 [formerly 54578116023ebc7a6474a3297d419c2777d31e17]]]]
Former-commit-id: 0dc5dfae82
Former-commit-id: 8cb9714061eef2410b301f238e3a91f1333c7e00 [formerly 3ed2948010b10a83db8a0e121f679148f5130c8c] [formerly d3a10ba1e6 [formerly 08ac542f2f]]
Former-commit-id: d3a10ba1e6
Former-commit-id: 1a21140770
2014-03-05 09:04:10 -06:00
Brian Clements
328e5fe74f Issue #2837 collaboration icon changes
changed add/remove group icon colors
created icons for add/remove contact, alias contact and rename group


Former-commit-id: dbb0076f53 [formerly 17661200a1] [formerly d76dd2a8f6] [formerly d76dd2a8f6 [formerly c0e4615967]] [formerly c9906cde88 [formerly d76dd2a8f6 [formerly c0e4615967] [formerly c9906cde88 [formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]]]]
Former-commit-id: c9906cde88
Former-commit-id: 67bd24d7f9d56eb79363e39291cebcf9c660c3cc [formerly 1d8422aecbe75d313717ff186a0a87becafd9906] [formerly 3d4323b447 [formerly d06182573e]]
Former-commit-id: 3d4323b447
Former-commit-id: f4a6d2a30d
2014-03-05 09:00:57 -06:00
Richard Peter
7f2fdc2ee2 Merge "Issue #2627 harden static initialization on edex main thread" into development
Former-commit-id: e497701fdb [formerly 2be140c0c4] [formerly fdba3b3099] [formerly fdba3b3099 [formerly 7c02ab6b66]] [formerly 6b08aaf55c [formerly fdba3b3099 [formerly 7c02ab6b66] [formerly 6b08aaf55c [formerly 82f20a96a82ef7f047f716662d319e522ee1c394]]]]
Former-commit-id: 6b08aaf55c
Former-commit-id: bcacc8a74bfe6dd1baaafe0283b5749c3a75d3ff [formerly 492f316506c2780dd12c817c21369a49396beff4] [formerly f6e1fc89de [formerly c12b4fb4ea]]
Former-commit-id: f6e1fc89de
Former-commit-id: e188d13ce1
2014-03-04 17:54:09 -06:00
Nate Jensen
5325f84d28 Issue #2627 harden static initialization on edex main thread
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff

Former-commit-id: b4fc91d730 [formerly e458ca5c52] [formerly 99254281af] [formerly 99254281af [formerly b989b7240c]] [formerly 660998ac72 [formerly 99254281af [formerly b989b7240c] [formerly 660998ac72 [formerly bb838950a2979703ae6ab8f486fc4460789c3f1b]]]]
Former-commit-id: 660998ac72
Former-commit-id: 89735b910d77335950aa6b64de480430c0c50fdd [formerly 7ec8c1c2768c7da3e60681607289e7157433c1ad] [formerly fadd59b36d [formerly 81a6675a14]]
Former-commit-id: fadd59b36d
Former-commit-id: 0122afaf40
2014-03-04 17:19:24 -06:00
Brian Clements
22bdbf2894 Issue #2756 added security toggle to collaboration
security on HTTP server can be disabled for legacy clients from openfire settings
added xmpp connection retry to http server so servers can be started in any order


Former-commit-id: 7d4b92d90f [formerly 2482a58273] [formerly cd0e1e271a] [formerly cd0e1e271a [formerly 7b085f62de]] [formerly f44f1212dd [formerly cd0e1e271a [formerly 7b085f62de] [formerly f44f1212dd [formerly 1e52606fe709f2cf27f835363ca5ab2bf6ada912]]]]
Former-commit-id: f44f1212dd
Former-commit-id: b1ec6b714e98e1e0b781c5dafe5e718ee5752089 [formerly c63989e0c0ae952f12584b6484f4cc133f757e99] [formerly c446513912 [formerly 0790849f03]]
Former-commit-id: c446513912
Former-commit-id: 19bb5d8de9
2014-03-04 16:02:25 -06:00
Nate Jensen
e96f0880de Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
Former-commit-id: b9d04a34b6 [formerly 6b4d16b750] [formerly 8ebe236ce9] [formerly 8ebe236ce9 [formerly 67fa21cfd9]] [formerly faf3dbb670 [formerly 8ebe236ce9 [formerly 67fa21cfd9] [formerly faf3dbb670 [formerly 27ce4812affb11b506a21b5cf54c4b74b8c49031]]]]
Former-commit-id: faf3dbb670
Former-commit-id: ff0b45ff305671505782d211ae335f19cf0cdba4 [formerly b1b15434c34d3a515d2e371f1abe646a64b39293] [formerly 0b827a343b [formerly ddf96ad45b]]
Former-commit-id: 0b827a343b
Former-commit-id: 12f218292c
2014-03-04 13:59:01 -06:00
Nate Jensen
8577c479eb Issue #2832 fix watches and warnings in collaboration displays
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f

Former-commit-id: ceaa1d11a9 [formerly 41d80f6fce] [formerly 559b1794af] [formerly 559b1794af [formerly e3d211c8d7]] [formerly 3c3e483d18 [formerly 559b1794af [formerly e3d211c8d7] [formerly 3c3e483d18 [formerly bb84ca01bb74bc93710ba92fcbdb13b30dc2454e]]]]
Former-commit-id: 3c3e483d18
Former-commit-id: 24afda98abb7e885284fc7c6f03a3ece4e326476 [formerly f48033e99ccba349f23f107d1871ca7961b89c90] [formerly e08b21fc40 [formerly 4c0df85caf]]
Former-commit-id: e08b21fc40
Former-commit-id: 0094132846
2014-03-04 13:18:16 -06:00
Richard Peter
1cb5af89b4 Merge "Issue #2791 Use Data Source for all grid data access." into development
Former-commit-id: 2bf2effb8d [formerly 83b99aad5c] [formerly 090829f75e] [formerly 090829f75e [formerly f87a913017]] [formerly 873fa00fac [formerly 090829f75e [formerly f87a913017] [formerly 873fa00fac [formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]]]
Former-commit-id: 873fa00fac
Former-commit-id: 7e3772e9e820b32e78978762725b7470efdbe8a0 [formerly 31ea5b7bbf5848e0ada30ca517c3c6b17e7d4154] [formerly 3a96d0758a [formerly 2a5b0fb3ba]]
Former-commit-id: 3a96d0758a
Former-commit-id: 7e096adc4a
2014-03-04 12:43:17 -06:00
Nate Jensen
31e18c0f76 Merge "Issue #2870 log product id when generic packet fails to find corresponding packet class" into development
Former-commit-id: 31ee19b5aa [formerly e74b0c2854] [formerly d0e405aac9] [formerly d0e405aac9 [formerly ea0248ff96]] [formerly 4547cbcfea [formerly d0e405aac9 [formerly ea0248ff96] [formerly 4547cbcfea [formerly 51797cd167b76be2b3ab55b6c7632e0039d7145c]]]]
Former-commit-id: 4547cbcfea
Former-commit-id: f177210ce3671580b0018b005a3c3908761208f8 [formerly 9e20fa9103fca3117e471be18adfb89e0f743437] [formerly 2dba0228c2 [formerly 471492201c]]
Former-commit-id: 2dba0228c2
Former-commit-id: fc953460b7
2014-03-04 12:39:13 -06:00
Richard Peter
697c2173fe Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development
Former-commit-id: 8b79b52d90 [formerly 560d3ea59f] [formerly 650f794329] [formerly 650f794329 [formerly bd94f6bf99]] [formerly 4fbb2f0059 [formerly 650f794329 [formerly bd94f6bf99] [formerly 4fbb2f0059 [formerly 12458982fe4c43a9b61e9194246c80527d02da6d]]]]
Former-commit-id: 4fbb2f0059
Former-commit-id: 1f82a5c0611dfa771bfe799d044b31ac338a0314 [formerly 5a213f229ea6ad72f4cd884b9d5a24db5f6d4023] [formerly 58f05e288f [formerly 363e9e294f]]
Former-commit-id: 58f05e288f
Former-commit-id: eb84b01b25
2014-03-04 12:38:30 -06:00
Richard Peter
d70df21041 Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development
Former-commit-id: 6271652a44 [formerly f343b87101] [formerly 15c9066986] [formerly 15c9066986 [formerly bc8b838a41]] [formerly 178bfc0b79 [formerly 15c9066986 [formerly bc8b838a41] [formerly 178bfc0b79 [formerly 234b6b7010e6eb044fbf1fc4728a58dc5cb84c8e]]]]
Former-commit-id: 178bfc0b79
Former-commit-id: 47da0b08a75dd03de704c797ddadeb88b7a34f18 [formerly a0e4b52a5d8449aeb28040899d5f6f7c762141e4] [formerly b3c2df969a [formerly e350b5bae1]]
Former-commit-id: b3c2df969a
Former-commit-id: 58e8cc7dd3
2014-03-04 12:38:07 -06:00
Nate Jensen
7b83b63a84 Issue #2870 log product id when generic packet fails to find
corresponding packet class

Change-Id: I839e622b063eae4e707f9abc31f010ef795bc9f1

Former-commit-id: 6a660b295b [formerly 02a7daf658] [formerly ef05ddc408] [formerly ef05ddc408 [formerly a1caeae552]] [formerly 6818ea9c23 [formerly ef05ddc408 [formerly a1caeae552] [formerly 6818ea9c23 [formerly 0d01b387e454f276d0ebdecfb14ad294b67a55b7]]]]
Former-commit-id: 6818ea9c23
Former-commit-id: c8ac867f70fd4990ac6a3a0233588ec88da6631b [formerly 147db2f60cd783078998957a4fefc35f48373315] [formerly b095d91c92 [formerly 552a2af0b9]]
Former-commit-id: b095d91c92
Former-commit-id: c8f3303317
2014-03-04 11:52:34 -06:00
Nate Jensen
039e740e7f Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development
Former-commit-id: d1e5191488 [formerly 6389e2fb02] [formerly 92e8393915] [formerly 92e8393915 [formerly 3afd14e1eb]] [formerly 9b94434a78 [formerly 92e8393915 [formerly 3afd14e1eb] [formerly 9b94434a78 [formerly eb07c44098abe7f72b578e24a4a7ea7e92dc655c]]]]
Former-commit-id: 9b94434a78
Former-commit-id: 97a81e75a604db940b96e82b281e07710b7b074e [formerly 813a67cfd0eabada60dcb3b8d68f61ef21cd4c70] [formerly c58926d598 [formerly 93da8c2075]]
Former-commit-id: c58926d598
Former-commit-id: be64298394
2014-03-04 11:42:51 -06:00
Nate Jensen
adaf73d534 Merge "Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done." into development
Former-commit-id: fd6af404be [formerly b0e727938b] [formerly 75611f0631] [formerly 75611f0631 [formerly f50a2789dd]] [formerly 7ac7dd5f01 [formerly 75611f0631 [formerly f50a2789dd] [formerly 7ac7dd5f01 [formerly 788133c5ea1a3005ed309a466e8cafad6db84ce3]]]]
Former-commit-id: 7ac7dd5f01
Former-commit-id: 0d1df41c3f6ba54d0fa021f0851c0cc93deb8bab [formerly 9ffb218b0f72703775dd6d2766c567fee092b78a] [formerly 44e9b34927 [formerly a2b3bc717e]]
Former-commit-id: 44e9b34927
Former-commit-id: b3a4e1d562
2014-03-04 10:55:05 -06:00
Max Schenkelberg
cef1660684 Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: 75d19d6be6 [formerly dbc6cc3fc6] [formerly 59434c8a60] [formerly 59434c8a60 [formerly a01a6d68d0]] [formerly cbf8b9249c [formerly 59434c8a60 [formerly a01a6d68d0] [formerly cbf8b9249c [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: 98b658ee3024e50c70a3a9e734120a03e368a302 [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2] [formerly 39e1c4fa46 [formerly 654da3c0a2]]
Former-commit-id: 39e1c4fa46
Former-commit-id: d85fd52c26
2014-03-04 09:23:36 -06:00
Max Schenkelberg
19d25e1f8c Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada

Former-commit-id: 70fec6a068 [formerly 4bcdc9f85b] [formerly 6edfb8965f] [formerly 6edfb8965f [formerly dbcbd1b560]] [formerly 1854bbb477 [formerly 6edfb8965f [formerly dbcbd1b560] [formerly 1854bbb477 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]]
Former-commit-id: 1854bbb477
Former-commit-id: 8560eb0aef67c72443f4df3086c608f06a5633e2 [formerly 64e66813ccc56d3b7a703a331fd119c8cbcceb08] [formerly bff80c3ee9 [formerly 6658c94e6e]]
Former-commit-id: bff80c3ee9
Former-commit-id: c37910a689
2014-03-03 17:59:48 -06:00
Bryan Kowal
2a089b43db Issue #2829 - fix the spelling of 'coordinate' in GfeUtil
Former-commit-id: 39c8b008f3 [formerly 5ded2afc7b] [formerly 83471b4900] [formerly 83471b4900 [formerly e6ae710871]] [formerly 56e79f2179 [formerly 83471b4900 [formerly e6ae710871] [formerly 56e79f2179 [formerly a06c8efe8b316359cfb0d4feaa7ea8f36e4122e7]]]]
Former-commit-id: 56e79f2179
Former-commit-id: a71a62b784f7b9f9200b3dc2e21bafe395839c43 [formerly 25690eebf00737ce2c3db1b4cd9bff6a9a40ab7f] [formerly 3c42fa358e [formerly eda1dc4142]]
Former-commit-id: 3c42fa358e
Former-commit-id: b5840bb880
2014-03-03 17:45:09 -06:00
Ben Steffensmeier
04f671edef Issue #2673 Add ability to query only ref times to Data Access Layer.
Former-commit-id: 13015e0003 [formerly 2807ec9b07] [formerly 2230164e1f] [formerly 2230164e1f [formerly 641d4acd15]] [formerly 9fcb730858 [formerly 2230164e1f [formerly 641d4acd15] [formerly 9fcb730858 [formerly 37c406a9945bfb6ccb99d2472b44d649f2ce18d0]]]]
Former-commit-id: 9fcb730858
Former-commit-id: bc2a362f5e0ec3b85a0e8035b137aff2fb2e8c86 [formerly 614b30500251a3eee6fb9711755f92aabf706b56] [formerly b9b5068329 [formerly 1d2d1e20f5]]
Former-commit-id: b9b5068329
Former-commit-id: 3613b62fe1
2014-03-03 17:44:11 -06:00
Nate Jensen
b841bb0232 Merge "Issue #2667 delta scripts for lightning source name change in xml files" into development
Former-commit-id: eff272fac0 [formerly b95e0e98b8] [formerly 36f5a3e788] [formerly 36f5a3e788 [formerly b9e4d40066]] [formerly 315b7abf28 [formerly 36f5a3e788 [formerly b9e4d40066] [formerly 315b7abf28 [formerly 2376124f601e97cf46ee8cb3281c326e178aab4d]]]]
Former-commit-id: 315b7abf28
Former-commit-id: acc6f73ce0e606401e677af0d9369c1e4c99b6e7 [formerly 96b8732a8c2d1aa94355db001efc5b33ad12027a] [formerly 64c9de836d [formerly 5cc5a59f2e]]
Former-commit-id: 64c9de836d
Former-commit-id: 3bf88e9264
2014-03-03 17:25:34 -06:00
Nate Jensen
22e038b2c9 Merge "Issue #2792 enforce getDensity() will not return above max" into development
Former-commit-id: 1b14f111a1 [formerly 5bd1713038] [formerly f38b4e42ba] [formerly 256a4c15679af35a3e96efa4ac5519defffdf419 [formerly f38b4e42ba [formerly bb9993e580]]] [formerly 2009972a2c [formerly f38b4e42ba [formerly bb9993e580] [formerly 2009972a2c [formerly 7c04864c902d3928165ea0bc107902b094209ed6]]]]
Former-commit-id: 2009972a2c
Former-commit-id: b7bc3f29d39930db99e3160f6f9f56ad0975b8e7 [formerly ea309ef204e8674084ebbdc87d531d69e0897f5c] [formerly 4df4a2361f [formerly cf960bace3]]
Former-commit-id: 4df4a2361f
Former-commit-id: 0b58ee20ee
2014-03-03 16:30:49 -06:00
Brian Clements
8c6c4b5166 Issue #2667 delta scripts for lightning source name change in xml files
handles stored procedures/bundles in localization


Former-commit-id: 4b16683777 [formerly 93c743267d] [formerly cc50637346] [formerly cc50637346 [formerly 0811b0580f]] [formerly ddcb1011bb [formerly cc50637346 [formerly 0811b0580f] [formerly ddcb1011bb [formerly 8e3e3be372d5db6dfc5897407074bc250fbef294]]]]
Former-commit-id: ddcb1011bb
Former-commit-id: 82e7c80f6e907398fb3236cd9b133e1d2b26301b [formerly 79db5b1fb34b532032174280c117b71cb066eb86] [formerly bf67bd0a33 [formerly 0292707f9d]]
Former-commit-id: bf67bd0a33
Former-commit-id: 6271ff6787
2014-03-03 16:30:45 -06:00
Nate Jensen
4186567d04 Merge "Issue #2756 install script for collaboration http server" into development
Former-commit-id: e56e8a2f25 [formerly 6ca8416898] [formerly e74625dcca] [formerly e74625dcca [formerly 2a83780be8]] [formerly 352a884b26 [formerly e74625dcca [formerly 2a83780be8] [formerly 352a884b26 [formerly d3d0173f7b5353256c1592b2b16cccd04ee98eff]]]]
Former-commit-id: 352a884b26
Former-commit-id: 0a89aa87a7b46b4ac722f9c347c3ede5c6bf4418 [formerly cc7496d2b9cf8e9947481a520709cc8cec4462e8] [formerly 18cd324d92 [formerly d9cfafa4cd]]
Former-commit-id: 18cd324d92
Former-commit-id: 18b2556559
2014-03-03 15:50:35 -06:00
Nate Jensen
f36f1fa5c0 Issue #2792 enforce getDensity() will not return above max
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1

Former-commit-id: e7e9623378 [formerly 0044c21ad5] [formerly 7f31e34dc9] [formerly 7f31e34dc9 [formerly 384b531d26]] [formerly 22153d43bb [formerly 7f31e34dc9 [formerly 384b531d26] [formerly 22153d43bb [formerly a502a64219e869401b1bff82fbb73e67565a6dae]]]]
Former-commit-id: 22153d43bb
Former-commit-id: 13aaf24790b6a18b09d437a84d20f5a7e9fee3dc [formerly 8163999a8004a10d68d6b96b3ec92494a440eed2] [formerly e40fbf0ba0 [formerly 58c9dc0c69]]
Former-commit-id: e40fbf0ba0
Former-commit-id: 47deb8f80c
2014-03-03 14:44:16 -06:00
Brian Clements
73b7bb05a3 Issue #2756 install script for collaboration http server
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars


Former-commit-id: 0170dbdb6f [formerly 769ee18145] [formerly a738448825] [formerly 443f420c0e6fc38c2a3fdd4e4aa68d8a8fb91db6 [formerly a738448825 [formerly 3b6121b9fa]]] [formerly 934ce73e4b [formerly a738448825 [formerly 3b6121b9fa] [formerly 934ce73e4b [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]]]
Former-commit-id: 934ce73e4b
Former-commit-id: aa27597578b1b18bfcd6890f24bc3e43b61ba524 [formerly 066c81f999fa0b82f0f2cf806a4411393bd5ac3c] [formerly 75c179b06f [formerly a44c5f8d48]]
Former-commit-id: 75c179b06f
Former-commit-id: 11b30001d5
2014-03-03 14:07:01 -06:00
Brian Clements
5ad8c94f37 Issue #2667 fixed bin lightning menus
the column name for the source of the lightning data was changed


Former-commit-id: 60dc43daea [formerly dedd9e80ed] [formerly 5d21675a91] [formerly 5d21675a91 [formerly 91936beadf]] [formerly 7a7d476899 [formerly 5d21675a91 [formerly 91936beadf] [formerly 7a7d476899 [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]]]
Former-commit-id: 7a7d476899
Former-commit-id: 45f33a2bdb2b4b91c2d6a33264e9513dc71a5eb6 [formerly dbc2261d04afbbeaa80308981a4752188bec6977] [formerly bf4c119278 [formerly 724bafd44f]]
Former-commit-id: bf4c119278
Former-commit-id: 472d08d2ad
2014-03-03 13:17:05 -06:00
Nate Jensen
fbb197807f Merge "Issue #2756 implemented HTTP public key auth scheme" into development
Former-commit-id: f9a90d4ae9 [formerly cce23732cd] [formerly c15f9950a1] [formerly c15f9950a1 [formerly 99fd81f105]] [formerly 869909cc66 [formerly c15f9950a1 [formerly 99fd81f105] [formerly 869909cc66 [formerly 21d22f790f71941797a23926be5ed77c6d72353b]]]]
Former-commit-id: 869909cc66
Former-commit-id: 970253652a6513db65dc9512c139ac1189098c68 [formerly 06cfe594234666c6d35b1f16214f065f5a9a2f18] [formerly a035269bb3 [formerly 19a252d820]]
Former-commit-id: a035269bb3
Former-commit-id: 46db8b9eb6
2014-03-03 09:44:26 -06:00
Dave Hladky
b1f403acfc Issue #2713 Update path for MADIS-Harvester.xml
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788

Former-commit-id: 7c384fc570 [formerly afef25c604] [formerly fb2cfff4d2] [formerly fb2cfff4d2 [formerly 92d677141f]] [formerly d40107e530 [formerly fb2cfff4d2 [formerly 92d677141f] [formerly d40107e530 [formerly f6e63a5d65a5450eb58e59833091b41ef4bf0a3f]]]]
Former-commit-id: d40107e530
Former-commit-id: f9de045d2d955f93ca74864a90e771ddc49c5125 [formerly 758b85a458cc5427609844effdd15c25ff39ee6d] [formerly dd3501ae41 [formerly 06d41ccafa]]
Former-commit-id: dd3501ae41
Former-commit-id: b39450bcd2
2014-03-03 08:46:37 -06:00
Ben Steffensmeier
45cada7456 Issue #2791 Use Data Source for all grid data access.
Former-commit-id: 6135f1c179 [formerly 16b6723cbb] [formerly 02cef4ddaa] [formerly 02cef4ddaa [formerly 6fa441396f]] [formerly 05770129c1 [formerly 02cef4ddaa [formerly 6fa441396f] [formerly 05770129c1 [formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]]]
Former-commit-id: 05770129c1
Former-commit-id: f34c71767a8711459155b5f3ceb76e5ecb0c5bab [formerly bc40fd62dff2b342470d96a6441fc6239af6c193] [formerly 72b117cf42 [formerly 4094ef6170]]
Former-commit-id: 72b117cf42
Former-commit-id: 374ad2c1e8
2014-02-28 17:06:33 -06:00
Brian Clements
109da18301 Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: f5ac60f8fa [formerly fd18963221] [formerly 9d0b02e0a4] [formerly 9d0b02e0a4 [formerly ce24bd1018]] [formerly d8e283e1b4 [formerly 9d0b02e0a4 [formerly ce24bd1018] [formerly d8e283e1b4 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]]
Former-commit-id: d8e283e1b4
Former-commit-id: a8497419fcf479ec1477a26ab09ecdbe904b7823 [formerly effe9ab4a85983edf2b983ee5e4b964df8a78343] [formerly f56cbac9fb [formerly edd72cbde4]]
Former-commit-id: f56cbac9fb
Former-commit-id: 43c19f09ba
2014-02-28 16:15:17 -06:00
Brian Clements
dcd11a4736 Issue #2667 fixed microseconds floating point error
time ranges now take any extra microseconds as separate argument


Former-commit-id: c813fdcfe1 [formerly d26e54bff3] [formerly b9bab34f7f] [formerly b9bab34f7f [formerly 5b4c234b48]] [formerly fdf3e42cb7 [formerly b9bab34f7f [formerly 5b4c234b48] [formerly fdf3e42cb7 [formerly 24d9440e440b74f6b1b907062b10da0fef268aed]]]]
Former-commit-id: fdf3e42cb7
Former-commit-id: 6ed0b65efb98d98fe0bba6af65566764752d6a1d [formerly 3e33767957989fe7bef67615c3feebaa13ee69c5] [formerly 0a2dffe600 [formerly cecff40a47]]
Former-commit-id: 0a2dffe600
Former-commit-id: 6ef371e92d
2014-02-28 15:47:20 -06:00
Nate Jensen
24c0ddc2de Merge "Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception" into development
Former-commit-id: a634576ae3 [formerly 15cbcdcbff] [formerly 2557ffe8c3] [formerly 2557ffe8c3 [formerly 47255ea9ad]] [formerly 45e8290111 [formerly 2557ffe8c3 [formerly 47255ea9ad] [formerly 45e8290111 [formerly 4ad72fcdc6cdccfce9f14808bdbcba5fa63d28ac]]]]
Former-commit-id: 45e8290111
Former-commit-id: f44a090206850c5a3732713c8f6ad3509ed0512b [formerly faaad66bd2ab6b8c2729152ba1bb0b3e77069a4e] [formerly 988249c4d8 [formerly 6d41fc9fd2]]
Former-commit-id: 988249c4d8
Former-commit-id: cced1d17c5
2014-02-28 14:02:33 -06:00
Nate Jensen
ab6f3c00c7 Merge "Issue #2638 wrote java utility for generating list of data URIs and their field names" into development
Former-commit-id: bb0d2b9597 [formerly 28ccecc515] [formerly 420a30cddc] [formerly 420a30cddc [formerly 135bb70a38]] [formerly f21e9eb889 [formerly 420a30cddc [formerly 135bb70a38] [formerly f21e9eb889 [formerly f7da1e27eca42ff822eeccf5a4a4bb56c77eb868]]]]
Former-commit-id: f21e9eb889
Former-commit-id: e4341946989db1d77bf3243ce0709d1975dcceb3 [formerly f0f85d0571b8d99ff0283fed753ee0778365a7f5] [formerly 403a8611c5 [formerly 67a7197f59]]
Former-commit-id: 403a8611c5
Former-commit-id: 778d6540f7
2014-02-28 14:02:22 -06:00
Lee Venable
4e094367aa Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
Former-commit-id: fd659b3ef2 [formerly 4631a29ca3] [formerly 40f3df6aff] [formerly 40f3df6aff [formerly f171e3adb0]] [formerly c77634951c [formerly 40f3df6aff [formerly f171e3adb0] [formerly c77634951c [formerly 1a72af70658f288d43e397d12499de1a08ff2ba8]]]]
Former-commit-id: c77634951c
Former-commit-id: ac7ec1c3162a20fe93f8740952b6d6b4aef69339 [formerly 2fb1bf66c74a373156ea360fd8e8e80b7e7e7b74] [formerly 67f7d52f74 [formerly 734f69403a]]
Former-commit-id: 67f7d52f74
Former-commit-id: 639f66e8b2
2014-02-28 13:50:15 -06:00
Mike Duff
791d43a7e8 Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 4bc3f2246e [formerly 512e634a97] [formerly 377c1f9998] [formerly 377c1f9998 [formerly 5440ff64d1]] [formerly 5f433b4f6b [formerly 377c1f9998 [formerly 5440ff64d1] [formerly 5f433b4f6b [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 427ebdb00a8b1af62bf840973fa2e105fce74f21 [formerly 0494775290c2982f78ac45adef680a21db012453] [formerly 63fc5f8c66 [formerly ee06fc58b5]]
Former-commit-id: 63fc5f8c66
Former-commit-id: 6c5c943a5e
2014-02-28 13:23:34 -06:00
Richard Peter
a73d2d608d Merge "Issue #2791 Switch contouring to use DataSource for data access." into development
Former-commit-id: 9514db2389 [formerly 39cf8178ff] [formerly 18ec1e12ae] [formerly 18ec1e12ae [formerly 5565bc88af]] [formerly d5e09a82a7 [formerly 18ec1e12ae [formerly 5565bc88af] [formerly d5e09a82a7 [formerly 029efeddc9a20b10f8991976be5640bff2e14cfc]]]]
Former-commit-id: d5e09a82a7
Former-commit-id: 1d31be65918cb0612915252b843d39dc0b8fc249 [formerly b053fcbd2fdae8ed288d71313c48f36099ef20df] [formerly e4dc3ea6cf [formerly f5c3e5d549]]
Former-commit-id: e4dc3ea6cf
Former-commit-id: feb0543e0e
2014-02-28 11:52:51 -06:00
Ben Steffensmeier
638db25e7a Issue #2791 Switch contouring to use DataSource for data access.
Former-commit-id: b0e6001cc7 [formerly 7c8332a30f] [formerly fbf6371c8e] [formerly fbf6371c8e [formerly 4b7f3b2a5b]] [formerly 23ce77d864 [formerly fbf6371c8e [formerly 4b7f3b2a5b] [formerly 23ce77d864 [formerly 6c90be7554bcbbf0aeb363b6e76c455d3896be83]]]]
Former-commit-id: 23ce77d864
Former-commit-id: 69109b8bc6bfbcf715b1c58eba3781cca14e0da1 [formerly 527028ea9c54386652ea6e4a25326acedb61a15d] [formerly 278ef9f0d4 [formerly a7787a7ff2]]
Former-commit-id: 278ef9f0d4
Former-commit-id: b747a91eaa
2014-02-28 11:28:02 -06:00
Dave Hladky
cf057a101c Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception
Former-commit-id: 7cc47281a0 [formerly fcd9f02b5c] [formerly 8bddfa77ce] [formerly 8bddfa77ce [formerly fd85324076]] [formerly 7399b10778 [formerly 8bddfa77ce [formerly fd85324076] [formerly 7399b10778 [formerly 137c6f8848715ee1acaaa2be943c053437902a8c]]]]
Former-commit-id: 7399b10778
Former-commit-id: b275de86a38f09c52cb0c8f71e4300b490143434 [formerly c6da2ffbb885334fdece65551dc7f61d9bcab9c0] [formerly d9a0f99bb5 [formerly 62156a1ba5]]
Former-commit-id: d9a0f99bb5
Former-commit-id: c15437bff8
2014-02-28 11:07:15 -06:00
Brad Gonzales
ffb95634b6 Issue #2821 Removed qpid 0.7 from the baseline.
Amend: Removed build.sh script that builds 0.7 and 0.18.  changed rpms.sh to call 0.18 build.sh script.

Change-Id: Iaf0cc8c0f9c47877f3e0acc02c60f27b25c0fccf

Former-commit-id: c0deeea120 [formerly bdadb0266b] [formerly f87d4ccf82] [formerly f87d4ccf82 [formerly a007ffabf9]] [formerly 50209c2084 [formerly f87d4ccf82 [formerly a007ffabf9] [formerly 50209c2084 [formerly 5ea4e87d10d335d85547b147228244892772a98f]]]]
Former-commit-id: 50209c2084
Former-commit-id: b50da5828b7fe4bacfcbdf91a0e74a51d709960b [formerly aa3ee588d04acaa851780f26f198fcd5053004bf] [formerly b9affa3c02 [formerly bf3a9ef7fe]]
Former-commit-id: b9affa3c02
Former-commit-id: 0c02861e4e
2014-02-28 10:15:18 -06:00
Nate Jensen
98a0fa5670 Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: f40efd5b98 [formerly 3153786b6f] [formerly b40f5477b4] [formerly b40f5477b4 [formerly 63244f840f]] [formerly 908d308825 [formerly b40f5477b4 [formerly 63244f840f] [formerly 908d308825 [formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]]
Former-commit-id: 908d308825
Former-commit-id: 3074b3a3e0b852d3d358d06516649417780897e2 [formerly f763c6864aae7276537781234c118f3f876d018c] [formerly fb68c4c07f [formerly 92527f1ffa]]
Former-commit-id: fb68c4c07f
Former-commit-id: 7ab7887199
2014-02-28 09:53:27 -06:00
Richard Peter
123c7d32eb Merge "Issue #2838 Archive binary feeder creation." into development
Former-commit-id: 63c1066b01 [formerly ddc733fda6] [formerly 944ea7936c] [formerly 944ea7936c [formerly 952669fc38]] [formerly 475557d4c8 [formerly 944ea7936c [formerly 952669fc38] [formerly 475557d4c8 [formerly c8ab23e68f870a6fc46171b9076e09689bc1b5bb]]]]
Former-commit-id: 475557d4c8
Former-commit-id: 3920f5fab143cd0fb6cdec59e6232ea61d5239b3 [formerly 3e47cae010b1d02395c7d662563fa5fddde5e973] [formerly 67a6ef4bd8 [formerly 1d51a87e86]]
Former-commit-id: 67a6ef4bd8
Former-commit-id: 61be7a7225
2014-02-27 17:36:56 -06:00
Nate Jensen
b98302df6a Issue #2638 wrote java utility for generating list of data URIs and
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

Former-commit-id: c513e50b11 [formerly b64a89eff1] [formerly 5b2f17826e] [formerly 5b2f17826e [formerly 7fb97ffad0]] [formerly 39e167fc76 [formerly 5b2f17826e [formerly 7fb97ffad0] [formerly 39e167fc76 [formerly a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46]]]]
Former-commit-id: 39e167fc76
Former-commit-id: 0f862d935f7471e5f4744467088db7ed63b0d300 [formerly 76c109bc0aaf7a0a1405976cdefd262abdaf71dc] [formerly f3de646859 [formerly 8bf8302811]]
Former-commit-id: f3de646859
Former-commit-id: 0e29ec5bb4
2014-02-27 17:14:32 -06:00
Nate Jensen
e40bc07d37 Merge "Issue #2823 deploy install now defaults to x86_64." into development
Former-commit-id: a206829bda [formerly 1a94acc527] [formerly 82817c2cbd] [formerly 82817c2cbd [formerly f7b4c75f13]] [formerly d7a8ddbb83 [formerly 82817c2cbd [formerly f7b4c75f13] [formerly d7a8ddbb83 [formerly 75be0d86a588209ff572362f098095beb0b618d2]]]]
Former-commit-id: d7a8ddbb83
Former-commit-id: c039ce8f1b61378045204c24fc793456eab0a1a7 [formerly 925ea42657cfdc93cc2d496f645202a2d2a00011] [formerly c439ecb2a4 [formerly 35ea5b9eb2]]
Former-commit-id: c439ecb2a4
Former-commit-id: ce34239347
2014-02-27 16:44:26 -06:00
Brad Gonzales
8c5e22d74b Issue #2823 deploy install now defaults to x86_64.
Change-Id: I06034fd03ab3779d83522134cb8067a64c2dcecc

Former-commit-id: a569fa1732 [formerly f84150e7a0] [formerly 73ed932660] [formerly 73ed932660 [formerly 2135663934]] [formerly 45160326aa [formerly 73ed932660 [formerly 2135663934] [formerly 45160326aa [formerly 9ef72acfce925dfcfc0df07e7ca5fb558b54d934]]]]
Former-commit-id: 45160326aa
Former-commit-id: f098f18b188adb35f2fa85a59c80cbb839c653d1 [formerly 198c4e59dcbb38b466db464ed3ce8ffb0ea02484] [formerly 003f028176 [formerly 90e6558083]]
Former-commit-id: 003f028176
Former-commit-id: 78cafe46d5
2014-02-27 16:34:53 -06:00
Richard Peter
414ccec00e Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 39fbaeed62 [formerly 79d3aa4e1a] [formerly 7bd6a07913] [formerly 7bd6a07913 [formerly 0e25ae35c1]] [formerly 1c150e6e8b [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: d17e408d9521d3f82597dba5bf5fbdcd68561d6a [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c] [formerly 50a1b270c5 [formerly f13c86bc3e]]
Former-commit-id: 50a1b270c5
Former-commit-id: 1d6e9816e0
2014-02-27 15:18:26 -06:00
Richard Peter
fb80617f10 Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: 19a4a52c38 [formerly 63da19f472] [formerly c267c5a08f] [formerly c267c5a08f [formerly 86d42ed603]] [formerly 862069dfd3 [formerly c267c5a08f [formerly 86d42ed603] [formerly 862069dfd3 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]]
Former-commit-id: 862069dfd3
Former-commit-id: bb8dbd96713298bfa5ca1f7f75f78402f4999166 [formerly 2ae63270ca0112aca619a0c7564fa8a1154ef4f9] [formerly 237ada7b8b [formerly c0d495d9c3]]
Former-commit-id: 237ada7b8b
Former-commit-id: 9f43d8e4b2
2014-02-27 13:46:47 -06:00
Richard Peter
09a0a14180 Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: a21f763dfa [formerly ae39697315] [formerly a23c8f2c27] [formerly a23c8f2c27 [formerly 729d608a15]] [formerly d54fee5dae [formerly a23c8f2c27 [formerly 729d608a15] [formerly d54fee5dae [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]]
Former-commit-id: d54fee5dae
Former-commit-id: 1a879575562ef1d74db4d48e7117ad375f8f0242 [formerly 08cbaa7fb54883ec7360be105a26ab8de2e57993] [formerly 67093287a0 [formerly 229437773b]]
Former-commit-id: 67093287a0
Former-commit-id: 3b09c69f65
2014-02-27 13:20:49 -06:00