Commit graph

5061 commits

Author SHA1 Message Date
Richard Peter
79d3aa4e1a 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: 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]
Former-commit-id: 0e25ae35c1
Former-commit-id: 7bd6a07913
2014-02-27 15:18:26 -06:00
Richard Peter
63da19f472 Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: 862069dfd3 [formerly 86d42ed603 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]
Former-commit-id: 86d42ed603
Former-commit-id: c267c5a08f
2014-02-27 13:46:47 -06:00
Richard Peter
ae39697315 Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: d54fee5dae [formerly 729d608a15 [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]
Former-commit-id: 729d608a15
Former-commit-id: a23c8f2c27
2014-02-27 13:20:49 -06:00
Steve Harris
26959b4fbb Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 99f53876d7 [formerly 5218a4d1e6 [formerly 2f2339f4c12e1862d27a8dda65264f353aed6ac6]]
Former-commit-id: 5218a4d1e6
Former-commit-id: 182c16067c
2014-02-27 10:02:43 -06:00
Nate Jensen
6e94f1dbbf Merge "Issue #2312 Fix file dialog input on export image dialog." into development
Former-commit-id: d1ec11d932 [formerly 71d494eb34 [formerly 4c4325675377cd170468a0c3dbe4632f5330227e]]
Former-commit-id: 71d494eb34
Former-commit-id: 414cc002b1
2014-02-27 09:10:07 -06:00
Roger Ferrel
98bd4174d3 Issue #2838 Archive binary feeder creation.
Change-Id: I4e431d62e3d27565af75d52012fe042a18fd1f9c

Former-commit-id: 995d962a66 [formerly 9b7715e5e0 [formerly 16c38960863df2f993c6ee7e18de31824cbdbb08]]
Former-commit-id: 9b7715e5e0
Former-commit-id: ac03675880
2014-02-27 07:45:40 -06:00
Brian.Dyke
2613e13e08 OB_14.1.1-20 baseline
Former-commit-id: 2bad40cfee [formerly 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]
Former-commit-id: 324696c436
Former-commit-id: b2401d2f0d
2014-02-26 17:39:15 -05:00
Lee Venable
191ca5f9ca Issue #2795 - added code to check for null images.
Former-commit-id: 49530206f4 [formerly 0c7395d423 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]
Former-commit-id: 0c7395d423
Former-commit-id: 5546b537cf
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
3d9b435262 Issue #2711 Use level factory more.
Former-commit-id: 3da086b71f [formerly d7a3ae4fdb [formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]
Former-commit-id: d7a3ae4fdb
Former-commit-id: 1069ef8d67
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
ee8f345cb2 Issue #2312 Fix file dialog input on export image dialog.
Former-commit-id: 6d0a78e233 [formerly e1dc75f97a [formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]
Former-commit-id: e1dc75f97a
Former-commit-id: 2fd8351874
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
fa6dcaac84 Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: 07bc9f075f [formerly d8bfdd1a7e [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]
Former-commit-id: d8bfdd1a7e
Former-commit-id: 2425b9665c
2014-02-26 14:45:19 -06:00
Lee Venable
d74b2c0118 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
Former-commit-id: e0ee93bab3 [formerly 94cede8153 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]]
Former-commit-id: 94cede8153
Former-commit-id: bb4b034375
2014-02-26 13:21:58 -06:00
Lee Venable
7bdf0b7396 Merge "Issue #2652. Fixed issue with edex-text-ingest log." into development
Former-commit-id: 34191dc3dc [formerly 72f71bc000 [formerly 0d1df7da4612a71195b4850b88b716f0d03acfe8]]
Former-commit-id: 72f71bc000
Former-commit-id: f58481dc6a
2014-02-25 15:53:14 -06:00
Brad Gonzales
e31b98bb85 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: cf9c22ac99 [formerly 4ccfe4f3c0 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]]
Former-commit-id: 4ccfe4f3c0
Former-commit-id: 40a653867a
2014-02-25 14:42:59 -06:00
Slav Korolev
6d4cf7476f Issue #2652. Fixed issue with edex-text-ingest log.
Former-commit-id: bfa84e65ec [formerly 5087a0154d [formerly 728e5b2d7ecad662e0c876533726d4bdd5c265d7]]
Former-commit-id: 5087a0154d
Former-commit-id: a34b1196b7
2014-02-25 15:23:22 -05:00
Richard Peter
2c433bb05c Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
Former-commit-id: b4e48698ed [formerly 3735cd3ffe [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]
Former-commit-id: 3735cd3ffe
Former-commit-id: 90b48e0393
2014-02-25 12:34:38 -06:00
Brad Gonzales
39afe190e0 Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: 8b2b50baaf [formerly 783afb1585 [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]
Former-commit-id: 783afb1585
Former-commit-id: b6e2ce4b74
2014-02-25 09:22:08 -06:00
Brian Clements
9597ce5cd9 Issue #2751 fixed webDAV path issue
webDAV needs every part of the path created individually
made the userid portion of the url use the entire id URL encoded


Former-commit-id: 3d365a4cd2 [formerly eef242194a [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]
Former-commit-id: eef242194a
Former-commit-id: 3f0e9d7a77
2014-02-25 09:17:36 -06:00
Nate Jensen
055caba2bf Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
Former-commit-id: 060eafc272 [formerly 279f05a1d5 [formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]
Former-commit-id: 279f05a1d5
Former-commit-id: 8ef957d2f0
2014-02-24 16:17:20 -06:00
Nate Jensen
a201d43d63 Issue #2830 sort TAF dataTimes so latest are retrieved
Former-commit-id: f353c44cc0 [formerly 8a00a419a1 [formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]
Former-commit-id: 8a00a419a1
Former-commit-id: 230b8bf117
2014-02-24 15:35:13 -06:00
Brian.Dyke
9158806dd2 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]
Former-commit-id: 2faab606e5
Former-commit-id: 363403fb34
2014-02-24 14:51:00 -05:00
Ron Anderson
049424e5f0 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]
Former-commit-id: 4364e7497c
Former-commit-id: 45ccac0859
2014-02-24 13:46:48 -06:00
Nate Jensen
4af8a7f326 Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
Former-commit-id: b1586f8603 [formerly 2111109ce2 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]
Former-commit-id: 2111109ce2
Former-commit-id: 98a6101cd3
2014-02-24 13:25:35 -06:00
Brian Clements
a173972437 Issue #2751 fixed leader transfer infinite loop, added event validation
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed


Former-commit-id: 386e9cc96a [formerly 3f362519aa [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]
Former-commit-id: 3f362519aa
Former-commit-id: 9217ba24c5
2014-02-24 13:19:07 -06:00
Dave Hladky
d31708962b Issue #2469 Fixed default rules implementation
Former-commit-id: 45413d0db4 [formerly 1d256bfcee [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]
Former-commit-id: 1d256bfcee
Former-commit-id: f9c6a396f0
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
669b580920 Issue #2762 Use UCUM to format units so IRPixel formats correctly.
Former-commit-id: f8cc0e3d95 [formerly 9e5f7d90a0 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]
Former-commit-id: 9e5f7d90a0
Former-commit-id: f7c48b24bb
2014-02-24 10:27:30 -06:00
Ben Steffensmeier
152980350c Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: e08d4f77c3 [formerly 70ae372303 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]
Former-commit-id: 70ae372303
Former-commit-id: 780dc19fac
2014-02-21 17:37:19 -06:00
Dave Hladky
cd7934e12f Issue #2636 Try Catch around the MaintTask
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: 49f6c31256 [formerly c4bed432da [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]
Former-commit-id: c4bed432da
Former-commit-id: 542ba7e504
2014-02-21 16:01:20 -06:00
Richard Peter
c06007eb9b Merge "Issue #2828 Added purge cron to Central SBN Simulator." into development
Former-commit-id: 58a3aac09d [formerly e923639fb1 [formerly d76c2325618af08be1f20ebec0b2463a49a9b03f]]
Former-commit-id: e923639fb1
Former-commit-id: 66d3fce57d
2014-02-21 11:26:26 -06:00
Brian.Dyke
3508e488f5 OB_14.1.1-19 baseline
Former-commit-id: 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]
Former-commit-id: cfa4997978
Former-commit-id: 779553142c
2014-02-21 06:50:59 -05:00
Nate Jensen
f4b3acbac0 Merge "Issue #2631 - Set preference defaults in the Activator. Removed unused file." into development
Former-commit-id: dd00fd1445 [formerly 9a3f60a216 [formerly 4399b11d3958de1cf8cce2bc66085aa43efb6519]]
Former-commit-id: 9a3f60a216
Former-commit-id: c1f4fbfbd4
2014-02-20 17:55:35 -06:00
Brad Gonzales
3052b2d9c7 Issue #2828 Added purge cron to Central SBN Simulator.
Amend: Removed comment accidentally merged from other branch.
       Moved logging to outer loop and log count of purged files for each dir.

Change-Id: I7038e7f76d09576903d35a54e733cd6986a4d1c6

Former-commit-id: bd25ec4cd9 [formerly 12e22752c2 [formerly 6a42f4162ace5a799df4df0e24bf0199905dcf89]]
Former-commit-id: 12e22752c2
Former-commit-id: 290a381715
2014-02-20 16:31:16 -06:00
Mike Duff
9eafacaac2 Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: a7b1e79d2d [formerly ed5cb91406 [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]
Former-commit-id: ed5cb91406
Former-commit-id: a96a833f51
2014-02-20 15:09:10 -06:00
Brian.Dyke
45cf129ad7 ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
Former-commit-id: 916f657e04 [formerly 2f79cc486e [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]
Former-commit-id: 2f79cc486e
Former-commit-id: 5f3ca0a3f4
2014-02-20 15:50:50 -05:00
Ron Anderson
bb3577ef37 Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated.
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405

Former-commit-id: 6ccf6a56e7 [formerly 6a7e4a147d [formerly a2b2a15f1ef8e237058f1760d64021895ae27c35]]
Former-commit-id: 6a7e4a147d
Former-commit-id: e4aeaa79f1
2014-02-20 12:32:31 -06:00
Brian Clements
8bbf2bb6bd Issue #2751 collab menu icons, fixed NPE
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog


Former-commit-id: 89a48c3f6b [formerly aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]
Former-commit-id: aaa2de20f4
Former-commit-id: a2bdfa25cc
2014-02-20 11:50:54 -06:00
Brian Clements
4e165aba58 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]
Former-commit-id: c3cadff705
Former-commit-id: a8ff1effc1
2014-02-20 11:10:14 -06:00
Nate Jensen
6973755f4e Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 0f81b80467 [formerly 32bd9fd635 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]
Former-commit-id: 32bd9fd635
Former-commit-id: 6ef26a636c
2014-02-20 10:53:21 -06:00
Ron Anderson
e1585c58e1 Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development
Former-commit-id: 6f4a63000d [formerly c13942140a [formerly 0729266c3f82eccdbf6835789898291ad34451c4]]
Former-commit-id: c13942140a
Former-commit-id: 810ad594a1
2014-02-20 09:55:56 -06:00
Ron Anderson
6645688ff4 Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7

Former-commit-id: 08a1be844d [formerly 6b6aa14e59 [formerly 37a420582eea8d3a1b4861e18c20d044c636173f]]
Former-commit-id: 6b6aa14e59
Former-commit-id: 2bfa521e7d
2014-02-20 09:34:18 -06:00
Nate Jensen
adb51300d8 Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
Former-commit-id: 5856957c57 [formerly 3078b69273 [formerly 7820be8f078be179c7963cbae73cd3023a70c306]]
Former-commit-id: 3078b69273
Former-commit-id: 4563e38db2
2014-02-19 17:22:00 -06:00
Nate Jensen
f939d93d7f Merge "Issue #2761 add region level to localization" into development
Former-commit-id: 6e59175ce4 [formerly 9011e1b31e [formerly 59789454912e36ed64eb18fa83561fb7325945e2]]
Former-commit-id: 9011e1b31e
Former-commit-id: 3782880dac
2014-02-19 17:18:24 -06:00
Nate Jensen
f545a8a74d Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: f99cf7df47 [formerly df376abcb7 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]
Former-commit-id: df376abcb7
Former-commit-id: a241472c34
2014-02-19 16:19:27 -06:00
Ron Anderson
dab0ebc99e Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: b8c00d8ead [formerly 98d2417f94 [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]
Former-commit-id: 98d2417f94
Former-commit-id: 8703c43937
2014-02-19 15:39:56 -06:00
Mike Duff
659cb1f2a0 Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: 95fcee385a [formerly 663ea8decd [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]
Former-commit-id: 663ea8decd
Former-commit-id: e2a6251a6b
2014-02-19 15:26:14 -06:00
Mike Duff
8a29af4894 Issue #2628 - Change cast from short to int for MPE colorbar
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c

Former-commit-id: 183657fb33 [formerly 682c6af456 [formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]
Former-commit-id: 682c6af456
Former-commit-id: 48a0b34b5f
2014-02-19 15:20:29 -06:00
Nate Jensen
72acab26c3 Merge "Issue #2751 fixed chat room bugs" into development
Former-commit-id: c72e2be969 [formerly 4b4cca776f [formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]]
Former-commit-id: 4b4cca776f
Former-commit-id: b4ac186728
2014-02-19 14:52:24 -06:00
Lee Venable
5582282777 Merge "Issue #2734 - default time range to 24 hours." into development
Former-commit-id: e204b350ee [formerly 8e967e8e59 [formerly 4604b591b1f15621fcf4cd0e93143435cccfe43b]]
Former-commit-id: 8e967e8e59
Former-commit-id: de102f4e94
2014-02-19 12:33:46 -06:00
Ron Anderson
5f3248574f Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 419e9d0b8d [formerly 5258aecf45 [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]
Former-commit-id: 5258aecf45
Former-commit-id: 663cb4cb62
2014-02-19 11:55:11 -06:00
Slav Korolev
39e49448ba Issue #2652. Fixed issue with edex-text-ingest log. Deleted unused code.
Change-Id: Id84e813047342a49988f78c1c9e13c356305e11b

Former-commit-id: 3b1ea13cb1 [formerly a597ac0989 [formerly 7b666c5fb7a1cb459a90bb295e58491a9a21063c]]
Former-commit-id: a597ac0989
Former-commit-id: f7a6a6c613
2014-02-19 12:01:06 -05:00