Ron Anderson
efbe57d909
Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
...
Former-commit-id: dab0ebc99e8703c4393798d2417f94b8c00d8ead98d2417f94b8c00d8ead7e7f0abfdcb9904edc3a
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: 659cb1f2a0e2a6251a6b663ea8decd95fcee385a663ea8decd95fcee385a3100a71f3489c4a3e04b
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: 8a29af489448a0b34b5f682c6af456183657fb33682c6af456183657fb3386fce9d5478be2622f85
2014-02-19 15:20:29 -06:00
Nate Jensen
7f1665f2eb
Merge "Issue #2751 fixed chat room bugs" into development
...
Former-commit-id: 72acab26c3b4ac1867284b4cca776fc72e2be9694b4cca776fc72e2be9697099b450235ef747c703
2014-02-19 14:52:24 -06:00
Lee Venable
a0d9fe6f20
Merge "Issue #2734 - default time range to 24 hours." into development
...
Former-commit-id: 5582282777de102f4e948e967e8e59e204b350ee8e967e8e59e204b350ee9cb8925e51404a4c3149
2014-02-19 12:33:46 -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
Slav Korolev
164665bbac
Issue #2652 . Fixed issue with edex-text-ingest log. Deleted unused code.
...
Change-Id: Id84e813047342a49988f78c1c9e13c356305e11b
Former-commit-id: 39e49448baf7a6a6c613a597ac09893b1ea13cb1a597ac09893b1ea13cb18ec2d02f5206d55c28f4
2014-02-19 12:01:06 -05: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
Lee Venable
32141b0655
Merge "Issue #2596 - Add check for null coordinates." into development
...
Former-commit-id: 0db46dd5fb1620d0fb226e60748b41c871e4c8726e60748b41c871e4c872d62b4e7621110557f42c
2014-02-18 18:08:10 -06:00
Nate Jensen
ce2568b36b
Merge "Issue #2672 Fix radar dataaccess from pure python." into development
...
Former-commit-id: dd821703b682fde2011c698a4f827d713ec598c3698a4f827d713ec598c379cbb8d79a05edfb90d5
2014-02-18 17:35:39 -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
Ben Steffensmeier
3b183b18f0
Issue #2672 Fix radar dataaccess from pure python.
...
Former-commit-id: 804bf6a8edadd98f22b13e0cba04c0e19b4518ef3e0cba04c0e19b4518ef399e3d3f072be385e6b8
2014-02-18 13:57:28 -06:00
David Gillingham
b373d71852
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: 43733c77eb607ce13c1932719432ffde12904c7a32719432ffde12904c7a1520317c24a83191356d
2014-02-18 13:24:37 -06:00
Richard Peter
ba1cb2a9cf
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: 4dcb9b321dc666adb5303ed6ad64ced19e464a1a3ed6ad64ced19e464a1a3c4e188037f7e43bdabd
2014-02-18 12:44:57 -06:00
Lee Venable
29dbb922b8
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: 03d23a194e7f3b6413e6adec7acc7cd9bccda151adec7acc7cd9bccda1518b8c5d2258e74e805bb6
2014-02-18 12:21:30 -06:00
Lee Venable
ab57d3efe7
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: f81d0d88b8e9226e71400cf2dba7314e7c3c0cbe0cf2dba7314e7c3c0cbe6fc9dcb3b146dbd967a5
2014-02-18 12:19:41 -06:00
Ron Anderson
317494f1c6
Merge "Issue #2758 Fix MHSEmulator to pass small files" into development
...
Former-commit-id: 9c9696faaffc5aa71b86a860ff3e6e7ab79d8b3aa860ff3e6e7ab79d8b3a33adfffab95c08871d87
2014-02-18 12:12:25 -06:00
Brad Gonzales
2330bf10b2
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: b0f71efecc49ddffc99b36a24c1cb5794bbc3c9b36a24c1cb5794bbc3c9b90d34f73863bb9975728
2014-02-18 12:11:02 -06:00
Mike Duff
cddd263edc
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: c125b9d04433f81d882289bd047283911789b91089bd047283911789b9105f9d913c6d42e6591bc8
2014-02-18 12:05:26 -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
Dave Hladky
b0849517aa
Issue #2786 Pending subscriptions don't work.
...
Former-commit-id: c8711269fa24a4fab6035c11dd09bb7ee101d7c75c11dd09bb7ee101d7c778d41d01bb012619f05f
2014-02-18 09:14:38 -06:00
Brian Clements
b4f07d06d8
Issue #2755 removed subscription plugin jar from rpms
...
Former-commit-id: fa44883db0944a874c5bd4f3fe7629248db98ddfd4f3fe7629248db98ddf5faad2ccca08bffb26ca
2014-02-18 09:00:21 -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
Bryan Kowal
dc3c609086
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: 8493f0581fbb3a067f93f5afe830a7e0b0d88e46f5afe830a7e0b0d88e46d4ce52459eb5d4574294
2014-02-17 14:41:10 -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
fd8e2126b1
Issue #2813 fix xml serialization of subscriptions
...
Former-commit-id: e42eb1940d4583814741be75cc373183e9226419be75cc373183e922641930bbc788cee9bbdfdf89
2014-02-17 11:37:48 -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
Ron Anderson
facdf2b779
Merge "Issue #2528 Fix display of data on somewhat identical projections. Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26" into omaha_14.2.1
...
Former-commit-id: 4b2981b74fce8d59e075fae824482b769c56bf08fae824482b769c56bf0829e24081a68434f5cc65
2014-02-17 08:56:48 -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
Ron Anderson
c77d1c7e95
Issue #2758 Fix MHSEmulator to pass small files
...
Change-Id: I760be79c1119708bdcc0ed472b575d9f88fd5707
Former-commit-id: 0f73b51155027cb2ef914309016948acf250cf4d4309016948acf250cf4dd7170d1ea8dabeb6272d
2014-02-13 15:53:15 -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
Nate Jensen
b357f36676
Merge "Issue #2751 user identity refactor" into development
...
Former-commit-id: 8ef1cef675da2eb1f068ee5b9b65bf38bd5b3d52ee5b9b65bf38bd5b3d5234906d54641ff97122ea
2014-02-13 14:01:53 -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
