Commit graph

4892 commits

Author SHA1 Message Date
Ben Steffensmeier
0b48d33f0b Issue #2791 Move D2D Grids to direct memory.
Former-commit-id: 6dc44e895f [formerly fd34cf3993] [formerly 12ed63619a] [formerly 6dc44e895f [formerly fd34cf3993] [formerly 12ed63619a] [formerly 775c29e77c [formerly 12ed63619a [formerly 8d8a06be12652349032f15ab1e31d5f23adf0b24]]]]
Former-commit-id: 775c29e77c
Former-commit-id: ceb056d304 [formerly 2bc8805fbc] [formerly e70e825d566372eb4b060f189bea9a1c2b022f0d [formerly a06a98750f]]
Former-commit-id: a89a30db3acd3cf5e17ecb35b2b039bc72f90b99 [formerly 3f62075baa]
Former-commit-id: ab265087eb
2014-03-05 14:57:28 -06:00
Richard Peter
9bacf68628 Merge "Issue #2791 Use Data Source for all grid data access." into development
Former-commit-id: 83b99aad5c [formerly 090829f75e] [formerly f87a913017] [formerly 83b99aad5c [formerly 090829f75e] [formerly f87a913017] [formerly 873fa00fac [formerly f87a913017 [formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]]]
Former-commit-id: 873fa00fac
Former-commit-id: 7e096adc4a [formerly 3a96d0758a] [formerly 31ea5b7bbf5848e0ada30ca517c3c6b17e7d4154 [formerly 2a5b0fb3ba]]
Former-commit-id: 20555b967806297585643060463c34a49a7adbb0 [formerly dfa3f06e8e]
Former-commit-id: 13bad4e99e
2014-03-04 12:43:17 -06:00
Nate Jensen
83bbb7c454 Merge "Issue #2870 log product id when generic packet fails to find corresponding packet class" into development
Former-commit-id: e74b0c2854 [formerly d0e405aac9] [formerly ea0248ff96] [formerly e74b0c2854 [formerly d0e405aac9] [formerly ea0248ff96] [formerly 4547cbcfea [formerly ea0248ff96 [formerly 51797cd167b76be2b3ab55b6c7632e0039d7145c]]]]
Former-commit-id: 4547cbcfea
Former-commit-id: fc953460b7 [formerly 2dba0228c2] [formerly 9e20fa9103fca3117e471be18adfb89e0f743437 [formerly 471492201c]]
Former-commit-id: 46fc821d91d7c735a7f7a67dd14aeb53d55cb2d8 [formerly f088ff8a4e]
Former-commit-id: 3baaa6e941
2014-03-04 12:39:13 -06:00
Richard Peter
0432201d65 Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development
Former-commit-id: 560d3ea59f [formerly 650f794329] [formerly bd94f6bf99] [formerly 560d3ea59f [formerly 650f794329] [formerly bd94f6bf99] [formerly 4fbb2f0059 [formerly bd94f6bf99 [formerly 12458982fe4c43a9b61e9194246c80527d02da6d]]]]
Former-commit-id: 4fbb2f0059
Former-commit-id: eb84b01b25 [formerly 58f05e288f] [formerly 5a213f229ea6ad72f4cd884b9d5a24db5f6d4023 [formerly 363e9e294f]]
Former-commit-id: b7e6d2d243f38ec344126b8f5d768567ef12fec1 [formerly 2aedbc961d]
Former-commit-id: 351998e947
2014-03-04 12:38:30 -06:00
Richard Peter
de546a29c1 Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development
Former-commit-id: f343b87101 [formerly 15c9066986] [formerly bc8b838a41] [formerly f343b87101 [formerly 15c9066986] [formerly bc8b838a41] [formerly 178bfc0b79 [formerly bc8b838a41 [formerly 234b6b7010e6eb044fbf1fc4728a58dc5cb84c8e]]]]
Former-commit-id: 178bfc0b79
Former-commit-id: 58e8cc7dd3 [formerly b3c2df969a] [formerly a0e4b52a5d8449aeb28040899d5f6f7c762141e4 [formerly e350b5bae1]]
Former-commit-id: a5bcbd30fbabf71de65110f449840c0ef62526e5 [formerly 000c577656]
Former-commit-id: 588b95db5c
2014-03-04 12:38:07 -06:00
Nate Jensen
3c67e87a9d Issue #2870 log product id when generic packet fails to find
corresponding packet class

Change-Id: I839e622b063eae4e707f9abc31f010ef795bc9f1

Former-commit-id: 02a7daf658 [formerly ef05ddc408] [formerly a1caeae552] [formerly 02a7daf658 [formerly ef05ddc408] [formerly a1caeae552] [formerly 6818ea9c23 [formerly a1caeae552 [formerly 0d01b387e454f276d0ebdecfb14ad294b67a55b7]]]]
Former-commit-id: 6818ea9c23
Former-commit-id: c8f3303317 [formerly b095d91c92] [formerly 147db2f60cd783078998957a4fefc35f48373315 [formerly 552a2af0b9]]
Former-commit-id: 649d94632ba158d384135559674876992cb43872 [formerly 6139ef3461]
Former-commit-id: c183d7bd51
2014-03-04 11:52:34 -06:00
Nate Jensen
58e0eac1ba Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development
Former-commit-id: 6389e2fb02 [formerly 92e8393915] [formerly 3afd14e1eb] [formerly 6389e2fb02 [formerly 92e8393915] [formerly 3afd14e1eb] [formerly 9b94434a78 [formerly 3afd14e1eb [formerly eb07c44098abe7f72b578e24a4a7ea7e92dc655c]]]]
Former-commit-id: 9b94434a78
Former-commit-id: be64298394 [formerly c58926d598] [formerly 813a67cfd0eabada60dcb3b8d68f61ef21cd4c70 [formerly 93da8c2075]]
Former-commit-id: 558594ea25630ed22d18a2569d571a598ec72d53 [formerly cd17f7b63f]
Former-commit-id: 0ee8c9e58a
2014-03-04 11:42:51 -06:00
Nate Jensen
af047be03c 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: b0e727938b [formerly 75611f0631] [formerly f50a2789dd] [formerly b0e727938b [formerly 75611f0631] [formerly f50a2789dd] [formerly 7ac7dd5f01 [formerly f50a2789dd [formerly 788133c5ea1a3005ed309a466e8cafad6db84ce3]]]]
Former-commit-id: 7ac7dd5f01
Former-commit-id: b3a4e1d562 [formerly 44e9b34927] [formerly 9ffb218b0f72703775dd6d2766c567fee092b78a [formerly a2b3bc717e]]
Former-commit-id: 87a0bdce28aac08b5040af41b1ac94bb28c275ad [formerly cb9d2a3298]
Former-commit-id: 1d27417675
2014-03-04 10:55:05 -06:00
Max Schenkelberg
7c66cf792b 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: dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: d85fd52c26 [formerly 39e1c4fa46] [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2 [formerly 654da3c0a2]]
Former-commit-id: 22a289abbef9ce66bd6d9f68b9610a2b65dc9258 [formerly f509321134]
Former-commit-id: c6cf08db73
2014-03-04 09:23:36 -06:00
Max Schenkelberg
bee18f29d0 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: 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 1854bbb477 [formerly dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]]
Former-commit-id: 1854bbb477
Former-commit-id: c37910a689 [formerly bff80c3ee9] [formerly 64e66813ccc56d3b7a703a331fd119c8cbcceb08 [formerly 6658c94e6e]]
Former-commit-id: ac56a95b831199d75f4f7799c88a6cd9f119118f [formerly 96bdc00728]
Former-commit-id: 83103254e7
2014-03-03 17:59:48 -06:00
Bryan Kowal
5aeecb8668 Issue #2829 - fix the spelling of 'coordinate' in GfeUtil
Former-commit-id: 5ded2afc7b [formerly 83471b4900] [formerly e6ae710871] [formerly 5ded2afc7b [formerly 83471b4900] [formerly e6ae710871] [formerly 56e79f2179 [formerly e6ae710871 [formerly a06c8efe8b316359cfb0d4feaa7ea8f36e4122e7]]]]
Former-commit-id: 56e79f2179
Former-commit-id: b5840bb880 [formerly 3c42fa358e] [formerly 25690eebf00737ce2c3db1b4cd9bff6a9a40ab7f [formerly eda1dc4142]]
Former-commit-id: f639aaed1d50293e626eefeaa33fcb6cdada48fa [formerly 832aca28ee]
Former-commit-id: 34c1a79ec8
2014-03-03 17:45:09 -06:00
Ben Steffensmeier
31cc3a237b Issue #2673 Add ability to query only ref times to Data Access Layer.
Former-commit-id: 2807ec9b07 [formerly 2230164e1f] [formerly 641d4acd15] [formerly 2807ec9b07 [formerly 2230164e1f] [formerly 641d4acd15] [formerly 9fcb730858 [formerly 641d4acd15 [formerly 37c406a9945bfb6ccb99d2472b44d649f2ce18d0]]]]
Former-commit-id: 9fcb730858
Former-commit-id: 3613b62fe1 [formerly b9b5068329] [formerly 614b30500251a3eee6fb9711755f92aabf706b56 [formerly 1d2d1e20f5]]
Former-commit-id: 48d6ac2942a8a7ef98a1259ca7320bedf1f46da9 [formerly 4f01f96cf4]
Former-commit-id: 9d757d79e2
2014-03-03 17:44:11 -06:00
Nate Jensen
6a958c0c14 Merge "Issue #2667 delta scripts for lightning source name change in xml files" into development
Former-commit-id: b95e0e98b8 [formerly 36f5a3e788] [formerly b9e4d40066] [formerly b95e0e98b8 [formerly 36f5a3e788] [formerly b9e4d40066] [formerly 315b7abf28 [formerly b9e4d40066 [formerly 2376124f601e97cf46ee8cb3281c326e178aab4d]]]]
Former-commit-id: 315b7abf28
Former-commit-id: 3bf88e9264 [formerly 64c9de836d] [formerly 96b8732a8c2d1aa94355db001efc5b33ad12027a [formerly 5cc5a59f2e]]
Former-commit-id: c7196a2ee229cdec7f6502ea7219efcc286d1edf [formerly a69546725c]
Former-commit-id: ffc65bdbb0
2014-03-03 17:25:34 -06:00
Nate Jensen
c0d28f5244 Merge "Issue #2792 enforce getDensity() will not return above max" into development
Former-commit-id: 5bd1713038 [formerly f38b4e42ba] [formerly bb9993e580] [formerly 5bd1713038 [formerly f38b4e42ba] [formerly bb9993e580] [formerly 2009972a2c [formerly bb9993e580 [formerly 7c04864c902d3928165ea0bc107902b094209ed6]]]]
Former-commit-id: 2009972a2c
Former-commit-id: 0b58ee20ee [formerly 4df4a2361f] [formerly ea309ef204e8674084ebbdc87d531d69e0897f5c [formerly cf960bace3]]
Former-commit-id: 871c5928c9785e6b9879ca5996aee12a3eef627f [formerly 8045bbfc16]
Former-commit-id: aeb07db59f
2014-03-03 16:30:49 -06:00
Brian Clements
bdac947397 Issue #2667 delta scripts for lightning source name change in xml files
handles stored procedures/bundles in localization


Former-commit-id: 93c743267d [formerly cc50637346] [formerly 0811b0580f] [formerly 93c743267d [formerly cc50637346] [formerly 0811b0580f] [formerly ddcb1011bb [formerly 0811b0580f [formerly 8e3e3be372d5db6dfc5897407074bc250fbef294]]]]
Former-commit-id: ddcb1011bb
Former-commit-id: 6271ff6787 [formerly bf67bd0a33] [formerly 79db5b1fb34b532032174280c117b71cb066eb86 [formerly 0292707f9d]]
Former-commit-id: 2386532c8555732d8aede43df568d8d6d3812eb3 [formerly c700bba545]
Former-commit-id: 9a8ad193c2
2014-03-03 16:30:45 -06:00
Nate Jensen
2e1a432bfc Merge "Issue #2756 install script for collaboration http server" into development
Former-commit-id: 6ca8416898 [formerly e74625dcca] [formerly 2a83780be8] [formerly 6ca8416898 [formerly e74625dcca] [formerly 2a83780be8] [formerly 352a884b26 [formerly 2a83780be8 [formerly d3d0173f7b5353256c1592b2b16cccd04ee98eff]]]]
Former-commit-id: 352a884b26
Former-commit-id: 18b2556559 [formerly 18cd324d92] [formerly cc7496d2b9cf8e9947481a520709cc8cec4462e8 [formerly d9cfafa4cd]]
Former-commit-id: fed02d3de0dfc12a0b73390d3fd4826cdd865771 [formerly 6e18253972]
Former-commit-id: 226f506a0e
2014-03-03 15:50:35 -06:00
Nate Jensen
662883bd88 Issue #2792 enforce getDensity() will not return above max
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1

Former-commit-id: 0044c21ad5 [formerly 7f31e34dc9] [formerly 384b531d26] [formerly 0044c21ad5 [formerly 7f31e34dc9] [formerly 384b531d26] [formerly 22153d43bb [formerly 384b531d26 [formerly a502a64219e869401b1bff82fbb73e67565a6dae]]]]
Former-commit-id: 22153d43bb
Former-commit-id: 47deb8f80c [formerly e40fbf0ba0] [formerly 8163999a8004a10d68d6b96b3ec92494a440eed2 [formerly 58c9dc0c69]]
Former-commit-id: c5c84333b34bdec81881012dcde557968d4e96f1 [formerly 6f488f855f]
Former-commit-id: 224fd09dab
2014-03-03 14:44:16 -06:00
Brian Clements
08c686bfa7 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: 769ee18145 [formerly a738448825] [formerly 3b6121b9fa] [formerly 769ee18145 [formerly a738448825] [formerly 3b6121b9fa] [formerly 934ce73e4b [formerly 3b6121b9fa [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]]]
Former-commit-id: 934ce73e4b
Former-commit-id: 11b30001d5 [formerly 75c179b06f] [formerly 066c81f999fa0b82f0f2cf806a4411393bd5ac3c [formerly a44c5f8d48]]
Former-commit-id: 0e0bd6fdd76a9a44b31ab23824202bfa97b827e6 [formerly a36f303646]
Former-commit-id: 861716341a
2014-03-03 14:07:01 -06:00
Brian Clements
dbb33ceac2 Issue #2667 fixed bin lightning menus
the column name for the source of the lightning data was changed


Former-commit-id: dedd9e80ed [formerly 5d21675a91] [formerly 91936beadf] [formerly dedd9e80ed [formerly 5d21675a91] [formerly 91936beadf] [formerly 7a7d476899 [formerly 91936beadf [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]]]
Former-commit-id: 7a7d476899
Former-commit-id: 472d08d2ad [formerly bf4c119278] [formerly dbc2261d04afbbeaa80308981a4752188bec6977 [formerly 724bafd44f]]
Former-commit-id: fcbaab390c314bd0db75b372cf855bd45a12a942 [formerly dc8667011b]
Former-commit-id: 44fdea985e
2014-03-03 13:17:05 -06:00
Nate Jensen
6420b2ac78 Merge "Issue #2756 implemented HTTP public key auth scheme" into development
Former-commit-id: cce23732cd [formerly c15f9950a1] [formerly 99fd81f105] [formerly cce23732cd [formerly c15f9950a1] [formerly 99fd81f105] [formerly 869909cc66 [formerly 99fd81f105 [formerly 21d22f790f71941797a23926be5ed77c6d72353b]]]]
Former-commit-id: 869909cc66
Former-commit-id: 46db8b9eb6 [formerly a035269bb3] [formerly 06cfe594234666c6d35b1f16214f065f5a9a2f18 [formerly 19a252d820]]
Former-commit-id: 76642c3ec87a32c87ffd3ed75be94afd11ef1d12 [formerly 76318d62e8]
Former-commit-id: 6ec6ce6b17
2014-03-03 09:44:26 -06:00
Dave Hladky
50a6b4364c Issue #2713 Update path for MADIS-Harvester.xml
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788

Former-commit-id: afef25c604 [formerly fb2cfff4d2] [formerly 92d677141f] [formerly afef25c604 [formerly fb2cfff4d2] [formerly 92d677141f] [formerly d40107e530 [formerly 92d677141f [formerly f6e63a5d65a5450eb58e59833091b41ef4bf0a3f]]]]
Former-commit-id: d40107e530
Former-commit-id: b39450bcd2 [formerly dd3501ae41] [formerly 758b85a458cc5427609844effdd15c25ff39ee6d [formerly 06d41ccafa]]
Former-commit-id: 55ca7aac9f711727703959425f270f4e46bf36b8 [formerly ee818ff96b]
Former-commit-id: f03f0f9092
2014-03-03 08:46:37 -06:00
Ben Steffensmeier
c8bb28c753 Issue #2791 Use Data Source for all grid data access.
Former-commit-id: 16b6723cbb [formerly 02cef4ddaa] [formerly 6fa441396f] [formerly 16b6723cbb [formerly 02cef4ddaa] [formerly 6fa441396f] [formerly 05770129c1 [formerly 6fa441396f [formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]]]
Former-commit-id: 05770129c1
Former-commit-id: 374ad2c1e8 [formerly 72b117cf42] [formerly bc40fd62dff2b342470d96a6441fc6239af6c193 [formerly 4094ef6170]]
Former-commit-id: bdf87913f359fbfcf11e0a003cf174b9addc76f9 [formerly c6f1b922b2]
Former-commit-id: a19e960342
2014-02-28 17:06:33 -06:00
Brian Clements
e9604a9700 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: fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]]
Former-commit-id: d8e283e1b4
Former-commit-id: 43c19f09ba [formerly f56cbac9fb] [formerly effe9ab4a85983edf2b983ee5e4b964df8a78343 [formerly edd72cbde4]]
Former-commit-id: 667a1021c89300b5befe11701d18fc1d06fbb6bb [formerly 6d4abdc37c]
Former-commit-id: f00f8eb1d9
2014-02-28 16:15:17 -06:00
Brian Clements
995852cba5 Issue #2667 fixed microseconds floating point error
time ranges now take any extra microseconds as separate argument


Former-commit-id: d26e54bff3 [formerly b9bab34f7f] [formerly 5b4c234b48] [formerly d26e54bff3 [formerly b9bab34f7f] [formerly 5b4c234b48] [formerly fdf3e42cb7 [formerly 5b4c234b48 [formerly 24d9440e440b74f6b1b907062b10da0fef268aed]]]]
Former-commit-id: fdf3e42cb7
Former-commit-id: 6ef371e92d [formerly 0a2dffe600] [formerly 3e33767957989fe7bef67615c3feebaa13ee69c5 [formerly cecff40a47]]
Former-commit-id: d187c2a57bc70c24df6c7e9c1803898563d09812 [formerly e8e545f05a]
Former-commit-id: 78782d97c2
2014-02-28 15:47:20 -06:00
Nate Jensen
b2859ba495 Merge "Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception" into development
Former-commit-id: 15cbcdcbff [formerly 2557ffe8c3] [formerly 47255ea9ad] [formerly 15cbcdcbff [formerly 2557ffe8c3] [formerly 47255ea9ad] [formerly 45e8290111 [formerly 47255ea9ad [formerly 4ad72fcdc6cdccfce9f14808bdbcba5fa63d28ac]]]]
Former-commit-id: 45e8290111
Former-commit-id: cced1d17c5 [formerly 988249c4d8] [formerly faaad66bd2ab6b8c2729152ba1bb0b3e77069a4e [formerly 6d41fc9fd2]]
Former-commit-id: d1da787838b5c47b3c864eca5eea18ac8d2220fe [formerly aa28135a16]
Former-commit-id: da3ac6ab07
2014-02-28 14:02:33 -06:00
Nate Jensen
17e33458d0 Merge "Issue #2638 wrote java utility for generating list of data URIs and their field names" into development
Former-commit-id: 28ccecc515 [formerly 420a30cddc] [formerly 135bb70a38] [formerly 28ccecc515 [formerly 420a30cddc] [formerly 135bb70a38] [formerly f21e9eb889 [formerly 135bb70a38 [formerly f7da1e27eca42ff822eeccf5a4a4bb56c77eb868]]]]
Former-commit-id: f21e9eb889
Former-commit-id: 778d6540f7 [formerly 403a8611c5] [formerly f0f85d0571b8d99ff0283fed753ee0778365a7f5 [formerly 67a7197f59]]
Former-commit-id: 38918599b02ac41a94645b5b68c05f846806643e [formerly 636cb1b4c1]
Former-commit-id: 58b4cdebad
2014-02-28 14:02:22 -06:00
Lee Venable
ba565d1d35 Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
Former-commit-id: 4631a29ca3 [formerly 40f3df6aff] [formerly f171e3adb0] [formerly 4631a29ca3 [formerly 40f3df6aff] [formerly f171e3adb0] [formerly c77634951c [formerly f171e3adb0 [formerly 1a72af70658f288d43e397d12499de1a08ff2ba8]]]]
Former-commit-id: c77634951c
Former-commit-id: 639f66e8b2 [formerly 67f7d52f74] [formerly 2fb1bf66c74a373156ea360fd8e8e80b7e7e7b74 [formerly 734f69403a]]
Former-commit-id: 7099b3f18e114b9e5e6354c85499d065bd3bc5df [formerly 7bbedd6edd]
Former-commit-id: 1ffa59cf4f
2014-02-28 13:50:15 -06:00
Mike Duff
60c471f48e Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 512e634a97 [formerly 377c1f9998] [formerly 5440ff64d1] [formerly 512e634a97 [formerly 377c1f9998] [formerly 5440ff64d1] [formerly 5f433b4f6b [formerly 5440ff64d1 [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 6c5c943a5e [formerly 63fc5f8c66] [formerly 0494775290c2982f78ac45adef680a21db012453 [formerly ee06fc58b5]]
Former-commit-id: 7a26eed4e3d8caf57b1f136686d6c69b9947d11a [formerly 02fa0d3c59]
Former-commit-id: 6c60255b75
2014-02-28 13:23:34 -06:00
Richard Peter
b8010ec1f1 Merge "Issue #2791 Switch contouring to use DataSource for data access." into development
Former-commit-id: 39cf8178ff [formerly 18ec1e12ae] [formerly 5565bc88af] [formerly 39cf8178ff [formerly 18ec1e12ae] [formerly 5565bc88af] [formerly d5e09a82a7 [formerly 5565bc88af [formerly 029efeddc9a20b10f8991976be5640bff2e14cfc]]]]
Former-commit-id: d5e09a82a7
Former-commit-id: feb0543e0e [formerly e4dc3ea6cf] [formerly b053fcbd2fdae8ed288d71313c48f36099ef20df [formerly f5c3e5d549]]
Former-commit-id: 44e7f02333d47299729bb21c7e7b7e49f8a0dbbc [formerly d736455a8a]
Former-commit-id: 34e2ab0d43
2014-02-28 11:52:51 -06:00
Ben Steffensmeier
19f976b1d3 Issue #2791 Switch contouring to use DataSource for data access.
Former-commit-id: 7c8332a30f [formerly fbf6371c8e] [formerly 4b7f3b2a5b] [formerly 7c8332a30f [formerly fbf6371c8e] [formerly 4b7f3b2a5b] [formerly 23ce77d864 [formerly 4b7f3b2a5b [formerly 6c90be7554bcbbf0aeb363b6e76c455d3896be83]]]]
Former-commit-id: 23ce77d864
Former-commit-id: b747a91eaa [formerly 278ef9f0d4] [formerly 527028ea9c54386652ea6e4a25326acedb61a15d [formerly a7787a7ff2]]
Former-commit-id: 53b3adff68d425a61d02a8ceaf904f17b0aa8efa [formerly c0c017e451]
Former-commit-id: 118991ec22
2014-02-28 11:28:02 -06:00
Dave Hladky
5b09ce0e02 Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception
Former-commit-id: fcd9f02b5c [formerly 8bddfa77ce] [formerly fd85324076] [formerly fcd9f02b5c [formerly 8bddfa77ce] [formerly fd85324076] [formerly 7399b10778 [formerly fd85324076 [formerly 137c6f8848715ee1acaaa2be943c053437902a8c]]]]
Former-commit-id: 7399b10778
Former-commit-id: c15437bff8 [formerly d9a0f99bb5] [formerly c6da2ffbb885334fdece65551dc7f61d9bcab9c0 [formerly 62156a1ba5]]
Former-commit-id: 01b5f219fe2a311b750e13d618e59ed11b2f8bfb [formerly b5b9e295fb]
Former-commit-id: 5d37ad762d
2014-02-28 11:07:15 -06:00
Brad Gonzales
1412bf249d 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: bdadb0266b [formerly f87d4ccf82] [formerly a007ffabf9] [formerly bdadb0266b [formerly f87d4ccf82] [formerly a007ffabf9] [formerly 50209c2084 [formerly a007ffabf9 [formerly 5ea4e87d10d335d85547b147228244892772a98f]]]]
Former-commit-id: 50209c2084
Former-commit-id: 0c02861e4e [formerly b9affa3c02] [formerly aa3ee588d04acaa851780f26f198fcd5053004bf [formerly bf3a9ef7fe]]
Former-commit-id: 44ac3f38c805b8effdacbbd35e22bafc74214f18 [formerly 6f32b5cc59]
Former-commit-id: b428cf44ca
2014-02-28 10:15:18 -06:00
Nate Jensen
7d45344d05 Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: 3153786b6f [formerly b40f5477b4] [formerly 63244f840f] [formerly 3153786b6f [formerly b40f5477b4] [formerly 63244f840f] [formerly 908d308825 [formerly 63244f840f [formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]]
Former-commit-id: 908d308825
Former-commit-id: 7ab7887199 [formerly fb68c4c07f] [formerly f763c6864aae7276537781234c118f3f876d018c [formerly 92527f1ffa]]
Former-commit-id: d76199bbbc5e0ea0744302003f49e6eeedb80d16 [formerly f0bb217f04]
Former-commit-id: 4e66e5bcc5
2014-02-28 09:53:27 -06:00
Richard Peter
b1546c7cc5 Merge "Issue #2838 Archive binary feeder creation." into development
Former-commit-id: ddc733fda6 [formerly 944ea7936c] [formerly 952669fc38] [formerly ddc733fda6 [formerly 944ea7936c] [formerly 952669fc38] [formerly 475557d4c8 [formerly 952669fc38 [formerly c8ab23e68f870a6fc46171b9076e09689bc1b5bb]]]]
Former-commit-id: 475557d4c8
Former-commit-id: 61be7a7225 [formerly 67a6ef4bd8] [formerly 3e47cae010b1d02395c7d662563fa5fddde5e973 [formerly 1d51a87e86]]
Former-commit-id: f78a4f05cb510f0fa86967f4944e7d59be253cf2 [formerly db1e7f8f48]
Former-commit-id: 1103fb5eff
2014-02-27 17:36:56 -06:00
Nate Jensen
879743ba05 Issue #2638 wrote java utility for generating list of data URIs and
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

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

Former-commit-id: f84150e7a0 [formerly 73ed932660] [formerly 2135663934] [formerly f84150e7a0 [formerly 73ed932660] [formerly 2135663934] [formerly 45160326aa [formerly 2135663934 [formerly 9ef72acfce925dfcfc0df07e7ca5fb558b54d934]]]]
Former-commit-id: 45160326aa
Former-commit-id: 78cafe46d5 [formerly 003f028176] [formerly 198c4e59dcbb38b466db464ed3ce8ffb0ea02484 [formerly 90e6558083]]
Former-commit-id: 5c8f4af5de6c86b4d6558f7730d51d7fc3919371 [formerly b6dbc7f605]
Former-commit-id: 562245f2af
2014-02-27 16:34:53 -06:00
Richard Peter
ef2ff1d0f7 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: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0 [formerly 50a1b270c5] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649]
Former-commit-id: 5fab51d41b
2014-02-27 15:18:26 -06:00
Richard Peter
7f36cf564b Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: 63da19f472 [formerly c267c5a08f] [formerly 86d42ed603] [formerly 63da19f472 [formerly c267c5a08f] [formerly 86d42ed603] [formerly 862069dfd3 [formerly 86d42ed603 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]]
Former-commit-id: 862069dfd3
Former-commit-id: 9f43d8e4b2 [formerly 237ada7b8b] [formerly 2ae63270ca0112aca619a0c7564fa8a1154ef4f9 [formerly c0d495d9c3]]
Former-commit-id: 1a965b16ce71e4ece17a9ac8efbc506a1d823b59 [formerly 9489565efb]
Former-commit-id: 68eade49a2
2014-02-27 13:46:47 -06:00
Richard Peter
0f7ab600e6 Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: ae39697315 [formerly a23c8f2c27] [formerly 729d608a15] [formerly ae39697315 [formerly a23c8f2c27] [formerly 729d608a15] [formerly d54fee5dae [formerly 729d608a15 [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]]
Former-commit-id: d54fee5dae
Former-commit-id: 3b09c69f65 [formerly 67093287a0] [formerly 08cbaa7fb54883ec7360be105a26ab8de2e57993 [formerly 229437773b]]
Former-commit-id: c9048aab5203dfd97a994e794f6e95e3997674d5 [formerly 9ca22fce7f]
Former-commit-id: 8d35f1ce5f
2014-02-27 13:20:49 -06:00
Steve Harris
078b2d659b Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 26959b4fbb [formerly 182c16067c] [formerly 5218a4d1e6] [formerly 26959b4fbb [formerly 182c16067c] [formerly 5218a4d1e6] [formerly 99f53876d7 [formerly 5218a4d1e6 [formerly 2f2339f4c12e1862d27a8dda65264f353aed6ac6]]]]
Former-commit-id: 99f53876d7
Former-commit-id: 01c53daa79 [formerly b8afc0e5f7] [formerly c886e6144ad2cced9b56124b623107c6b77c407f [formerly 0d9abc724c]]
Former-commit-id: dbca9ddc73bb956eca322153c5567ad2d57caa2b [formerly 1c547c6a96]
Former-commit-id: 40e335fdf7
2014-02-27 10:02:43 -06:00
Nate Jensen
e00bb786ce Merge "Issue #2312 Fix file dialog input on export image dialog." into development
Former-commit-id: 6e94f1dbbf [formerly 414cc002b1] [formerly 71d494eb34] [formerly 6e94f1dbbf [formerly 414cc002b1] [formerly 71d494eb34] [formerly d1ec11d932 [formerly 71d494eb34 [formerly 4c4325675377cd170468a0c3dbe4632f5330227e]]]]
Former-commit-id: d1ec11d932
Former-commit-id: b13f098262 [formerly 80ef0dc055] [formerly 91dfb6da3c8d39b1c96ec2b8fcbe4d9047893d20 [formerly 9a39867de4]]
Former-commit-id: 89d71e83dded30277253cca70c8d0589ff95d762 [formerly ee788777ad]
Former-commit-id: 445fd40303
2014-02-27 09:10:07 -06:00
Roger Ferrel
a47b877f44 Issue #2838 Archive binary feeder creation.
Change-Id: I4e431d62e3d27565af75d52012fe042a18fd1f9c

Former-commit-id: 98bd4174d3 [formerly ac03675880] [formerly 9b7715e5e0] [formerly 98bd4174d3 [formerly ac03675880] [formerly 9b7715e5e0] [formerly 995d962a66 [formerly 9b7715e5e0 [formerly 16c38960863df2f993c6ee7e18de31824cbdbb08]]]]
Former-commit-id: 995d962a66
Former-commit-id: 592bbd8241 [formerly dae52ad3a0] [formerly 8b2aa969d1f1fe5980fc422623cca4e71e6d36fc [formerly 03843090fa]]
Former-commit-id: 78ebd5a1d7d77f8dc49f5bbc17e2c05c508f1e9d [formerly 40369d124f]
Former-commit-id: 1b29ee087f
2014-02-27 07:45:40 -06:00
Lee Venable
b9455bcd94 Issue #2795 - added code to check for null images.
Former-commit-id: 191ca5f9ca [formerly 5546b537cf] [formerly 0c7395d423] [formerly 191ca5f9ca [formerly 5546b537cf] [formerly 0c7395d423] [formerly 49530206f4 [formerly 0c7395d423 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]]]
Former-commit-id: 49530206f4
Former-commit-id: da795bce98 [formerly 35f6f35186] [formerly 3612dfd65a9bb45c3bd962d6f9fe927cf481321f [formerly facc67e6b5]]
Former-commit-id: c2f13c1ac7e77c67d20701ab555a5c3013497418 [formerly 3932c3f02f]
Former-commit-id: 54fa6c12b3
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
b4f8468f87 Issue #2711 Use level factory more.
Former-commit-id: 3d9b435262 [formerly 1069ef8d67] [formerly d7a3ae4fdb] [formerly 3d9b435262 [formerly 1069ef8d67] [formerly d7a3ae4fdb] [formerly 3da086b71f [formerly d7a3ae4fdb [formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]]]
Former-commit-id: 3da086b71f
Former-commit-id: 4d1276def2 [formerly 29f9a87085] [formerly 81be956862611f9499f1e2716026d69eacf91f27 [formerly f45646ae91]]
Former-commit-id: ac87ec8ef2e20c2296cc8f89005a894dbccc5be1 [formerly 3a5f655ea4]
Former-commit-id: 0dd62678f2
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
b830f753bb Issue #2312 Fix file dialog input on export image dialog.
Former-commit-id: ee8f345cb2 [formerly 2fd8351874] [formerly e1dc75f97a] [formerly ee8f345cb2 [formerly 2fd8351874] [formerly e1dc75f97a] [formerly 6d0a78e233 [formerly e1dc75f97a [formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]]]
Former-commit-id: 6d0a78e233
Former-commit-id: 88fd930b77 [formerly 058652febe] [formerly 33d269bf45b5c7555173d073fc5eeb1dc2b0f237 [formerly 2d11421854]]
Former-commit-id: 81b2f08a2787faa302dad147e59e1ded781e0f34 [formerly 542c8ae3a1]
Former-commit-id: 5fd6a533b8
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
0de5a55243 Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: fa6dcaac84 [formerly 2425b9665c] [formerly d8bfdd1a7e] [formerly fa6dcaac84 [formerly 2425b9665c] [formerly d8bfdd1a7e] [formerly 07bc9f075f [formerly d8bfdd1a7e [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 66b052cd5a [formerly 0fde78c595] [formerly 21789a864d2ed6b3a1c15882fe3f817dac2fd3f7 [formerly 804cbb48e6]]
Former-commit-id: e3dfae5839ecf10e3241d25f087585ecf760940a [formerly 6843396c78]
Former-commit-id: d899433612
2014-02-26 14:45:19 -06:00
Lee Venable
b7ad39dab9 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
Former-commit-id: d74b2c0118 [formerly bb4b034375] [formerly 94cede8153] [formerly d74b2c0118 [formerly bb4b034375] [formerly 94cede8153] [formerly e0ee93bab3 [formerly 94cede8153 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]]
Former-commit-id: e0ee93bab3
Former-commit-id: de2bff4d95 [formerly 91d419662c] [formerly 08d8e41d0aefbc0220f2fd973374918a413db9bb [formerly e0fbc02307]]
Former-commit-id: 1802d5e972cbe43fc2263ca2317ab3d366a9edb6 [formerly 316ba53e74]
Former-commit-id: 8d49130542
2014-02-26 13:21:58 -06:00
Lee Venable
7972b72561 Merge "Issue #2652. Fixed issue with edex-text-ingest log." into development
Former-commit-id: 7bdf0b7396 [formerly f58481dc6a] [formerly 72f71bc000] [formerly 7bdf0b7396 [formerly f58481dc6a] [formerly 72f71bc000] [formerly 34191dc3dc [formerly 72f71bc000 [formerly 0d1df7da4612a71195b4850b88b716f0d03acfe8]]]]
Former-commit-id: 34191dc3dc
Former-commit-id: 715c69bd2a [formerly f2db331c8e] [formerly 256d29e07a25ae3241087bae47151c23f8e56c06 [formerly b4b6cb655e]]
Former-commit-id: f9b00185019f0cedee890ed8077158507020714a [formerly 23c2014393]
Former-commit-id: 19e67bdb0c
2014-02-25 15:53:14 -06:00
Brad Gonzales
a1a34a3558 Issue #2683 for java 1.7.0_51, added jdk-7u51-linux-i586.tar.gz and jdk-7u51-linux-x64.tar.gz
and removed jdk-7u40-linux-i586.tar.gz jdk-7u40-linux-x64.tar.gz.  Updated the component.spec to the new version number.

Change-Id: I383d78b6b52a2e196aa01f81e157a4d49fd11ba3

Former-commit-id: e31b98bb85 [formerly 40a653867a] [formerly 4ccfe4f3c0] [formerly e31b98bb85 [formerly 40a653867a] [formerly 4ccfe4f3c0] [formerly cf9c22ac99 [formerly 4ccfe4f3c0 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]]]]
Former-commit-id: cf9c22ac99
Former-commit-id: 7c0db7ac7a [formerly 1df77529c3] [formerly ba481e4a842a84fed85e94eea66cb8cabf458c52 [formerly a24cbaf683]]
Former-commit-id: 6b6559f6e56e17a95bf05ea409272e339f0bdebd [formerly 3780b24792]
Former-commit-id: d1ef377ec0
2014-02-25 14:42:59 -06:00