Commit graph

2856 commits

Author SHA1 Message Date
Richard Peter
34e2ab0d43 Merge "Issue #2791 Switch contouring to use DataSource for data access." into development
Former-commit-id: 18ec1e12ae [formerly 5565bc88af] [formerly 18ec1e12ae [formerly 5565bc88af] [formerly d5e09a82a7 [formerly 029efeddc9a20b10f8991976be5640bff2e14cfc]]]
Former-commit-id: d5e09a82a7
Former-commit-id: e4dc3ea6cf [formerly f5c3e5d549]
Former-commit-id: d736455a8a
2014-02-28 11:52:51 -06:00
Ben Steffensmeier
118991ec22 Issue #2791 Switch contouring to use DataSource for data access.
Former-commit-id: fbf6371c8e [formerly 4b7f3b2a5b] [formerly fbf6371c8e [formerly 4b7f3b2a5b] [formerly 23ce77d864 [formerly 6c90be7554bcbbf0aeb363b6e76c455d3896be83]]]
Former-commit-id: 23ce77d864
Former-commit-id: 278ef9f0d4 [formerly a7787a7ff2]
Former-commit-id: c0c017e451
2014-02-28 11:28:02 -06:00
Nate Jensen
4e66e5bcc5 Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: b40f5477b4 [formerly 63244f840f] [formerly b40f5477b4 [formerly 63244f840f] [formerly 908d308825 [formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]
Former-commit-id: 908d308825
Former-commit-id: fb68c4c07f [formerly 92527f1ffa]
Former-commit-id: f0bb217f04
2014-02-28 09:53:27 -06:00
Lee Venable
7299c53ba5 Issue #2795 - removed test code.
Former-commit-id: e34e636dc7 [formerly 28fe1e99e2] [formerly e34e636dc7 [formerly 28fe1e99e2] [formerly f94bcc4d3f [formerly 0e1db42a04b15b8815d59db272b4b2f7b3e79fb9]]]
Former-commit-id: f94bcc4d3f
Former-commit-id: 267fa56e32 [formerly 708de93fc4]
Former-commit-id: d026da3632
2014-02-27 15:46:30 -06:00
Richard Peter
5fab51d41b 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: 7bd6a07913 [formerly 0e25ae35c1] [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 50a1b270c5 [formerly f13c86bc3e]
Former-commit-id: 9b3f8f9649
2014-02-27 15:18:26 -06:00
Richard Peter
68eade49a2 Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

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

Former-commit-id: a23c8f2c27 [formerly 729d608a15] [formerly a23c8f2c27 [formerly 729d608a15] [formerly d54fee5dae [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]
Former-commit-id: d54fee5dae
Former-commit-id: 67093287a0 [formerly 229437773b]
Former-commit-id: 9ca22fce7f
2014-02-27 13:20:49 -06:00
Mike Duff
5a8d3e6d51 Issue #2842 - Fix MPE tearoff menu issues, add next/prev hr toolbar buttons
Change-Id: Ic16bc87680918a1a462bcd5373e8f92faf6d905d

Former-commit-id: 7d14383bed [formerly 801abc37a2] [formerly 7d14383bed [formerly 801abc37a2] [formerly 42982306ab [formerly 048b3ab40864d13baa7bcd9c8aef04564ec8a5f9]]]
Former-commit-id: 42982306ab
Former-commit-id: 05cf39b8a6 [formerly aa8ca42413]
Former-commit-id: aefb2bbf0e
2014-02-27 12:01:30 -06:00
Nate Jensen
445fd40303 Merge "Issue #2312 Fix file dialog input on export image dialog." into development
Former-commit-id: 414cc002b1 [formerly 71d494eb34] [formerly 414cc002b1 [formerly 71d494eb34] [formerly d1ec11d932 [formerly 4c4325675377cd170468a0c3dbe4632f5330227e]]]
Former-commit-id: d1ec11d932
Former-commit-id: 80ef0dc055 [formerly 9a39867de4]
Former-commit-id: ee788777ad
2014-02-27 09:10:07 -06:00
Brian.Dyke
f9587d39d1 OB_14.1.1-20 baseline
Former-commit-id: b2401d2f0d [formerly 324696c436] [formerly b2401d2f0d [formerly 324696c436] [formerly 2bad40cfee [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]
Former-commit-id: 2bad40cfee
Former-commit-id: c873f20d04 [formerly 16117255f3]
Former-commit-id: 5feadbe4d9
2014-02-26 17:39:15 -05:00
Lee Venable
54fa6c12b3 Issue #2795 - added code to check for null images.
Former-commit-id: 5546b537cf [formerly 0c7395d423] [formerly 5546b537cf [formerly 0c7395d423] [formerly 49530206f4 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]]
Former-commit-id: 49530206f4
Former-commit-id: 35f6f35186 [formerly facc67e6b5]
Former-commit-id: 3932c3f02f
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
0dd62678f2 Issue #2711 Use level factory more.
Former-commit-id: 1069ef8d67 [formerly d7a3ae4fdb] [formerly 1069ef8d67 [formerly d7a3ae4fdb] [formerly 3da086b71f [formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]]
Former-commit-id: 3da086b71f
Former-commit-id: 29f9a87085 [formerly f45646ae91]
Former-commit-id: 3a5f655ea4
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
5fd6a533b8 Issue #2312 Fix file dialog input on export image dialog.
Former-commit-id: 2fd8351874 [formerly e1dc75f97a] [formerly 2fd8351874 [formerly e1dc75f97a] [formerly 6d0a78e233 [formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]]
Former-commit-id: 6d0a78e233
Former-commit-id: 058652febe [formerly 2d11421854]
Former-commit-id: 542c8ae3a1
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
d899433612 Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: 2425b9665c [formerly d8bfdd1a7e] [formerly 2425b9665c [formerly d8bfdd1a7e] [formerly 07bc9f075f [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 0fde78c595 [formerly 804cbb48e6]
Former-commit-id: 6843396c78
2014-02-26 14:45:19 -06:00
Lee Venable
8d49130542 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
Former-commit-id: bb4b034375 [formerly 94cede8153] [formerly bb4b034375 [formerly 94cede8153] [formerly e0ee93bab3 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]
Former-commit-id: e0ee93bab3
Former-commit-id: 91d419662c [formerly e0fbc02307]
Former-commit-id: 316ba53e74
2014-02-26 13:21:58 -06:00
Brian Clements
1001ef1ec2 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: 3f0e9d7a77 [formerly eef242194a] [formerly 3f0e9d7a77 [formerly eef242194a] [formerly 3d365a4cd2 [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]]
Former-commit-id: 3d365a4cd2
Former-commit-id: 1f5d296314 [formerly 473fcda0cf]
Former-commit-id: a102e927b1
2014-02-25 09:17:36 -06:00
Nate Jensen
caaffabda3 Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
Former-commit-id: 8ef957d2f0 [formerly 279f05a1d5] [formerly 8ef957d2f0 [formerly 279f05a1d5] [formerly 060eafc272 [formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]]
Former-commit-id: 060eafc272
Former-commit-id: 2f58408036 [formerly a5477ea272]
Former-commit-id: d9411eb382
2014-02-24 16:17:20 -06:00
Nate Jensen
78c8f1a62c Issue #2830 sort TAF dataTimes so latest are retrieved
Former-commit-id: 230b8bf117 [formerly 8a00a419a1] [formerly 230b8bf117 [formerly 8a00a419a1] [formerly f353c44cc0 [formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]
Former-commit-id: f353c44cc0
Former-commit-id: a97f5b5ff7 [formerly 74329bcb89]
Former-commit-id: 02d2f0c713
2014-02-24 15:35:13 -06:00
Brian.Dyke
0bcf7c89b8 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 363403fb34 [formerly 2faab606e5] [formerly 363403fb34 [formerly 2faab606e5] [formerly 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 73a1c238f4 [formerly 227131e5f1]
Former-commit-id: 38829b9014
2014-02-24 14:51:00 -05:00
Ron Anderson
3c673caec2 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: 45ccac0859 [formerly 4364e7497c] [formerly 45ccac0859 [formerly 4364e7497c] [formerly 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: 7d3af157f8 [formerly 3b2ea2d6ac]
Former-commit-id: f2b0cc20e8
2014-02-24 13:46:48 -06:00
Brian Clements
48cfc3c933 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: 9217ba24c5 [formerly 3f362519aa] [formerly 9217ba24c5 [formerly 3f362519aa] [formerly 386e9cc96a [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]]
Former-commit-id: 386e9cc96a
Former-commit-id: 73cb7b7313 [formerly b9c9be4c4f]
Former-commit-id: 4abf737852
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
07ffe9f711 Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: 780dc19fac [formerly 70ae372303] [formerly 780dc19fac [formerly 70ae372303] [formerly e08d4f77c3 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]
Former-commit-id: e08d4f77c3
Former-commit-id: 7aca322faa [formerly a6bf896593]
Former-commit-id: 7e29aa25a9
2014-02-21 17:37:19 -06:00
Brian.Dyke
f86f9f8918 OB_14.1.1-19 baseline
Former-commit-id: 779553142c [formerly cfa4997978] [formerly 779553142c [formerly cfa4997978] [formerly 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: c41dd22ff2 [formerly 64044e7ce5]
Former-commit-id: 1b359c2564
2014-02-21 06:50:59 -05:00
Mike Duff
692830c5c9 Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: a96a833f51 [formerly ed5cb91406] [formerly a96a833f51 [formerly ed5cb91406] [formerly a7b1e79d2d [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]]
Former-commit-id: a7b1e79d2d
Former-commit-id: f98eec12b9 [formerly d90f4495c2]
Former-commit-id: 5014499431
2014-02-20 15:09:10 -06:00
Brian Clements
1d2406e180 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: a2bdfa25cc [formerly aaa2de20f4] [formerly a2bdfa25cc [formerly aaa2de20f4] [formerly 89a48c3f6b [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: 04697836b8 [formerly 4b7ba54dc3]
Former-commit-id: e3973b9fc7
2014-02-20 11:50:54 -06:00
Brian Clements
9b0fd74f5b Issue #2751 implemented room/topic ownership transfer
Former-commit-id: a8ff1effc1 [formerly c3cadff705] [formerly a8ff1effc1 [formerly c3cadff705] [formerly ab72938246 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]
Former-commit-id: ab72938246
Former-commit-id: 9d00fe2bab [formerly d9ac2c0037]
Former-commit-id: d218686d1f
2014-02-20 11:10:14 -06:00
Nate Jensen
3955f66213 Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 6ef26a636c [formerly 32bd9fd635] [formerly 6ef26a636c [formerly 32bd9fd635] [formerly 0f81b80467 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]
Former-commit-id: 0f81b80467
Former-commit-id: 6e2150ccd7 [formerly 9f33e97c1b]
Former-commit-id: 1f5f895dcf
2014-02-20 10:53:21 -06:00
Nate Jensen
4628b0c67c Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
Former-commit-id: 4563e38db2 [formerly 3078b69273] [formerly 4563e38db2 [formerly 3078b69273] [formerly 5856957c57 [formerly 7820be8f078be179c7963cbae73cd3023a70c306]]]
Former-commit-id: 5856957c57
Former-commit-id: c936a659a5 [formerly 5412b72c57]
Former-commit-id: 9e261c9c22
2014-02-19 17:22:00 -06:00
Nate Jensen
1db1ae5a38 Merge "Issue #2761 add region level to localization" into development
Former-commit-id: 3782880dac [formerly 9011e1b31e] [formerly 3782880dac [formerly 9011e1b31e] [formerly 6e59175ce4 [formerly 59789454912e36ed64eb18fa83561fb7325945e2]]]
Former-commit-id: 6e59175ce4
Former-commit-id: 9394879520 [formerly b1e2788958]
Former-commit-id: 8f73511086
2014-02-19 17:18:24 -06:00
Nate Jensen
dbdcfa8e41 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: a241472c34 [formerly df376abcb7] [formerly a241472c34 [formerly df376abcb7] [formerly f99cf7df47 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]]
Former-commit-id: f99cf7df47
Former-commit-id: d3ec0da1bb [formerly 8b152a8027]
Former-commit-id: dafb323edb
2014-02-19 16:19:27 -06:00
Ron Anderson
331803d94a Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: 8703c43937 [formerly 98d2417f94] [formerly 8703c43937 [formerly 98d2417f94] [formerly b8c00d8ead [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]]
Former-commit-id: b8c00d8ead
Former-commit-id: b9904edc3a [formerly 7e7f0abfdc]
Former-commit-id: db9cc1e6b5
2014-02-19 15:39:56 -06:00
Mike Duff
401973b39e Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: e2a6251a6b [formerly 663ea8decd] [formerly e2a6251a6b [formerly 663ea8decd] [formerly 95fcee385a [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]
Former-commit-id: 95fcee385a
Former-commit-id: 89c4a3e04b [formerly 3100a71f34]
Former-commit-id: 92d356f4f0
2014-02-19 15:26:14 -06:00
Mike Duff
0494f646ab Issue #2628 - Change cast from short to int for MPE colorbar
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c

Former-commit-id: 48a0b34b5f [formerly 682c6af456] [formerly 48a0b34b5f [formerly 682c6af456] [formerly 183657fb33 [formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]]
Former-commit-id: 183657fb33
Former-commit-id: 8be2622f85 [formerly 86fce9d547]
Former-commit-id: 06b243a7fd
2014-02-19 15:20:29 -06:00
Nate Jensen
659bc630be Merge "Issue #2751 fixed chat room bugs" into development
Former-commit-id: b4ac186728 [formerly 4b4cca776f] [formerly b4ac186728 [formerly 4b4cca776f] [formerly c72e2be969 [formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]]]
Former-commit-id: c72e2be969
Former-commit-id: 5ef747c703 [formerly 7099b45023]
Former-commit-id: 696937bfcc
2014-02-19 14:52:24 -06:00
Ron Anderson
e91fd1d683 Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 663cb4cb62 [formerly 5258aecf45] [formerly 663cb4cb62 [formerly 5258aecf45] [formerly 419e9d0b8d [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 908e43039e [formerly 8a41723ba6]
Former-commit-id: b0a4b63689
2014-02-19 11:55:11 -06:00
Mike Duff
304a9dc507 Issue #2734 - default time range to 24 hours.
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d

Former-commit-id: bc180503b1 [formerly 19033601bf] [formerly bc180503b1 [formerly 19033601bf] [formerly 0b316f7bd9 [formerly 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5]]]
Former-commit-id: 0b316f7bd9
Former-commit-id: 06ed3db690 [formerly 7710724c5a]
Former-commit-id: e6fb8413b9
2014-02-19 10:23:48 -06:00
Matt Nash
1814b1448e Issue #2761 add region level to localization
Amend : Change comment now that we do not get file from localization

Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2

Former-commit-id: 3f67324d7c [formerly 2d20e84f6a] [formerly 3f67324d7c [formerly 2d20e84f6a] [formerly 1835019567 [formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]]
Former-commit-id: 1835019567
Former-commit-id: ae1d36b6d0 [formerly bb10484bd0]
Former-commit-id: 3b39e1d2bc
2014-02-19 10:01:25 -06:00
Brian Clements
b47b194564 Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client


Former-commit-id: 06c16118e1 [formerly dc074a9650] [formerly 06c16118e1 [formerly dc074a9650] [formerly 3a135b8eac [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 77bb396c9a [formerly bee7cdb71a]
Former-commit-id: ddc0945e40
2014-02-19 08:32:26 -06:00
Mike Duff
a4ab323833 Issue #2596 - Add check for null coordinates.
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75

Former-commit-id: 283b0c670c [formerly a6509aad8c] [formerly 283b0c670c [formerly a6509aad8c] [formerly 9754f0d8dd [formerly 11f3705080210161e6915309a4aec423b307cce8]]]
Former-commit-id: 9754f0d8dd
Former-commit-id: 40b0540830 [formerly ecb0d45b24]
Former-commit-id: 7ba61e6b53
2014-02-18 17:32:32 -06:00
Nate Jensen
337aa2f312 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: ac0a10678b [formerly 020d54c48a] [formerly ac0a10678b [formerly 020d54c48a] [formerly b08d96b1e8 [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]
Former-commit-id: b08d96b1e8
Former-commit-id: 4bb0997749 [formerly a6bb05f2e3]
Former-commit-id: 3c9ebe52d3
2014-02-18 14:51:13 -06:00
Nate Jensen
1e6b1343b0 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: 1738248fac [formerly c63289fa14] [formerly 1738248fac [formerly c63289fa14] [formerly b3c45b303c [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]]
Former-commit-id: b3c45b303c
Former-commit-id: 2e468e9ec1 [formerly 173c646576]
Former-commit-id: b1dc1e8849
2014-02-18 11:22:19 -06:00
Brian Clements
c38397e00b Issue #2793 improved collaboration disconnect handling
collaboration was being shutdown even though smack was trying to reconnect
changed to notify of disconnect, but not shutdown until reconnect fails


Former-commit-id: 9095a1584f [formerly a28fcf0dc5] [formerly 9095a1584f [formerly a28fcf0dc5] [formerly 7028f7fd4d [formerly 231c3cd84e3c86caba81708581be911e771aa774]]]
Former-commit-id: 7028f7fd4d
Former-commit-id: 9d9c4c7c27 [formerly 510c39713f]
Former-commit-id: 3bf2a08c57
2014-02-18 11:11:33 -06:00
Brad Gonzales
b0421675ff Issue #2771 For Data Delivery CAVE now request current id from
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: 379c0fb46c [formerly 19460ed0d7] [formerly 379c0fb46c [formerly 19460ed0d7] [formerly ba4e308328 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]
Former-commit-id: ba4e308328
Former-commit-id: 1b76488111 [formerly 3be3380944]
Former-commit-id: 9aa1cb299e
2014-02-18 11:10:44 -06:00
Ron Anderson
8a7af092f2 Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: e7f2b6883d [formerly 32bcf9d0d0] [formerly e7f2b6883d [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 0135771eec [formerly d4ba9eba94]
Former-commit-id: 68e03bf02f
2014-02-18 10:45:20 -06:00
Brian Clements
f866ac4365 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: f0c89ef6c6 [formerly f6b2827434] [formerly f0c89ef6c6 [formerly f6b2827434] [formerly 5b4f1e8288 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 02319f36e4 [formerly a1d9e40bd4]
Former-commit-id: 5889341612
2014-02-18 10:03:12 -06:00
Nate Jensen
72a40614fb Merge "Issue #2751 fixed blocked icon for roster entries" into development
Former-commit-id: 0228d24f1d [formerly e70f0d21ab] [formerly 0228d24f1d [formerly e70f0d21ab] [formerly aa7413fd4c [formerly 4f02e79ed2211fa9e406e3bc2c633256c6e85faf]]]
Former-commit-id: aa7413fd4c
Former-commit-id: c3756326a6 [formerly f1b7bf1c2a]
Former-commit-id: a08dea4b08
2014-02-18 08:48:00 -06:00
Brian Clements
df4c4af7e9 Issue #2751 fixed blocked icon for roster entries
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels


Former-commit-id: e894019715 [formerly a94b366e26] [formerly e894019715 [formerly a94b366e26] [formerly 3307f5ea5e [formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]]
Former-commit-id: 3307f5ea5e
Former-commit-id: 02d3a9ae7e [formerly 476d0c3257]
Former-commit-id: 6574733eba
2014-02-17 17:11:36 -06:00
Nate Jensen
0dd9cd1094 Issue #2704 fix alertviz connectivity checks
Former-commit-id: 0160ab0464 [formerly 0c4de50218] [formerly 0160ab0464 [formerly 0c4de50218] [formerly 4d68994525 [formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]
Former-commit-id: 4d68994525
Former-commit-id: 121bcd184a [formerly 228ab8dd60]
Former-commit-id: 944df080f4
2014-02-17 17:10:07 -06:00
Brian Clements
fab5759a01 Issue #2800 added equals/hashcode to classes used in roster tree
tree view uses hashmap to decide if a node is new
tree was collapsing groups/sessions on refresh since it thought they were new nodes


Former-commit-id: 6d71686332 [formerly 3b5648c055] [formerly 6d71686332 [formerly 3b5648c055] [formerly 3dfd8fbafb [formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]]
Former-commit-id: 3dfd8fbafb
Former-commit-id: 0d07e417fc [formerly 9dc2967e3f]
Former-commit-id: cd7abc37fc
2014-02-17 16:39:43 -06:00
Nate Jensen
083a66dc4e Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
Former-commit-id: 2367c79c1c [formerly 5675869906] [formerly 2367c79c1c [formerly 5675869906] [formerly f4260a617e [formerly ef860082c4cd6159233323b89e0b73e272224f38]]]
Former-commit-id: f4260a617e
Former-commit-id: 1639f43f50 [formerly 96014c806d]
Former-commit-id: e4fb5e0067
2014-02-17 14:09:58 -06:00