Steve Harris
b1436cd176
Merge branch 'omaha_13.5.1' (13.5.1-16) into development
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
nativeLib/edex_com/.cproject
Former-commit-id: 891f00d6503f8cc1daf38484f03bb8891f00d6503f8cc1daf38484f03bb83f8cc1daf356416708fc
2013-08-15 12:50:08 -05:00
Steve Harris
0e6b082e85
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Former-commit-id: a687da607508b105a492727eba03b9a687da607508b105a492727eba03b908b105a4928f0b0c1514
2013-08-15 12:46:48 -05:00
Steve Harris
8484d25386
13.5.1-16 baseline
...
Former-commit-id: 7ce0234d766818d80085cd3b63d9617ce0234d766818d80085cd3b63d9616818d8008547130c98a5
2013-08-15 13:40:37 -04:00
Ben Steffensmeier
84acf21b74
Issue #2259 fix units for goes point data pressure
...
Former-commit-id: 984c5f2684d3628766b82171c10e9e984c5f2684d3628766b82171c10e9ed3628766b891df4581d2
2013-08-15 12:02:24 -05:00
David Gillingham
6f33dfc736
Issue #2262 : Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into
...
Java. Convert to use of these new methods where possible. Create unit tests.
Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d
Former-commit-id: 40b5d54bf3c17f8b44090b6b0e06cc40b5d54bf3c17f8b44090b6b0e06ccc17f8b4409bd9b224ff5
2013-08-15 11:30:45 -05:00
Jonathan Sanchez
f6d0525778
Issue #2243 Resolved timing issues.
...
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34
Former-commit-id: bc30396b6378b655fd1f2b849d7003bc30396b6378b655fd1f2b849d700378b655fd1f6902b263e5
2013-08-15 10:56:37 -05:00
Ron Anderson
d8cfa8a068
Merge "Issue #1133 Better error handling for invalid polygons in map resource. Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442" into development
...
Former-commit-id: ca560e5fc05afcf8bee22b491f11adca560e5fc05afcf8bee22b491f11ad5afcf8bee2d70ba1184d
2013-08-15 10:50:57 -05:00
Ben Steffensmeier
eda48eedf5
Issue #1133 Better error handling for invalid polygons in map resource.
...
Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442
Former-commit-id: 7f9bbf3d52aa08c8af4227594e68087f9bbf3d52aa08c8af4227594e6808aa08c8af42b887dcbe6d
2013-08-15 10:32:28 -05:00
Richard Peter
2a7e9184c9
Issue #2214 : Fix merge issue with gfe-spring.xml
...
Former-commit-id: dad1b6fb452064be203deb8805e51cdad1b6fb452064be203deb8805e51c2064be203de5cb3f9e0a
2013-08-14 18:32:39 -05:00
Nate Jensen
6d2c3b2f86
Merge "Issue #2254 - Send an email to omaha_awips on unit test failures or errors" into development
...
Former-commit-id: f08d3f4a9dbc80d6f7dcce4d54ee5af08d3f4a9dbc80d6f7dcce4d54ee5abc80d6f7dcf9af5f041e
2013-08-14 15:45:29 -05:00
Richard Peter
48071c65d3
Issue #1977 : Fix merge issue with WarngenDialog
...
Former-commit-id: a5383dbfa48ba6abf6427c03fc955ba5383dbfa48ba6abf6427c03fc955b8ba6abf6424dc2cdd1d4
2013-08-14 15:33:02 -05:00
Richard Peter
be6e9a56c2
Merge branch 'omaha_13.5.1' (13.5.1-15) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
Former-commit-id: 2a9276c7281f32ef9c7a5e5047cc4f2a9276c7281f32ef9c7a5e5047cc4f1f32ef9c7a181df35afc
2013-08-14 15:23:18 -05:00
Greg Armendariz
d784d473ad
Merge "Issue #2257 - updated edex_com to use the qpid 0.18 messaging api" into omaha_13.5.1
...
Former-commit-id: edf12d4d4fe254c838eaf02fef09a2edf12d4d4fe254c838eaf02fef09a2e254c838ea0578f67668
2013-08-14 15:00:26 -05:00
Richard Peter
1db3b4c11b
Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: ee6b9eb11a2608dfe1d8c61afa1bfaee6b9eb11a2608dfe1d8c61afa1bfa2608dfe1d89ff9054d7e
2013-08-14 14:29:55 -05:00
Mike Duff
4198b68969
Issue #2254 - Send an email to omaha_awips on unit test failures or errors
...
Former-commit-id: 0973d5018cc7a76d191f18f11ce9e00973d5018cc7a76d191f18f11ce9e0c7a76d191fff37559dcd
2013-08-14 14:20:52 -05:00
Richard Peter
6ba91900d2
Merge "Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT to correspond to the port that the DPA looks for. Renamed registry mode to wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode." into development
...
Former-commit-id: bca32c2e0a09e4f4f4dabdf3d5a295bca32c2e0a09e4f4f4dabdf3d5a29509e4f4f4da6c7c5a5b4b
2013-08-14 13:57:48 -05:00
Nate Jensen
b9f7180d8d
Merge "Issue #2033 moved bundles and menu files into corresponding plugins" into development
...
Former-commit-id: 0947f358b13b97de573a9776721a460947f358b13b97de573a9776721a463b97de573a9407a5202a
2013-08-14 12:55:15 -05:00
Brad Gonzales
c70dd5e0c4
Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT to correspond to the port that the DPA looks for.
...
Renamed registry mode to wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode.
Change-Id: I8793b2a5c6ebf0f2ce342103e81d48de1b3e2044
Former-commit-id: 5d169e4df150a10b3efb533deffd535d169e4df150a10b3efb533deffd5350a10b3efbec3646def6
2013-08-14 12:35:18 -05:00
Richard Peter
2e526ff940
Merge "Issue #2224 Bug fixes to pass unit test." into development
...
Former-commit-id: 11229d4b51a9ef2e7fd31a3dfd45ab11229d4b51a9ef2e7fd31a3dfd45aba9ef2e7fd3c489a4e9b2
2013-08-14 11:55:17 -05:00
Bryan Kowal
97fa7e98d6
Issue #2257 - updated edex_com to use the qpid 0.18 messaging api
...
- created the new awips2-qpid-lib rpm
- removed the ldm dependendency on awips2-notification (ldm still uses qpid 0.7)
- qpid 0.7 libraries are now packaged with ldm
- Amend: update the 32-bit build configurations
- Amend: improve error handling in the EdexNotification cleanup function
Change-Id: Iee8ec98304a6b5aea0d11044dd8779d2afa100c3
Former-commit-id: 21893102bbec0ef7fe80fc8c3f540d21893102bbec0ef7fe80fc8c3f540dec0ef7fe8067c9cbf70e
2013-08-14 11:21:33 -05:00
Richard Peter
9eb6c06b2d
Merge "Issue #2247 - Fix permission displays in UserAdmin Dialogs" into development
...
Former-commit-id: 045d3cd61872ecb0b995cfe449d838045d3cd61872ecb0b995cfe449d83872ecb0b9952169c7ae71
2013-08-14 10:53:53 -05:00
Roger Ferrel
ef3be7c029
Issue #2224 Bug fixes to pass unit test.
...
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00
Former-commit-id: 87f9cb2fb381a31214cdcaa97d7d0987f9cb2fb381a31214cdcaa97d7d0981a31214cdd3a33f2855
2013-08-14 10:25:49 -05:00
Mike Duff
e59a16406d
Issue #2247 - Fix permission displays in UserAdmin Dialogs
...
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4
Former-commit-id: e791617acce319928638097028ec59e791617acce319928638097028ec59e3199286383959e7e9f8
2013-08-14 10:13:05 -05:00
Steve Harris
64369ef595
13.5.1-15 baseline
...
Former-commit-id: c6dc1817e7535218c67653e96e21dbc6dc1817e7535218c67653e96e21db535218c676b05abcaec0
2013-08-14 10:24:26 -04:00
Max Schenkelberg
6b347f7aee
Issue #2033 moved bundles and menu files into corresponding plugins
...
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc
Former-commit-id: 06dbae8bdb6c92aa9dd75ab8b6e2c606dbae8bdb6c92aa9dd75ab8b6e2c66c92aa9dd79be1171c33
2013-08-14 09:20:28 -05:00
Steve Harris
05ec949b01
13.5.1-14 baseline
...
Former-commit-id: 80e5f7fbd4b848317203d695e5debe80e5f7fbd4b848317203d695e5debeb848317203c6465a3398
2013-08-14 10:07:41 -04:00
Jonathan Sanchez
7365c246ef
Issue #2243 Resolved incorrect import.
...
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb
Former-commit-id: fd0f2f1c0952d7862d36c6b6576f01fd0f2f1c0952d7862d36c6b6576f0152d7862d36714982e96f
2013-08-13 20:47:49 -05:00
Nate Jensen
c66c09a725
Merge "Issue #2262 create new wxmath plugin seeded by Java derivparam functions" into development
...
Former-commit-id: c844396230a50328f796e4a9195477c844396230a50328f796e4a9195477a50328f796a72d987b2e
2013-08-13 17:19:25 -05:00
Nate Jensen
3871882405
Issue #2262 create new wxmath plugin seeded by Java derivparam functions
...
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2
Former-commit-id: 959b50d18423fe237b7e09872d6713959b50d18423fe237b7e09872d671323fe237b7e9df41ff246
2013-08-13 16:59:57 -05:00
Richard Peter
297b1003b3
Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
...
Former-commit-id: d5130432a82b23cb871e6efc27c1b1d5130432a82b23cb871e6efc27c1b12b23cb871e4dd1b27e44
2013-08-13 16:45:37 -05:00
Jonathan Sanchez
0c048d00ff
Issue #2243 Fixed update list bugs.
...
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f
Former-commit-id: 49f488a58f8d0ee7f5cad685125b2549f488a58f8d0ee7f5cad685125b258d0ee7f5cadc2363ffd7
2013-08-13 16:30:05 -05:00
Roger Ferrel
6d877ab021
Issue #2224 Quick for daily build until I figure out what is really wrong.
...
Change-Id: I589b04aae265239dc2cb2e34819ff28eb2ced8d6
Former-commit-id: ea862ea39591b375e761f4d6bf5ff3ea862ea39591b375e761f4d6bf5ff391b375e761ed22d942af
2013-08-13 16:03:50 -05:00
Mike Duff
86347133cd
Issue #2263 - remove build failure on unit test failure
...
Change-Id: I921470904bf894cf49c7952b6c5feba3caf5b83f
Former-commit-id: 62c3e2107f18f0ef68db367420ad4862c3e2107f18f0ef68db367420ad4818f0ef68dbe1e84be2b9
2013-08-13 14:54:24 -05:00
Nate Jensen
96ff74eae4
Merge "Issue #2253 fix issue where warnings do not show up in the drop down in Warngen" into development
...
Former-commit-id: d995e29afeb435eba010f8d8e312f3d995e29afeb435eba010f8d8e312f3b435eba010ee45599b10
2013-08-13 12:34:44 -05:00
Greg Armendariz
1564720241
Merge "Issue #2164 - fix 13.6.1 build" into development
...
Former-commit-id: 84413bd66f8bcfc737e634b428b5a084413bd66f8bcfc737e634b428b5a08bcfc737e60e4fb54616
2013-08-13 12:34:04 -05:00
Nate Jensen
9fface9dba
Merge "Issue #2142 removing more dependencies on edex.common" into development
...
Former-commit-id: 576b8fa83086e823cc9f260ea8a0b9576b8fa83086e823cc9f260ea8a0b986e823cc9fd6a7d77ae6
2013-08-13 12:32:09 -05:00
Nate Jensen
baee72c5c3
Issue #2197 cherry picking 2197 into 13.5
...
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 63b2fe798aa9815b055115405cab1b63b2fe798aa9815b055115405cab1ba9815b05519a01271f5f
2013-08-13 12:27:02 -05:00
Matt Nash
9c6215335a
Issue #2253 fix issue where warnings do not show up in the drop down in Warngen
...
Change-Id: I680948f5e5224da9f649632fd72ca0412eb9b186
Former-commit-id: dda3d78b4880172b1aba5aeda85fcadda3d78b4880172b1aba5aeda85fca80172b1aba9289576049
2013-08-13 11:59:35 -05:00
Bryan Kowal
bd0bb4ed34
Issue #2164 - fix 13.6.1 build
...
Former-commit-id: 586b7646f0dbaa6da3ea4604653241586b7646f0dbaa6da3ea4604653241dbaa6da3ea17c4406504
2013-08-13 11:13:52 -05:00
Richard Peter
b8ad7fc2c1
Merge "Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals." into development
...
Former-commit-id: 60831564a037630734593f6d8a28da60831564a037630734593f6d8a28da376307345964496ad332
2013-08-13 10:10:07 -05:00
Nate Jensen
b25287ad9e
Issue #2142 removing more dependencies on edex.common
...
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf
Former-commit-id: 0c92461c6578256fd891df95db8f780c92461c6578256fd891df95db8f7878256fd8915e24a11e06
2013-08-13 09:09:05 -05:00
Nate Jensen
e634d29ffd
Merge "Issue #2162 : Add performance logging for GFE edit area query evaluation." into development
...
Former-commit-id: e6fc534b8c9e283f0640bb955e6ee7e6fc534b8c9e283f0640bb955e6ee79e283f06409424d4d05e
2013-08-13 08:58:50 -05:00
Nate Jensen
0f2b05bb28
Merge "Issue #2033 Fixed alertviz startup" into development
...
Former-commit-id: c62139c3275b3334b2ff58e7b31de9c62139c3275b3334b2ff58e7b31de95b3334b2ff74a6174e78
2013-08-13 08:56:24 -05:00
Nate Jensen
9a147fc4ce
Merge "Issue #2142 more removing of dependencies from common plugins to edex.common" into development
...
Former-commit-id: 8101c961d4ce20de02a75948ebca878101c961d4ce20de02a75948ebca87ce20de02a77bbc2ec7d7
2013-08-13 08:56:01 -05:00
Max Schenkelberg
1a324ae28b
Issue #2033 Fixed alertviz startup
...
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5
Former-commit-id: 3f35c335c9c825e2f0e249381ac4813f35c335c9c825e2f0e249381ac481c825e2f0e27598c95fd9
2013-08-12 17:37:15 -05:00
Nate Jensen
285ed9898f
Issue #2142 more removing of dependencies from common plugins to edex.common
...
Change-Id: I3ccb07227ef6adef233898e7fae6678ea4d18c7f
Former-commit-id: c2bf2163d923802cfe0228c79d0a56c2bf2163d923802cfe0228c79d0a5623802cfe02c137e92198
2013-08-12 15:41:39 -05:00
Richard Peter
37719d8cd5
Merge "Issue #2224 Changes to have DataSet in configuration." into development
...
Former-commit-id: 2de533cbbf5548ae76b1d8124958b52de533cbbf5548ae76b1d8124958b55548ae76b1201004e203
2013-08-12 15:01:51 -05:00
Nate Jensen
e707a0f25e
Merge "Issue #2142 remove some uf.common dependencies on edex.common" into development
...
Former-commit-id: de382803171473d04e2582472058e9de382803171473d04e2582472058e91473d04e2504d2a4741d
2013-08-12 14:16:29 -05:00
Ben Steffensmeier
31da6c1dfc
Issue #2245 make DataTimeCompatible Java 6 compatible.
...
Former-commit-id: 46c341380500f61c485867c84f2fb846c341380500f61c485867c84f2fb800f61c485862961949ba
2013-08-12 13:43:43 -05:00
Roger Ferrel
fef46c4cdb
Issue #2224 Changes to have DataSet in configuration.
...
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8
Former-commit-id: 3ecf95b18a705a3482f81863d4d65b3ecf95b18a705a3482f81863d4d65b705a3482f809360f30c5
2013-08-12 12:50:12 -05:00
