Commit graph

3468 commits

Author SHA1 Message Date
Nate Jensen
a72c02725d Merge "Issue #2269 add new acarssounding feature to resolve dependency issues." into development
Former-commit-id: 8d020df109 [formerly 000966f04f] [formerly 8d020df109 [formerly 000966f04f] [formerly c498e13951 [formerly 95e387e528abd58efd296275447edda7572f77de]]]
Former-commit-id: c498e13951
Former-commit-id: a8ce9f93f9 [formerly 1051e7c99e]
Former-commit-id: 96125b7012
2013-08-20 17:06:33 -05:00
Nate Jensen
469e5ff090 Merge "Issue #2250 resolve some ffmp data factory issues and make some changes to failing function calls in FFMP, and handle new types of objects in JUtil" into development
Former-commit-id: 783b7d151f [formerly 8d01eefc50] [formerly 783b7d151f [formerly 8d01eefc50] [formerly 6941e3300b [formerly 811924693ef44e87aae65a33c8decd1a7f1cd321]]]
Former-commit-id: 6941e3300b
Former-commit-id: 4de49cde5a [formerly 599642edf5]
Former-commit-id: 81d07dfaf6
2013-08-20 14:49:24 -05:00
Ben Steffensmeier
c4623516dd Issue #2269 add new acarssounding feature to resolve dependency issues.
Former-commit-id: a271dd3416 [formerly b51bd9bf9e] [formerly a271dd3416 [formerly b51bd9bf9e] [formerly b2989eb937 [formerly eb6b98e80f483f330022481889522dcfd7f0e526]]]
Former-commit-id: b2989eb937
Former-commit-id: b0b16f1e93 [formerly a9bb310daf]
Former-commit-id: 0ba01e4d93
2013-08-20 14:41:57 -05:00
Matt Nash
6b00110403 Issue #2250 resolve some ffmp data factory issues and make some changes to failing function calls in FFMP, and handle new types of objects in JUtil
Change-Id: If6b33d542e2a0c2744e6c906d98273f589694772

Former-commit-id: c2da9a7152 [formerly 4c8e631e22] [formerly c2da9a7152 [formerly 4c8e631e22] [formerly 304ef3e3b8 [formerly 8916efbaad066e1b5dc6d01b68fa67c72ebc982b]]]
Former-commit-id: 304ef3e3b8
Former-commit-id: d7a87afa96 [formerly b2b6246ead]
Former-commit-id: e345fbaa6b
2013-08-20 12:10:19 -05:00
Roger Ferrel
101fc37ef7 Issue #2220 Better response using priority queues and delay getting display data.
Change-Id: I5f7b8eb904dcde9ef52acc2f39df864ac62080bb

Former-commit-id: 73cc41435b [formerly 23bfd136b2] [formerly 73cc41435b [formerly 23bfd136b2] [formerly c626f25565 [formerly 41b9f80efe66151a16b0df5b74ccc2904ac19e20]]]
Former-commit-id: c626f25565
Former-commit-id: 7d97beec44 [formerly 62563c8b7b]
Former-commit-id: 6f9c9d752d
2013-08-20 11:55:19 -05:00
Richard Peter
513398be67 Merge "Issue #2196 Renamed ncfRegistry.sh to centralRegistry.sh and wfoRegistry.sh to registry.sh to correspend to the modes.xml names." into development
Former-commit-id: f623053d18 [formerly 02131eecb0] [formerly f623053d18 [formerly 02131eecb0] [formerly 36c486ca0a [formerly 4003a61f0b6ea56f31dcf6cf1be7ee16f70860be]]]
Former-commit-id: 36c486ca0a
Former-commit-id: d0c5729abc [formerly 83eaf3f5fc]
Former-commit-id: b258da63c1
2013-08-20 11:37:28 -05:00
Richard Peter
abb479c601 Merge "Issue #1692 Implemented/Verified Registry LifecycleManager - Verified submitObjects protocol - Added unimplemented features of removeObjects protocol - Implemented updateObjects protocol - Refactored registry error reporting - Fixed JUnit tests - Corrected @XmlRootElement tag on registry objects - Added capability to modify registry objects using XPath" into development
Former-commit-id: 4a581efbc5 [formerly 544504b029] [formerly 4a581efbc5 [formerly 544504b029] [formerly afc8e8823f [formerly 95d945ad9fdfaf4a18d2fb6d9dd63b1314e95c8c]]]
Former-commit-id: afc8e8823f
Former-commit-id: 82239ba26f [formerly 194604aa24]
Former-commit-id: 3459527089
2013-08-20 11:02:43 -05:00
Richard Peter
578e2cab2e Merge "Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent." into development
Former-commit-id: 907ba11370 [formerly 3f68e90b92] [formerly 907ba11370 [formerly 3f68e90b92] [formerly fed1365d50 [formerly d18c660b2b9d1f9c679118ca46be45c69d76aea7]]]
Former-commit-id: fed1365d50
Former-commit-id: 15f4bda876 [formerly 75bdec15f2]
Former-commit-id: 3443f1803b
2013-08-20 11:01:05 -05:00
Ben Steffensmeier
202dc2b6eb Issue #2269 Fix MDCRS data and switch acars to use nsharp.
Former-commit-id: d4b2bf52fb [formerly 5fd84f4516] [formerly d4b2bf52fb [formerly 5fd84f4516] [formerly f778b53310 [formerly 30b4923ee25dcba22e79f03ae5a3e8cec8f9683e]]]
Former-commit-id: f778b53310
Former-commit-id: d7d0a42633 [formerly 2d54492d7f]
Former-commit-id: 62474b8798
2013-08-19 17:23:03 -05:00
Nate Jensen
4b8a23b2fe Merge "Issue #2260 Switch goessounding to NSharp. Change-Id: Ie78c4456758dcbce845cfb85da3e2e69ec74323b" into development
Former-commit-id: 9ac6600e92 [formerly d5426a47ba] [formerly 9ac6600e92 [formerly d5426a47ba] [formerly 2635170d1d [formerly b00130e76268a896bcda6edfc62f2e0238c377cc]]]
Former-commit-id: 2635170d1d
Former-commit-id: 64e9f13e0a [formerly 0c8619e01e]
Former-commit-id: e3bb60f947
2013-08-19 17:22:48 -05:00
Brad Gonzales
fc886acb52 Issue #2196 Renamed ncfRegistry.sh to centralRegistry.sh and wfoRegistry.sh
to registry.sh to correspend to the modes.xml names.

Change-Id: Ia07b046016e522089002440b4162de8370ee5343

Former-commit-id: 1c117e1ace [formerly 6a98f66353] [formerly 1c117e1ace [formerly 6a98f66353] [formerly 6f7eb373d4 [formerly 17f72768dbee4239238c77d21a35a07c21824e88]]]
Former-commit-id: 6f7eb373d4
Former-commit-id: 0b9acdf944 [formerly aa63997a17]
Former-commit-id: a714dc6aba
2013-08-19 16:56:09 -05:00
Ben Steffensmeier
084f6c8adc Issue #2260 Switch goessounding to NSharp.
Change-Id: Ie78c4456758dcbce845cfb85da3e2e69ec74323b

Former-commit-id: aa204eba5e [formerly 2f0c0c9cf2] [formerly aa204eba5e [formerly 2f0c0c9cf2] [formerly 54310cd87e [formerly 7e0b4473c5ebe30794014b43ffc2788eb98fc47f]]]
Former-commit-id: 54310cd87e
Former-commit-id: c48cda36c0 [formerly d2237d9e44]
Former-commit-id: 47b2fa3025
2013-08-19 16:34:42 -05:00
Lee Venable
71aa6f514f Merge "Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog Peer review comments" into development
Former-commit-id: 23dca45a0c [formerly b8d050a172] [formerly 23dca45a0c [formerly b8d050a172] [formerly 6f1e633d57 [formerly cb230698c8be8faef2441171f2270e41807f797d]]]
Former-commit-id: 6f1e633d57
Former-commit-id: a4cb2d6d21 [formerly e1b9d4cf81]
Former-commit-id: cd7b1fdc0a
2013-08-19 15:14:22 -05:00
Benjamin Phillippe
ea6d316023 Issue #1692 Implemented/Verified Registry LifecycleManager
- Verified submitObjects protocol
            - Added unimplemented features of removeObjects protocol
            - Implemented updateObjects protocol
            - Refactored registry error reporting
            - Fixed JUnit tests
            - Corrected @XmlRootElement tag on registry objects
            - Added capability to modify registry objects using XPath

Change-Id: Id8eea47c3c4a1e39fe88cb17530e9e6cdacd7ce2

Former-commit-id: fcd42b5869 [formerly 2403f75262] [formerly fcd42b5869 [formerly 2403f75262] [formerly 1390bd8a65 [formerly 94810246b449c64457c48684df72baf6e9e8b03d]]]
Former-commit-id: 1390bd8a65
Former-commit-id: d98fbd79c7 [formerly d9dffafa6f]
Former-commit-id: f2889110a7
2013-08-19 13:16:13 -05:00
Bryan Kowal
7bcb1f4407 Issue #2169 - gzip data uris; entities that receive data uris will unzip them before running thrift conversions.
- Amend: updates for 32-bit edex_com
- Amend: do not synchronize when building the message
- Amend: use the byte array pool
- Amend: default to data decompression when the queue is edex.alerts

Change-Id: I79a1f3d3d698c67019a4aa33e667fef99f6ebc17

Former-commit-id: 7e61461e86 [formerly 3eaacdb522] [formerly 7e61461e86 [formerly 3eaacdb522] [formerly 2e1a8eb2b3 [formerly 120aa0d6ee671e20734f8efb7bad89ff1b145629]]]
Former-commit-id: 2e1a8eb2b3
Former-commit-id: 18c9026455 [formerly 5c0af47d6d]
Former-commit-id: 6f246409fd
2013-08-19 12:06:30 -05:00
Lee Venable
e69a99cd7e Merge "Issue #2256 - Memory leak fixes and some code clean up fixes." into development
Former-commit-id: a77bacccdb [formerly b005f48faa] [formerly a77bacccdb [formerly b005f48faa] [formerly 2a296b5890 [formerly 44eddc910a51059ed527c41ca8aafe7ade2410fe]]]
Former-commit-id: 2a296b5890
Former-commit-id: 089100569d [formerly 932568191b]
Former-commit-id: 5dd5e0bf30
2013-08-19 11:13:57 -05:00
Richard Peter
3aa7b22c17 Merge "Issue #1742 Fixed concurrent mod exception in DAT config updates Change-Id: I78ddb871e2bdc3c4200d9c32ae5d9fbd729f116e" into development
Former-commit-id: fd4e8b931c [formerly e5b6102791] [formerly fd4e8b931c [formerly e5b6102791] [formerly 39a56abb39 [formerly 7988827cf78516d2b928db9004cec0ab5bebd08e]]]
Former-commit-id: 39a56abb39
Former-commit-id: cdc82ab15f [formerly 2258c4cee1]
Former-commit-id: c15214630c
2013-08-19 10:10:38 -05:00
Dave Hladky
c16bb222de Issue #1742 Fixed concurrent mod exception in DAT config updates
Change-Id: I78ddb871e2bdc3c4200d9c32ae5d9fbd729f116e

Former-commit-id: c25937ec85 [formerly 111ffab3c9] [formerly c25937ec85 [formerly 111ffab3c9] [formerly 6d9872d694 [formerly 8f3cbb79c086845d49b7a877359cac3f83fc1c1c]]]
Former-commit-id: 6d9872d694
Former-commit-id: d290c84290 [formerly 2702279e7a]
Former-commit-id: a7de983a1c
2013-08-16 16:26:19 -05:00
Richard Peter
2ad455691f Merge "Issue #2240 Fix incorrect environment assumptions" into development
Former-commit-id: 60cd44b5a5 [formerly 3c8f6762fe] [formerly 60cd44b5a5 [formerly 3c8f6762fe] [formerly d997b1b0fe [formerly 8894c03f3db89e44ddc97d1ca897130670291687]]]
Former-commit-id: d997b1b0fe
Former-commit-id: 9e393f0e9b [formerly d3f04844c1]
Former-commit-id: aaf413d874
2013-08-16 15:15:54 -05:00
Lee Venable
f0ec3034d0 Issue #2256 - Memory leak fixes and some code clean up fixes.
Change-Id: I7b16871f59e63218b1d5754ac460bbab056f78a5

Former-commit-id: 212c830986 [formerly 752371bc63] [formerly 212c830986 [formerly 752371bc63] [formerly 49c06062fe [formerly 67228c5208da07cc56b95ce378ec50370541a260]]]
Former-commit-id: 49c06062fe
Former-commit-id: c11caef6ca [formerly 606c25c093]
Former-commit-id: 23f828983a
2013-08-16 15:04:28 -05:00
Bryan Kowal
b2e870cd57 Issue #2164 - fix 13.6 aviation rpm
Former-commit-id: 46976ba44b [formerly c113178a49] [formerly 46976ba44b [formerly c113178a49] [formerly 347a886099 [formerly bbeb36de32df79731ace5b56d4d746b8057707f0]]]
Former-commit-id: 347a886099
Former-commit-id: 2a4eb86e05 [formerly e8e67a6905]
Former-commit-id: af5210414f
2013-08-16 14:21:03 -05:00
Mike Duff
e33069668b Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog
Peer review comments

Change-Id: I4b2eef5a0d0697e2f94aa7c59872c73cb3b350b0

Former-commit-id: 89cdc61d65 [formerly 70af70ba8d] [formerly 89cdc61d65 [formerly 70af70ba8d] [formerly 6190281e77 [formerly 938c6d3151fc5b7513ee48fe9e9de0c60e7799a8]]]
Former-commit-id: 6190281e77
Former-commit-id: 8d27c7b420 [formerly c4c73b4e3b]
Former-commit-id: f22684b90b
2013-08-16 13:13:02 -05:00
Bryan Kowal
28fa6a1962 Issue #2164 - fix 13.6.1 CAVE build
Former-commit-id: 138d442180 [formerly 197498e784] [formerly 138d442180 [formerly 197498e784] [formerly 9e2aa969cf [formerly eb249e6e879bcff4cbed17edde9307e5390d3619]]]
Former-commit-id: 9e2aa969cf
Former-commit-id: 87038b3d36 [formerly 7cbd9bb75c]
Former-commit-id: da9d66d124
2013-08-16 12:40:38 -05:00
Everett Kladstrup
eb14f5a5fe Issue #2240 Fix incorrect environment assumptions
* using $awips_home as the prefix for java/python/psql causes
  problems on edex-environment (wes2bridge) installs; where
  $awips_home does not contain the java/python/psql installs, instead
  they are located at /awips2

Change-Id: Iadfe6c2b2ca1a1d9e55bb9cfc73ed6042e6fdcee

Former-commit-id: 2803eded49 [formerly 535248b69b] [formerly 2803eded49 [formerly 535248b69b] [formerly fba53e9fe3 [formerly d7f3cd19c3f2697b139e3d36ac7ee536947a2b6f]]]
Former-commit-id: fba53e9fe3
Former-commit-id: b602d37357 [formerly 6883cdc389]
Former-commit-id: 08bbf8620a
2013-08-16 11:02:15 -05:00
Nate Jensen
7710ab9c0e Merge "Issue #2260 Switch poessounding to NSharp. Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78" into development
Former-commit-id: f5e84f17ea [formerly 469df6d806] [formerly f5e84f17ea [formerly 469df6d806] [formerly d28cb1ff68 [formerly 2f69b0b239a292711ed6b40a1348d357f65bdc67]]]
Former-commit-id: d28cb1ff68
Former-commit-id: 8f6f749c60 [formerly b34d67ced3]
Former-commit-id: bca8f9f3ca
2013-08-16 10:06:32 -05:00
Richard Peter
dd7b4a4705 Merge "Issue #2196 final name change for registries. Now registry and centralRegistry." into development
Former-commit-id: bbde1db7a0 [formerly ae1d4ca6b4] [formerly bbde1db7a0 [formerly ae1d4ca6b4] [formerly ea98de5ad1 [formerly e9dc49bfac807b7ddbe2a6ac39e13eb917aacf44]]]
Former-commit-id: ea98de5ad1
Former-commit-id: 6bb8ae2dda [formerly 8f12009352]
Former-commit-id: b8bf91e9af
2013-08-16 09:41:08 -05:00
Lee Venable
930524f962 Merge "Issue #2143 - Fix various issues with SCAN/DMD/TVS" into development
Former-commit-id: 65b9b35dbe [formerly ec5668caef] [formerly 65b9b35dbe [formerly ec5668caef] [formerly fbb341f176 [formerly 83920d5ea505a04b920ab2da3caa7d27cf55d43b]]]
Former-commit-id: fbb341f176
Former-commit-id: de18cd342d [formerly faaeb93c7d]
Former-commit-id: 823e1c3562
2013-08-16 08:32:25 -05:00
Ben Steffensmeier
d9932b5ce1 Issue #2260 Switch poessounding to NSharp.
Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78

Former-commit-id: fb23de355e [formerly 36a920333f] [formerly fb23de355e [formerly 36a920333f] [formerly 74b0b57f4b [formerly 4e83b721a46cea5af56fd2444ba4bf22813604e9]]]
Former-commit-id: 74b0b57f4b
Former-commit-id: ad82565d1a [formerly 94e79ff7b4]
Former-commit-id: e24647553f
2013-08-15 17:51:52 -05:00
Nate Jensen
312256254d Merge "Issue #2258 Convert profiler sounding to var height with hodo. Change-Id: I7b8c704ebc847169c2d09bb0bea13d0b60a9cff6" into development
Former-commit-id: 0f006e221e [formerly b92b67676c] [formerly 0f006e221e [formerly b92b67676c] [formerly e4825013dd [formerly 2a570e7691354ff43d2cec751bfe2e51ef84c902]]]
Former-commit-id: e4825013dd
Former-commit-id: 78f8b742a6 [formerly 925478cac7]
Former-commit-id: d0514389aa
2013-08-15 17:46:59 -05:00
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
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
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
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
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
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