Commit graph

3983 commits

Author SHA1 Message Date
Bryan Kowal
49dd7daf05 Merge branch 'development' into development_on_RHEL6
Former-commit-id: c13018301e [formerly a929dec887 [formerly b3e74019d1a8550c1c7cbebe219dee3ba7e603b3]]
Former-commit-id: a929dec887
Former-commit-id: 3f4263fa07
2013-10-14 17:58:22 -05:00
Richard Peter
49cb49baba Merge "Issue #2361 fix build" into development
Former-commit-id: 5173e00254 [formerly b7db7c0c2c [formerly 29e94325e3b1dbe949051650091854a152800ac9]]
Former-commit-id: b7db7c0c2c
Former-commit-id: aab5187185
2013-10-14 16:39:44 -05:00
Nate Jensen
d103e67426 Issue #2361 fix build
Change-Id: I7c93d2be6a04d3414db14e97d0a6a9b2d928ffbd

Former-commit-id: 0adc85a58a [formerly 1e3af0bd1f [formerly d90dae07bd4507c96bb60a4ed372f206aeac74a7]]
Former-commit-id: 1e3af0bd1f
Former-commit-id: 2ae2b7faab
2013-10-14 16:37:52 -05:00
Nate Jensen
2c3d286eb2 Merge "Issue #2386 - DD Front end refactor Peer review comments Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f" into development
Former-commit-id: 23e1817385 [formerly baac431d85 [formerly c3550fa64755f73ee2a23080a0f786a2f170e6ae]]
Former-commit-id: baac431d85
Former-commit-id: b1d4d2d9ef
2013-10-14 16:26:47 -05:00
Richard Peter
20ae99b316 Merge "Issue #2468 compare DataTime without Calendar. Change-Id: I94f5258d04a53ba77c0e0d7af8637d96dd1ecb59" into development
Former-commit-id: 952f7be167 [formerly 9fa7f87769 [formerly c45932f98cfeb3b4054b8c632e477c6b344590b7]]
Former-commit-id: 9fa7f87769
Former-commit-id: fe606f370e
2013-10-14 15:43:59 -05:00
Mike Duff
335c8ba871 Issue #2386 - DD Front end refactor
Peer review comments
Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f

Former-commit-id: 83ec4daee2 [formerly 33a5d36e1c [formerly a72c1f9ad09594ddc0c0e78e78c9fccd95fd49ff]]
Former-commit-id: 33a5d36e1c
Former-commit-id: 9b4daacb26
2013-10-14 15:42:28 -05:00
Ben Steffensmeier
fa304d28a6 Issue #2468 compare DataTime without Calendar.
Change-Id: I94f5258d04a53ba77c0e0d7af8637d96dd1ecb59

Former-commit-id: 88d9dd4a9d [formerly 27758e3e7f [formerly c988286b20545bbe7e7dab3d717ebd7f78968048]]
Former-commit-id: 27758e3e7f
Former-commit-id: 7901fd821e
2013-10-14 15:37:25 -05:00
Nate Jensen
2fb28dce46 Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]
Former-commit-id: b49a2ceb2f
Former-commit-id: d7e4576380
2013-10-14 15:30:09 -05:00
Lee Venable
4d3e1ef28c Issue #2474 - Fixed font memory leak.
Former-commit-id: f3a9e541a1 [formerly a9b8c2a2fe [formerly a8a78efd01f8f3ed0ee533d4eeeb9e3463d3c0f2]]
Former-commit-id: a9b8c2a2fe
Former-commit-id: 7defe1efea
2013-10-14 12:42:27 -05:00
Ben Steffensmeier
dcf275dbc3 Issue #2402 Drop grib split to one thread, remove LargeGribFile from ISerializeableObject file.
Former-commit-id: afe18f40e6 [formerly cb37bc8e38 [formerly 0b0476bf4df65366fb4bfe8cbead30dde1620054]]
Former-commit-id: cb37bc8e38
Former-commit-id: 75cef40e49
2013-10-14 11:46:57 -05:00
Nate Jensen
d8bd120a11 Merge "Issue #2441 Initialize python interpreter asynchronously when opening localization perspective." into development
Former-commit-id: 93c67d2d8c [formerly abf2fa50b7 [formerly 97ac5b996bc54d949f03e6ea0f0952207e10366c]]
Former-commit-id: abf2fa50b7
Former-commit-id: b328e8dec5
2013-10-14 11:42:23 -05:00
Nate Jensen
72cea9a79b Merge "Issue #2333 Removed more unused fields from satellite record" into development
Former-commit-id: b9cf1a6533 [formerly 01b534fc5a [formerly 49ba8c831ec6318b82d66372c8370b97070733dd]]
Former-commit-id: 01b534fc5a
Former-commit-id: d60c08024f
2013-10-14 11:41:45 -05:00
Richard Peter
2dec51d9b8 Merge "Issue #2402 Remove excessive grid point count output." into development
Former-commit-id: ac61eedd88 [formerly 8466d69993 [formerly ef68e9c3459e1e1cf40b433e05e0c6beea5f18e0]]
Former-commit-id: 8466d69993
Former-commit-id: fa3d3ad219
2013-10-14 11:16:03 -05:00
Richard Peter
e1ba2afa4c Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: c056c93104 [formerly d8b49516dc [formerly 581cc8e7319216c910e71936820f7414d2281fed]]
Former-commit-id: d8b49516dc
Former-commit-id: 1f772816de
2013-10-14 11:15:40 -05:00
Ben Steffensmeier
70416f3d59 Issue #2402 Remove excessive grid point count output.
Former-commit-id: f290019e64 [formerly a42c0654f5 [formerly 4c25d75411a8c28cc2a2511c8d3a4876eaaa7be4]]
Former-commit-id: a42c0654f5
Former-commit-id: 944aee22c9
2013-10-14 11:13:03 -05:00
Greg Armendariz
b379f7d077 Merge "Issue #2297 - fix 14.2.1 qpid build" into development
Former-commit-id: 01a1ada89b [formerly aa0d3bdab4 [formerly 6a11a118261a0cbad93933d99d6a89187c831a02]]
Former-commit-id: aa0d3bdab4
Former-commit-id: 14d90768e0
2013-10-14 09:08:05 -05:00
Mike Duff
10f3fa86b0 Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments

Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf

Former-commit-id: a69120c623 [formerly a220ff05b0 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]]
Former-commit-id: a220ff05b0
Former-commit-id: c4e501aaf9
2013-10-11 18:18:18 -05:00
Ben Steffensmeier
a1fe58b934 Issue #2441 Initialize python interpreter asynchronously when opening localization perspective.
Former-commit-id: c5d49b2a4c [formerly 89eb327bf0 [formerly 7d9312fbedf734f973401e21445448646ff67410]]
Former-commit-id: 89eb327bf0
Former-commit-id: ccf8a88f17
2013-10-11 16:25:28 -05:00
Max Schenkelberg
f34750cb5f Issue #2333 Removed more unused fields from satellite record
Change-Id: I02ec3ff328606673d717c31e583c2679389e87ec

Former-commit-id: 8fddd5a57b [formerly b68b8de21b [formerly 91c5da670e6b23814532b473c93237744398369d]]
Former-commit-id: b68b8de21b
Former-commit-id: 3c2492cdbe
2013-10-11 16:17:52 -05:00
Richard Peter
0a802a9218 Merge "Issue #2402 Make grib large grid handling more dynamic. Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d" into development
Former-commit-id: dba525c5e6 [formerly a99e286c0f [formerly f0ab566352660170b71b46f6517e371d42f973df]]
Former-commit-id: a99e286c0f
Former-commit-id: ea74adff8f
2013-10-11 15:34:31 -05:00
Nate Jensen
e11a93f252 Merge "Issue #2333 Updated upgrade script to only run against entries in satellite_spatial that have not already been updated. This is so the upgrade script won't break the satellite data if it has already been ran" into development
Former-commit-id: 1b2024a69d [formerly 88f83a842e [formerly 2de15863597a3fc86ff11415de9c1bbec26b12e8]]
Former-commit-id: 88f83a842e
Former-commit-id: 2a069e8cf2
2013-10-11 15:33:42 -05:00
Ben Steffensmeier
38ac706b80 Issue #2402 Make grib large grid handling more dynamic.
Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d

Former-commit-id: 0ecab8d44e [formerly 3fd473e25d [formerly bec1391240d3bf2ac0da4e8b29ae6ce3985e3d32]]
Former-commit-id: 3fd473e25d
Former-commit-id: 2de4562585
2013-10-11 15:22:32 -05:00
Max Schenkelberg
5cecf2a1d6 Issue #2081 Fixed null pointer in DataURIUtil
Change-Id: Ic052c0d12e51949568bb5540ab97b1e0091ca231

Former-commit-id: 67bfa28850 [formerly 819df41147 [formerly ab9174cac744785588c49237fde5cb497fb09d0f]]
Former-commit-id: 819df41147
Former-commit-id: 8e1a0cb397
2013-10-11 14:29:11 -05:00
Lee Venable
64b05d759b Merge "Issue #2471 - fixed color memory leak." into development
Former-commit-id: 06a38bd123 [formerly 3b98dc699c [formerly 1cb4839c1115ff4e65dcfd27377f81af7795ddd0]]
Former-commit-id: 3b98dc699c
Former-commit-id: 16e5a0223a
2013-10-11 13:02:35 -05:00
Max Schenkelberg
a0abc34322 Issue #2333 Updated upgrade script to only run against entries in satellite_spatial that have not already been updated. This is so the upgrade script won't break the satellite data if it has already been ran
Change-Id: Ibe2206e584e89a40d4cdd1a2b50e91e10c885ae0

Former-commit-id: 41b6f79c52 [formerly fbc06d81f7 [formerly 2957c9c40fe85cbe5bd90c5f6444fce1f9ffdcf1]]
Former-commit-id: fbc06d81f7
Former-commit-id: 06603cabe5
2013-10-11 12:14:21 -05:00
Nate Jensen
568e5bd9f6 Merge "Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104." into development
Former-commit-id: d5d0fab53b [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]
Former-commit-id: 8208d756c7
Former-commit-id: c6c2f50562
2013-10-11 11:21:18 -05:00
Lee Venable
0cadf82e88 Issue #2471 - fixed color memory leak.
Former-commit-id: 61e5d5e4da [formerly bceb4d76bf [formerly a573bacadd4d9b3ea0058bb70b348372b6a21cc9]]
Former-commit-id: bceb4d76bf
Former-commit-id: 97b3c7af6b
2013-10-11 11:09:57 -05:00
Brad Gonzales
718fea35a1 Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
       Fix GriddedTime addCycles when cycles are empty.

Change-Id: I9fa27178e5f59252cb872314493256be7f038890

Former-commit-id: bc87f2a168 [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]
Former-commit-id: 25710edd9e
Former-commit-id: ac3d87c397
2013-10-11 10:36:53 -05:00
Max Schenkelberg
c2471fd381 Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
Amend: Accepted ticket, cleanup, comments

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]
Former-commit-id: 7a66a3c995
Former-commit-id: b64050ff1e
2013-10-11 10:21:37 -05:00
Ron Anderson
fe072b8a46 Merge "Issue #2361 fix iscUtil" into development
Former-commit-id: 584a782545 [formerly 3e260a58d9 [formerly 52834c2c4a82218588f2725c3ea12c4ce8e3dc14]]
Former-commit-id: 3e260a58d9
Former-commit-id: 1d74ec7b95
2013-10-10 18:03:36 -05:00
Nate Jensen
6a4a5789f8 Merge "Issue #2376 Fix STI parsing Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5" into development
Former-commit-id: 3dbf65f001 [formerly baac824e68 [formerly dfe0380de11634362922e9194e7a2f7e915a1445]]
Former-commit-id: baac824e68
Former-commit-id: d410323a97
2013-10-10 17:38:22 -05:00
Nate Jensen
9061866d58 Issue #2361 fix iscUtil
Change-Id: I4f62e048db3c1b453f56ece98448e1cf8b35fc28

Former-commit-id: dc60f94a34 [formerly 8aecb21306 [formerly 93ec0db0ac9adeab663fa18f2d93eb9a42e4302b]]
Former-commit-id: 8aecb21306
Former-commit-id: fa2a7db710
2013-10-10 17:38:01 -05:00
Ben Steffensmeier
0f77e750f6 Issue #2376 Fix STI parsing
Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5

Former-commit-id: f1699b1d62 [formerly abf0df45c4 [formerly 4af47a67091e0249c01289f275d44756f04e50d3]]
Former-commit-id: abf0df45c4
Former-commit-id: 29f3ac17f1
2013-10-10 15:47:54 -05:00
Lee Venable
442865a5f3 Merge "Issue #2464 - fixed font memory leak." into development
Former-commit-id: feb40aada0 [formerly 3a611d3f4f [formerly 5765e3fb4ee0f7305e5ec6240caeec375dd985a9]]
Former-commit-id: 3a611d3f4f
Former-commit-id: e337b90ba5
2013-10-10 15:29:28 -05:00
Lee Venable
e2cb973876 Merge "Issue #2428. Fixed memory leak for Regions" into development
Former-commit-id: 6282814c91 [formerly aa27b764ca [formerly 29dd5dbf962cace42e38999f075aaaa57e24f3fc]]
Former-commit-id: aa27b764ca
Former-commit-id: 10c5920b90
2013-10-10 15:26:04 -05:00
Nate Jensen
9edf04647a Merge "Issue #2361 remove ISerializableObject for hydro colors" into development
Former-commit-id: c6a8eaa841 [formerly 7ca0f9a251 [formerly 25c12b40a85db7a4e968dccb57798aaacb089b64]]
Former-commit-id: 7ca0f9a251
Former-commit-id: 59e0414d4d
2013-10-10 15:07:34 -05:00
Slav Korolev
2b29184b21 Issue #2428. Fixed memory leak for Regions
Former-commit-id: 0021d53557 [formerly cab603ba36 [formerly 899d1f6371d55056af747d8bf6dee99d0c4179c9]]
Former-commit-id: cab603ba36
Former-commit-id: 2c4730db16
2013-10-10 14:09:37 -04:00
Bryan Kowal
9f5cbcda14 Issue #2402 - re-compile 32-bit grib2.so
Former-commit-id: 3eee9edb58 [formerly 05954f89b8 [formerly e70561d259082645390f95df823ad4583aea8bbe]]
Former-commit-id: 05954f89b8
Former-commit-id: 410b9b6669
2013-10-10 12:49:49 -05:00
Richard Peter
a4b1eb9dff Merge "Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes." into development
Former-commit-id: d7db5d0219 [formerly 8f67035519 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]]
Former-commit-id: 8f67035519
Former-commit-id: e717ae510b
2013-10-10 11:34:11 -05:00
Bryan Kowal
886e5f2370 Issue #2297 - fix 14.2.1 qpid build
Former-commit-id: 584d8b2ae4 [formerly 9d7ad6908a [formerly 7863a68ae1c67188450ab7c3a9cc2c912533300c]]
Former-commit-id: 9d7ad6908a
Former-commit-id: a8dfd1ef01
2013-10-10 11:21:11 -05:00
Richard Peter
8ed2c3a117 Merge "Issue #2466 Returned to original harvesterThreadPool Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d" into development
Former-commit-id: fde5182264 [formerly a3e361323c [formerly 2d49ceead68df56e96c38652ab1c7df543f0f6d5]]
Former-commit-id: a3e361323c
Former-commit-id: f03832c79b
2013-10-10 11:05:45 -05:00
Nate Jensen
54a13cef30 Issue #2361 remove ISerializableObject for hydro colors
Change-Id: Icc4a1e2ebff06ff389e95563406176663000ad7c

Former-commit-id: 83fafc638b [formerly 0fe5979eac [formerly f23474913e08b34d1eb82e2106549f57fd36538c]]
Former-commit-id: 0fe5979eac
Former-commit-id: 472c2693c4
2013-10-10 10:57:59 -05:00
Dave Hladky
843f83e4a4 Issue #2466 Returned to original harvesterThreadPool
Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d

Former-commit-id: e6931e8454 [formerly 38a6b4e811 [formerly 26316e71831c51e3ee96a1afd9ef213f1d87beff]]
Former-commit-id: 38a6b4e811
Former-commit-id: 36667033b2
2013-10-10 10:47:44 -05:00
Nate Jensen
038f48e28f Merge "Issue #2361 remove ISerializableObject for some pointdata and user roles classes" into development
Former-commit-id: 2934222c09 [formerly b3fdf129db [formerly 7a2dd6ccb98c9b7b28b989835b6ed6535f7a6ce1]]
Former-commit-id: b3fdf129db
Former-commit-id: 55d1d12c38
2013-10-10 10:09:46 -05:00
Bryan Kowal
66eb9a1983 Fix Merge Issue.
Former-commit-id: db25d33a4d [formerly 21df04ff39 [formerly 91716e4f6eb81153afa48266cdd43e3239864301]]
Former-commit-id: 21df04ff39
Former-commit-id: 62db4d7b07
2013-10-10 10:04:26 -05:00
Lee Venable
9c8d1471db Issue #2464 - fixed font memory leak.
Former-commit-id: e1adc2e4be [formerly 1a693c5d35 [formerly eceb0ab9c7ddc0d28d5452d9bf77888b9e58a9ac]]
Former-commit-id: 1a693c5d35
Former-commit-id: e3f44d751a
2013-10-10 09:48:55 -05:00
Slav Korolev
815b2fb40d Issue #2427. Fixed memory leak for images
Former-commit-id: f0aba7be10 [formerly 012497bfef [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]]
Former-commit-id: 012497bfef
Former-commit-id: 5dcf4a00bc
2013-10-10 09:34:24 -04:00
Bryan Kowal
92aedd9726 Issue #2422 - recompile updated grib2.so for RHEL6
Former-commit-id: bb9b1e4279 [formerly 9c3c123631 [formerly ae2923791512c7488805c19a773390ef1de5150b]]
Former-commit-id: 9c3c123631
Former-commit-id: 585f63e88c
2013-10-09 18:38:58 -05:00
Nate Jensen
8d5b0ce4ea Issue #2361 remove ISerializableObject for some pointdata and user roles classes
Change-Id: I8a4a53dd1139a376aaa001bb7fef38444d8db005

Former-commit-id: d635901828 [formerly 0cff122d9c [formerly 3fa7b3de6733842c240959030023e84c844ef760]]
Former-commit-id: 0cff122d9c
Former-commit-id: 5c185a4ec2
2013-10-09 18:03:11 -05:00
Brad Gonzales
094c9dc6a7 Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30

Former-commit-id: 61448cc04a [formerly 73e757c284 [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]
Former-commit-id: 73e757c284
Former-commit-id: 59f22b866a
2013-10-09 17:58:12 -05:00