Commit graph

3695 commits

Author SHA1 Message Date
Ben Steffensmeier
7ea9607352 Issue #2258 Convert profiler sounding to var height with hodo.
Change-Id: I7b8c704ebc847169c2d09bb0bea13d0b60a9cff6

Former-commit-id: b7b18e02bf [formerly 0c2f894b82] [formerly b7b18e02bf [formerly 0c2f894b82] [formerly 32a0b19a38 [formerly 2aab48d1032c0b6fd14645437836ad5ca13cb415]]]
Former-commit-id: 32a0b19a38
Former-commit-id: 890eaa3751 [formerly f75824d4bc]
Former-commit-id: 766fadfa67
2013-08-15 16:15:15 -05:00
Nate Jensen
37b276d43f Merge "Issue #2033 moved avnfps and text workstation files into respective plugins." into development
Former-commit-id: 65753deffe [formerly ad209867bd] [formerly 65753deffe [formerly ad209867bd] [formerly 5ad699cd5b [formerly 54f5b92e5ce56be84d938cd47d5bd43b98b1251b]]]
Former-commit-id: 5ad699cd5b
Former-commit-id: b322a51e1e [formerly 313eeaac9e]
Former-commit-id: 5ec88138d6
2013-08-15 16:07:42 -05:00
Max Schenkelberg
6709242e36 Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7

Former-commit-id: 5a4d880498 [formerly e85d66f4e5] [formerly 5a4d880498 [formerly e85d66f4e5] [formerly 3800aec9e6 [formerly d132d2ec2fc296518765d78b04ed942ec246b2e0]]]
Former-commit-id: 3800aec9e6
Former-commit-id: 352e21ffd3 [formerly d89d13d029]
Former-commit-id: ee68615786
2013-08-15 15:50:40 -05:00
Brad Gonzales
223a52eece Issue #2196 final name change for registries. Now registry and centralRegistry.
Change-Id: I172aa9918c2281fa2923503eeb067954e4bf955f

Former-commit-id: 18956d5816 [formerly 2279d03112] [formerly 18956d5816 [formerly 2279d03112] [formerly 705d4660cc [formerly f5a61ca98bc2da6bb69ef6f78fe40e390bfab45f]]]
Former-commit-id: 705d4660cc
Former-commit-id: 48cc348080 [formerly cf77bb12b7]
Former-commit-id: 9c63e17a83
2013-08-15 14:57:53 -05:00
Bryan Kowal
e359fa1588 Issue #2257 - edexBridge now uses qpid 0.18 (64-bit)
- Amend: updated for 32-bit
- Amend: close sender, session, and connection independently

Change-Id: I9b8cafbc10d81782a812e9d2d57930e859fa29a5

Former-commit-id: 14fc0aba77 [formerly da29ff63f4] [formerly 14fc0aba77 [formerly da29ff63f4] [formerly 431dbaeaac [formerly e8f8d498cd15855b72c170f2990fd4929eb636b2]]]
Former-commit-id: 431dbaeaac
Former-commit-id: 00c47b4f24 [formerly 7c3c19f794]
Former-commit-id: 36c1e6cff3
2013-08-15 14:30:55 -05:00
Mike Duff
aac43728d3 Issue #2143 - Fix various issues with SCAN/DMD/TVS
Change-Id: Ice9a0f13881c31ca1d51f2f2158f74caa064f1f8

Former-commit-id: e31a6c3426 [formerly c871d6a1cd] [formerly e31a6c3426 [formerly c871d6a1cd] [formerly 640a154647 [formerly 0d5a35fcaac31c594ae7e5abda889e75a772c352]]]
Former-commit-id: 640a154647
Former-commit-id: 136a98785b [formerly 03b3b3860a]
Former-commit-id: 976e9956d6
2013-08-15 14:14:07 -05:00
Max Schenkelberg
b75d942133 Issue #2189 Added a FontType option when initializing a font from a file.
Change-Id: I54973b7c380b1535dd1e1f7fb49fd0b74b3d1752
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments

Former-commit-id: b07ed474e3 [formerly eab65aab5a] [formerly b07ed474e3 [formerly eab65aab5a] [formerly 570266eb7b [formerly 473421a32f7c53453db1c5331714204a89bad4da]]]
Former-commit-id: 570266eb7b
Former-commit-id: 72fbe0208e [formerly 5840d99a95]
Former-commit-id: 4191582186
2013-08-15 13:51:07 -05:00
David Gillingham
ff61a0701c Issue #2262: Fix ImportError and misnamed method in meteolib.py.
Change-Id: Ic6eb7de7b8c5b6ff7fbd989a43d00c97ea688364

Former-commit-id: a8868c5beb [formerly 8ef34db798] [formerly a8868c5beb [formerly 8ef34db798] [formerly 953fc192a1 [formerly b61065e473c5f783ebe3cfd603a9e7bd91b63a11]]]
Former-commit-id: 953fc192a1
Former-commit-id: afbb147ef6 [formerly a4ed28a384]
Former-commit-id: 3d3f785fdd
2013-08-15 13:14:39 -05:00
Steve Harris
7d10f18ae8 Merge branch 'omaha_13.5.1' into omaha_13.5.2
Former-commit-id: dfee8ca5d9 [formerly 67f7a8db62] [formerly dfee8ca5d9 [formerly 67f7a8db62] [formerly 282577d168 [formerly cfd93a48150e8c559622e806e98362a51f19aee0]]]
Former-commit-id: 282577d168
Former-commit-id: 1b31d1d62f [formerly 877d672852]
Former-commit-id: 850d0d54c6
2013-08-15 12:55:24 -05:00
Steve Harris
52564dc43c 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: 3f8cc1daf3 [formerly 8484f03bb8] [formerly 3f8cc1daf3 [formerly 8484f03bb8] [formerly 891f00d650 [formerly e8580e78f408b796a1fea65167c43cc122a325bf]]]
Former-commit-id: 891f00d650
Former-commit-id: 2681f1f045 [formerly 44251fd949]
Former-commit-id: e2a322158b
2013-08-15 12:50:08 -05:00
Steve Harris
f8442ee983 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 08b105a492 [formerly 727eba03b9] [formerly 08b105a492 [formerly 727eba03b9] [formerly a687da6075 [formerly 85cde5da231741012e611250a5c3490467aeef1b]]]
Former-commit-id: a687da6075
Former-commit-id: e5c50ad0b6 [formerly 522867f068]
Former-commit-id: 08a7c0831f
2013-08-15 12:46:48 -05:00
Steve Harris
ff03caef3d 13.5.1-16 baseline
Former-commit-id: 6818d80085 [formerly cd3b63d961] [formerly 6818d80085 [formerly cd3b63d961] [formerly 7ce0234d76 [formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]]
Former-commit-id: 7ce0234d76
Former-commit-id: e881ff6271 [formerly d7b1ed4900]
Former-commit-id: af2b4495bb
2013-08-15 13:40:37 -04:00
Max Schenkelberg
f553c93092 Issue #2033 moved avnfps and text workstation files into respective plugins.
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2

Former-commit-id: bbad83c21a [formerly 6f60751ec6] [formerly bbad83c21a [formerly 6f60751ec6] [formerly c5575f9624 [formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]]
Former-commit-id: c5575f9624
Former-commit-id: 8139e0dfb7 [formerly 8de539020d]
Former-commit-id: 451eb54a36
2013-08-15 12:21:43 -05:00
Ben Steffensmeier
1ffc606115 Issue #2259 fix units for goes point data pressure
Former-commit-id: d3628766b8 [formerly 2171c10e9e] [formerly d3628766b8 [formerly 2171c10e9e] [formerly 984c5f2684 [formerly 411c30dc9a5396ade5af03294cad612472e8060b]]]
Former-commit-id: 984c5f2684
Former-commit-id: 7070a2bd18 [formerly fff0ce30ae]
Former-commit-id: 5a6ad9b554
2013-08-15 12:02:24 -05:00
David Gillingham
a217ce6044 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: c17f8b4409 [formerly 0b6b0e06cc] [formerly c17f8b4409 [formerly 0b6b0e06cc] [formerly 40b5d54bf3 [formerly 5992197809236553e9c021526e42d28ed327b413]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 9c656c28b9 [formerly 8d347252d2]
Former-commit-id: f46f62ff2e
2013-08-15 11:30:45 -05:00
Jonathan Sanchez
a1dc6ac50b Issue #2243 Resolved timing issues.
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34

Former-commit-id: 78b655fd1f [formerly 2b849d7003] [formerly 78b655fd1f [formerly 2b849d7003] [formerly bc30396b63 [formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]]]
Former-commit-id: bc30396b63
Former-commit-id: 19853a4b57 [formerly fca67fb4ca]
Former-commit-id: dbb60f2c13
2013-08-15 10:56:37 -05:00
Ron Anderson
6a8381426a Merge "Issue #1133 Better error handling for invalid polygons in map resource. Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442" into development
Former-commit-id: 5afcf8bee2 [formerly 2b491f11ad] [formerly 5afcf8bee2 [formerly 2b491f11ad] [formerly ca560e5fc0 [formerly 9f4d6e687d0dae6dd9104fd39c44144c0d7ce174]]]
Former-commit-id: ca560e5fc0
Former-commit-id: 7924115bbc [formerly 86b10cfd4b]
Former-commit-id: 6ae94c0f65
2013-08-15 10:50:57 -05:00
Ben Steffensmeier
8830b5717f Issue #1133 Better error handling for invalid polygons in map resource.
Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442

Former-commit-id: aa08c8af42 [formerly 27594e6808] [formerly aa08c8af42 [formerly 27594e6808] [formerly 7f9bbf3d52 [formerly 68f1b06c79639874b94b87e4f4365f1fe36c7bac]]]
Former-commit-id: 7f9bbf3d52
Former-commit-id: b970d2ffbb [formerly 5b51795a18]
Former-commit-id: 717b078a6a
2013-08-15 10:32:28 -05:00
Brad Gonzales
04f9dfb84a 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: e4251ad380 [formerly d2dac35b65] [formerly e4251ad380 [formerly d2dac35b65] [formerly 64c6e5abff [formerly 818688266a32feec2081f0c6e74a37e431df9435]]]
Former-commit-id: 64c6e5abff
Former-commit-id: fa4e8d9897 [formerly 84e14a5a62]
Former-commit-id: 4d4f281553
2013-08-15 09:35:10 -05:00
Richard Peter
c27aa3bd98 Issue #2214: Fix merge issue with gfe-spring.xml
Former-commit-id: 2064be203d [formerly eb8805e51c] [formerly 2064be203d [formerly eb8805e51c] [formerly dad1b6fb45 [formerly 346de47492d79ea1a2605fa3a02bc5058f2b8e9e]]]
Former-commit-id: dad1b6fb45
Former-commit-id: bbe1002d2d [formerly c799d73430]
Former-commit-id: b09a191bfc
2013-08-14 18:32:39 -05:00
David Gillingham
7729c52e6d Issue #2009: Fix NullPointerException in SocketServer start up.
Change-Id: I07683ba74410234d162e058df0bb3ff6e00ee59e

Former-commit-id: 8faf78d220 [formerly 2d6c6cdd39] [formerly 8faf78d220 [formerly 2d6c6cdd39] [formerly 17a45cafe5 [formerly 51a951bf190b7ca68121dc1630f3bc5d094b601b]]]
Former-commit-id: 17a45cafe5
Former-commit-id: 64d4ecca53 [formerly db0d0374b0]
Former-commit-id: 6277627e7e
2013-08-14 17:13:58 -05:00
David Gillingham
a2a4d1fbcf Issue #2009: Implement dual-domain GFE export_grids solution. Update MHS
emulator program to support new directory structure and some code cleanup and
refactoring.

Change-Id: Ib3cf5c0123cd87497517d4221edea5883db9157d

Former-commit-id: 1d3f3da9cc [formerly 0f4f24beb8] [formerly 1d3f3da9cc [formerly 0f4f24beb8] [formerly f8b6ec20c1 [formerly ad7acb2d563c79d92d84ec62405b492907191af3]]]
Former-commit-id: f8b6ec20c1
Former-commit-id: 3af47effc5 [formerly 751188ab5a]
Former-commit-id: 4bd40cd544
2013-08-14 17:10:04 -05:00
Nate Jensen
5c3562fc6f Merge "Issue #2254 - Send an email to omaha_awips on unit test failures or errors" into development
Former-commit-id: bc80d6f7dc [formerly ce4d54ee5a] [formerly bc80d6f7dc [formerly ce4d54ee5a] [formerly f08d3f4a9d [formerly 22288cd9249420ffd643e5bb6d1f84bc6eda5326]]]
Former-commit-id: f08d3f4a9d
Former-commit-id: 01f2bcd45c [formerly d8812ab5f0]
Former-commit-id: 252be9c401
2013-08-14 15:45:29 -05:00
Richard Peter
0e62a4243e Issue #1977: Fix merge issue with WarngenDialog
Former-commit-id: 8ba6abf642 [formerly 7c03fc955b] [formerly 8ba6abf642 [formerly 7c03fc955b] [formerly a5383dbfa4 [formerly ddfc06eb9753e893ece28e1718c5e4550e82b053]]]
Former-commit-id: a5383dbfa4
Former-commit-id: c8ad0e3317 [formerly 951bb37cd7]
Former-commit-id: 6ebc5d67bd
2013-08-14 15:33:02 -05:00
Richard Peter
42c78326f1 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: 1f32ef9c7a [formerly 5e5047cc4f] [formerly 1f32ef9c7a [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]
Former-commit-id: 2a9276c728
Former-commit-id: c0b0eef331 [formerly db7c941f6f]
Former-commit-id: 9cf5e247ab
2013-08-14 15:23:18 -05:00
Greg Armendariz
b3d6a81db2 Merge "Issue #2257 - updated edex_com to use the qpid 0.18 messaging api" into omaha_13.5.1
Former-commit-id: e254c838ea [formerly f02fef09a2] [formerly e254c838ea [formerly f02fef09a2] [formerly edf12d4d4f [formerly ced372967755b611158c213011132a353b72f421]]]
Former-commit-id: edf12d4d4f
Former-commit-id: c9980c9d3f [formerly e867472bf6]
Former-commit-id: f24011d94d
2013-08-14 15:00:26 -05:00
Richard Peter
a7075027be 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: 2608dfe1d8 [formerly c61afa1bfa] [formerly 2608dfe1d8 [formerly c61afa1bfa] [formerly ee6b9eb11a [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 3f65eaf74b [formerly 58a4aaa080]
Former-commit-id: 7ca1edf371
2013-08-14 14:29:55 -05:00
Mike Duff
0aaa973b2e Issue #2254 - Send an email to omaha_awips on unit test failures or errors
Former-commit-id: c7a76d191f [formerly 18f11ce9e0] [formerly c7a76d191f [formerly 18f11ce9e0] [formerly 0973d5018c [formerly 8e0e4e93a094c60c18b28a5ebc49a8f175e6f373]]]
Former-commit-id: 0973d5018c
Former-commit-id: 1f3becc31e [formerly 6ac90578a1]
Former-commit-id: 541032a06e
2013-08-14 14:20:52 -05:00
Richard Peter
3e062d95de 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: 09e4f4f4da [formerly bdf3d5a295] [formerly 09e4f4f4da [formerly bdf3d5a295] [formerly bca32c2e0a [formerly 3f45f1988372462a7f541b9e76a893b1e2f4e1ae]]]
Former-commit-id: bca32c2e0a
Former-commit-id: cc2bc4e366 [formerly 925f6cade4]
Former-commit-id: b555889e5c
2013-08-14 13:57:48 -05:00
Nate Jensen
bc7cbd4aba Merge "Issue #2033 moved bundles and menu files into corresponding plugins" into development
Former-commit-id: 3b97de573a [formerly 9776721a46] [formerly 3b97de573a [formerly 9776721a46] [formerly 0947f358b1 [formerly 34c2b29b569f9179d37c330bc2f8edf5d56edf6c]]]
Former-commit-id: 0947f358b1
Former-commit-id: 49567ae86c [formerly b1882e2e42]
Former-commit-id: 01ee796921
2013-08-14 12:55:15 -05:00
Brad Gonzales
490b772aaf 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: 50a10b3efb [formerly 533deffd53] [formerly 50a10b3efb [formerly 533deffd53] [formerly 5d169e4df1 [formerly b4ee9c5753571a8cdd0720986c76723f4e646f0c]]]
Former-commit-id: 5d169e4df1
Former-commit-id: 88fdc1e56b [formerly f3bc3d9185]
Former-commit-id: 526c244fc5
2013-08-14 12:35:18 -05:00
Richard Peter
4dd0dac7da Merge "Issue #2224 Bug fixes to pass unit test." into development
Former-commit-id: a9ef2e7fd3 [formerly 1a3dfd45ab] [formerly a9ef2e7fd3 [formerly 1a3dfd45ab] [formerly 11229d4b51 [formerly 0063088d0cffc2e7c6ba12f055184dd85f8820ca]]]
Former-commit-id: 11229d4b51
Former-commit-id: ea0ca8a055 [formerly 5eb9ca0e1a]
Former-commit-id: bf33ae0ab3
2013-08-14 11:55:17 -05:00
Bryan Kowal
73b3a1faa2 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: ec0ef7fe80 [formerly fc8c3f540d] [formerly ec0ef7fe80 [formerly fc8c3f540d] [formerly 21893102bb [formerly af2882799bd08998d1321bac37beb2a7cecb4fb9]]]
Former-commit-id: 21893102bb
Former-commit-id: e76b46487c [formerly c2c9d745af]
Former-commit-id: d083f1ae4e
2013-08-14 11:21:33 -05:00
Richard Peter
6c9e009af6 Merge "Issue #2247 - Fix permission displays in UserAdmin Dialogs" into development
Former-commit-id: 72ecb0b995 [formerly cfe449d838] [formerly 72ecb0b995 [formerly cfe449d838] [formerly 045d3cd618 [formerly 247b8d0848b7cfcadfe2163938226f20e654a98d]]]
Former-commit-id: 045d3cd618
Former-commit-id: f02fc50031 [formerly 3f456db0f1]
Former-commit-id: f8f31253ce
2013-08-14 10:53:53 -05:00
Roger Ferrel
0760fb70e2 Issue #2224 Bug fixes to pass unit test.
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00

Former-commit-id: 81a31214cd [formerly caa97d7d09] [formerly 81a31214cd [formerly caa97d7d09] [formerly 87f9cb2fb3 [formerly ca2bb73e1fd77bc289a106eb7743ee5344be3a52]]]
Former-commit-id: 87f9cb2fb3
Former-commit-id: 87ca79b294 [formerly 5be73428f0]
Former-commit-id: 39239f4005
2013-08-14 10:25:49 -05:00
Mike Duff
622f835330 Issue #2247 - Fix permission displays in UserAdmin Dialogs
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4

Former-commit-id: e319928638 [formerly 097028ec59] [formerly e319928638 [formerly 097028ec59] [formerly e791617acc [formerly ca3499309373b553874e7a89e8f38f30e9b041e6]]]
Former-commit-id: e791617acc
Former-commit-id: b70b7a0681 [formerly 081d30db4f]
Former-commit-id: 242f34efa9
2013-08-14 10:13:05 -05:00
Steve Harris
d0be6956e9 13.5.1-15 baseline
Former-commit-id: 535218c676 [formerly 53e96e21db] [formerly 535218c676 [formerly 53e96e21db] [formerly c6dc1817e7 [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]
Former-commit-id: c6dc1817e7
Former-commit-id: 4f9288e7c1 [formerly 65beefde58]
Former-commit-id: 9ea3f0c215
2013-08-14 10:24:26 -04:00
Max Schenkelberg
229e0ee235 Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc

Former-commit-id: 6c92aa9dd7 [formerly 5ab8b6e2c6] [formerly 6c92aa9dd7 [formerly 5ab8b6e2c6] [formerly 06dbae8bdb [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]]
Former-commit-id: 06dbae8bdb
Former-commit-id: 2fc5af010d [formerly 759ff7bcfd]
Former-commit-id: 961ed891c8
2013-08-14 09:20:28 -05:00
Steve Harris
f4262380d6 13.5.1-14 baseline
Former-commit-id: b848317203 [formerly d695e5debe] [formerly b848317203 [formerly d695e5debe] [formerly 80e5f7fbd4 [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 9bd983e2fe [formerly cd5b1e9e2f]
Former-commit-id: 0f3ffc3892
2013-08-14 10:07:41 -04:00
Jonathan Sanchez
c2e2741ad6 Issue #2243 Resolved incorrect import.
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb

Former-commit-id: 52d7862d36 [formerly c6b6576f01] [formerly 52d7862d36 [formerly c6b6576f01] [formerly fd0f2f1c09 [formerly f79e7820ea010e0bc860b0033183147d7299221f]]]
Former-commit-id: fd0f2f1c09
Former-commit-id: 7189057682 [formerly 70bb266da7]
Former-commit-id: 77a919a7e8
2013-08-13 20:47:49 -05:00
Nate Jensen
0159659393 Merge "Issue #2262 create new wxmath plugin seeded by Java derivparam functions" into development
Former-commit-id: a50328f796 [formerly e4a9195477] [formerly a50328f796 [formerly e4a9195477] [formerly c844396230 [formerly 5b909886e84f0f6942a06367f223940e4448e315]]]
Former-commit-id: c844396230
Former-commit-id: e3f8c316f2 [formerly ffed8deab6]
Former-commit-id: 2b9c2a7b3f
2013-08-13 17:19:25 -05:00
Nate Jensen
2bed514c66 Issue #2262 create new wxmath plugin seeded by Java derivparam functions
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2

Former-commit-id: 23fe237b7e [formerly 09872d6713] [formerly 23fe237b7e [formerly 09872d6713] [formerly 959b50d184 [formerly f3d233aeff8017c521288affd4b5be668c9a890a]]]
Former-commit-id: 959b50d184
Former-commit-id: aaee338f5c [formerly 44ef756627]
Former-commit-id: 5a2c7fd36f
2013-08-13 16:59:57 -05:00
Richard Peter
48e9e757e9 Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
Former-commit-id: 2b23cb871e [formerly 6efc27c1b1] [formerly 2b23cb871e [formerly 6efc27c1b1] [formerly d5130432a8 [formerly d7d87eb785c9c5e26a841503ea11fac4461b23b3]]]
Former-commit-id: d5130432a8
Former-commit-id: e28de494e9 [formerly 2fc754b899]
Former-commit-id: 6e3624d1a7
2013-08-13 16:45:37 -05:00
Jonathan Sanchez
ba585b9424 Issue #2243 Fixed update list bugs.
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f

Former-commit-id: 8d0ee7f5ca [formerly d685125b25] [formerly 8d0ee7f5ca [formerly d685125b25] [formerly 49f488a58f [formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]]
Former-commit-id: 49f488a58f
Former-commit-id: d33332bd58 [formerly 96c88ad28b]
Former-commit-id: 721b2c7c04
2013-08-13 16:30:05 -05:00
Roger Ferrel
b591bd604d Issue #2224 Quick for daily build until I figure out what is really wrong.
Change-Id: I589b04aae265239dc2cb2e34819ff28eb2ced8d6

Former-commit-id: 91b375e761 [formerly f4d6bf5ff3] [formerly 91b375e761 [formerly f4d6bf5ff3] [formerly ea862ea395 [formerly 261e40897b011ea7f0aec668d57b65631a6c735f]]]
Former-commit-id: ea862ea395
Former-commit-id: 3a402e1e52 [formerly 05d0a371e2]
Former-commit-id: 0df3bdb780
2013-08-13 16:03:50 -05:00
Mike Duff
f2141a2f80 Issue #2263 - remove build failure on unit test failure
Change-Id: I921470904bf894cf49c7952b6c5feba3caf5b83f

Former-commit-id: 18f0ef68db [formerly 367420ad48] [formerly 18f0ef68db [formerly 367420ad48] [formerly 62c3e2107f [formerly 57870e24ca02e1cb66705cac79fb8856685a56b3]]]
Former-commit-id: 62c3e2107f
Former-commit-id: bd7c39692a [formerly cac7a8d0da]
Former-commit-id: 420025ae77
2013-08-13 14:54:24 -05:00
Nate Jensen
76773c9b82 Merge "Issue #2253 fix issue where warnings do not show up in the drop down in Warngen" into development
Former-commit-id: b435eba010 [formerly f8d8e312f3] [formerly b435eba010 [formerly f8d8e312f3] [formerly d995e29afe [formerly 32053b62812fc375aebb5af21af1149b2b4944c5]]]
Former-commit-id: d995e29afe
Former-commit-id: f8a839a0a1 [formerly 759348ba2e]
Former-commit-id: 087658d413
2013-08-13 12:34:44 -05:00
Greg Armendariz
0995174c2e Merge "Issue #2164 - fix 13.6.1 build" into development
Former-commit-id: 8bcfc737e6 [formerly 34b428b5a0] [formerly 8bcfc737e6 [formerly 34b428b5a0] [formerly 84413bd66f [formerly aa808c2ef1cbee907fbe910892a2c37fa5b0d45c]]]
Former-commit-id: 84413bd66f
Former-commit-id: 02dfe84d31 [formerly dbae6131cb]
Former-commit-id: e5399de2a2
2013-08-13 12:34:04 -05:00
Nate Jensen
ede849eea4 Merge "Issue #2142 removing more dependencies on edex.common" into development
Former-commit-id: 86e823cc9f [formerly 260ea8a0b9] [formerly 86e823cc9f [formerly 260ea8a0b9] [formerly 576b8fa830 [formerly 725b2654ce507b302ac111a740f27460799ecd80]]]
Former-commit-id: 576b8fa830
Former-commit-id: 12fd3b3b8d [formerly 295b29860b]
Former-commit-id: f8dc20caba
2013-08-13 12:32:09 -05:00
Nate Jensen
7e35afdd49 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: a9815b0551 [formerly 15405cab1b] [formerly a9815b0551 [formerly 15405cab1b] [formerly 63b2fe798a [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]]
Former-commit-id: 63b2fe798a
Former-commit-id: 464a104dc1 [formerly 3be446fca8]
Former-commit-id: 96214e9554
2013-08-13 12:27:02 -05:00