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
Mike Duff
9fccc1836b
Issue #2842 - Fix MPE tearoff menu issues, add next/prev hr toolbar buttons
...
Change-Id: Ic16bc87680918a1a462bcd5373e8f92faf6d905d
Former-commit-id: 4bf028c4d7
[formerly 7d14383bed
] [formerly 801abc37a2
] [formerly 42982306ab
[formerly 801abc37a2
[formerly 048b3ab40864d13baa7bcd9c8aef04564ec8a5f9]]]
Former-commit-id: 42982306ab
Former-commit-id: 53dc752ce5f5371c76c78a099ec708c2304076ab [formerly aa8ca42413
]
Former-commit-id: 05cf39b8a6
2014-02-27 12:01:30 -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
Juliya Dynina
e6a5f06b88
Merge "ASM #236 " into asm_14.2.2
...
Former-commit-id: 86838cc422
[formerly a0af710ac3
] [formerly 7d2a404f66
] [formerly 09708ce0ba
[formerly 7d2a404f66
[formerly 8ddc79c66a4131f9671b605057abf916200a276a]]]
Former-commit-id: 09708ce0ba
Former-commit-id: b6a2b3e3d406da21716d1348b73da04ebcdc9fdf [formerly c8ab0aa33a
]
Former-commit-id: 33bfcfd251
2014-02-27 09:48:01 -05:00
Brian.Dyke
89b66fcb5b
OB_14.1.1-20 baseline
...
Former-commit-id: 2613e13e08
[formerly b2401d2f0d
] [formerly 324696c436
] [formerly 2bad40cfee
[formerly 324696c436
[formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]
Former-commit-id: 2bad40cfee
Former-commit-id: ed8e6914deb29235289414c9240bc93a504f11a5 [formerly 16117255f3
]
Former-commit-id: c873f20d04
2014-02-26 17:39:15 -05: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
Ben Steffensmeier
4d1276def2
Issue #2711 Use level factory more.
...
Former-commit-id: 3d9b435262
[formerly 1069ef8d67
] [formerly d7a3ae4fdb
] [formerly 3da086b71f
[formerly d7a3ae4fdb
[formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]]
Former-commit-id: 3da086b71f
Former-commit-id: 81be956862611f9499f1e2716026d69eacf91f27 [formerly f45646ae91
]
Former-commit-id: 29f9a87085
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
88fd930b77
Issue #2312 Fix file dialog input on export image dialog.
...
Former-commit-id: ee8f345cb2
[formerly 2fd8351874
] [formerly e1dc75f97a
] [formerly 6d0a78e233
[formerly e1dc75f97a
[formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]]
Former-commit-id: 6d0a78e233
Former-commit-id: 33d269bf45b5c7555173d073fc5eeb1dc2b0f237 [formerly 2d11421854
]
Former-commit-id: 058652febe
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
66b052cd5a
Issue #2703 Fix GFE time matching in iscMode.
...
Former-commit-id: fa6dcaac84
[formerly 2425b9665c
] [formerly d8bfdd1a7e
] [formerly 07bc9f075f
[formerly d8bfdd1a7e
[formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 21789a864d2ed6b3a1c15882fe3f817dac2fd3f7 [formerly 804cbb48e6
]
Former-commit-id: 0fde78c595
2014-02-26 14:45:19 -06:00
Lee Venable
de2bff4d95
Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
...
Former-commit-id: d74b2c0118
[formerly bb4b034375
] [formerly 94cede8153
] [formerly e0ee93bab3
[formerly 94cede8153
[formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]
Former-commit-id: e0ee93bab3
Former-commit-id: 08d8e41d0aefbc0220f2fd973374918a413db9bb [formerly e0fbc02307
]
Former-commit-id: 91d419662c
2014-02-26 13:21:58 -06:00
steve.naples
f4c11adcfc
ASM #236
...
Change-Id: I849aa9c15622973e49f385ada9df84ba3b1417dd
Former-commit-id: 4400821f53
[formerly 06f619b3ff
] [formerly 6be82c41fc
] [formerly cc9e62c806
[formerly 6be82c41fc
[formerly 8d0e82a46186f3457c5d4e3001548d067ebbaae2]]]
Former-commit-id: cc9e62c806
Former-commit-id: 739ab9214214a58ad3716378a60a67bab5d677fe [formerly 9b850d81df
]
Former-commit-id: 1c6f6be15e
2014-02-26 18:54:36 +00:00
Brian Clements
408b834fc6
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: 9597ce5cd9
[formerly 3f0e9d7a77
] [formerly eef242194a
] [formerly 3d365a4cd2
[formerly eef242194a
[formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]]
Former-commit-id: 3d365a4cd2
Former-commit-id: afda13c403f6099ee52fb2149ecc71798cd4f1b6 [formerly 473fcda0cf
]
Former-commit-id: 1f5d296314
2014-02-25 09:17:36 -06:00
Daniel.Huffman
adba7f0a5b
ASM #76
...
Added lpi resources. File latLonOcean.xml is an example.
Change-Id: I533aa7616d837a70d2b14a4bbe00397ef2a7ddff
Former-commit-id: 7d6a245835
[formerly f675fab121
] [formerly 9c29bddee0
] [formerly a34124c355
[formerly 9c29bddee0
[formerly 733a80d0019ccf7f5529abbd6054cb485412e962]]]
Former-commit-id: a34124c355
Former-commit-id: 5341e20d6461ed861108547cfbd178e31b9412b2 [formerly 68eab08f8e
]
Former-commit-id: cd2ecab86d
2014-02-24 22:59:41 +00:00
Nate Jensen
308a560602
Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
...
Former-commit-id: 055caba2bf
[formerly 8ef957d2f0
] [formerly 279f05a1d5
] [formerly 060eafc272
[formerly 279f05a1d5
[formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]]
Former-commit-id: 060eafc272
Former-commit-id: 558be9d98a06c71a0e559cdc2b834c684467687f [formerly a5477ea272
]
Former-commit-id: 2f58408036
2014-02-24 16:17:20 -06:00
Nate Jensen
4d460d3a26
Issue #2830 sort TAF dataTimes so latest are retrieved
...
Former-commit-id: a201d43d63
[formerly 230b8bf117
] [formerly 8a00a419a1
] [formerly f353c44cc0
[formerly 8a00a419a1
[formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]
Former-commit-id: f353c44cc0
Former-commit-id: 67f46ed66aeefd71f35b8ac193010ae9e960ed0b [formerly 74329bcb89
]
Former-commit-id: a97f5b5ff7
2014-02-24 15:35:13 -06:00
Brian.Dyke
6b1b6d38e3
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: 9158806dd2
[formerly 363403fb34
] [formerly 2faab606e5
] [formerly 1a8a0b703e
[formerly 2faab606e5
[formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1
]
Former-commit-id: 73a1c238f4
2014-02-24 14:51:00 -05:00
Ron Anderson
5831f8d79e
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: 049424e5f0
[formerly 45ccac0859
] [formerly 4364e7497c
] [formerly 2db5f26840
[formerly 4364e7497c
[formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac
]
Former-commit-id: 7d3af157f8
2014-02-24 13:46:48 -06:00
Brian Clements
743c6cd74b
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: a173972437
[formerly 9217ba24c5
] [formerly 3f362519aa
] [formerly 386e9cc96a
[formerly 3f362519aa
[formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]]
Former-commit-id: 386e9cc96a
Former-commit-id: 83e8dc39015b780c38746e7cdc688605acdb3a6e [formerly b9c9be4c4f
]
Former-commit-id: 73cb7b7313
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
d27c21b9f6
Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
...
Former-commit-id: 152980350c
[formerly 780dc19fac
] [formerly 70ae372303
] [formerly e08d4f77c3
[formerly 70ae372303
[formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]
Former-commit-id: e08d4f77c3
Former-commit-id: c293b1124e59af7c01e948de86093eee22fbb5d9 [formerly a6bf896593
]
Former-commit-id: 7aca322faa
2014-02-21 17:37:19 -06:00
Brian.Dyke
5a11fbbfdb
OB_14.1.1-19 baseline
...
Former-commit-id: 3508e488f5
[formerly 779553142c
] [formerly cfa4997978
] [formerly 10b723647b
[formerly cfa4997978
[formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5
]
Former-commit-id: c41dd22ff2
2014-02-21 06:50:59 -05:00
Mike Duff
5754117aad
Issue #2631 - Set preference defaults in the Activator.
...
Removed unused file.
Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e
Former-commit-id: 9eafacaac2
[formerly a96a833f51
] [formerly ed5cb91406
] [formerly a7b1e79d2d
[formerly ed5cb91406
[formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]]
Former-commit-id: a7b1e79d2d
Former-commit-id: 054cdc944f74842daa02964eb9d5d80d21f23654 [formerly d90f4495c2
]
Former-commit-id: f98eec12b9
2014-02-20 15:09:10 -06:00
Brian Clements
e7584f3a49
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: 8bbf2bb6bd
[formerly a2bdfa25cc
] [formerly aaa2de20f4
] [formerly 89a48c3f6b
[formerly aaa2de20f4
[formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: 5cc63f048c2ca2bae92c62e08c20b8a3fc4c7681 [formerly 4b7ba54dc3
]
Former-commit-id: 04697836b8
2014-02-20 11:50:54 -06:00
Brian Clements
08a0e5baf2
Issue #2751 implemented room/topic ownership transfer
...
Former-commit-id: 4e165aba58
[formerly a8ff1effc1
] [formerly c3cadff705
] [formerly ab72938246
[formerly c3cadff705
[formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]
Former-commit-id: ab72938246
Former-commit-id: d96f62f0208dbdcb69677a9d6b014fc0a7761a39 [formerly d9ac2c0037
]
Former-commit-id: 9d00fe2bab
2014-02-20 11:10:14 -06:00
Nate Jensen
5d5518e29f
Issue #2704 fix startup issues where settings are valid but dialog
...
doens't realize it
Former-commit-id: 6973755f4e
[formerly 6ef26a636c
] [formerly 32bd9fd635
] [formerly 0f81b80467
[formerly 32bd9fd635
[formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]
Former-commit-id: 0f81b80467
Former-commit-id: bd38074eb147c551318fc588a5101194eae5605b [formerly 9f33e97c1b
]
Former-commit-id: 6e2150ccd7
2014-02-20 10:53:21 -06:00
Nate Jensen
08ede8e9f3
Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
...
Former-commit-id: adb51300d8
[formerly 4563e38db2
] [formerly 3078b69273
] [formerly 5856957c57
[formerly 3078b69273
[formerly 7820be8f078be179c7963cbae73cd3023a70c306]]]
Former-commit-id: 5856957c57
Former-commit-id: 1a60933c3ce5c3f2514129d9f7ef73e507bb6d7c [formerly 5412b72c57
]
Former-commit-id: c936a659a5
2014-02-19 17:22:00 -06:00
Nate Jensen
8a564e9987
Merge "Issue #2761 add region level to localization" into development
...
Former-commit-id: f939d93d7f
[formerly 3782880dac
] [formerly 9011e1b31e
] [formerly 6e59175ce4
[formerly 9011e1b31e
[formerly 59789454912e36ed64eb18fa83561fb7325945e2]]]
Former-commit-id: 6e59175ce4
Former-commit-id: 9bf4479e05cb345ab571f6736d903c87cbcab9f4 [formerly b1e2788958
]
Former-commit-id: 9394879520
2014-02-19 17:18:24 -06:00
Nate Jensen
eeac24c773
Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
...
Former-commit-id: f545a8a74d
[formerly a241472c34
] [formerly df376abcb7
] [formerly f99cf7df47
[formerly df376abcb7
[formerly ff080a6b5184f486348a015f31b957325fa280fa]]]
Former-commit-id: f99cf7df47
Former-commit-id: 76b7d9b753824f510f6d112e0bfada581f946906 [formerly 8b152a8027
]
Former-commit-id: d3ec0da1bb
2014-02-19 16:19:27 -06:00
Ron Anderson
efbe57d909
Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
...
Former-commit-id: dab0ebc99e
[formerly 8703c43937
] [formerly d87e0842ed68e4ba44c266df39b6308f7366e5ee [formerly 98d2417f94
]] [formerly b8c00d8ead
[formerly 98d2417f94
[formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]]
Former-commit-id: b8c00d8ead
Former-commit-id: 5a4e4666cbcd00018ef121b89b85a78808d680db [formerly 7e7f0abfdc
]
Former-commit-id: b9904edc3a
2014-02-19 15:39:56 -06:00
Mike Duff
a723f69ad9
Issue #2631 - Add sound preference for users joining a room.
...
review comments
Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207
Former-commit-id: 659cb1f2a0
[formerly e2a6251a6b
] [formerly 663ea8decd
] [formerly 95fcee385a
[formerly 663ea8decd
[formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]
Former-commit-id: 95fcee385a
Former-commit-id: 280611ef49d0a886c12f13b5471242ae42c55bac [formerly 3100a71f34
]
Former-commit-id: 89c4a3e04b
2014-02-19 15:26:14 -06:00
Mike Duff
10765884a3
Issue #2628 - Change cast from short to int for MPE colorbar
...
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c
Former-commit-id: 8a29af4894
[formerly 48a0b34b5f
] [formerly 682c6af456
] [formerly 183657fb33
[formerly 682c6af456
[formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]]
Former-commit-id: 183657fb33
Former-commit-id: 4622ac20555cc93d1c3532eaaaec9b3ab36c4650 [formerly 86fce9d547
]
Former-commit-id: 8be2622f85
2014-02-19 15:20:29 -06:00
Nate Jensen
7f1665f2eb
Merge "Issue #2751 fixed chat room bugs" into development
...
Former-commit-id: 72acab26c3
[formerly b4ac186728
] [formerly 4b4cca776f
] [formerly c72e2be969
[formerly 4b4cca776f
[formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]]]
Former-commit-id: c72e2be969
Former-commit-id: b5160733f88b5b22d9395a61e0d9f2dc75ca22a9 [formerly 7099b45023
]
Former-commit-id: 5ef747c703
2014-02-19 14:52:24 -06:00
Ron Anderson
84bea14340
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 5f3248574f
[formerly 663cb4cb62
] [formerly 5258aecf45
] [formerly 419e9d0b8d
[formerly 5258aecf45
[formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: ba993f1f22c77f61f4ea6ed8c28039e69d6a34b2 [formerly 8a41723ba6
]
Former-commit-id: 908e43039e
2014-02-19 11:55:11 -06:00
Mike Duff
bac3c86658
Issue #2734 - default time range to 24 hours.
...
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d
Former-commit-id: c7e22b7b3b
[formerly bc180503b1
] [formerly 19033601bf
] [formerly 0b316f7bd9
[formerly 19033601bf
[formerly 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5]]]
Former-commit-id: 0b316f7bd9
Former-commit-id: 0bf0f051070755b17c7ecbd3f200deb688e5152a [formerly 7710724c5a
]
Former-commit-id: 06ed3db690
2014-02-19 10:23:48 -06:00
Matt Nash
9cb0b6d530
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: 1d6e1d443c
[formerly 3f67324d7c
] [formerly 2d20e84f6a
] [formerly 1835019567
[formerly 2d20e84f6a
[formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]]
Former-commit-id: 1835019567
Former-commit-id: 82cdf604370def6ebacc4f1cbb2ebeaa41b75898 [formerly bb10484bd0
]
Former-commit-id: ae1d36b6d0
2014-02-19 10:01:25 -06:00
Brian Clements
30027665ac
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: abc01f5475
[formerly 06c16118e1
] [formerly 73ae2145ee1dd7c24b67f28a479521c8624012a8 [formerly dc074a9650
]] [formerly 3a135b8eac
[formerly dc074a9650
[formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 7c130f893c124249133b51cb750375f7ea62663d [formerly bee7cdb71a
]
Former-commit-id: 77bb396c9a
2014-02-19 08:32:26 -06:00
Mike Duff
5b1250208e
Issue #2596 - Add check for null coordinates.
...
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75
Former-commit-id: a370e81065
[formerly 283b0c670c
] [formerly a6509aad8c
] [formerly 9754f0d8dd
[formerly a6509aad8c
[formerly 11f3705080210161e6915309a4aec423b307cce8]]]
Former-commit-id: 9754f0d8dd
Former-commit-id: e476bd640b2d122cdc7d40b221ae5ec48126a502 [formerly ecb0d45b24
]
Former-commit-id: 40b0540830
2014-02-18 17:32:32 -06:00
Nate Jensen
2f1c0109b1
Merge "Issue #2756 new collaboration openfire plugin and http service" into development
...
Former-commit-id: 961239e181
[formerly ac0a10678b
] [formerly 020d54c48a
] [formerly b08d96b1e8
[formerly 020d54c48a
[formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]
Former-commit-id: b08d96b1e8
Former-commit-id: cc96c8c42118f1e42ca1fd6d9fbb3290f8d9ee88 [formerly a6bb05f2e3
]
Former-commit-id: 4bb0997749
2014-02-18 14:51:13 -06:00
Nate Jensen
61ec0df1c9
Merge "Issue #2793 improved collaboration disconnect handling" into development
...
Former-commit-id: d4cc8b1827
[formerly 1738248fac
] [formerly c63289fa14
] [formerly b3c45b303c
[formerly c63289fa14
[formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]]
Former-commit-id: b3c45b303c
Former-commit-id: fc277ab5e1f9070756173bf025bcb61f2b809b18 [formerly 173c646576
]
Former-commit-id: 2e468e9ec1
2014-02-18 11:22:19 -06:00
Brian Clements
0d7ae9a2ff
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: 1c8f5dd579
[formerly 9095a1584f
] [formerly a28fcf0dc5
] [formerly 7028f7fd4d
[formerly a28fcf0dc5
[formerly 231c3cd84e3c86caba81708581be911e771aa774]]]
Former-commit-id: 7028f7fd4d
Former-commit-id: e913208b8ecd6b9c2ea3cdbd0d843cace61bfdfe [formerly 510c39713f
]
Former-commit-id: 9d9c4c7c27
2014-02-18 11:11:33 -06:00
Brad Gonzales
ae35320dd6
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: 1d57e9f5f7
[formerly 379c0fb46c
] [formerly 19460ed0d7
] [formerly ba4e308328
[formerly 19460ed0d7
[formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]
Former-commit-id: ba4e308328
Former-commit-id: eab08c6056f77a408245754e016c16a1db9d08f4 [formerly 3be3380944
]
Former-commit-id: 1b76488111
2014-02-18 11:10:44 -06:00
Ron Anderson
8779564e3a
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: 410f956cff
[formerly e7f2b6883d
] [formerly 32bcf9d0d0
] [formerly 14a082a4e9
[formerly 32bcf9d0d0
[formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94
]
Former-commit-id: 0135771eec
2014-02-18 10:45:20 -06:00
Brian Clements
74d08f1d19
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: 68fac79fe7
[formerly f0c89ef6c6
] [formerly f6b2827434
] [formerly 5b4f1e8288
[formerly f6b2827434
[formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 9b1edc285732dbc80b9bea2223564bca70eef005 [formerly a1d9e40bd4
]
Former-commit-id: 02319f36e4
2014-02-18 10:03:12 -06:00
Nate Jensen
f348686037
Merge "Issue #2751 fixed blocked icon for roster entries" into development
...
Former-commit-id: 35b4de0640
[formerly 0228d24f1d
] [formerly e70f0d21ab
] [formerly aa7413fd4c
[formerly e70f0d21ab
[formerly 4f02e79ed2211fa9e406e3bc2c633256c6e85faf]]]
Former-commit-id: aa7413fd4c
Former-commit-id: 5d71389eedc005620646fd52ef65be20efafb64e [formerly f1b7bf1c2a
]
Former-commit-id: c3756326a6
2014-02-18 08:48:00 -06:00
Brian Clements
f5a25c9030
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: ab8f47413f
[formerly e894019715
] [formerly a94b366e26
] [formerly 3307f5ea5e
[formerly a94b366e26
[formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]]
Former-commit-id: 3307f5ea5e
Former-commit-id: 0a4ca2ccc03c0b3bc7d6e3a7885088347d34525e [formerly 476d0c3257
]
Former-commit-id: 02d3a9ae7e
2014-02-17 17:11:36 -06:00
Nate Jensen
60fd298721
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: 742217ded0
[formerly 0160ab0464
] [formerly 0c4de50218
] [formerly 4d68994525
[formerly 0c4de50218
[formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]
Former-commit-id: 4d68994525
Former-commit-id: 4ab3a27b137394410a2b8da012bfe21a237dd4b6 [formerly 228ab8dd60
]
Former-commit-id: 121bcd184a
2014-02-17 17:10:07 -06:00
Brian Clements
430832e3e5
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: ca8869b8ef
[formerly 6d71686332
] [formerly 3b5648c055
] [formerly 3dfd8fbafb
[formerly 3b5648c055
[formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]]
Former-commit-id: 3dfd8fbafb
Former-commit-id: 1370e6bd4a52b34c5890edb1080fbc043e98ad05 [formerly 9dc2967e3f
]
Former-commit-id: 0d07e417fc
2014-02-17 16:39:43 -06:00
Nate Jensen
7ad4c20f9c
Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
...
Former-commit-id: a416577b25
[formerly 2367c79c1c
] [formerly 5675869906
] [formerly f4260a617e
[formerly 5675869906
[formerly ef860082c4cd6159233323b89e0b73e272224f38]]]
Former-commit-id: f4260a617e
Former-commit-id: a1e31a6cfa24652c733363259ac1b8f622ca78e3 [formerly 96014c806d
]
Former-commit-id: 1639f43f50
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
028bfc35f6
Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
...
Former-commit-id: 386b6a2499
[formerly 2cf496ca84
] [formerly 937b3071d4
] [formerly ca90137801
[formerly 937b3071d4
[formerly 3f7342fc4f280180af46290b9afc7a047e16ce4a]]]
Former-commit-id: ca90137801
Former-commit-id: a03c7a16df951c26dd80622d531ce31fa0468d4d [formerly 0f6f60a132
]
Former-commit-id: fb5b367ecc
2014-02-17 14:02:57 -06:00
Nate Jensen
62739b7936
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: 34c7c3cba1
[formerly c8e70cd6b1
] [formerly 15ff4ab5d7
] [formerly 2486e39192
[formerly 15ff4ab5d7
[formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]]
Former-commit-id: 2486e39192
Former-commit-id: 961e5c0a4aa129e13bdd51a1f6be5cc7caf172c0 [formerly 0314d61773
]
Former-commit-id: b801b36ca7
2014-02-17 11:58:04 -06:00