Commit graph

3225 commits

Author SHA1 Message Date
Bryan Kowal
4ba61ba307 Issue #2215 - Updates to edex_com and edex_notify for the thrift 0.9.0 upgrade.
- Amend: fix data types in GridDataRequestMessage

Change-Id: I7f7abd36b3c3f94c24ee0381115c5643aae39f22

Former-commit-id: c7ca10997a [formerly 8ac250ca02] [formerly c5c9f4d30b] [formerly c7ca10997a [formerly 8ac250ca02] [formerly c5c9f4d30b] [formerly a44a5d16e7 [formerly c5c9f4d30b [formerly e317a0d7101182ad351f604cfc04ad0292773161]]]]
Former-commit-id: a44a5d16e7
Former-commit-id: 66dc4ed288 [formerly 3c1a1d7d9d] [formerly 10142f3033966b2e09e7acab2313f01e6daa1ff0 [formerly 3fadaf976c]]
Former-commit-id: 4369e904e4a219e0821c27445bba43daa100a868 [formerly b355324172]
Former-commit-id: 2936104283
2013-07-29 13:50:33 -05:00
Bryan Kowal
a88f3ba342 Issue #2164 - disable build of awips2-notification temporarily.
Former-commit-id: 631fa7e5bf [formerly bedb6e5b55] [formerly 9ae7f63e26] [formerly 631fa7e5bf [formerly bedb6e5b55] [formerly 9ae7f63e26] [formerly cccb37ebc0 [formerly 9ae7f63e26 [formerly 69f7d9afd3d61fe1a68b16b98d7d3a41d4fcc2c4]]]]
Former-commit-id: cccb37ebc0
Former-commit-id: d9c8a62bbd [formerly 693a72ad6a] [formerly faee5296a8e05ac1bd6012bc5025005b71e77423 [formerly 779c2ea7a2]]
Former-commit-id: 07ec53029a01785b5ab3fab7fa4687970ff0a929 [formerly 04b8d9d26c]
Former-commit-id: 5945e88676
2013-07-24 12:45:29 -05:00
Nate Jensen
ca8db7613f Merge "Issue #2223 fix melting layer memory leak" into development
Former-commit-id: dbd9508668 [formerly b604a13d73] [formerly 59f14f622f] [formerly dbd9508668 [formerly b604a13d73] [formerly 59f14f622f] [formerly e147fd411e [formerly 59f14f622f [formerly 88fd745e4bb12abc3302727f9ec0ed37afc133c5]]]]
Former-commit-id: e147fd411e
Former-commit-id: fb816b8615 [formerly 7ae65a8946] [formerly 5778aee1b9379e13c6d0b9438bf3db9fb149fd4b [formerly 64ba0d05ab]]
Former-commit-id: c0287074cfdfcd6daadebaccaee7f421fa29bca6 [formerly 7e00e72a62]
Former-commit-id: c7be548921
2013-07-23 15:49:06 -05:00
Nate Jensen
48adc9f5e4 Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: bf0ff5eb76 [formerly 194db9a9f9] [formerly 88b2dd18e6] [formerly bf0ff5eb76 [formerly 194db9a9f9] [formerly 88b2dd18e6] [formerly 7b5dcc09fa [formerly 88b2dd18e6 [formerly 3909f42ee097dac541328f8dc85330c618583b3f]]]]
Former-commit-id: 7b5dcc09fa
Former-commit-id: 23113b9799 [formerly 95aeee2fe6] [formerly 565ae6820431b40a925d369d31213973fbb0fab4 [formerly 8db7b7b5f6]]
Former-commit-id: 92bd473dfff6300abfe6b2e88f57f10d4c00d59e [formerly f6d5014c43]
Former-commit-id: 8be1ed440a
2013-07-23 14:27:29 -05:00
Ron Anderson
782949b548 Merge "Issue #2009: Fix NullPointerException in SocketServer start up." into development
Former-commit-id: b516de5288 [formerly 5ff82ce522] [formerly 1b87afefc3] [formerly b516de5288 [formerly 5ff82ce522] [formerly 1b87afefc3] [formerly fd031ba61f [formerly 1b87afefc3 [formerly 71ae0f3b1c05f6e888e974946d7f4378c6efe32f]]]]
Former-commit-id: fd031ba61f
Former-commit-id: 92c28d148c [formerly 90f3f0f4b7] [formerly d4d02ece1ceae4270bd382ee0efb3e81ec3a1a61 [formerly ee45dfcbea]]
Former-commit-id: f71572a310db2ccc80974d2825d092e750f29a26 [formerly b612d75564]
Former-commit-id: fd0eda517e
2013-07-23 14:07:43 -05:00
Nate Jensen
ebc078d294 Issue #2215 finish removing old facebook thrift
Change-Id: I32423b0f7d0b59cb439fcefcc9b5482947a8a4b1

Former-commit-id: fe77ac028d [formerly b22a1302e9] [formerly d6efde8ce2] [formerly fe77ac028d [formerly b22a1302e9] [formerly d6efde8ce2] [formerly a859d20865 [formerly d6efde8ce2 [formerly 66924bc597e0e6da2e5f28b10a40fca10d697fbd]]]]
Former-commit-id: a859d20865
Former-commit-id: 51ebc7cbce [formerly 3bff1bfbad] [formerly 3cf4ef02f8041c3ce9b6edba8975b7a332c3cd64 [formerly 1feaa09ccf]]
Former-commit-id: 5e34127701fae9d2c2c9fbfbe75110c347ccca4a [formerly e8b685d73d]
Former-commit-id: 3c7ec48316
2013-07-23 14:03:03 -05:00
David Gillingham
250f0b4a75 Issue #2009: Fix NullPointerException in SocketServer start up.
Change-Id: I07683ba74410234d162e058df0bb3ff6e00ee59e

Former-commit-id: e10c907d60 [formerly a42de38d9e] [formerly f4b6c5929c] [formerly e10c907d60 [formerly a42de38d9e] [formerly f4b6c5929c] [formerly a711fea3d9 [formerly f4b6c5929c [formerly b2b6220d5b5ef2235edb57fe2ab2ce0cb234ee25]]]]
Former-commit-id: a711fea3d9
Former-commit-id: 1ce2c2fcf4 [formerly bf2e332633] [formerly 3f2862d88613bb9801408b75f01fb41f8da27c96 [formerly 9fbbeff998]]
Former-commit-id: 2cc53bf06ea4692b94334c1273204f28d694b55b [formerly a6fd072a4e]
Former-commit-id: 1474d8791c
2013-07-23 13:57:38 -05:00
Nate Jensen
e30cf91b22 Merge "Issue #2215 upgrade thrift to version 0.9.0" into development
Former-commit-id: e4867042d2 [formerly 3aee4ff8a4] [formerly 99eff65daa] [formerly e4867042d2 [formerly 3aee4ff8a4] [formerly 99eff65daa] [formerly fa8d032583 [formerly 99eff65daa [formerly 5afd770ba549c485b3bba3e9c24aa5d9ae45f326]]]]
Former-commit-id: fa8d032583
Former-commit-id: 8580abb9fe [formerly d2d760e035] [formerly a78932ea4a0671427755bb002de3a9bab71a45fa [formerly 4aa9943e70]]
Former-commit-id: 79a2270e4d4efa08d9237cd2315386994110f0c9 [formerly d8f42c48f7]
Former-commit-id: 645c5101b4
2013-07-23 13:48:19 -05:00
Nate Jensen
8dd49daed8 Issue #2215 upgrade thrift to version 0.9.0
Change-Id: I9cf910a75c25f1d97a711a9088c3b496ceb2be70

Former-commit-id: 8707633263 [formerly 7197e75c15] [formerly 7b4938a999] [formerly 8707633263 [formerly 7197e75c15] [formerly 7b4938a999] [formerly 8898a6d2ba [formerly 7b4938a999 [formerly ab2e3f3e8910043b117887712258fc689f2e9445]]]]
Former-commit-id: 8898a6d2ba
Former-commit-id: c869207445 [formerly 7c438bd944] [formerly 4fe140d3706a9bb93c749820c213f4a95dd40dbc [formerly 375ad89ac8]]
Former-commit-id: 03082558b26f67648b804696198cf0f48e47ed8f [formerly fa24302a76]
Former-commit-id: 3aba42df34
2013-07-23 12:28:07 -05:00
Greg Armendariz
df3a9b133a Issue #2214 - Correct syntax
Former-commit-id: bd9c893494 [formerly eb6fef00c7] [formerly 62751f2af8] [formerly bd9c893494 [formerly eb6fef00c7] [formerly 62751f2af8] [formerly df8dd8d71b [formerly 62751f2af8 [formerly 0b398665c539949a624b9d2e3e0b11dcd501044d]]]]
Former-commit-id: df8dd8d71b
Former-commit-id: 15bdc4f6c4 [formerly d8b26bf14f] [formerly a612dab10b72b7853b3b68864ce38d4b1f9c19bc [formerly 6f0c139522]]
Former-commit-id: deaf8244b1d1436fc80e9274eb45b26afa55b714 [formerly 3396444cea]
Former-commit-id: 717b8071cd
2013-07-23 09:08:53 -05:00
Richard Peter
77829569ba Issue #1977: Fix NCEP Plugin issues due to merge
Former-commit-id: fc28bf67bb [formerly 3879c810db] [formerly fa6a457cd0] [formerly fc28bf67bb [formerly 3879c810db] [formerly fa6a457cd0] [formerly 00aeeb338b [formerly fa6a457cd0 [formerly 7c054e201e41d4df5fdb82faf2648e3f8cd227cc]]]]
Former-commit-id: 00aeeb338b
Former-commit-id: a138619ea8 [formerly 55730a775c] [formerly 2fcab6ba0629d543c3db0c87536593cdc6fea382 [formerly b5e8abbcab]]
Former-commit-id: 8e0ed508d0f5c25c766be224268c2067ba7e030b [formerly c079e1d161]
Former-commit-id: 3644f1a0eb
2013-07-22 16:37:43 -05:00
Bryan Kowal
5dfb0af756 Issue #2206 - relocate ATBL directory change to 13.5
Former-commit-id: 38ef1633d2 [formerly 7e0a51e3b2] [formerly bdcbf39a9a] [formerly 38ef1633d2 [formerly 7e0a51e3b2] [formerly bdcbf39a9a] [formerly 7dcbe438e9 [formerly bdcbf39a9a [formerly e6bc04f738a19c56563e81d1924969640223f843]]]]
Former-commit-id: 7dcbe438e9
Former-commit-id: 0056d3fd53 [formerly d393264d27] [formerly 51ed507e7af85ecf40d3340950202abafe787a1a [formerly 1729820501]]
Former-commit-id: 8782c883d5dc5d31746545530f31f934119d177c [formerly dbec306afd]
Former-commit-id: a7f6f1633b
2013-07-22 16:37:42 -05:00
David Gillingham
e4f0a337db Issue #1842: Fix issue where start time of in progress VTEC events was being set
to 991130T0000Z.


Former-commit-id: b850630912 [formerly 5bfa13b5bf] [formerly cf21fb8fb3] [formerly b850630912 [formerly 5bfa13b5bf] [formerly cf21fb8fb3] [formerly 2281f4abc5 [formerly cf21fb8fb3 [formerly e6ad90e07a4af553edcb79ce71790f339b3f4ed5]]]]
Former-commit-id: 2281f4abc5
Former-commit-id: 10adecfece [formerly c14ab8225f] [formerly be091cc35bece18942bed5dda679b7f3418ec640 [formerly ea42ffa3e5]]
Former-commit-id: 55d4815f4196cac812ca0c080cbe3fe51324069b [formerly 6b49330d25]
Former-commit-id: 683298b43b
2013-07-22 16:37:42 -05:00
Nate Jensen
10633d245d Issue #2142 fix ncep features
Change-Id: I3d13c58e450d7b0b41f41f608986537b51c3b4ca

Former-commit-id: 96afcbfa72 [formerly 412c880579] [formerly 747cab2eaf] [formerly 96afcbfa72 [formerly 412c880579] [formerly 747cab2eaf] [formerly 07dfc5d206 [formerly 747cab2eaf [formerly 3b35fd54816e3a8926e4061a4e36ca6be7287dd3]]]]
Former-commit-id: 07dfc5d206
Former-commit-id: df039291f6 [formerly 682bf1ea10] [formerly 3998b8ee2da3132c813de94e8a202f05ea32d3ad [formerly 2e92cf7bc1]]
Former-commit-id: ccff5fd6cfcbdd014b832a5b70b9bbfe91444532 [formerly edb3e81718]
Former-commit-id: fc9a9f990b
2013-07-22 14:17:17 -05:00
Ron Anderson
7b0cc7ccd1 Merge "Issue #2009: Implement dual-domain GFE export_grids solution. Update MHS emulator program to support new directory structure and some code cleanup and refactoring." into development
Former-commit-id: 0b8a7a5725 [formerly 89a1c1b2c9] [formerly eb7893c0ba] [formerly 0b8a7a5725 [formerly 89a1c1b2c9] [formerly eb7893c0ba] [formerly 6540885809 [formerly eb7893c0ba [formerly ba587ef79d0db60aa31b681e1a0614d2fee65417]]]]
Former-commit-id: 6540885809
Former-commit-id: 6a13573cbc [formerly 8425e10cbc] [formerly fe10c63301d5526605b465bdd6d822d6248227eb [formerly d54aa6fe0b]]
Former-commit-id: cd4ffe0deb9045272ba557873132ebd522bc42fd [formerly 577819698c]
Former-commit-id: 6548d151d3
2013-07-22 13:29:24 -05:00
Nate Jensen
325654d640 Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: 178107c128 [formerly bcdaae1922] [formerly 22438766b4] [formerly 178107c128 [formerly bcdaae1922] [formerly 22438766b4] [formerly 4c9cc211ec [formerly 22438766b4 [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: 78e718122d [formerly a51d424851] [formerly 3dc4b88484b3a717a07e85e47dd00b4cd0dcaaee [formerly 797760bb71]]
Former-commit-id: c97be13fa7db2191a5a8ef2ef39d349d3dc46e1b [formerly c28a52bee8]
Former-commit-id: 3e7f3c66a8
2013-07-22 12:20:43 -05:00
Ron Anderson
68865236c0 Merge "Issue #2185 Cache computed grid reprojections." into development
Former-commit-id: ddf5165267 [formerly 1a479e848f] [formerly ecce97701f] [formerly ddf5165267 [formerly 1a479e848f] [formerly ecce97701f] [formerly cd639e0220 [formerly ecce97701f [formerly 4f75c44b4dccb1cde093e32605dae809aa7a351c]]]]
Former-commit-id: cd639e0220
Former-commit-id: dbb6dccf32 [formerly 95a153d410] [formerly 5eebb28a1dedb2ebe2a2eea184eb9d3992c79673 [formerly 61e947ba76]]
Former-commit-id: 1840803adffc759f326493517607dd5a041b4786 [formerly 8bff2be5dc]
Former-commit-id: d9df33da78
2013-07-22 11:43:48 -05:00
Richard Peter
1d08e54d43 Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: 4c53471f8e [formerly e7ec068c7e] [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]]
Former-commit-id: 468a024f2957450aa44633c7888eb3aad2011b85 [formerly 85fc9c773b]
Former-commit-id: 2a9cfe51af
2013-07-22 09:40:18 -05:00
Richard Peter
5977b7de0c Merge "Issue #1655 - Implement the framework for DD system status messaging" into development
Former-commit-id: e0564b3b6c [formerly d075546952] [formerly 51a097fb8d] [formerly e0564b3b6c [formerly d075546952] [formerly 51a097fb8d] [formerly 7ceaed43c3 [formerly 51a097fb8d [formerly 638b708123bb5a89292cc7778ed8211102718d28]]]]
Former-commit-id: 7ceaed43c3
Former-commit-id: bbd3b18d5f [formerly ce7e6eeeed] [formerly d38a47bc4241e93cb847b7f2b7c520baf5764f92 [formerly 5026801885]]
Former-commit-id: 8de0536fd2eff02f9c40a5b2f1e2b773ea915da0 [formerly 7fc81195f0]
Former-commit-id: 6ba6248d49
2013-07-21 22:54:14 -05:00
Richard Peter
dedba8b339 Merge "Issue #1653 - Add a subscription summary" into development
Former-commit-id: f5040c96b7 [formerly c926f71281] [formerly 73c2547981] [formerly f5040c96b7 [formerly c926f71281] [formerly 73c2547981] [formerly 68e565fdd9 [formerly 73c2547981 [formerly 74351187e3b7061ecfdfd040ff88b81823055889]]]]
Former-commit-id: 68e565fdd9
Former-commit-id: 0845c5e3d1 [formerly d922c86c26] [formerly 94ee77045edc6a368692dfc25e52a4a8f9104a06 [formerly 992b544e33]]
Former-commit-id: de6de7b31d9114349745d4351107561f72323ae8 [formerly 64adb6ec6c]
Former-commit-id: 56eac084b5
2013-07-21 22:04:02 -05:00
Richard Peter
ecb72bbbd1 Merge "Issue #1992 Remove redundant time columns from bufrua. Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90" into development
Former-commit-id: 9429c1cd71 [formerly 4dc5e4ac27] [formerly 857426cc44] [formerly 9429c1cd71 [formerly 4dc5e4ac27] [formerly 857426cc44] [formerly c7e9cd592e [formerly 857426cc44 [formerly 57a6241f16973a6e793d0917ca4242a51bfd55f6]]]]
Former-commit-id: c7e9cd592e
Former-commit-id: 1c023492a9 [formerly 54d607a63f] [formerly 25cb9281915b246dafc2c45370d2c68f3373388d [formerly a86bc58e13]]
Former-commit-id: bb06bb9e4440d1688c0b02cfffe8b4cd0674d9e9 [formerly 73b4dfdff9]
Former-commit-id: 1b96d1cbf4
2013-07-21 21:57:38 -05:00
Richard Peter
4232d10f8b Merge "Issue #2194 Fix site override." into development
Former-commit-id: bd05184660 [formerly 09b2f9fa7e] [formerly 26ab0ff706] [formerly bd05184660 [formerly 09b2f9fa7e] [formerly 26ab0ff706] [formerly 347fb5bc2f [formerly 26ab0ff706 [formerly f32db14a29a2d545aa44dddf0bec0d4e5e56069b]]]]
Former-commit-id: 347fb5bc2f
Former-commit-id: 19beaef3fc [formerly 3ddae2a6e5] [formerly 52c02331b3ac7bb70cc2423580905b8d948d36fd [formerly 3719e0d32f]]
Former-commit-id: 0c46c56907eb6e36099019b1a54e3b771ee02d8d [formerly 6318d3dec0]
Former-commit-id: bd403dc35a
2013-07-21 21:45:43 -05:00
Greg Armendariz
723d0a4806 Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1
Former-commit-id: 16cb7d3737 [formerly fda3ba6d5b] [formerly a3b77f2623] [formerly 16cb7d3737 [formerly fda3ba6d5b] [formerly a3b77f2623] [formerly d5ea12d97f [formerly a3b77f2623 [formerly d60e75576a5f80f8838330789c97e89788c7a057]]]]
Former-commit-id: d5ea12d97f
Former-commit-id: 4c26ff845a [formerly c8c2a3d636] [formerly 6a070220b5d10249ff1b492f7b2e28dd9dd2b76e [formerly 3947baa02d]]
Former-commit-id: f1f5602f12e8568c08454a071de154890cb220bf [formerly e1092b5725]
Former-commit-id: 6c35eb215a
2013-07-19 14:15:24 -05:00
Ben Steffensmeier
07017164f1 Issue #1992 Remove redundant time columns from bufrua.
Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90

Former-commit-id: 095f200bd9 [formerly e11099ff24] [formerly ad0cefc7fa] [formerly 095f200bd9 [formerly e11099ff24] [formerly ad0cefc7fa] [formerly 9c55581ad2 [formerly ad0cefc7fa [formerly 3e916aad7d281ba53cd1634a15d7ac521943bc75]]]]
Former-commit-id: 9c55581ad2
Former-commit-id: 8045e0c18c [formerly f6eb262152] [formerly 7fbf5157984fd1fdbb4718c783654069ee6d1a47 [formerly a4f75b68d4]]
Former-commit-id: da394c61610b65100d8f3a206295fd77adbf1e4a [formerly 71a32933c4]
Former-commit-id: c584a6797d
2013-07-19 11:53:23 -05:00
Dustin Johnson
55b373071b Merge "Issue #2193 - Fix for DD data browser subscription column." into development
Former-commit-id: 48daaa343b [formerly 9dbf1c69d8] [formerly 8e78f80ddd] [formerly 48daaa343b [formerly 9dbf1c69d8] [formerly 8e78f80ddd] [formerly 1acaf2dbfa [formerly 8e78f80ddd [formerly 674aeafa6f5d317a30e1f078b1ee38acff6acf95]]]]
Former-commit-id: 1acaf2dbfa
Former-commit-id: ae0b440061 [formerly 176b1fddfb] [formerly 4e04acfbd88020959c649d17548647bac210a17e [formerly 900241dc68]]
Former-commit-id: 89c89ee2b0104ea09494b26237634c9d8b3ca000 [formerly 698cf4a9a7]
Former-commit-id: d8e5f6550f
2013-07-19 10:40:45 -05:00
Bryan Kowal
a3b4b564ab Issue #2153 - fix 13.5.1 build after merge
Former-commit-id: 0a4d751112 [formerly b49ddfe75a] [formerly 914f2f7e2f] [formerly 0a4d751112 [formerly b49ddfe75a] [formerly 914f2f7e2f] [formerly e9e3baa4df [formerly 914f2f7e2f [formerly a70fac10e48f1fc258a7756acb4d48560a54248d]]]]
Former-commit-id: e9e3baa4df
Former-commit-id: 18f781ee61 [formerly d67aa10275] [formerly 243a3b4f5bb1ab2d3bf98b3e738e06b86d9930de [formerly a7f431e526]]
Former-commit-id: ab3ee7fa5b0a2d8d14a2afa09e3342b6f7efca17 [formerly 9af77e045c]
Former-commit-id: 21902a3edb
2013-07-19 10:28:30 -05:00
Dave Hladky
f395ea040d Issue #2209 Fixed un-serialized subscription in BandwidthManager
Change-Id: I7fd734cf360a55ab3d8f5869963dc50dd7d4f5a4

Former-commit-id: 5bb599bbfe [formerly e72a0afa66] [formerly 6da58160d6] [formerly 5bb599bbfe [formerly e72a0afa66] [formerly 6da58160d6] [formerly e9b3030a6f [formerly 6da58160d6 [formerly 4107e8c2ab354d3bfb59b9c633cbd55bc0810066]]]]
Former-commit-id: e9b3030a6f
Former-commit-id: d6a79d49be [formerly 404087b14f] [formerly 08fea8099b324bfb60699a31afbbf120225acc0e [formerly ca04bb6dd6]]
Former-commit-id: bf296b65bcbda055e3338971ef43ed1fdcd5c73e [formerly a5416b471b]
Former-commit-id: 5a551a6e0e
2013-07-19 10:08:09 -05:00
Richard Peter
69af3f93ca Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	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/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]]
Former-commit-id: cc7189fcb7
Former-commit-id: e46425cd8d [formerly eefaf2c836] [formerly d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343]]
Former-commit-id: fcddfd2ee1c278a22544ea6d0efd7a301de67fff [formerly 3a573f4256]
Former-commit-id: 374879df01
2013-07-18 21:46:25 -05:00
Nate Jensen
2ac94b1152 Issue #2032 moving localization edex_static files to respective plugins, except colormaps
Change-Id: I287fe0a7d44782dc45265a9ffe2312549d95edbf

Former-commit-id: 3d226c0e69 [formerly 2ee87452db] [formerly da311b00a8] [formerly 3d226c0e69 [formerly 2ee87452db] [formerly da311b00a8] [formerly b7ea2ae30b [formerly da311b00a8 [formerly 69c812bb8f03844333497feba62951fbdcbc9e2b]]]]
Former-commit-id: b7ea2ae30b
Former-commit-id: e0650650c9 [formerly 41d3e45e60] [formerly d21a0f2bca28d0f158a5d74da9f0d15c638ab7ac [formerly dce6c06174]]
Former-commit-id: 1adfa30cf69529b0b748acde939b453b7a7d7b49 [formerly b997f2a670]
Former-commit-id: 6d7658e02e
2013-07-18 17:20:27 -05:00
Ben Steffensmeier
1f6e59c6ce Issue #2194 Fix site override.
Former-commit-id: 63dfcb59da [formerly e01f3b5b0e] [formerly 1e9fe8ba48] [formerly 63dfcb59da [formerly e01f3b5b0e] [formerly 1e9fe8ba48] [formerly ca6cba7b41 [formerly 1e9fe8ba48 [formerly b8a15544a205663adb4106453b4606d7f31f0423]]]]
Former-commit-id: ca6cba7b41
Former-commit-id: dcf44a8219 [formerly 1ebe55a213] [formerly 04b6aab49f71dc6f9a94c46624ebe5c357b2c720 [formerly 61cde4953c]]
Former-commit-id: a06206553644a811e9f9368f19dff4ecded30544 [formerly 63f6a96a77]
Former-commit-id: 0365236455
2013-07-18 15:29:41 -05:00
Mike Duff
d3d47d6d4e Issue #1653 - Add a subscription summary
Change-Id: I677ae6d472a4de5bd8905650b2e13ffc1e2af149

Former-commit-id: 271959462c [formerly 3cac2bd4ba] [formerly 823f064ef8] [formerly 271959462c [formerly 3cac2bd4ba] [formerly 823f064ef8] [formerly d5ef7f056f [formerly 823f064ef8 [formerly d64a7895e08df47feedfb95edec033d0c87384c1]]]]
Former-commit-id: d5ef7f056f
Former-commit-id: b8b8adfe89 [formerly efea9b3739] [formerly 8dcb19154786aa426856c5a801762302c07e0dc2 [formerly b4c9a0066a]]
Former-commit-id: ac8cbf8a13c1770ff77b165f9cefbcd1e953b9e1 [formerly 00904dc8ec]
Former-commit-id: 2b08ae68ff
2013-07-18 14:53:10 -05:00
Mike Duff
2fe6fa3800 Issue #2193 - Fix for DD data browser subscription column.
Change-Id: I1a76cdac15273b2e1b5b76095d9ae5f3ece8c1a3

Former-commit-id: 64c0321ac6 [formerly 997d195db6] [formerly 0ad0821d1c] [formerly 64c0321ac6 [formerly 997d195db6] [formerly 0ad0821d1c] [formerly 8229d5a23f [formerly 0ad0821d1c [formerly 344193f08e3ced288cd223a0ae295d13aa50e13a]]]]
Former-commit-id: 8229d5a23f
Former-commit-id: bc3471b3f7 [formerly 22e08fc1bb] [formerly 3c29b97739bff8c1739f10963f09157b93f9b97f [formerly 4495425388]]
Former-commit-id: 2128514a60cacff261f20e63fb1c26804bfa0dbf [formerly 0cc0145076]
Former-commit-id: aab1eea5df
2013-07-18 14:30:39 -05:00
Dustin Johnson
d7fc87cddf Merge "Issue #2191 Fixed spring error" into development
Former-commit-id: 9a3cfe6fec [formerly 45d84cf09f] [formerly 4bd8184d8a] [formerly 9a3cfe6fec [formerly 45d84cf09f] [formerly 4bd8184d8a] [formerly 8b908afc8f [formerly 4bd8184d8a [formerly 8794f7763a3cb982c5c282b40cfc82b466f49e5f]]]]
Former-commit-id: 8b908afc8f
Former-commit-id: a09755465b [formerly 952dfd04f1] [formerly 36bde70385adc9206b5ae2e0a721fef0e65b95ae [formerly c79352ae95]]
Former-commit-id: 7e056e756aac7691cc80c7c717ed91954ed78cca [formerly 433e683dc6]
Former-commit-id: b7c8e82d1a
2013-07-18 13:21:01 -05:00
Benjamin Phillippe
269a687ca6 Issue #2191 Fixed spring error
Change-Id: Ia010d718640d1dd24f2e635eaae07dae6fa29a72

Former-commit-id: aff288e373 [formerly 245307d449] [formerly 9f60b0b2f6] [formerly aff288e373 [formerly 245307d449] [formerly 9f60b0b2f6] [formerly 831418e2c0 [formerly 9f60b0b2f6 [formerly 43bb45deb9075eea60ee82a66173bc7ee89d4f0a]]]]
Former-commit-id: 831418e2c0
Former-commit-id: cd82da999b [formerly 95fad21198] [formerly e71729b998fc34c6ae394cb24dc95eb8f3bf9bc5 [formerly 7fb8740fae]]
Former-commit-id: 20cda7edecd66029681d5628823fa0f621aeec65 [formerly edcacb3dc7]
Former-commit-id: 0aa1109598
2013-07-18 12:50:10 -05:00
Steve Harris
adf2f89d57 13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b [formerly cb50a0028d] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd]
Former-commit-id: 513c089375
2013-07-18 12:07:22 -04:00
Nate Jensen
6c2fa164e3 Issue #2032 removing user-specific colormap files
Change-Id: Ia48f3100233c185514ca65acd0086a72f26ec7f1

Former-commit-id: 427ab79e9c [formerly 50c17a691c] [formerly 5aef034545] [formerly 427ab79e9c [formerly 50c17a691c] [formerly 5aef034545] [formerly ba6851b0e6 [formerly 5aef034545 [formerly bd0401862fb0778cabb98e1fa8ef65925e25f649]]]]
Former-commit-id: ba6851b0e6
Former-commit-id: f337ec5f02 [formerly ffe57ce04e] [formerly 5d6e67fb9a9c95a5af359967fd4f6518739f952c [formerly d479258121]]
Former-commit-id: f001f64c329cfb14d8204eea8aadef6034794bf6 [formerly c63066c708]
Former-commit-id: e721095714
2013-07-18 11:06:45 -05:00
Dustin Johnson
ba4e0041a9 Issue #2205 Fix cancelling adhoc queries
Change-Id: I81207fe9c68a111e9894a7a25b83d9f0b4c03317

Former-commit-id: ed50793d64 [formerly 584e427e81] [formerly 58ab4e5cfc] [formerly ed50793d64 [formerly 584e427e81] [formerly 58ab4e5cfc] [formerly 9aadc61ea5 [formerly 58ab4e5cfc [formerly dd05e6c8f9c17ac331b137b9eb3d486c459144fb]]]]
Former-commit-id: 9aadc61ea5
Former-commit-id: 47b5f3aa73 [formerly 520d539a44] [formerly 34a268fe658d39e9111d17c052060bbb36bf86e0 [formerly 54ff2b87c6]]
Former-commit-id: 5c1de511e41dbc8984c9686a7ae60f25c05944fa [formerly 865d1d88fc]
Former-commit-id: f342d10b14
2013-07-18 11:06:42 -05:00
Roger Ferrel
df37274974 Issue #1966 Relocation of configuration files and checks for bad configuration files.
Change-Id: I1e26806cfc27eb25d0f3b8c1ad6ed21bfaebfc9c

Former-commit-id: e5cd0e7599 [formerly e225bd674b] [formerly c002045a87] [formerly e5cd0e7599 [formerly e225bd674b] [formerly c002045a87] [formerly 91ee1d36bf [formerly c002045a87 [formerly d8b89bcf2bb65e3e54730e58ab7529f03fcbbaad]]]]
Former-commit-id: 91ee1d36bf
Former-commit-id: 1f56a1179e [formerly 97e4dc3633] [formerly e674edd4dd9db03d4b9f31499b37657af33debd7 [formerly 95cb3439a4]]
Former-commit-id: 4285173926a19c787c964793fdd7bd9e860c0e29 [formerly 47ac9a9147]
Former-commit-id: 8d6092bbf0
2013-07-18 10:02:05 -05:00
Nate Jensen
2d6737f52c Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15

Former-commit-id: 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly b767760a9c [formerly 5264d3a5b8 [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]]]
Former-commit-id: b767760a9c
Former-commit-id: 0509e362b9 [formerly 93713d9698] [formerly 85f35fc0d31289c55393eeee4cf0917b4eabadb0 [formerly c77936c6c0]]
Former-commit-id: 0d2fa08b78da80bd2050c50580bfb6d7564771fc [formerly 175a28da9a]
Former-commit-id: 06502f57ef
2013-07-18 09:53:53 -05:00
Ben Steffensmeier
a1e87d64d0 Issue #2185 Cache computed grid reprojections.
Former-commit-id: db4a331ea9 [formerly d9d18683f1] [formerly b5542309b3] [formerly db4a331ea9 [formerly d9d18683f1] [formerly b5542309b3] [formerly ae8110acf6 [formerly b5542309b3 [formerly 891f2241dd238b2901f8c1daee8f2236558f42e0]]]]
Former-commit-id: ae8110acf6
Former-commit-id: eb5726821f [formerly 69c3c7527e] [formerly 4f5d44fe45130ae8b4f798ea1c686ac5c2d2e215 [formerly 6febd20a1c]]
Former-commit-id: d90fd6108372ba1c0f1269096fdbdba2adad0386 [formerly e6e2a2d619]
Former-commit-id: 66ab85e41d
2013-07-17 17:34:34 -05:00
Nate Jensen
2a221bafdf Merge "Issue #2156 added orphan checking to time match basis on time match and set to null if not on any descriptor" into development
Former-commit-id: 0a462628ed [formerly 60f15e1081] [formerly 12a9907775] [formerly 0a462628ed [formerly 60f15e1081] [formerly 12a9907775] [formerly 08a90aa293 [formerly 12a9907775 [formerly ae5a73adff9925796610ccdda83459a2f7ffb771]]]]
Former-commit-id: 08a90aa293
Former-commit-id: 4afebce15c [formerly a0bccec268] [formerly 13b893b0f852a3d356269b82bf262d7918a23468 [formerly 41fb919028]]
Former-commit-id: adbe7ad067219d5d0ae8300e9187e930a2e5cef2 [formerly d3526cc878]
Former-commit-id: 6f98f286d6
2013-07-17 17:10:32 -05:00
Nate Jensen
95d5b89058 Merge "Issue #2158 Allow VizGlobalsManager to work without accessing UI thread. Change-Id: I3cb8e97d68a76b371a93a52b1c4f7b860b0847c1" into development
Former-commit-id: 458688ba47 [formerly db2e2b8359] [formerly b42b2f12ec] [formerly 458688ba47 [formerly db2e2b8359] [formerly b42b2f12ec] [formerly 3c2cd76715 [formerly b42b2f12ec [formerly 91357f42f9762e47984cba6fcf5479deb1fd5724]]]]
Former-commit-id: 3c2cd76715
Former-commit-id: 787fec1106 [formerly 6a47dfacb6] [formerly 1e744dc5eeb81454e92687a341f543753c2eb7d1 [formerly bd489239a9]]
Former-commit-id: 60c3f94e11fe2ba426ff2e8c9670d5f3635e28bc [formerly 655050e317]
Former-commit-id: 5ddf889a93
2013-07-17 17:09:29 -05:00
Nate Jensen
ded426050e Merge "Issue #2184 Removed all other HUCs other than ALL from storage" into omaha_13.5.1
Former-commit-id: c04357a0b6 [formerly 96ae856660] [formerly 09cae0cba3] [formerly c04357a0b6 [formerly 96ae856660] [formerly 09cae0cba3] [formerly 3649af1b71 [formerly 09cae0cba3 [formerly 7f9e83b42df42c1bec7946833e88a8916fc0c12d]]]]
Former-commit-id: 3649af1b71
Former-commit-id: afb7f93c21 [formerly a9f0243e01] [formerly 171ed9b9a2486eb3a9ba6e19cecfe9daeced6126 [formerly cb9b26a380]]
Former-commit-id: c4212ac6ccdd498b29f780728ef4250b940f63d7 [formerly c6c8c3c2d0]
Former-commit-id: 1df8a39cd9
2013-07-17 16:34:25 -05:00
Nate Jensen
c6b9b2dd7f Issue #2142 clean up dependencies and dead code
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59

Former-commit-id: 8838a7ee75 [formerly c4bc1ef034] [formerly a636846295] [formerly 8838a7ee75 [formerly c4bc1ef034] [formerly a636846295] [formerly f28420dac4 [formerly a636846295 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]]]]
Former-commit-id: f28420dac4
Former-commit-id: d39a175583 [formerly 8b070975aa] [formerly 222e227b908ca94947a44a0518892d94ce66b436 [formerly 65dbc62b59]]
Former-commit-id: 858ba69761701e13b33acad8a218e96e2b1ad8e4 [formerly 428d0c73dc]
Former-commit-id: 5a0dd6f037
2013-07-17 16:30:08 -05:00
Max Schenkelberg
57cc5782f0 Issue #2156 added orphan checking to time match basis on time match and set to null if not on any descriptor
Amend: Accepted ticket

Change-Id: I27df5b96cc411bb3b48850e3c6fb1ee862dbd760

Former-commit-id: 9552fdb7a3 [formerly bb53119678] [formerly 7f94b93c84] [formerly 9552fdb7a3 [formerly bb53119678] [formerly 7f94b93c84] [formerly 29943f945c [formerly 7f94b93c84 [formerly 782a1b71f83ee3d0db7b7df82eecabe7f7fecd4f]]]]
Former-commit-id: 29943f945c
Former-commit-id: e3141b8627 [formerly ecf47b4586] [formerly 861829e99bff8633e2158f386d4287e2a7c92c89 [formerly a2210eebf9]]
Former-commit-id: 0d0256c97f116f1812e56a912457f1a06697c51b [formerly 49d8014f85]
Former-commit-id: d515b0500e
2013-07-17 16:12:36 -05:00
Dave Hladky
ffe58606fe Issue #2184 Removed all other HUCs other than ALL from storage
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5

Former-commit-id: 361dd5113f [formerly 840b44b1e1] [formerly 84dae0a6b8] [formerly 361dd5113f [formerly 840b44b1e1] [formerly 84dae0a6b8] [formerly bd03085f8d [formerly 84dae0a6b8 [formerly 251cf3cca7c6653300f115083aa860444fee0ea9]]]]
Former-commit-id: bd03085f8d
Former-commit-id: 6f43853101 [formerly 4556798697] [formerly a1bddfe6f6215adf6084c27a5107f0fcd314b75b [formerly 15738a4d30]]
Former-commit-id: 1d2fbac9ecdf8c1c0fa1cc39f8c710dab63ba6bc [formerly f5ea1f0327]
Former-commit-id: 779ebd5db3
2013-07-17 15:18:49 -05:00
Nate Jensen
bc564392d1 Issue #2142 logback cleanup
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1

Former-commit-id: 9c575f1754 [formerly 621a4da9b7] [formerly 81d9a28d53] [formerly 9c575f1754 [formerly 621a4da9b7] [formerly 81d9a28d53] [formerly a0aeeedd23 [formerly 81d9a28d53 [formerly 38ee29e206824a1beeaad5837d731804b4affbdc]]]]
Former-commit-id: a0aeeedd23
Former-commit-id: 8b409d373f [formerly 5c123e60d8] [formerly 7e6549f719edb3018a4fa8735433e50b1367bd15 [formerly 447ac6311d]]
Former-commit-id: 71620ec8729f783f4d97d16161fe2bd5dd0c1285 [formerly 6d8c46e6d6]
Former-commit-id: 2a28bb772b
2013-07-17 14:03:43 -05:00
David Gillingham
928c708bed 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: e3f47a588c [formerly 4702fd8a72] [formerly ae75638063] [formerly e3f47a588c [formerly 4702fd8a72] [formerly ae75638063] [formerly 2c4acfec0b [formerly ae75638063 [formerly baaefbd38040c69ba42feaa8b00e8ca4d69f4ba1]]]]
Former-commit-id: 2c4acfec0b
Former-commit-id: 35c6110378 [formerly d57767c225] [formerly 4a5887a85440d6bfe270b4c011ae55fc10413f55 [formerly b788025b37]]
Former-commit-id: a84f2bbfb07f532a45605f6988e44b0ad8408e1d [formerly d6802fe8b7]
Former-commit-id: a5df825bcd
2013-07-17 13:19:23 -05:00
Ben Steffensmeier
da743477a6 Issue #2112 Split poes data so it gets stored in correct file.
Former-commit-id: cdef90a289 [formerly 01f617534f] [formerly 0ab5b60c33] [formerly cdef90a289 [formerly 01f617534f] [formerly 0ab5b60c33] [formerly b0faff6952 [formerly 0ab5b60c33 [formerly 34555a105a0e8232c389c4bc64c93830304368dc]]]]
Former-commit-id: b0faff6952
Former-commit-id: c33c7d5409 [formerly 280c7a8c1d] [formerly efaef2432331bb27a4cf7ee082904372390442f4 [formerly deec7a8a99]]
Former-commit-id: b7b1ad1d3510afb98cbe6d4e8002dae085473efe [formerly fcb678eb3c]
Former-commit-id: d8a724b726
2013-07-17 12:12:43 -05:00
Richard Peter
d31312d8d4 Merge "Issue #2181 Convert geometry types to use hibernate-spatial" into development
Former-commit-id: 08d9af1ef3 [formerly 8ba374afcb] [formerly 04db7e82c4] [formerly 08d9af1ef3 [formerly 8ba374afcb] [formerly 04db7e82c4] [formerly f3bb0a2d3c [formerly 04db7e82c4 [formerly 00bcdca58906f04bea863614b87a17022bdd4006]]]]
Former-commit-id: f3bb0a2d3c
Former-commit-id: 3faf66f1cb [formerly 8df280ceb4] [formerly 4a0800b5f4796fb5fd4e643b6cc80df38bd2031d [formerly 973480b6af]]
Former-commit-id: 026477932f5fa433b0adb12851c57517ec48fc10 [formerly a13c7eb986]
Former-commit-id: 923ad70250
2013-07-17 09:52:07 -05:00