Nate Jensen
7f1665f2eb
Merge "Issue #2751 fixed chat room bugs" into development
...
Former-commit-id: 72acab26c3b4ac1867284b4cca776fc72e2be9694b4cca776fc72e2be9697099b450235ef747c703
2014-02-19 14:52:24 -06:00
Ron Anderson
84bea14340
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 5f3248574f663cb4cb625258aecf45419e9d0b8d5258aecf45419e9d0b8d8a41723ba6908e43039e
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: c7e22b7b3bbc180503b119033601bf0b316f7bd919033601bf0b316f7bd97710724c5a06ed3db690
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: 1d6e1d443c3f67324d7c2d20e84f6a18350195672d20e84f6a1835019567bb10484bd0ae1d36b6d0
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: abc01f547506c16118e1dc074a96503a135b8eacdc074a96503a135b8eacbee7cdb71a77bb396c9a
2014-02-19 08:32:26 -06:00
Mike Duff
5b1250208e
Issue #2596 - Add check for null coordinates.
...
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75
Former-commit-id: a370e81065283b0c670ca6509aad8c9754f0d8dda6509aad8c9754f0d8ddecb0d45b2440b0540830
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: 961239e181ac0a10678b020d54c48ab08d96b1e8020d54c48ab08d96b1e8a6bb05f2e34bb0997749
2014-02-18 14:51:13 -06:00
Nate Jensen
61ec0df1c9
Merge "Issue #2793 improved collaboration disconnect handling" into development
...
Former-commit-id: d4cc8b18271738248facc63289fa14b3c45b303cc63289fa14b3c45b303c173c6465762e468e9ec1
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: 1c8f5dd5799095a1584fa28fcf0dc57028f7fd4da28fcf0dc57028f7fd4d510c39713f9d9c4c7c27
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: 1d57e9f5f7379c0fb46c19460ed0d7ba4e30832819460ed0d7ba4e3083283be33809441b76488111
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: 410f956cffe7f2b6883d32bcf9d0d014a082a4e932bcf9d0d014a082a4e9d4ba9eba940135771eec
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: 68fac79fe7f0c89ef6c6f6b28274345b4f1e8288f6b28274345b4f1e8288a1d9e40bd402319f36e4
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: 35b4de06400228d24f1de70f0d21abaa7413fd4ce70f0d21abaa7413fd4cf1b7bf1c2ac3756326a6
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: ab8f47413fe894019715a94b366e263307f5ea5ea94b366e263307f5ea5e476d0c325702d3a9ae7e
2014-02-17 17:11:36 -06:00
Nate Jensen
60fd298721
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: 742217ded00160ab04640c4de502184d689945250c4de502184d68994525228ab8dd60121bcd184a
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: ca8869b8ef6d716863323b5648c0553dfd8fbafb3b5648c0553dfd8fbafb9dc2967e3f0d07e417fc
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: a416577b252367c79c1c5675869906f4260a617e5675869906f4260a617e96014c806d1639f43f50
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: 386b6a24992cf496ca84937b3071d4ca90137801937b3071d4ca901378010f6f60a132fb5b367ecc
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: 34c7c3cba1c8e70cd6b115ff4ab5d72486e3919215ff4ab5d72486e391920314d61773b801b36ca7
2014-02-17 11:58:04 -06:00
Nate Jensen
0f317fd808
Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
...
Former-commit-id: ed76393cd80fe984258230632fbd84063d85ee2230632fbd84063d85ee22996663ccee1169f85a3b
2014-02-17 11:22:53 -06:00
Max Schenkelberg
748a81d884
Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
...
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc
Former-commit-id: 554e0caec51de140a526acad6702296a2a33abe1acad6702296a2a33abe191f707537bff9fdc63b0
2014-02-17 11:07:45 -06:00
Steve Harris
1fbbb6e73f
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 1b7e02636dd0352c69d4267cc881a49fcc5ad930267cc881a49fcc5ad930e115197bb7146412a8bd
2014-02-17 08:54:34 -06:00
Nate Jensen
d3c66cb748
Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
...
Former-commit-id: fa87ba313856aa06888f723ff23ee9f3d107580f723ff23ee9f3d107580fdbc420e917b1c976ac17
2014-02-14 10:50:38 -06:00
Max Schenkelberg
db72c9efca
Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
...
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df
Former-commit-id: 38aae37f014d656b5d066309f9b34bc8e93190f26309f9b34bc8e93190f23571135645b311aba5d5
2014-02-14 10:47:42 -06:00
Mike Duff
fad65749a8
Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
...
Former-commit-id: b34c9eedd043ea3b0918ac62d322ed346dc4afffac62d322ed346dc4afff5b3a55d11f6601dff483
2014-02-14 08:53:40 -06:00
Nate Jensen
740e71adba
Issue #2751 first cut of transfer leadership
...
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9
Former-commit-id: 47b27c602f63d5f94cbbe05f1eae96a85575a763e05f1eae96a85575a76311fb06810f139479b4e1
2014-02-13 15:35:53 -06:00
Nate Jensen
2772ad3c9c
Merge "Issue #2700 fixed subscribe request group input" into development
...
Former-commit-id: ec6d8585e1f2b32fa1ae2643d01b74d8e2d2837e2643d01b74d8e2d2837eb31470f7e31f3c4090a0
2014-02-13 14:02:55 -06:00
Brian Clements
21b1a6844a
Issue #2751 user identity refactor
...
VenueParticipant no longer a subtype of UserId
New interface for both
refactored base classes to be generic for user types
Former-commit-id: 01653c76de16ed18e0c6ef529089060ac7ff81cfef529089060ac7ff81cf3ec3ad0543e6de3a118d
2014-02-13 13:51:39 -06:00
Ron Anderson
c2e56111c1
Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
...
Former-commit-id: ce72867ab921e95cc2f051c9d27a3942fd9c8f9a51c9d27a3942fd9c8f9ab84a83eb6fca11555427
2014-02-13 10:46:27 -06:00
Ron Anderson
4d8ebf6712
Issue #2788 Fix topo for large areas.
...
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 69ee4792ad3e78908bb5fcf45916f42f067699f2fcf45916f42f067699f22d7c87ac84d9b82b4ebe
2014-02-13 10:10:34 -06:00
Brian Clements
d4afb01ecc
Issue #2700 fixed subscribe request group input
...
user was being added to roster twice, the second time overwrote the group info
changed dialog to pass group info back so we only add once
Former-commit-id: a0eb8342bf2d72c0f475579f7c826dcaa8360ac7579f7c826dcaa8360ac7bafe2972a446ea69990d
2014-02-13 09:47:02 -06:00
Nate Jensen
906e7f679a
Merge "Issue #2799 fixed double click chat not working for roster entries" into development
...
Former-commit-id: 1841c4f7bfed87998c31609331286194b8b7eb04609331286194b8b7eb04b9e027059ff53e9523f3
2014-02-12 17:34:27 -06:00
Brian Clements
0145571fe4
Issue #2799 fixed double click chat not working for roster entries
...
Former-commit-id: 2a687e7ac51e19c8d62c1bf3a090569d7490a1581bf3a090569d7490a158f22268295e667a1450cf
2014-02-12 17:06:44 -06:00
Brian Clements
c322557870
Issue #2797 fixed presence bug
...
a defensive copy was needed when sending presence to rooms
Former-commit-id: b8a1c8f56d22031aa87d81ddf87b0423e203902881ddf87b0423e203902809859bdee9a1ba9c6b9d
2014-02-12 16:54:46 -06:00
Nate Jensen
fc4670578b
Merge "Issue #2793 improved error handling for packet extension" into development
...
Former-commit-id: 1bf941fc58fa42c40bc7eec72c59565e6656581beec72c59565e6656581b7247d69202bac84c698f
2014-02-12 15:06:43 -06:00
Brian Clements
85e92777e3
Issue #2793 improved error handling for packet extension
...
any exception thrown while parsing packets disconnects stream
changed to logging parsing problems and returning empty payload so we stay connected
added null check when sending to topic
Former-commit-id: 87a7bf82e53034ac5994e381edcd60b0714ba659e381edcd60b0714ba6594406477877b94bc84429
2014-02-12 14:22:33 -06:00
Lee Venable
c17a417cbe
Issue #2773 - added code to help prevent eclipse bug from occurring.
...
Former-commit-id: 328aebb4a68073fd22b17099472204ce08022db77099472204ce08022db7c74ae6b83da7302a3232
2014-02-12 13:47:20 -06:00
Brian Clements
8b275e94b2
Issue #2699 require non blank handle
...
previously defaulted to userid if handle left blank
now reprompts for handle
preferences now default to userid to pre-fill handle
Former-commit-id: 88db377b418f07ae2a420765451a9dddf5b2a3ef0765451a9dddf5b2a3effab4fea1779c67bcbbcf
2014-02-12 09:13:48 -06:00
Brian.Dyke
1c7bf39f73
14.1.1-18 baseline
...
Former-commit-id: 1f27652aa3f05a2220cd575e3281231d6a9456b7575e3281231d6a9456b7c5857c30f2d61ae6c5f4
2014-02-11 15:52:50 -05:00
Lee Venable
f8ae04bce2
Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
...
Former-commit-id: 6773d174ecc7cfd496225c256dc19cf078971b5d5c256dc19cf078971b5d42fdfa4964ab6fab4199
2014-02-11 09:15:44 -06:00
Nate Jensen
1dcb3a77c3
Issue #2704 smarter thin client connectivity dialog and connection
...
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: 24bbf4949dc28085118f75ca70fba6fd43d9e09575ca70fba6fd43d9e0952111989497c0256ac19e
2014-02-10 16:48:29 -06:00
Max Schenkelberg
8ddc6b95e4
Issue #2680 fixed samplers in structs issues with GLSL spec.
...
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9
Former-commit-id: 7de6ff30da3c1fafe3287822511754a8a67634f97822511754a8a67634f9e2e9eaaf35dd872433c7
2014-02-10 13:43:16 -06:00
Lee Venable
e9e5667274
Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1
...
Former-commit-id: b90abb03c1d6fa79f1a727be4297e688a9d2031627be4297e688a9d20316d975dcf01e65e6fa1963
2014-02-10 11:50:07 -06:00
Nate Jensen
c65669a6bf
Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1
...
Former-commit-id: fb8ce8da65d16d6798095c7c14a6c4a48c1c67835c7c14a6c4a48c1c678357aa6788833047063c6e
2014-02-10 09:53:41 -06:00
Mike Duff
b62abd4219
Issue #2453 - Notification Center refactor
...
Former-commit-id: c20018d0ba61c57d2254eeb78f7f202c9d603e50eeb78f7f202c9d603e504a87525df07535b51fe7
2014-02-07 16:50:50 -06:00
Ben Steffensmeier
7f8ff5efc0
Issue #2211 Fix data mapped sampling.
...
Former-commit-id: e7baa5b186d219a687c9724bb856763d76d6655b724bb856763d76d6655b6a95dd6242a37a910f67
2014-02-07 13:00:00 -06:00
Brian Clements
0dd73fed5a
Issue #2699 removed over cautious handle validation
...
xmpp does not limit the characters that can go in a handle
fixed id from room parsing to account for special characters
Former-commit-id: 6c6467d235639f7745677d6e116b9f6518b88fe57d6e116b9f6518b88fe58742be3a136efb4f51d2
2014-02-07 10:06:06 -06:00
David Gillingham
8cdf1ce158
Issue #2509 : Fix baseline merge breakage to ifpIMAGE.
...
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00
Former-commit-id: dc8f0dde25b12e29dd7c03d36b8309e8ffc7389303d36b8309e8ffc7389394ec272ab2ad8c40032f
2014-02-07 09:51:42 -06:00
Richard Peter
5a7e7af23b
Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
...
Former-commit-id: 8ad3c5857b82fc0a2ed364f0cabaef36d3d21b5764f0cabaef36d3d21b57c965993d17c3c1205848
2014-02-05 18:20:36 -06:00
Nate Jensen
73c1a1141d
Merge "Issue #2672 Handle envelopes in data access requests of gridded types. Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c" into development
...
Former-commit-id: 6b9561855bd3d0dc5f77d863bf208cf00d4c54d8d863bf208cf00d4c54d88feed9aadf39c9dda92b
2014-02-05 17:09:17 -06:00
