Steve Harris
56416708fc
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: 891f00d650
[formerly 8484f03bb8
[formerly e8580e78f408b796a1fea65167c43cc122a325bf]]
Former-commit-id: 8484f03bb8
Former-commit-id: 3f8cc1daf3
2013-08-15 12:50:08 -05:00
Steve Harris
8f0b0c1514
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Former-commit-id: a687da6075
[formerly 727eba03b9
[formerly 85cde5da231741012e611250a5c3490467aeef1b]]
Former-commit-id: 727eba03b9
Former-commit-id: 08b105a492
2013-08-15 12:46:48 -05:00
Steve Harris
47130c98a5
13.5.1-16 baseline
...
Former-commit-id: 7ce0234d76
[formerly cd3b63d961
[formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]
Former-commit-id: cd3b63d961
Former-commit-id: 6818d80085
2013-08-15 13:40:37 -04:00
Max Schenkelberg
db24201469
Issue #2033 moved avnfps and text workstation files into respective plugins.
...
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2
Former-commit-id: c5575f9624
[formerly 6f60751ec6
[formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]
Former-commit-id: 6f60751ec6
Former-commit-id: bbad83c21a
2013-08-15 12:21:43 -05:00
Ben Steffensmeier
91df4581d2
Issue #2259 fix units for goes point data pressure
...
Former-commit-id: 984c5f2684
[formerly 2171c10e9e
[formerly 411c30dc9a5396ade5af03294cad612472e8060b]]
Former-commit-id: 2171c10e9e
Former-commit-id: d3628766b8
2013-08-15 12:02:24 -05:00
David Gillingham
bd9b224ff5
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: 40b5d54bf3
[formerly 0b6b0e06cc
[formerly 5992197809236553e9c021526e42d28ed327b413]]
Former-commit-id: 0b6b0e06cc
Former-commit-id: c17f8b4409
2013-08-15 11:30:45 -05:00
Jonathan Sanchez
6902b263e5
Issue #2243 Resolved timing issues.
...
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34
Former-commit-id: bc30396b63
[formerly 2b849d7003
[formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]]
Former-commit-id: 2b849d7003
Former-commit-id: 78b655fd1f
2013-08-15 10:56:37 -05:00
Ron Anderson
d70ba1184d
Merge "Issue #1133 Better error handling for invalid polygons in map resource. Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442" into development
...
Former-commit-id: ca560e5fc0
[formerly 2b491f11ad
[formerly 9f4d6e687d0dae6dd9104fd39c44144c0d7ce174]]
Former-commit-id: 2b491f11ad
Former-commit-id: 5afcf8bee2
2013-08-15 10:50:57 -05:00
Ben Steffensmeier
b887dcbe6d
Issue #1133 Better error handling for invalid polygons in map resource.
...
Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442
Former-commit-id: 7f9bbf3d52
[formerly 27594e6808
[formerly 68f1b06c79639874b94b87e4f4365f1fe36c7bac]]
Former-commit-id: 27594e6808
Former-commit-id: aa08c8af42
2013-08-15 10:32:28 -05:00
Brad Gonzales
edbea8c515
Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent.
...
Amend: Added constructor to RegistryStatisticsEvent that takes a count parameter
and other recommendations from peer review. Removed count attribute
from RegistryStatisticsEvent. Changed construction of SubsriptionRequestEvents
to set numRecords attribute.
Change-Id: Ib7595b9098299aedeae9db0ca02250551848c3e2
Former-commit-id: 64c6e5abff
[formerly d2dac35b65
[formerly 818688266a32feec2081f0c6e74a37e431df9435]]
Former-commit-id: d2dac35b65
Former-commit-id: e4251ad380
2013-08-15 09:35:10 -05:00
Richard Peter
e5cb3f9e0a
Issue #2214 : Fix merge issue with gfe-spring.xml
...
Former-commit-id: dad1b6fb45
[formerly eb8805e51c
[formerly 346de47492d79ea1a2605fa3a02bc5058f2b8e9e]]
Former-commit-id: eb8805e51c
Former-commit-id: 2064be203d
2013-08-14 18:32:39 -05:00
Nate Jensen
f9af5f041e
Merge "Issue #2254 - Send an email to omaha_awips on unit test failures or errors" into development
...
Former-commit-id: f08d3f4a9d
[formerly ce4d54ee5a
[formerly 22288cd9249420ffd643e5bb6d1f84bc6eda5326]]
Former-commit-id: ce4d54ee5a
Former-commit-id: bc80d6f7dc
2013-08-14 15:45:29 -05:00
Richard Peter
4dc2cdd1d4
Issue #1977 : Fix merge issue with WarngenDialog
...
Former-commit-id: a5383dbfa4
[formerly 7c03fc955b
[formerly ddfc06eb9753e893ece28e1718c5e4550e82b053]]
Former-commit-id: 7c03fc955b
Former-commit-id: 8ba6abf642
2013-08-14 15:33:02 -05:00
Richard Peter
181df35afc
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: 2a9276c728
[formerly 5e5047cc4f
[formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]
Former-commit-id: 5e5047cc4f
Former-commit-id: 1f32ef9c7a
2013-08-14 15:23:18 -05:00
Greg Armendariz
0578f67668
Merge "Issue #2257 - updated edex_com to use the qpid 0.18 messaging api" into omaha_13.5.1
...
Former-commit-id: edf12d4d4f
[formerly f02fef09a2
[formerly ced372967755b611158c213011132a353b72f421]]
Former-commit-id: f02fef09a2
Former-commit-id: e254c838ea
2013-08-14 15:00:26 -05:00
Richard Peter
9ff9054d7e
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: ee6b9eb11a
[formerly c61afa1bfa
[formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]
Former-commit-id: c61afa1bfa
Former-commit-id: 2608dfe1d8
2013-08-14 14:29:55 -05:00
Mike Duff
ff37559dcd
Issue #2254 - Send an email to omaha_awips on unit test failures or errors
...
Former-commit-id: 0973d5018c
[formerly 18f11ce9e0
[formerly 8e0e4e93a094c60c18b28a5ebc49a8f175e6f373]]
Former-commit-id: 18f11ce9e0
Former-commit-id: c7a76d191f
2013-08-14 14:20:52 -05:00
Richard Peter
6c7c5a5b4b
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: bca32c2e0a
[formerly bdf3d5a295
[formerly 3f45f1988372462a7f541b9e76a893b1e2f4e1ae]]
Former-commit-id: bdf3d5a295
Former-commit-id: 09e4f4f4da
2013-08-14 13:57:48 -05:00
Nate Jensen
9407a5202a
Merge "Issue #2033 moved bundles and menu files into corresponding plugins" into development
...
Former-commit-id: 0947f358b1
[formerly 9776721a46
[formerly 34c2b29b569f9179d37c330bc2f8edf5d56edf6c]]
Former-commit-id: 9776721a46
Former-commit-id: 3b97de573a
2013-08-14 12:55:15 -05:00
Brad Gonzales
ec3646def6
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: 5d169e4df1
[formerly 533deffd53
[formerly b4ee9c5753571a8cdd0720986c76723f4e646f0c]]
Former-commit-id: 533deffd53
Former-commit-id: 50a10b3efb
2013-08-14 12:35:18 -05:00
Richard Peter
c489a4e9b2
Merge "Issue #2224 Bug fixes to pass unit test." into development
...
Former-commit-id: 11229d4b51
[formerly 1a3dfd45ab
[formerly 0063088d0cffc2e7c6ba12f055184dd85f8820ca]]
Former-commit-id: 1a3dfd45ab
Former-commit-id: a9ef2e7fd3
2013-08-14 11:55:17 -05:00
Bryan Kowal
67c9cbf70e
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: 21893102bb
[formerly fc8c3f540d
[formerly af2882799bd08998d1321bac37beb2a7cecb4fb9]]
Former-commit-id: fc8c3f540d
Former-commit-id: ec0ef7fe80
2013-08-14 11:21:33 -05:00
Richard Peter
2169c7ae71
Merge "Issue #2247 - Fix permission displays in UserAdmin Dialogs" into development
...
Former-commit-id: 045d3cd618
[formerly cfe449d838
[formerly 247b8d0848b7cfcadfe2163938226f20e654a98d]]
Former-commit-id: cfe449d838
Former-commit-id: 72ecb0b995
2013-08-14 10:53:53 -05:00
Roger Ferrel
d3a33f2855
Issue #2224 Bug fixes to pass unit test.
...
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00
Former-commit-id: 87f9cb2fb3
[formerly caa97d7d09
[formerly ca2bb73e1fd77bc289a106eb7743ee5344be3a52]]
Former-commit-id: caa97d7d09
Former-commit-id: 81a31214cd
2013-08-14 10:25:49 -05:00
Mike Duff
3959e7e9f8
Issue #2247 - Fix permission displays in UserAdmin Dialogs
...
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4
Former-commit-id: e791617acc
[formerly 097028ec59
[formerly ca3499309373b553874e7a89e8f38f30e9b041e6]]
Former-commit-id: 097028ec59
Former-commit-id: e319928638
2013-08-14 10:13:05 -05:00
Steve Harris
b05abcaec0
13.5.1-15 baseline
...
Former-commit-id: c6dc1817e7
[formerly 53e96e21db
[formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]
Former-commit-id: 53e96e21db
Former-commit-id: 535218c676
2013-08-14 10:24:26 -04:00
Max Schenkelberg
9be1171c33
Issue #2033 moved bundles and menu files into corresponding plugins
...
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc
Former-commit-id: 06dbae8bdb
[formerly 5ab8b6e2c6
[formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]
Former-commit-id: 5ab8b6e2c6
Former-commit-id: 6c92aa9dd7
2013-08-14 09:20:28 -05:00
Steve Harris
c6465a3398
13.5.1-14 baseline
...
Former-commit-id: 80e5f7fbd4
[formerly d695e5debe
[formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]
Former-commit-id: d695e5debe
Former-commit-id: b848317203
2013-08-14 10:07:41 -04:00
Jonathan Sanchez
714982e96f
Issue #2243 Resolved incorrect import.
...
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb
Former-commit-id: fd0f2f1c09
[formerly c6b6576f01
[formerly f79e7820ea010e0bc860b0033183147d7299221f]]
Former-commit-id: c6b6576f01
Former-commit-id: 52d7862d36
2013-08-13 20:47:49 -05:00
Nate Jensen
a72d987b2e
Merge "Issue #2262 create new wxmath plugin seeded by Java derivparam functions" into development
...
Former-commit-id: c844396230
[formerly e4a9195477
[formerly 5b909886e84f0f6942a06367f223940e4448e315]]
Former-commit-id: e4a9195477
Former-commit-id: a50328f796
2013-08-13 17:19:25 -05:00
Nate Jensen
9df41ff246
Issue #2262 create new wxmath plugin seeded by Java derivparam functions
...
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2
Former-commit-id: 959b50d184
[formerly 09872d6713
[formerly f3d233aeff8017c521288affd4b5be668c9a890a]]
Former-commit-id: 09872d6713
Former-commit-id: 23fe237b7e
2013-08-13 16:59:57 -05:00
Richard Peter
4dd1b27e44
Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
...
Former-commit-id: d5130432a8
[formerly 6efc27c1b1
[formerly d7d87eb785c9c5e26a841503ea11fac4461b23b3]]
Former-commit-id: 6efc27c1b1
Former-commit-id: 2b23cb871e
2013-08-13 16:45:37 -05:00
Jonathan Sanchez
dc2363ffd7
Issue #2243 Fixed update list bugs.
...
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f
Former-commit-id: 49f488a58f
[formerly d685125b25
[formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]
Former-commit-id: d685125b25
Former-commit-id: 8d0ee7f5ca
2013-08-13 16:30:05 -05:00
Roger Ferrel
ed22d942af
Issue #2224 Quick for daily build until I figure out what is really wrong.
...
Change-Id: I589b04aae265239dc2cb2e34819ff28eb2ced8d6
Former-commit-id: ea862ea395
[formerly f4d6bf5ff3
[formerly 261e40897b011ea7f0aec668d57b65631a6c735f]]
Former-commit-id: f4d6bf5ff3
Former-commit-id: 91b375e761
2013-08-13 16:03:50 -05:00
Mike Duff
e1e84be2b9
Issue #2263 - remove build failure on unit test failure
...
Change-Id: I921470904bf894cf49c7952b6c5feba3caf5b83f
Former-commit-id: 62c3e2107f
[formerly 367420ad48
[formerly 57870e24ca02e1cb66705cac79fb8856685a56b3]]
Former-commit-id: 367420ad48
Former-commit-id: 18f0ef68db
2013-08-13 14:54:24 -05:00
Nate Jensen
ee45599b10
Merge "Issue #2253 fix issue where warnings do not show up in the drop down in Warngen" into development
...
Former-commit-id: d995e29afe
[formerly f8d8e312f3
[formerly 32053b62812fc375aebb5af21af1149b2b4944c5]]
Former-commit-id: f8d8e312f3
Former-commit-id: b435eba010
2013-08-13 12:34:44 -05:00
Greg Armendariz
0e4fb54616
Merge "Issue #2164 - fix 13.6.1 build" into development
...
Former-commit-id: 84413bd66f
[formerly 34b428b5a0
[formerly aa808c2ef1cbee907fbe910892a2c37fa5b0d45c]]
Former-commit-id: 34b428b5a0
Former-commit-id: 8bcfc737e6
2013-08-13 12:34:04 -05:00
Nate Jensen
d6a7d77ae6
Merge "Issue #2142 removing more dependencies on edex.common" into development
...
Former-commit-id: 576b8fa830
[formerly 260ea8a0b9
[formerly 725b2654ce507b302ac111a740f27460799ecd80]]
Former-commit-id: 260ea8a0b9
Former-commit-id: 86e823cc9f
2013-08-13 12:32:09 -05:00
Nate Jensen
9a01271f5f
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: 63b2fe798a
[formerly 15405cab1b
[formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]
Former-commit-id: 15405cab1b
Former-commit-id: a9815b0551
2013-08-13 12:27:02 -05:00
Matt Nash
9289576049
Issue #2253 fix issue where warnings do not show up in the drop down in Warngen
...
Change-Id: I680948f5e5224da9f649632fd72ca0412eb9b186
Former-commit-id: dda3d78b48
[formerly 5aeda85fca
[formerly 1c72a8cfeeb9263f8d406002de9703a1ee73f40e]]
Former-commit-id: 5aeda85fca
Former-commit-id: 80172b1aba
2013-08-13 11:59:35 -05:00
Bryan Kowal
17c4406504
Issue #2164 - fix 13.6.1 build
...
Former-commit-id: 586b7646f0
[formerly 4604653241
[formerly 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371]]
Former-commit-id: 4604653241
Former-commit-id: dbaa6da3ea
2013-08-13 11:13:52 -05:00
Richard Peter
64496ad332
Merge "Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals." into development
...
Former-commit-id: 60831564a0
[formerly 3f6d8a28da
[formerly c4cc04a6b759f934a556004a242da4dfa4709653]]
Former-commit-id: 3f6d8a28da
Former-commit-id: 3763073459
2013-08-13 10:10:07 -05:00
Nate Jensen
5e24a11e06
Issue #2142 removing more dependencies on edex.common
...
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf
Former-commit-id: 0c92461c65
[formerly df95db8f78
[formerly 231c873711159c9a59f0bc4e25e70cc9c989ecc0]]
Former-commit-id: df95db8f78
Former-commit-id: 78256fd891
2013-08-13 09:09:05 -05:00
Nate Jensen
9424d4d05e
Merge "Issue #2162 : Add performance logging for GFE edit area query evaluation." into development
...
Former-commit-id: e6fc534b8c
[formerly bb955e6ee7
[formerly 731fb620ed8dec721c1fe4bbc0b55b4e11e1283f]]
Former-commit-id: bb955e6ee7
Former-commit-id: 9e283f0640
2013-08-13 08:58:50 -05:00
Nate Jensen
74a6174e78
Merge "Issue #2033 Fixed alertviz startup" into development
...
Former-commit-id: c62139c327
[formerly 58e7b31de9
[formerly 3312f297f36ab27d9f9fb74d48bf291f60292e5a]]
Former-commit-id: 58e7b31de9
Former-commit-id: 5b3334b2ff
2013-08-13 08:56:24 -05:00
Nate Jensen
7bbc2ec7d7
Merge "Issue #2142 more removing of dependencies from common plugins to edex.common" into development
...
Former-commit-id: 8101c961d4
[formerly 5948ebca87
[formerly e9e46b68652caff85b2206180856654876f55f12]]
Former-commit-id: 5948ebca87
Former-commit-id: ce20de02a7
2013-08-13 08:56:01 -05:00
Max Schenkelberg
7598c95fd9
Issue #2033 Fixed alertviz startup
...
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5
Former-commit-id: 3f35c335c9
[formerly 49381ac481
[formerly 1cdd5eab835f2df85f8ebc82d0bea79bca3977da]]
Former-commit-id: 49381ac481
Former-commit-id: c825e2f0e2
2013-08-12 17:37:15 -05:00
Nate Jensen
c137e92198
Issue #2142 more removing of dependencies from common plugins to edex.common
...
Change-Id: I3ccb07227ef6adef233898e7fae6678ea4d18c7f
Former-commit-id: c2bf2163d9
[formerly 28c79d0a56
[formerly 2342170ce4cf51f12759afa26fc5af46f35c6188]]
Former-commit-id: 28c79d0a56
Former-commit-id: 23802cfe02
2013-08-12 15:41:39 -05:00
Richard Peter
201004e203
Merge "Issue #2224 Changes to have DataSet in configuration." into development
...
Former-commit-id: 2de533cbbf
[formerly d8124958b5
[formerly d4a46b8283ac0cb47f62c43b999d7f119161e08d]]
Former-commit-id: d8124958b5
Former-commit-id: 5548ae76b1
2013-08-12 15:01:51 -05:00
Nate Jensen
04d2a4741d
Merge "Issue #2142 remove some uf.common dependencies on edex.common" into development
...
Former-commit-id: de38280317
[formerly 82472058e9
[formerly 9e3b68a2e0ed6dcc63c5d2cace84c0fa3cadb521]]
Former-commit-id: 82472058e9
Former-commit-id: 1473d04e25
2013-08-12 14:16:29 -05:00