xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4898 commits 31 branches 40 tags 3.8 GiB
Commit graph

4898 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mike Duff
1c0d844dc2 Issue #2632 - Fix problem with multiple notifiers per user. 
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000

Former-commit-id: a670398424 [formerly 14107f0914] [formerly 8c693a5f70] [formerly 9963324b60 [formerly 8c693a5f70 [formerly 168a656194aa3b455f403aa92b290bbbe17d3b45]]]
Former-commit-id: 9963324b60
Former-commit-id: fd61ded4da051608ff2b758971fbc5bacbaca791 [formerly 3bdf20dea3]
Former-commit-id: 198d9e6780
 2014-03-05 12:02:33 -06:00
Brian Clements
f4a6d2a30d 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: 17661200a1 [formerly d76dd2a8f6] [formerly c0e4615967] [formerly c9906cde88 [formerly c0e4615967 [formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]]]
Former-commit-id: c9906cde88
Former-commit-id: 1d8422aecbe75d313717ff186a0a87becafd9906 [formerly d06182573e]
Former-commit-id: 3d4323b447
 2014-03-05 09:00:57 -06:00
Richard Peter
e188d13ce1 Merge "Issue #2627 harden static initialization on edex main thread" into development 
Former-commit-id: 2be140c0c4 [formerly fdba3b3099] [formerly 7c02ab6b66] [formerly 6b08aaf55c [formerly 7c02ab6b66 [formerly 82f20a96a82ef7f047f716662d319e522ee1c394]]]
Former-commit-id: 6b08aaf55c
Former-commit-id: 492f316506c2780dd12c817c21369a49396beff4 [formerly c12b4fb4ea]
Former-commit-id: f6e1fc89de
 2014-03-04 17:54:09 -06:00
Nate Jensen
0122afaf40 Issue #2627 harden static initialization on edex main thread 
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff

Former-commit-id: e458ca5c52 [formerly 99254281af] [formerly b989b7240c] [formerly 660998ac72 [formerly b989b7240c [formerly bb838950a2979703ae6ab8f486fc4460789c3f1b]]]
Former-commit-id: 660998ac72
Former-commit-id: 7ec8c1c2768c7da3e60681607289e7157433c1ad [formerly 81a6675a14]
Former-commit-id: fadd59b36d
 2014-03-04 17:19:24 -06:00
Brian Clements
19bb5d8de9 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: 2482a58273 [formerly cd0e1e271a] [formerly 7b085f62de] [formerly f44f1212dd [formerly 7b085f62de [formerly 1e52606fe709f2cf27f835363ca5ab2bf6ada912]]]
Former-commit-id: f44f1212dd
Former-commit-id: c63989e0c0ae952f12584b6484f4cc133f757e99 [formerly 0790849f03]
Former-commit-id: c446513912
 2014-03-04 16:02:25 -06:00
Nate Jensen
12f218292c Merge "Issue #2832 fix watches and warnings in collaboration displays" into development 
Former-commit-id: 6b4d16b750 [formerly 8ebe236ce9] [formerly 67fa21cfd9] [formerly faf3dbb670 [formerly 67fa21cfd9 [formerly 27ce4812affb11b506a21b5cf54c4b74b8c49031]]]
Former-commit-id: faf3dbb670
Former-commit-id: b1b15434c34d3a515d2e371f1abe646a64b39293 [formerly ddf96ad45b]
Former-commit-id: 0b827a343b
 2014-03-04 13:59:01 -06:00
Nate Jensen
0094132846 Issue #2832 fix watches and warnings in collaboration displays 
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f

Former-commit-id: 41d80f6fce [formerly 559b1794af] [formerly e3d211c8d7] [formerly 3c3e483d18 [formerly e3d211c8d7 [formerly bb84ca01bb74bc93710ba92fcbdb13b30dc2454e]]]
Former-commit-id: 3c3e483d18
Former-commit-id: f48033e99ccba349f23f107d1871ca7961b89c90 [formerly 4c0df85caf]
Former-commit-id: e08b21fc40
 2014-03-04 13:18:16 -06:00
Richard Peter
7e096adc4a Merge "Issue #2791 Use Data Source for all grid data access." into development 
Former-commit-id: 83b99aad5c [formerly 090829f75e] [formerly f87a913017] [formerly 873fa00fac [formerly f87a913017 [formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]]
Former-commit-id: 873fa00fac
Former-commit-id: 31ea5b7bbf5848e0ada30ca517c3c6b17e7d4154 [formerly 2a5b0fb3ba]
Former-commit-id: 3a96d0758a
 2014-03-04 12:43:17 -06:00
Nate Jensen
fc953460b7 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 4547cbcfea [formerly ea0248ff96 [formerly 51797cd167b76be2b3ab55b6c7632e0039d7145c]]]
Former-commit-id: 4547cbcfea
Former-commit-id: 9e20fa9103fca3117e471be18adfb89e0f743437 [formerly 471492201c]
Former-commit-id: 2dba0228c2
 2014-03-04 12:39:13 -06:00
Richard Peter
eb84b01b25 Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development 
Former-commit-id: 560d3ea59f [formerly 650f794329] [formerly bd94f6bf99] [formerly 4fbb2f0059 [formerly bd94f6bf99 [formerly 12458982fe4c43a9b61e9194246c80527d02da6d]]]
Former-commit-id: 4fbb2f0059
Former-commit-id: 5a213f229ea6ad72f4cd884b9d5a24db5f6d4023 [formerly 363e9e294f]
Former-commit-id: 58f05e288f
 2014-03-04 12:38:30 -06:00
Richard Peter
58e8cc7dd3 Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development 
Former-commit-id: f343b87101 [formerly 15c9066986] [formerly bc8b838a41] [formerly 178bfc0b79 [formerly bc8b838a41 [formerly 234b6b7010e6eb044fbf1fc4728a58dc5cb84c8e]]]
Former-commit-id: 178bfc0b79
Former-commit-id: a0e4b52a5d8449aeb28040899d5f6f7c762141e4 [formerly e350b5bae1]
Former-commit-id: b3c2df969a
 2014-03-04 12:38:07 -06:00
Nate Jensen
c8f3303317 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 6818ea9c23 [formerly a1caeae552 [formerly 0d01b387e454f276d0ebdecfb14ad294b67a55b7]]]
Former-commit-id: 6818ea9c23
Former-commit-id: 147db2f60cd783078998957a4fefc35f48373315 [formerly 552a2af0b9]
Former-commit-id: b095d91c92
 2014-03-04 11:52:34 -06:00
Nate Jensen
be64298394 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 9b94434a78 [formerly 3afd14e1eb [formerly eb07c44098abe7f72b578e24a4a7ea7e92dc655c]]]
Former-commit-id: 9b94434a78
Former-commit-id: 813a67cfd0eabada60dcb3b8d68f61ef21cd4c70 [formerly 93da8c2075]
Former-commit-id: c58926d598
 2014-03-04 11:42:51 -06:00
Nate Jensen
b3a4e1d562 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 7ac7dd5f01 [formerly f50a2789dd [formerly 788133c5ea1a3005ed309a466e8cafad6db84ce3]]]
Former-commit-id: 7ac7dd5f01
Former-commit-id: 9ffb218b0f72703775dd6d2766c567fee092b78a [formerly a2b3bc717e]
Former-commit-id: 44e9b34927
 2014-03-04 10:55:05 -06:00
Max Schenkelberg
d85fd52c26 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 cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]
Former-commit-id: cbf8b9249c
Former-commit-id: d886f6a0f4f81e75f3b006fbf72cebc9033f58c2 [formerly 654da3c0a2]
Former-commit-id: 39e1c4fa46
 2014-03-04 09:23:36 -06:00
Max Schenkelberg
c37910a689 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 1854bbb477 [formerly dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]
Former-commit-id: 1854bbb477
Former-commit-id: 64e66813ccc56d3b7a703a331fd119c8cbcceb08 [formerly 6658c94e6e]
Former-commit-id: bff80c3ee9
 2014-03-03 17:59:48 -06:00
Bryan Kowal
b5840bb880 Issue #2829 - fix the spelling of 'coordinate' in GfeUtil 
Former-commit-id: 5ded2afc7b [formerly 83471b4900] [formerly e6ae710871] [formerly 56e79f2179 [formerly e6ae710871 [formerly a06c8efe8b316359cfb0d4feaa7ea8f36e4122e7]]]
Former-commit-id: 56e79f2179
Former-commit-id: 25690eebf00737ce2c3db1b4cd9bff6a9a40ab7f [formerly eda1dc4142]
Former-commit-id: 3c42fa358e
 2014-03-03 17:45:09 -06:00
Ben Steffensmeier
3613b62fe1 Issue #2673 Add ability to query only ref times to Data Access Layer. 
Former-commit-id: 2807ec9b07 [formerly 2230164e1f] [formerly 641d4acd15] [formerly 9fcb730858 [formerly 641d4acd15 [formerly 37c406a9945bfb6ccb99d2472b44d649f2ce18d0]]]
Former-commit-id: 9fcb730858
Former-commit-id: 614b30500251a3eee6fb9711755f92aabf706b56 [formerly 1d2d1e20f5]
Former-commit-id: b9b5068329
 2014-03-03 17:44:11 -06:00
Nate Jensen
3bf88e9264 Merge "Issue #2667 delta scripts for lightning source name change in xml files" into development 
Former-commit-id: b95e0e98b8 [formerly 36f5a3e788] [formerly b9e4d40066] [formerly 315b7abf28 [formerly b9e4d40066 [formerly 2376124f601e97cf46ee8cb3281c326e178aab4d]]]
Former-commit-id: 315b7abf28
Former-commit-id: 96b8732a8c2d1aa94355db001efc5b33ad12027a [formerly 5cc5a59f2e]
Former-commit-id: 64c9de836d
 2014-03-03 17:25:34 -06:00
Nate Jensen
0b58ee20ee Merge "Issue #2792 enforce getDensity() will not return above max" into development 
Former-commit-id: 5bd1713038 [formerly f38b4e42ba] [formerly 256a4c15679af35a3e96efa4ac5519defffdf419 [formerly bb9993e580]] [formerly 2009972a2c [formerly bb9993e580 [formerly 7c04864c902d3928165ea0bc107902b094209ed6]]]
Former-commit-id: 2009972a2c
Former-commit-id: ea309ef204e8674084ebbdc87d531d69e0897f5c [formerly cf960bace3]
Former-commit-id: 4df4a2361f
 2014-03-03 16:30:49 -06:00
Brian Clements
6271ff6787 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 ddcb1011bb [formerly 0811b0580f [formerly 8e3e3be372d5db6dfc5897407074bc250fbef294]]]
Former-commit-id: ddcb1011bb
Former-commit-id: 79db5b1fb34b532032174280c117b71cb066eb86 [formerly 0292707f9d]
Former-commit-id: bf67bd0a33
 2014-03-03 16:30:45 -06:00
Nate Jensen
18b2556559 Merge "Issue #2756 install script for collaboration http server" into development 
Former-commit-id: 6ca8416898 [formerly e74625dcca] [formerly 2a83780be8] [formerly 352a884b26 [formerly 2a83780be8 [formerly d3d0173f7b5353256c1592b2b16cccd04ee98eff]]]
Former-commit-id: 352a884b26
Former-commit-id: cc7496d2b9cf8e9947481a520709cc8cec4462e8 [formerly d9cfafa4cd]
Former-commit-id: 18cd324d92
 2014-03-03 15:50:35 -06:00
Nate Jensen
47deb8f80c Issue #2792 enforce getDensity() will not return above max 
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1

Former-commit-id: 0044c21ad5 [formerly 7f31e34dc9] [formerly 384b531d26] [formerly 22153d43bb [formerly 384b531d26 [formerly a502a64219e869401b1bff82fbb73e67565a6dae]]]
Former-commit-id: 22153d43bb
Former-commit-id: 8163999a8004a10d68d6b96b3ec92494a440eed2 [formerly 58c9dc0c69]
Former-commit-id: e40fbf0ba0
 2014-03-03 14:44:16 -06:00
Brian Clements
11b30001d5 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 443f420c0e6fc38c2a3fdd4e4aa68d8a8fb91db6 [formerly 3b6121b9fa]] [formerly 934ce73e4b [formerly 3b6121b9fa [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]]
Former-commit-id: 934ce73e4b
Former-commit-id: 066c81f999fa0b82f0f2cf806a4411393bd5ac3c [formerly a44c5f8d48]
Former-commit-id: 75c179b06f
 2014-03-03 14:07:01 -06:00
Brian Clements
472d08d2ad 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 7a7d476899 [formerly 91936beadf [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]]
Former-commit-id: 7a7d476899
Former-commit-id: dbc2261d04afbbeaa80308981a4752188bec6977 [formerly 724bafd44f]
Former-commit-id: bf4c119278
 2014-03-03 13:17:05 -06:00
Nate Jensen
46db8b9eb6 Merge "Issue #2756 implemented HTTP public key auth scheme" into development 
Former-commit-id: cce23732cd [formerly c15f9950a1] [formerly 99fd81f105] [formerly 869909cc66 [formerly 99fd81f105 [formerly 21d22f790f71941797a23926be5ed77c6d72353b]]]
Former-commit-id: 869909cc66
Former-commit-id: 06cfe594234666c6d35b1f16214f065f5a9a2f18 [formerly 19a252d820]
Former-commit-id: a035269bb3
 2014-03-03 09:44:26 -06:00
Dave Hladky
b39450bcd2 Issue #2713 Update path for MADIS-Harvester.xml 
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788

Former-commit-id: afef25c604 [formerly fb2cfff4d2] [formerly 92d677141f] [formerly d40107e530 [formerly 92d677141f [formerly f6e63a5d65a5450eb58e59833091b41ef4bf0a3f]]]
Former-commit-id: d40107e530
Former-commit-id: 758b85a458cc5427609844effdd15c25ff39ee6d [formerly 06d41ccafa]
Former-commit-id: dd3501ae41
 2014-03-03 08:46:37 -06:00
Ben Steffensmeier
374ad2c1e8 Issue #2791 Use Data Source for all grid data access. 
Former-commit-id: 16b6723cbb [formerly 02cef4ddaa] [formerly 6fa441396f] [formerly 05770129c1 [formerly 6fa441396f [formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]]
Former-commit-id: 05770129c1
Former-commit-id: bc40fd62dff2b342470d96a6441fc6239af6c193 [formerly 4094ef6170]
Former-commit-id: 72b117cf42
 2014-02-28 17:06:33 -06:00
Brian Clements
43c19f09ba 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 d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]
Former-commit-id: d8e283e1b4
Former-commit-id: effe9ab4a85983edf2b983ee5e4b964df8a78343 [formerly edd72cbde4]
Former-commit-id: f56cbac9fb
 2014-02-28 16:15:17 -06:00
Brian Clements
6ef371e92d 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 fdf3e42cb7 [formerly 5b4c234b48 [formerly 24d9440e440b74f6b1b907062b10da0fef268aed]]]
Former-commit-id: fdf3e42cb7
Former-commit-id: 3e33767957989fe7bef67615c3feebaa13ee69c5 [formerly cecff40a47]
Former-commit-id: 0a2dffe600
 2014-02-28 15:47:20 -06:00
Nate Jensen
cced1d17c5 Merge "Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception" into development 
Former-commit-id: 15cbcdcbff [formerly 2557ffe8c3] [formerly 47255ea9ad] [formerly 45e8290111 [formerly 47255ea9ad [formerly 4ad72fcdc6cdccfce9f14808bdbcba5fa63d28ac]]]
Former-commit-id: 45e8290111
Former-commit-id: faaad66bd2ab6b8c2729152ba1bb0b3e77069a4e [formerly 6d41fc9fd2]
Former-commit-id: 988249c4d8
 2014-02-28 14:02:33 -06:00
Nate Jensen
778d6540f7 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 f21e9eb889 [formerly 135bb70a38 [formerly f7da1e27eca42ff822eeccf5a4a4bb56c77eb868]]]
Former-commit-id: f21e9eb889
Former-commit-id: f0f85d0571b8d99ff0283fed753ee0778365a7f5 [formerly 67a7197f59]
Former-commit-id: 403a8611c5
 2014-02-28 14:02:22 -06:00
Lee Venable
639f66e8b2 Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development 
Former-commit-id: 4631a29ca3 [formerly 40f3df6aff] [formerly f171e3adb0] [formerly c77634951c [formerly f171e3adb0 [formerly 1a72af70658f288d43e397d12499de1a08ff2ba8]]]
Former-commit-id: c77634951c
Former-commit-id: 2fb1bf66c74a373156ea360fd8e8e80b7e7e7b74 [formerly 734f69403a]
Former-commit-id: 67f7d52f74
 2014-02-28 13:50:15 -06:00
Mike Duff
6c5c943a5e Issue #2632 - Implement buddy pounce (Contact Notifiers) 
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 512e634a97 [formerly 377c1f9998] [formerly 5440ff64d1] [formerly 5f433b4f6b [formerly 5440ff64d1 [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 0494775290c2982f78ac45adef680a21db012453 [formerly ee06fc58b5]
Former-commit-id: 63fc5f8c66
 2014-02-28 13:23:34 -06:00
Richard Peter
feb0543e0e Merge "Issue #2791 Switch contouring to use DataSource for data access." into development 
Former-commit-id: 39cf8178ff [formerly 18ec1e12ae] [formerly 5565bc88af] [formerly d5e09a82a7 [formerly 5565bc88af [formerly 029efeddc9a20b10f8991976be5640bff2e14cfc]]]
Former-commit-id: d5e09a82a7
Former-commit-id: b053fcbd2fdae8ed288d71313c48f36099ef20df [formerly f5c3e5d549]
Former-commit-id: e4dc3ea6cf
 2014-02-28 11:52:51 -06:00
Ben Steffensmeier
b747a91eaa Issue #2791 Switch contouring to use DataSource for data access. 
Former-commit-id: 7c8332a30f [formerly fbf6371c8e] [formerly 4b7f3b2a5b] [formerly 23ce77d864 [formerly 4b7f3b2a5b [formerly 6c90be7554bcbbf0aeb363b6e76c455d3896be83]]]
Former-commit-id: 23ce77d864
Former-commit-id: 527028ea9c54386652ea6e4a25326acedb61a15d [formerly a7787a7ff2]
Former-commit-id: 278ef9f0d4
 2014-02-28 11:28:02 -06:00
Dave Hladky
c15437bff8 Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception 
Former-commit-id: fcd9f02b5c [formerly 8bddfa77ce] [formerly fd85324076] [formerly 7399b10778 [formerly fd85324076 [formerly 137c6f8848715ee1acaaa2be943c053437902a8c]]]
Former-commit-id: 7399b10778
Former-commit-id: c6da2ffbb885334fdece65551dc7f61d9bcab9c0 [formerly 62156a1ba5]
Former-commit-id: d9a0f99bb5
 2014-02-28 11:07:15 -06:00
Brad Gonzales
0c02861e4e 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 50209c2084 [formerly a007ffabf9 [formerly 5ea4e87d10d335d85547b147228244892772a98f]]]
Former-commit-id: 50209c2084
Former-commit-id: aa3ee588d04acaa851780f26f198fcd5053004bf [formerly bf3a9ef7fe]
Former-commit-id: b9affa3c02
 2014-02-28 10:15:18 -06:00
Nate Jensen
7ab7887199 Merge "Issue #2703 Fix GFE time matching in iscMode." into development 
Former-commit-id: 3153786b6f [formerly b40f5477b4] [formerly 63244f840f] [formerly 908d308825 [formerly 63244f840f [formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]
Former-commit-id: 908d308825
Former-commit-id: f763c6864aae7276537781234c118f3f876d018c [formerly 92527f1ffa]
Former-commit-id: fb68c4c07f
 2014-02-28 09:53:27 -06:00
Richard Peter
61be7a7225 Merge "Issue #2838 Archive binary feeder creation." into development 
Former-commit-id: ddc733fda6 [formerly 944ea7936c] [formerly 952669fc38] [formerly 475557d4c8 [formerly 952669fc38 [formerly c8ab23e68f870a6fc46171b9076e09689bc1b5bb]]]
Former-commit-id: 475557d4c8
Former-commit-id: 3e47cae010b1d02395c7d662563fa5fddde5e973 [formerly 1d51a87e86]
Former-commit-id: 67a6ef4bd8
 2014-02-27 17:36:56 -06:00
Nate Jensen
0e29ec5bb4 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 39e167fc76 [formerly 7fb97ffad0 [formerly a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46]]]
Former-commit-id: 39e167fc76
Former-commit-id: 76c109bc0aaf7a0a1405976cdefd262abdaf71dc [formerly 8bf8302811]
Former-commit-id: f3de646859
 2014-02-27 17:14:32 -06:00
Nate Jensen
ce34239347 Merge "Issue #2823 deploy install now defaults to x86_64." into development 
Former-commit-id: 1a94acc527 [formerly 82817c2cbd] [formerly f7b4c75f13] [formerly d7a8ddbb83 [formerly f7b4c75f13 [formerly 75be0d86a588209ff572362f098095beb0b618d2]]]
Former-commit-id: d7a8ddbb83
Former-commit-id: 925ea42657cfdc93cc2d496f645202a2d2a00011 [formerly 35ea5b9eb2]
Former-commit-id: c439ecb2a4
 2014-02-27 16:44:26 -06:00
Brad Gonzales
78cafe46d5 Issue #2823 deploy install now defaults to x86_64. 
Change-Id: I06034fd03ab3779d83522134cb8067a64c2dcecc

Former-commit-id: f84150e7a0 [formerly 73ed932660] [formerly 2135663934] [formerly 45160326aa [formerly 2135663934 [formerly 9ef72acfce925dfcfc0df07e7ca5fb558b54d934]]]
Former-commit-id: 45160326aa
Former-commit-id: 198c4e59dcbb38b466db464ed3ce8ffb0ea02484 [formerly 90e6558083]
Former-commit-id: 003f028176
 2014-02-27 16:34:53 -06:00
Richard Peter
1d6e9816e0 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 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]
Former-commit-id: 50a1b270c5
 2014-02-27 15:18:26 -06:00
Richard Peter
9f43d8e4b2 Issue #2509: Fix Merge of 13.5.2-4 ncep resources 
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

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

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

Former-commit-id: 98bd4174d3 [formerly ac03675880] [formerly 9b7715e5e0] [formerly 995d962a66 [formerly 9b7715e5e0 [formerly 16c38960863df2f993c6ee7e18de31824cbdbb08]]]
Former-commit-id: 995d962a66
Former-commit-id: 8b2aa969d1f1fe5980fc422623cca4e71e6d36fc [formerly 03843090fa]
Former-commit-id: dae52ad3a0
 2014-02-27 07:45:40 -06:00
Lee Venable
da795bce98 Issue #2795 - added code to check for null images. 
Former-commit-id: 191ca5f9ca [formerly 5546b537cf] [formerly 0c7395d423] [formerly 49530206f4 [formerly 0c7395d423 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]]
Former-commit-id: 49530206f4
Former-commit-id: 3612dfd65a9bb45c3bd962d6f9fe927cf481321f [formerly facc67e6b5]
Former-commit-id: 35f6f35186
 2014-02-26 15:50:46 -06:00