Commit graph

1396 commits

Author SHA1 Message Date
Ben Steffensmeier
7a7b821029 Issue #189 add some more catch blocks to contour subgridding so it works in more odd cases.
Former-commit-id: b5d4cd8534 [formerly 7bb12231f6] [formerly 43d506d8eb] [formerly 6c875b276a [formerly 43d506d8eb [formerly 6670aaff36bca8df4f6b841dc288199e69b5843d]]]
Former-commit-id: 6c875b276a
Former-commit-id: e922532cd40d95b117ded20705442ec0d75139b6 [formerly 6758415123]
Former-commit-id: 688c5b6119
2012-11-19 12:30:44 -06:00
Richard Peter
26c1302816 Merge "Issue #1322 Fix ingestGrib modes.xml to include router spring file" into development
Former-commit-id: f95d3c99f8 [formerly ac10bd4c27] [formerly b71c022247] [formerly 657c7a35c5 [formerly b71c022247 [formerly d846e934736d3e68f65620640ae2699dfb3c7530]]]
Former-commit-id: 657c7a35c5
Former-commit-id: 9568fbb668620de81123d84d9756a1e3c9eb7e0f [formerly e2f026a6a8]
Former-commit-id: dc5b3410eb
2012-11-19 12:14:16 -06:00
Dustin Johnson
f661846a65 Issue #1322 Fix ingestGrib modes.xml to include router spring file
Amend:
  Add correct bean name.

Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349

Former-commit-id: 8ec80021c2 [formerly 9cfb406675] [formerly ea7e8ac946] [formerly 63db1ce6f8 [formerly ea7e8ac946 [formerly a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0]]]
Former-commit-id: 63db1ce6f8
Former-commit-id: bab3f53f7731061ffcaf6c4adb70871624655bfa [formerly 56ea981db7]
Former-commit-id: 75feca3cd0
2012-11-19 12:03:31 -06:00
Steve Harris
042780cdc0 Merge "Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed" into development
Former-commit-id: 972bbe5676 [formerly 264dc4bc43] [formerly fb4ec71079841beda9efccc88f552282266fead1 [formerly 0d16c0c0df]] [formerly 63cdc32988 [formerly 0d16c0c0df [formerly 4dac2ba9a01b36885188f93fdaf974099cbc9d0c]]]
Former-commit-id: 63cdc32988
Former-commit-id: 51ddde0dc0e8afec3e577c5e3a5b7875642863d7 [formerly 91bc36fda3]
Former-commit-id: 082e1cbd09
2012-11-16 15:35:47 -06:00
Steve Harris
93c2fdf3e0 Merge "Issue #1151 fix radar updates to use levels" into development
Former-commit-id: e477d5c7ec [formerly 601eb746d1] [formerly 5c71f2551b] [formerly 152c06a718 [formerly 5c71f2551b [formerly 939d9031e4bc1107333f066321ec28ea93cfd3c3]]]
Former-commit-id: 152c06a718
Former-commit-id: c9cf9e23e389b5119c8375282fb8d835d167b3df [formerly b04797de6f]
Former-commit-id: 3d628abebe
2012-11-16 15:35:26 -06:00
Dustin Johnson
9b9f41cb5a Issue #1322 Add server keyed routing
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: 22c930824c [formerly d1024d091c] [formerly 87148a8061] [formerly 8a6be78eb0 [formerly 87148a8061 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 0e562f6e19c01c0c23b34e7e423696a3b7663f29 [formerly 1d5714b994]
Former-commit-id: a448369b44
2012-11-16 14:43:45 -06:00
Max Schenkelberg
09c3fa90aa Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed
Change-Id: I25ab9832d725647c17aea505514334a7c0026ae7

Former-commit-id: 8b497d5900 [formerly 34c4ec44c3] [formerly 0daa22064b] [formerly 71367ef5bb [formerly 0daa22064b [formerly a7386c6570455fe6f9175eaeae1225923124cce8]]]
Former-commit-id: 71367ef5bb
Former-commit-id: abe81bf3cd4269bfb4f9905a69a85f5a8e3dafd3 [formerly 102c2dbaa1]
Former-commit-id: afc4de9a1a
2012-11-16 14:12:27 -06:00
Ben Steffensmeier
069256d109 Issue #1151 fix radar updates to use levels
Former-commit-id: f27749abb2 [formerly f04ac9f7b0] [formerly 9efd40dfd0] [formerly 8ac1373035 [formerly 9efd40dfd0 [formerly 7666bee12af83d195fccd845e874df19eabd94f6]]]
Former-commit-id: 8ac1373035
Former-commit-id: bc222ac0e4190182eb5a9af79adf31fd12a57a0b [formerly a1d70499eb]
Former-commit-id: 956b6ecfdb
2012-11-16 13:53:05 -06:00
Lee Venable
b5b7c1d932 Merge "Issue #189 fix modes for gridcoverage to include converter registration" into development
Former-commit-id: 3b1d97d3d0 [formerly 2ce90a79cb] [formerly 998cbc25d3] [formerly b745b95643 [formerly 998cbc25d3 [formerly 7e4649185aa94d3191773a08d9e0673fad71ddb7]]]
Former-commit-id: b745b95643
Former-commit-id: 8a074cdca03b8299edf19d9815dfb641d31c661b [formerly cbe9bc5e76]
Former-commit-id: 6c283693e4
2012-11-16 12:28:49 -06:00
Ben Steffensmeier
4135b1ad21 Issue #189 fix modes for gridcoverage to include converter registration
Former-commit-id: 27f6224e91 [formerly 1082b1b51d] [formerly 1a7560b8a3] [formerly 6b0ed3fa50 [formerly 1a7560b8a3 [formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]]
Former-commit-id: 6b0ed3fa50
Former-commit-id: 0225fcc4d96c0f4eb7101fbb5dc6255eb318fcbc [formerly 2a0769d094]
Former-commit-id: 5126024a6b
2012-11-16 12:25:00 -06:00
Slav Korolev
9bb8e24c52 Issue #1297. Changed non-blocking ZoneTableDlg. Next patch.
Changes from reviewers comments.

Change-Id: Ie812ef1167fa6b1ea78ee615190bd3059285a682

Former-commit-id: a519f985ec [formerly 487a9eabb8] [formerly d220f74018] [formerly 4560efe149 [formerly d220f74018 [formerly 8f002a71cb688fe8fbf7378ef53398dfecb0354e]]]
Former-commit-id: 4560efe149
Former-commit-id: 513793f8cfb0f26fa9576ec1dfb831fc65d80eec [formerly 765dbd8766]
Former-commit-id: 063c155818
2012-11-16 11:08:42 -05:00
Lee Venable
f246c5746c Merge "Issue #1298 Changes for non-blocking GhgAlertDlg." into development
Former-commit-id: 3eba3cc1e6 [formerly eb297f00fc] [formerly bf70978ad90783f4e9d2893cc8d3fda9c76ecddc [formerly 0540d84e4e]] [formerly 40f11cfba5 [formerly 0540d84e4e [formerly e96cd422716fc6da7c0007b58fa75659c7600ad7]]]
Former-commit-id: 40f11cfba5
Former-commit-id: db488b57f68a48ef282a9fda654e55329f0e887d [formerly aa4b1f4970]
Former-commit-id: 247a2859ca
2012-11-15 17:43:31 -06:00
Max Schenkelberg
d86550c239 Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737

Former-commit-id: a40abfda65 [formerly a472f5535b] [formerly 655f54b098] [formerly f540f65fd7 [formerly 655f54b098 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]]
Former-commit-id: f540f65fd7
Former-commit-id: 6ed55cce2d899bb904eca4a9886c9f8d39f745d2 [formerly f1866b2e49]
Former-commit-id: db2fe0b5e8
2012-11-15 16:21:42 -06:00
Roger Ferrel
273f68e6bf Issue #1298 Changes for non-blocking GhgAlertDlg.
Change-Id: I1da7317ad69203a4160c806458fdbf99a7d9108d

Former-commit-id: 7811b44376 [formerly b66bc0210a] [formerly 800c1a6908] [formerly c0554d9686 [formerly 800c1a6908 [formerly b3c640da3fad8d1ce07e348b075b9b1a0468da37]]]
Former-commit-id: c0554d9686
Former-commit-id: f1224ad7a9ab994434fec5a5c2870efc11e20f61 [formerly 05f32527bd]
Former-commit-id: 0a11332193
2012-11-15 15:51:46 -06:00
Roger Ferrel
76d9479fb9 Issue #1298 Changes for non-blocking GhgMonitorDlg.
Change-Id: I69a05b6d62e8d75c998b6cb9059c9f45e6cf39d3

Former-commit-id: 07cc6ec003 [formerly a29b52ca8c] [formerly dc82ad820b] [formerly 109dea21e1 [formerly dc82ad820b [formerly 782113272c208a32e6165c02404138fcaa79d523]]]
Former-commit-id: 109dea21e1
Former-commit-id: 2ae5143718b7d58053a166fd95152a86a5f839a4 [formerly 2206167b00]
Former-commit-id: e35d7b3f15
2012-11-15 14:37:29 -06:00
Lee Venable
32a107dc9d Merge "Issue #1298 Changes for non-blocking SelectionDlg." into development
Former-commit-id: 13043336d7 [formerly ba019bf3f6] [formerly ba95731387] [formerly 2dee27fbf3 [formerly ba95731387 [formerly a1d258382de88af5c139e22d2efb6183261d1e3b]]]
Former-commit-id: 2dee27fbf3
Former-commit-id: fc63dd3bffdc9bea1ecb6fa95cf613aee3cd8738 [formerly ed64d2f97a]
Former-commit-id: a4a5c89fa8
2012-11-15 13:47:46 -06:00
Benjamin Phillippe
41647b0274 Issue #1335 Fixed EHCache warnings. Changes to necessary config files
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 1fa596463d [formerly 44519995ee] [formerly 5bf46d468d] [formerly 5c31b34e12 [formerly 5bf46d468d [formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]]
Former-commit-id: 5c31b34e12
Former-commit-id: d2f70d8685a2cd0f6ca4f66510f619573250a39a [formerly 6b1b73429b]
Former-commit-id: 43b94988c8
2012-11-15 13:35:25 -06:00
Roger Ferrel
c2ccf9dd90 Issue #1298 Changes for non-blocking SelectionDlg.
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b

Former-commit-id: 3087efb2e0 [formerly 5f3fab4677] [formerly ad5b18948318d625cd56d758188258585ea3e1ae [formerly 00693d83bb]] [formerly 59181213a0 [formerly 00693d83bb [formerly cd85c4e60fd3863c39a7c61ad73848207e196a05]]]
Former-commit-id: 59181213a0
Former-commit-id: c9f30770363ef819d269136eb35a07599220439c [formerly fdfcb2ebea]
Former-commit-id: d0cdc594f8
2012-11-15 12:55:49 -06:00
Nate Jensen
4475544f1a Merge "Issue #1325 add missing sourcepath for jts" into development
Former-commit-id: 1e1049386d [formerly 397c71cb00] [formerly 19d74235d9] [formerly c4e1d26056 [formerly 19d74235d9 [formerly ecff6dc0484b6dc65e2c043be4a2b6a7fbb3a503]]]
Former-commit-id: c4e1d26056
Former-commit-id: 2a500d5ac4d21be7fe96c6af1e73df54c1aa995e [formerly 84e98e2364]
Former-commit-id: 72a741c6a3
2012-11-15 11:02:35 -06:00
Ron Anderson
f45b7720e1 Issue #1325 add missing sourcepath for jts
Change-Id: I776bcb3cbb2accd0cf6c41b2a91c12102b9a9653

Former-commit-id: f3ee84c21e [formerly 0984f201b2] [formerly 94ec6eaeaf] [formerly 457d55ecdf [formerly 94ec6eaeaf [formerly bf8dd91d2e2cb79548cc852c82446cb914e63991]]]
Former-commit-id: 457d55ecdf
Former-commit-id: 0a5977386395099b02d8f8518f5295e0e06d0602 [formerly 1157e5a55e]
Former-commit-id: 9d832ad8be
2012-11-15 11:00:02 -06:00
Bryan Kowal
ddfb4e506c Issue #1318 - updated ncep database rpm specification file
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832

Former-commit-id: b1b627e2c2 [formerly cbef9ad78d] [formerly b60dda550c] [formerly fe9dcaa216 [formerly b60dda550c [formerly b3f1b857e5a8efcfea0f5b8985eddd5992724d89]]]
Former-commit-id: fe9dcaa216
Former-commit-id: 4eb2cd0ee8e37a25a3f86d7e56bcd8d29436927f [formerly 67c3c140e3]
Former-commit-id: fe9a06b9b9
2012-11-15 10:24:38 -06:00
Lee Venable
bb740353a1 Merge "Issue #1298 Changes for non-blocking MoveWeatherElementDialog." into development
Former-commit-id: 16dd09e0c0 [formerly cf2462875c] [formerly 2ff812677f] [formerly a5a0ef2297 [formerly 2ff812677f [formerly 722a841e5ea9a947bb3d46f5f1e231c67ec1f919]]]
Former-commit-id: a5a0ef2297
Former-commit-id: a3f5f08f1aea9fe5ddc9a91f8181b5e333221485 [formerly 491161b0d0]
Former-commit-id: c60ac74310
2012-11-15 09:28:33 -06:00
Bryan Kowal
43764917d6 Issue #1318 - updated ncep database rpm specification file
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9

Former-commit-id: fec5563e49 [formerly 12667f6180] [formerly 99399e880e] [formerly 24074da383 [formerly 99399e880e [formerly f433daa8ffe59da91acba71ac5893d77ad810404]]]
Former-commit-id: 24074da383
Former-commit-id: 6bb70694850931d2fdd0600e6b049709acb20cc6 [formerly 3d123e08a7]
Former-commit-id: 1842deff13
2012-11-15 09:26:46 -06:00
Roger Ferrel
4b6c5bc2d3 Issue #1298 Changes for non-blocking MoveWeatherElementDialog.
Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455

Former-commit-id: 8cce309a6e [formerly fc87eccb77] [formerly a6fdc7b580] [formerly acf1881cb7 [formerly a6fdc7b580 [formerly dd80807a0469e7c677f8e0d214fcdec715c67518]]]
Former-commit-id: acf1881cb7
Former-commit-id: 092e0c8e86fd9af48cdabc168fe255b8d961546d [formerly d6c5839e0e]
Former-commit-id: 8881e4d3ec
2012-11-14 16:33:27 -06:00
Max Schenkelberg
91607fb03e Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: 61f0c0501b [formerly fe11e31bfb] [formerly dcde9e8951] [formerly 28e61c8285 [formerly dcde9e8951 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]
Former-commit-id: 28e61c8285
Former-commit-id: 5f777b3fc72c55ae811d6c28a223bff8a71b24e9 [formerly 2e20c3e799]
Former-commit-id: 5aa26e4f13
2012-11-14 16:19:37 -06:00
Nate Jensen
9d1827c0fd Merge "Issue #1332: Update pypies createStorageRecord to not pull in parent group node" into development
Former-commit-id: 8a2d593625 [formerly 1f11cf8ee1] [formerly 72a54e9e29] [formerly ffce7efeb2 [formerly 72a54e9e29 [formerly 31989b21e8199a739d2764d226b02de056d3f8a3]]]
Former-commit-id: ffce7efeb2
Former-commit-id: 82578a86cee91c0466dc42123bc5db633ff332e6 [formerly bfd1f088b0]
Former-commit-id: 1540334a35
2012-11-14 16:10:49 -06:00
Nate Jensen
03192766ba Merge "Issue #189 fix contour subgridding for worldwide grids" into development
Former-commit-id: 38b27d23af [formerly ee7daccb2c] [formerly 5055164f55] [formerly 340f8e1fa8 [formerly 5055164f55 [formerly 553b56aa362b452110a7f5a4f76aec9640d13599]]]
Former-commit-id: 340f8e1fa8
Former-commit-id: 20413eb7c1980b78cd6d04d145b4b6df5833b8ad [formerly 6210f94be1]
Former-commit-id: 721ef4452d
2012-11-14 16:09:51 -06:00
Nate Jensen
c281cd6661 Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
Former-commit-id: c4cc7b638c [formerly 0398aeaa5b] [formerly 49c2079963] [formerly 31637efbbc [formerly 49c2079963 [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]]
Former-commit-id: 31637efbbc
Former-commit-id: 0bf1056e5bebc6db3ad2c4e0bf1d7112695b64f7 [formerly 8944e220f6]
Former-commit-id: 9158625765
2012-11-14 16:09:00 -06:00
Lee Venable
e32f3dec10 Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development
Former-commit-id: 2c82bf1184 [formerly 6152ecccda] [formerly 695cf85335] [formerly 6134e5d3f7 [formerly 695cf85335 [formerly 33b0aada5191fd6a757f37029862cdcadf8c0692]]]
Former-commit-id: 6134e5d3f7
Former-commit-id: 5f410f0507be8de6ebdea359793b084ce6d0667a [formerly 7ed335793f]
Former-commit-id: d82072b975
2012-11-14 16:06:02 -06:00
Lee Venable
e251942c81 Merge "Issue #1298 Changes for non-blocking TEWxSetValueDialog." into development
Former-commit-id: 39972763e4 [formerly 64d9ba9184] [formerly 8fa3d794fd] [formerly edfab7e56f [formerly 8fa3d794fd [formerly eceb7bed3794368ebb0cd57e466e7beaee88a19d]]]
Former-commit-id: edfab7e56f
Former-commit-id: d1ce292dff3c47cb135f6e21036c0f1507192a9e [formerly bbba9b1b29]
Former-commit-id: 2f4b1d9d5f
2012-11-14 16:05:20 -06:00
Roger Ferrel
27b63206b7 Issue #1298 Changes for non-blocking DisplayAttributesDialog.
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d

Former-commit-id: 08919ea541 [formerly 82f9c74bef] [formerly 7ca75756ae] [formerly 212045c1a6 [formerly 7ca75756ae [formerly 260f5085bba45ab5b3ad10dd3945a64195eb2d7b]]]
Former-commit-id: 212045c1a6
Former-commit-id: fe1b8540deb8623751c11b171ed8881812641aa8 [formerly d069f186e1]
Former-commit-id: 7f33d6ba18
2012-11-14 14:56:42 -06:00
Dustin Johnson
08fd67e94a Merge branch 'ss_builds' (12.12.1-4) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b]
Former-commit-id: 5d5dbe27e1
2012-11-14 14:41:57 -06:00
Roger Ferrel
086f464e38 Issue #1298 Changes for non-blocking TEWxSetValueDialog.
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b

Former-commit-id: cac846718a [formerly 679d967382] [formerly 7f22145bf2] [formerly dd8f8a9fa7 [formerly 7f22145bf2 [formerly f489ae636459e2dfcf7092d0ede7a37e84398cb2]]]
Former-commit-id: dd8f8a9fa7
Former-commit-id: 9c581c148e8a0d69f42133e580578c5ccbd32780 [formerly 89653eb5e1]
Former-commit-id: 56ed69fc83
2012-11-14 14:20:40 -06:00
Steve Harris
4300583fc2 12.12.1-4 baseline
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]
Former-commit-id: e35a321a8c
2012-11-14 14:19:20 -06:00
Roger Ferrel
33cd82df5c Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8

Former-commit-id: a49ee93898 [formerly 62faa06ddf] [formerly e267248b57] [formerly 2331b8e1f5 [formerly e267248b57 [formerly 5c0eef28a67b874f184fd391d9220957030e43c7]]]
Former-commit-id: 2331b8e1f5
Former-commit-id: f3b0d96220d8990a788ce98360553eaaec46477f [formerly 3f0dc83f89]
Former-commit-id: ce623db367
2012-11-14 14:02:01 -06:00
Lee Venable
0f3fb27af1 Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development
Former-commit-id: 68a58d808a [formerly a6e88a6856] [formerly e755889643] [formerly e9ae25e781 [formerly e755889643 [formerly dbb1bc97d99827f7e97039f7a333ae0fc00353f0]]]
Former-commit-id: e9ae25e781
Former-commit-id: 298e4f53220a5c54f7602fa97c954e24234058eb [formerly 09591687a9]
Former-commit-id: 680373301f
2012-11-14 13:30:42 -06:00
Lee Venable
6584f9b3f0 Merge "Issue #1298 Changes for non-blocking WeatherElementGroupDialog. Changes from reviewer comments." into development
Former-commit-id: 4b1e4ea01c [formerly cd0a4804c6] [formerly 341dc89480] [formerly 7634ea221b [formerly 341dc89480 [formerly 3106b10a003ca5985e29c69ee0f02185c88edc12]]]
Former-commit-id: 7634ea221b
Former-commit-id: 8dd28cb82c13d4398691d31e0be1541b3934558d [formerly 389f9c6a87]
Former-commit-id: 23f4face77
2012-11-14 13:29:53 -06:00
Richard Peter
9af2ce6934 Issue #1332: Update pypies createStorageRecord to not pull in parent group node
Change-Id: Ieb4b45bce2f5c0eca41301eacbd7782b3c310edd

Former-commit-id: 3778419a78 [formerly 375383a09f] [formerly 73c2fa6ed3] [formerly d2aff4118b [formerly 73c2fa6ed3 [formerly 926250abd96f2b5e30b6a863735a10203491a257]]]
Former-commit-id: d2aff4118b
Former-commit-id: 797dbdc6515d86bef0473de80cc129c909946fd4 [formerly 859d3840bb]
Former-commit-id: 521ebb7e86
2012-11-14 12:51:53 -06:00
Ben Steffensmeier
069028be40 Issue #189 changes to mappings and ncep merge from code review
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 233398088a [formerly 3d126b41e1] [formerly 2c8f3f09ac] [formerly 2d864c3b09 [formerly 2c8f3f09ac [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]]
Former-commit-id: 2d864c3b09
Former-commit-id: 93da211e0f7547578a2ee201bcf8f17e845566f7 [formerly 91254adfd6]
Former-commit-id: 47759f025b
2012-11-14 12:22:53 -06:00
Dustin Johnson
21dc859b85 Issue #1322 Common baseline changes to support BandwidthManager
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: f1cfa9a60d [formerly afd9a767ea] [formerly 7d9e7567bd] [formerly 7c59f9ea41 [formerly 7d9e7567bd [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: caae98dd9803817a99d22d4cbbe38eccdaeff2f9 [formerly c0c60c2488]
Former-commit-id: 5d410ff934
2012-11-14 12:19:10 -06:00
Roger Ferrel
f954d3dbe5 Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog.
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072

Former-commit-id: a8453f1f81 [formerly 7f3d893c84] [formerly d16a448e05] [formerly 590eca2cba [formerly d16a448e05 [formerly eadf4e9a28df6687a8e0bee6c6cef74356cd26d7]]]
Former-commit-id: 590eca2cba
Former-commit-id: 8bfed4f98086bca15c0c91bc03d65765d14477ce [formerly 950300e16d]
Former-commit-id: 78422d9893
2012-11-14 12:04:18 -06:00
Nate Jensen
3e5220d216 Merge "Issue #189 modify upgrade script to work with grid resources within bestRes." into development
Former-commit-id: 107e6365fd [formerly 750e91914f] [formerly 7f95e486c8] [formerly 7663818f6c [formerly 7f95e486c8 [formerly 82d0be7824c4dd02d23e4422775d803eec4db115]]]
Former-commit-id: 7663818f6c
Former-commit-id: 7a696184a4aea2751117571932173618b2b2221c [formerly 6aa5904dc9]
Former-commit-id: 2f197bad4d
2012-11-14 11:45:10 -06:00
Ben Steffensmeier
8f5469f3a5 Issue #189 fix contour subgridding for worldwide grids
Former-commit-id: 3165998c1c [formerly 33d07530c6] [formerly a597cd1bd42ebe59853f5dfcc83a963178bbca30 [formerly 3ee95cff21]] [formerly 929a785e1b [formerly 3ee95cff21 [formerly e0fb632cc7e0d089436b64a3f2bc6977a0487708]]]
Former-commit-id: 929a785e1b
Former-commit-id: 3043904c1186406f3a7c5e40c122df9a7ee2f7ad [formerly 76996706f4]
Former-commit-id: 7de15734e9
2012-11-14 11:38:25 -06:00
Roger Ferrel
ffefe1fe90 Issue #1298 Changes for non-blocking WeatherElementGroupDialog.
Changes from reviewer comments.

Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac

Former-commit-id: 4424131662 [formerly 5e805da0e1] [formerly 049ecefe1d] [formerly b32480ed08 [formerly 049ecefe1d [formerly d8b828e6bc0a47caa01165cdb22e87f301534e30]]]
Former-commit-id: b32480ed08
Former-commit-id: 488a54e8e90966466526378b7880051a98a03d8f [formerly af0ad0433b]
Former-commit-id: be24ca5ed6
2012-11-14 11:36:52 -06:00
Ron Anderson
6a2f93a290 Merge "Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb" into development
Former-commit-id: 31d37c7a8f [formerly 29559e851e] [formerly 86c4a247cd] [formerly 0fe91e0d95 [formerly 86c4a247cd [formerly 46116a80d319050628e6c8a7d01c7c2d0bb5402f]]]
Former-commit-id: 0fe91e0d95
Former-commit-id: 57456c56cf1258f5f07f6b333d1c42e7c804071e [formerly 652c27918c]
Former-commit-id: 9f112f298c
2012-11-14 11:23:06 -06:00
Ben Steffensmeier
1fe90be139 Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb
Former-commit-id: af2808c4f4 [formerly 6e6823d62d] [formerly 42bbc21a3fb7c54af8002d5868fa85bcb7c56443 [formerly 5a1a6f2fdb]] [formerly 1b4236ccc5 [formerly 5a1a6f2fdb [formerly 26e79c68560dced9b7148e8eebf4a7394461bd7c]]]
Former-commit-id: 1b4236ccc5
Former-commit-id: 5960908c4df2a4a5a484c956e47d7a5861f6bc10 [formerly 159817f538]
Former-commit-id: 5367f936f4
2012-11-14 11:05:42 -06:00
Steve Harris
0e13c45e0b Merge "Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml" into development
Former-commit-id: fb70b19b31 [formerly ac834c0ebb] [formerly f5c87b04d6] [formerly 956e1a45da [formerly f5c87b04d6 [formerly ce25af9ad1e713bd85fd24f10188c9f46c83da5c]]]
Former-commit-id: 956e1a45da
Former-commit-id: 16c5eaa729364210458557da2e30a37a959c6022 [formerly a5ca238e96]
Former-commit-id: 397cac3352
2012-11-14 10:19:27 -06:00
Ben Steffensmeier
7e06343c7c Issue #1331 fix grib-request spring
Former-commit-id: 2ca7447dee [formerly 23190381cd] [formerly b128a3f3c5] [formerly c97223458e [formerly b128a3f3c5 [formerly 3b4dda66b20f04915f406df814ca989350794ae7]]]
Former-commit-id: c97223458e
Former-commit-id: 2b1b7db15036a1c0cfab26f1a1c0221fd8283b45 [formerly 60743ec4b1]
Former-commit-id: 7590451249
2012-11-14 10:07:44 -06:00
Brad Gonzales
e092183f27 Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
Change-Id: I6de95db502206b7b4dda198d61844570ed428862

Former-commit-id: de29d9feba [formerly 782ffb92ea] [formerly 4af27e092f] [formerly 1617341e2a [formerly 4af27e092f [formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]]
Former-commit-id: 1617341e2a
Former-commit-id: f8f796be57c18271c59de81d8c886b4407b52ee5 [formerly c024c94050]
Former-commit-id: cc8ed35821
2012-11-14 09:39:26 -06:00
Steve Harris
98670f1cc2 Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]
Former-commit-id: 21ecd53719
2012-11-13 17:28:50 -06:00