Nate Jensen
3078b69273
Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
...
Former-commit-id: 7820be8f078be179c7963cbae73cd3023a70c306
2014-02-19 17:22:00 -06:00
Nate Jensen
9011e1b31e
Merge "Issue #2761 add region level to localization" into development
...
Former-commit-id: 59789454912e36ed64eb18fa83561fb7325945e2
2014-02-19 17:18:24 -06:00
Nate Jensen
df376abcb7
Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
...
Former-commit-id: ff080a6b5184f486348a015f31b957325fa280fa
2014-02-19 16:19:27 -06:00
Ron Anderson
98d2417f94
Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
...
Former-commit-id: d4fb7ae2684b26e93c33467de0b1813e263ce9e6
2014-02-19 15:39:56 -06:00
Mike Duff
663ea8decd
Issue #2631 - Add sound preference for users joining a room.
...
review comments
Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207
Former-commit-id: f578e45e37f7ac0780d2dc6b6ea21e81630ddc78
2014-02-19 15:26:14 -06:00
Mike Duff
682c6af456
Issue #2628 - Change cast from short to int for MPE colorbar
...
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c
Former-commit-id: d21c88a52604ff5f95e713eea0a61b1f6b33455e
2014-02-19 15:20:29 -06:00
Nate Jensen
4b4cca776f
Merge "Issue #2751 fixed chat room bugs" into development
...
Former-commit-id: 86d03d7d6741b176a23dd93efd996154d3beaecb
2014-02-19 14:52:24 -06:00
Lee Venable
8e967e8e59
Merge "Issue #2734 - default time range to 24 hours." into development
...
Former-commit-id: 4604b591b1f15621fcf4cd0e93143435cccfe43b
2014-02-19 12:33:46 -06:00
Ron Anderson
5258aecf45
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: ce896b573fcef99e30e3bda5f53b0941cd1b2e36
2014-02-19 11:55:11 -06:00
Slav Korolev
a597ac0989
Issue #2652 . Fixed issue with edex-text-ingest log. Deleted unused code.
...
Change-Id: Id84e813047342a49988f78c1c9e13c356305e11b
Former-commit-id: 7b666c5fb7a1cb459a90bb295e58491a9a21063c
2014-02-19 12:01:06 -05:00
Mike Duff
19033601bf
Issue #2734 - default time range to 24 hours.
...
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d
Former-commit-id: 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5
2014-02-19 10:23:48 -06:00
Matt Nash
2d20e84f6a
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: 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6
2014-02-19 10:01:25 -06:00
Brian Clements
dc074a9650
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: 453604eca5fca9e5d14ba1842dc7f76f1e0180ca
2014-02-19 08:32:26 -06:00
Lee Venable
6e60748b41
Merge "Issue #2596 - Add check for null coordinates." into development
...
Former-commit-id: e3517f5144c386038c4d535d79e62ec02d504f9f
2014-02-18 18:08:10 -06:00
Nate Jensen
698a4f827d
Merge "Issue #2672 Fix radar dataaccess from pure python." into development
...
Former-commit-id: 6c8fba6afd4b5e28b425b6058e40130a1dd0b518
2014-02-18 17:35:39 -06:00
Mike Duff
a6509aad8c
Issue #2596 - Add check for null coordinates.
...
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75
Former-commit-id: 11f3705080210161e6915309a4aec423b307cce8
2014-02-18 17:32:32 -06:00
Nate Jensen
020d54c48a
Merge "Issue #2756 new collaboration openfire plugin and http service" into development
...
Former-commit-id: e483f4311d00726f023d30e6d3f4e813c559390e
2014-02-18 14:51:13 -06:00
Ben Steffensmeier
3e0cba04c0
Issue #2672 Fix radar dataaccess from pure python.
...
Former-commit-id: 8beef8db2ffe599c9167dbd61aed8243d3a0af0e
2014-02-18 13:57:28 -06:00
David Gillingham
32719432ff
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd
2014-02-18 13:24:37 -06:00
Richard Peter
3ed6ad64ce
Merge "Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues." into omaha_14.2.1
...
Former-commit-id: 5bf461753675af961c484d022cec4006fabfeba8
2014-02-18 12:44:57 -06:00
Lee Venable
adec7acc7c
Merge "Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now." into development
...
Former-commit-id: 81d300630a64d9077e5b3a801e722fd10de4119e
2014-02-18 12:21:30 -06:00
Lee Venable
0cf2dba731
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21
2014-02-18 12:19:41 -06:00
Ron Anderson
a860ff3e6e
Merge "Issue #2758 Fix MHSEmulator to pass small files" into development
...
Former-commit-id: ecece1009e1508451569b3d065e30820819a0502
2014-02-18 12:12:25 -06:00
Brad Gonzales
36a24c1cb5
Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues.
...
Amend: updated test envlope sizes.
fixed ticket numbers in software history.
Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5
Former-commit-id: 4c3148df4e85ccfa1d5b123fcb605d97249833d7
2014-02-18 12:11:02 -06:00
Mike Duff
89bd047283
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5
2014-02-18 12:05:26 -06:00
Nate Jensen
c63289fa14
Merge "Issue #2793 improved collaboration disconnect handling" into development
...
Former-commit-id: bf0a607b05ffb042e998d2c9940091137da21dc0
2014-02-18 11:22:19 -06:00
Brian Clements
a28fcf0dc5
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: 231c3cd84e3c86caba81708581be911e771aa774
2014-02-18 11:11:33 -06:00
Brad Gonzales
19460ed0d7
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: d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb
2014-02-18 11:10:44 -06:00
Ron Anderson
32bcf9d0d0
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: 4155b9785e0a82078db6805659146980cafc2aa7
2014-02-18 10:45:20 -06:00
Brian Clements
f6b2827434
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: ff23569984eee43927c10ca041ca7e0ca4d40a3b
2014-02-18 10:03:12 -06:00
Dave Hladky
5c11dd09bb
Issue #2786 Pending subscriptions don't work.
...
Former-commit-id: e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79
2014-02-18 09:14:38 -06:00
Brian Clements
d4f3fe7629
Issue #2755 removed subscription plugin jar from rpms
...
Former-commit-id: 59921407164c798a0748475d84ca0ad32bf7bfcb
2014-02-18 09:00:21 -06:00
Nate Jensen
e70f0d21ab
Merge "Issue #2751 fixed blocked icon for roster entries" into development
...
Former-commit-id: 4f02e79ed2211fa9e406e3bc2c633256c6e85faf
2014-02-18 08:48:00 -06:00
Brian Clements
a94b366e26
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: 7f3a2f5e631176426ece6384719f3b1c9b00105a
2014-02-17 17:11:36 -06:00
Nate Jensen
0c4de50218
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: adfb9c293456aeced60e3ab41575d8b3b0f635b8
2014-02-17 17:10:07 -06:00
Brian Clements
3b5648c055
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: 9a4b091f7e2655f48fd061021d161c4eb2e63dd8
2014-02-17 16:39:43 -06:00
Bryan Kowal
f5afe830a7
Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now.
...
Amend: add a default value for localization site in the pure overrider.
Change-Id: I6056c274a10def96ba69786b58ba284146e49160
Former-commit-id: 71c960bfc67fd78d3ffee8a14005d4391f4bc2aa
2014-02-17 14:41:10 -06:00
Nate Jensen
5675869906
Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
...
Former-commit-id: ef860082c4cd6159233323b89e0b73e272224f38
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
937b3071d4
Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
...
Former-commit-id: 3f7342fc4f280180af46290b9afc7a047e16ce4a
2014-02-17 14:02:57 -06:00
Nate Jensen
15ff4ab5d7
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: 6e020ed9403fcd2e1c27ed9ab8443497ba645933
2014-02-17 11:58:04 -06:00
Nate Jensen
be75cc3731
Issue #2813 fix xml serialization of subscriptions
...
Former-commit-id: 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba
2014-02-17 11:37:48 -06:00
Nate Jensen
30632fbd84
Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
...
Former-commit-id: 4778976c7175121841fc9ca69a814daf9d466c6c
2014-02-17 11:22:53 -06:00
Max Schenkelberg
acad670229
Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
...
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc
Former-commit-id: e0a5ec0a713f06eab93d86671a43334110b60b0c
2014-02-17 11:07:45 -06:00
Steve Harris
267cc881a4
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: a494febee5f45d211797843d56077ac0ef358dbf
2014-02-17 08:54:34 -06:00
Ron Anderson
fae824482b
Merge "Issue #2528 Fix display of data on somewhat identical projections. Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26" into omaha_14.2.1
...
Former-commit-id: ddb195c3032b80221e63f21eb113eaab5d50b124
2014-02-17 08:56:48 -06:00
Nate Jensen
723ff23ee9
Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
...
Former-commit-id: 4b48313cb3509bebcfdd79e1df3d746a2d12c6af
2014-02-14 10:50:38 -06:00
Max Schenkelberg
6309f9b34b
Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
...
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df
Former-commit-id: 8b3deac27c76c6827ad2ad7863f91a3b8fbe7fa4
2014-02-14 10:47:42 -06:00
Mike Duff
ac62d322ed
Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
...
Former-commit-id: a2dcb434e8d72e0046c6af9900e0abd093f9bcbc
2014-02-14 08:53:40 -06:00
Ron Anderson
4309016948
Issue #2758 Fix MHSEmulator to pass small files
...
Change-Id: I760be79c1119708bdcc0ed472b575d9f88fd5707
Former-commit-id: 82cf8e81625ebf809ce62b1e21b4db8d5ef0a098
2014-02-13 15:53:15 -06:00
Nate Jensen
e05f1eae96
Issue #2751 first cut of transfer leadership
...
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9
Former-commit-id: cd0a838d34c9d7533bf59a477a17f4cb1af75a00
2014-02-13 15:35:53 -06:00