Commit graph

1580 commits

Author SHA1 Message Date
Bryan Kowal
4c406f29a4 Merge "Issue #1373 - prevent file naming conflicts" into development
Former-commit-id: 694574d73f [formerly 274aecc49b] [formerly e6b9d5efa0] [formerly 694574d73f [formerly 274aecc49b] [formerly e6b9d5efa0] [formerly 3128e0ae68 [formerly e6b9d5efa0 [formerly abc2790a82b6b6a80e7e958cd8c96dceaf78b860]]]]
Former-commit-id: 3128e0ae68
Former-commit-id: 1ccf304f0c [formerly 5efecb2e6b] [formerly be2e5dc6a13e140e6e5ed99a8d06e44ff9e07bb7 [formerly fc9ce23c7c]]
Former-commit-id: e2f26cf597f95048dadd19a68e996365a81cf737 [formerly 838c77bca1]
Former-commit-id: 9d9f8bc837
2013-01-05 10:41:54 -06:00
Bryan Kowal
5ca7008802 Issue #1373 - prevent file naming conflicts
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02

Former-commit-id: a4576aeb23 [formerly 94fe1c8f59] [formerly 9079c2dd3f] [formerly a4576aeb23 [formerly 94fe1c8f59] [formerly 9079c2dd3f] [formerly 2c9e5d68fa [formerly 9079c2dd3f [formerly b7c11d1a5d55908a9e60e29b68fa01bf924c1429]]]]
Former-commit-id: 2c9e5d68fa
Former-commit-id: 9cea52c3bd [formerly 5aed64be97] [formerly 9dd0aeae5d8737f589956e4d1a2827d65b6fc693 [formerly 6580901b03]]
Former-commit-id: a947744e5f5de62fe560f0217c5e2740f6988cc9 [formerly ad30a7fb6a]
Former-commit-id: 7138f2a20f
2013-01-05 10:40:10 -06:00
Richard Peter
5e69ef3983 Merge "Issue #1451 Allow overriding of IUserManager via ServiceLoader." into development
Former-commit-id: 12a6723691 [formerly 0923729898] [formerly 4fe4daf973] [formerly 12a6723691 [formerly 0923729898] [formerly 4fe4daf973] [formerly 36c31ce6df [formerly 4fe4daf973 [formerly a1f84dbd0a1ef95c0303119f152396aaed6fcb16]]]]
Former-commit-id: 36c31ce6df
Former-commit-id: 0b85ba581a [formerly 2029ea53b8] [formerly 952ea5e9c8bcc61396a58711fcce60153282a697 [formerly 6457ab4bdb]]
Former-commit-id: 6bf8d96d498ed19133dcdd1f895973a94b6f45dd [formerly a60d057a2a]
Former-commit-id: 358b09b0d2
2013-01-04 13:31:48 -06:00
Bryan Kowal
95c7ef5aa6 Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms
Former-commit-id: 09fe6a9c03 [formerly 2d9e54ddf8] [formerly 9062ed93d7] [formerly 09fe6a9c03 [formerly 2d9e54ddf8] [formerly 9062ed93d7] [formerly e131b5bc72 [formerly 9062ed93d7 [formerly 96fe189b5af5fbf0424504cc0b27d44c1defc0c2]]]]
Former-commit-id: e131b5bc72
Former-commit-id: 2cb595f8bb [formerly ce21e23e52] [formerly 4cab8f42ca65f8a1e9fd3656f1c5391c169ad000 [formerly 8a4bc85bad]]
Former-commit-id: c01dc89b759f5950dcb70e67442b4d828bcb5b58 [formerly d2cd60bb5c]
Former-commit-id: a14d25ded0
2013-01-04 12:50:37 -06:00
Dustin Johnson
ee8e3c1b75 Issue #1451 Allow overriding of IUserManager via ServiceLoader.
Change-Id: Iec63c05fe7365051e7bd1a01ecca701b5553c9e9

Former-commit-id: 393f51fe1b [formerly f5f6884b79] [formerly 452729a647] [formerly 393f51fe1b [formerly f5f6884b79] [formerly 452729a647] [formerly 19f1b30437 [formerly 452729a647 [formerly 46d756ba5cd37ae22fc31ae67dac0751c2c02985]]]]
Former-commit-id: 19f1b30437
Former-commit-id: 34fea3d53a [formerly cdf08ea65a] [formerly de7f6eddfab0e5e6cb4cd6a0a89817af6d81ac7a [formerly 818664e557]]
Former-commit-id: ed5a671e6262c6d9d859eb31d20e0f2000aeb165 [formerly a29d38f5f9]
Former-commit-id: 3d9c459c10
2013-01-04 12:34:43 -06:00
Richard Peter
7aaec36c1f Issue #1373: Update jvm startup to load a service list for services to start.
Former-commit-id: f941605942 [formerly af5b616282] [formerly 1c560f5013] [formerly f941605942 [formerly af5b616282] [formerly 1c560f5013] [formerly c1765f776c [formerly 1c560f5013 [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]]]
Former-commit-id: c1765f776c
Former-commit-id: 38c6856d3c [formerly 9f991104dd] [formerly b3978f7df010c7a6841e8680eae5b357ababaca4 [formerly 424cb12ef6]]
Former-commit-id: 56d8351962d633cfe957c08f60babdaea17194e8 [formerly 6fd64a20fa]
Former-commit-id: e8d1469a70
2013-01-03 16:27:32 -06:00
Ben Steffensmeier
87965c53d5 Issue #1450 apply opposite scanning before flipping in grib decoder
Former-commit-id: dda3437f46 [formerly 03f9d510fe] [formerly 6a8066f3d4] [formerly dda3437f46 [formerly 03f9d510fe] [formerly 6a8066f3d4] [formerly a3bfb8a14e [formerly 6a8066f3d4 [formerly ce2095697f1f00656bf6b778e565d708ddc6a29c]]]]
Former-commit-id: a3bfb8a14e
Former-commit-id: 53a7483c97 [formerly 0102bdc392] [formerly b41b95e3d236fd69a14b07d92cb84c5a239e754a [formerly e1bc52b1d8]]
Former-commit-id: fb53ca5f08bfff60ba75217fcfc76d75d884e966 [formerly 1c472994ef]
Former-commit-id: 27bd5ba7b8
2013-01-03 11:44:13 -06:00
Dustin Johnson
2f4c4ecb1d Issue #1449 Add interface in front of VizApp task running methods
Change-Id: I4696782d800a836f347cf72738c6c0673314a492

Former-commit-id: f7127d12f3 [formerly f6e081d331] [formerly b9c9030d05] [formerly f7127d12f3 [formerly f6e081d331] [formerly b9c9030d05] [formerly dc61af2dea [formerly b9c9030d05 [formerly 3ed5c31344148559c0e5479f4b7955fcee7cb0a7]]]]
Former-commit-id: dc61af2dea
Former-commit-id: 7f958ac71d [formerly 853ea19014] [formerly a3e4e685d352ecc229c5ffe510888c363f9a3dc9 [formerly 19cdf2f57c]]
Former-commit-id: 2fcaa691592b6f8420a274a31e7a166814158f1f [formerly 05951d66c6]
Former-commit-id: 1bc5b09603
2013-01-02 11:01:15 -06:00
Richard Peter
ec8a1b4c84 Merge "Issue #1438 move all gfe processing out of the grib plugin." into development
Former-commit-id: 53bbc7e795 [formerly f8f34c268d] [formerly cadd463843] [formerly 53bbc7e795 [formerly f8f34c268d] [formerly cadd463843] [formerly 76ef2ae454 [formerly cadd463843 [formerly 87c31ed4792c0270f3166b0b69ce64d0bca1464b]]]]
Former-commit-id: 76ef2ae454
Former-commit-id: 6837c27118 [formerly 9cddcffb4b] [formerly 716fef37f8ead5f5995db721ad3868a2c866200f [formerly d3053692b5]]
Former-commit-id: 02f5cc88ce4615b9c95b71c5fb805ad6c52cef9e [formerly c604ec186f]
Former-commit-id: be9e052dc3
2012-12-21 14:03:04 -06:00
Nate Jensen
f502f77d0e Merge "Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor." into development
Former-commit-id: c5190b20b1 [formerly c12b081dd5] [formerly af67ccef2e] [formerly c5190b20b1 [formerly c12b081dd5] [formerly af67ccef2e] [formerly d4ed7f5b06 [formerly af67ccef2e [formerly 04cd8a3390e6615ec2c3abdbd5ba24652c6b54da]]]]
Former-commit-id: d4ed7f5b06
Former-commit-id: 4415754d3b [formerly 10b4bdf1cb] [formerly 4df85fd42b60467e396e5092adc3467835dc5602 [formerly b1972e519d]]
Former-commit-id: 53007bba6bb4240e198f3d24acb0095b8b47430c [formerly f7ca60ad57]
Former-commit-id: 0b60945017
2012-12-21 13:41:12 -06:00
Richard Peter
32eb717c2b Merge "Issue #1445 fix time range for accumulations" into development
Former-commit-id: 577610d1c7 [formerly f169ff1a6d] [formerly 4512f39b31] [formerly 577610d1c7 [formerly f169ff1a6d] [formerly 4512f39b31] [formerly 312f5ea6c3 [formerly 4512f39b31 [formerly 3057efc842920e3843a90005d4166c5b5d4814a6]]]]
Former-commit-id: 312f5ea6c3
Former-commit-id: 6d4c25151c [formerly d2b6381d85] [formerly 02453cad9cd895744d1bb92c07b093c0e3b6caf6 [formerly 7ac93e7ea3]]
Former-commit-id: 8b2e4510c77204065db73654abad128b42081640 [formerly 4d7cb47c65]
Former-commit-id: d58d5fbc2b
2012-12-21 10:14:10 -06:00
Max Schenkelberg
5fb550377e Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor.
Change-Id: I1a5bcb4ba18a8dd73f8857c5bd4256529af57fde

Former-commit-id: 656a4500eb [formerly 08160fff31] [formerly fabb9bbcff] [formerly 656a4500eb [formerly 08160fff31] [formerly fabb9bbcff] [formerly 7e3273db95 [formerly fabb9bbcff [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]]]]
Former-commit-id: 7e3273db95
Former-commit-id: b912ede4c2 [formerly 3a1106efa0] [formerly 4287aae513311854dca459766b0660713bfe075e [formerly 904270b99b]]
Former-commit-id: 09a73da346014f11fd385751bf9b96d1d8a46914 [formerly 09f1499af9]
Former-commit-id: d0a39b6c17
2012-12-20 17:14:34 -06:00
Ben Steffensmeier
fce7343926 Issue #1445 fix time range for accumulations
Former-commit-id: 19bdfc527a [formerly e7db0f009c] [formerly 144ddacb07] [formerly 19bdfc527a [formerly e7db0f009c] [formerly 144ddacb07] [formerly bb557546bf [formerly 144ddacb07 [formerly 590d927da3f051ed033c41bc0c89108a25826759]]]]
Former-commit-id: bb557546bf
Former-commit-id: a92edd7fec [formerly 2a2f226b92] [formerly 54218642851336cbaf62c1352cc6071441068ce0 [formerly 403381dde1]]
Former-commit-id: 21ba5381c77e299e4e702f94dcd6f301f928e8b9 [formerly e80deb958f]
Former-commit-id: 3b9f1b2ae2
2012-12-19 15:14:03 -06:00
Ben Steffensmeier
d66d85e346 Issue #1425 make contouring handle NaN better.
Former-commit-id: 0890a0d5ef [formerly a1bda65a85] [formerly 1588e1b194] [formerly 0890a0d5ef [formerly a1bda65a85] [formerly 1588e1b194] [formerly b4f100da04 [formerly 1588e1b194 [formerly c090b012a6fafb8816f0c17c1af6f14774f08d83]]]]
Former-commit-id: b4f100da04
Former-commit-id: d8c38ca001 [formerly a7c1e74ac2] [formerly 3fa986665c1a6afc6f6f8b89446a6dd262195d4f [formerly 06ae24cf4f]]
Former-commit-id: 37495d1bb0377bd951a8b1899457f71d6418bffe [formerly 45d4ef7ea5]
Former-commit-id: 8af25f1870
2012-12-19 13:23:28 -06:00
Ben Steffensmeier
6899085fb5 Issue #1438 move all gfe processing out of the grib plugin.
Former-commit-id: 474a8dcf65 [formerly b312bce5ad] [formerly 521924904a] [formerly 474a8dcf65 [formerly b312bce5ad] [formerly 521924904a] [formerly fe0a8b60c6 [formerly 521924904a [formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]]]]
Former-commit-id: fe0a8b60c6
Former-commit-id: 2a86c290c7 [formerly ca4e39df79] [formerly 4c95d1279cc2d643fa5e3100b8491e31f64b88bb [formerly c6032b1950]]
Former-commit-id: f316ad8c2fe2fba44aa3af884a66b4942b9301ca [formerly 7d19f5e38f]
Former-commit-id: f62c7fde9b
2012-12-19 11:26:40 -06:00
Richard Peter
a78970da48 Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development
Former-commit-id: 218b69a387 [formerly 314bcffd15] [formerly c3e9f40479] [formerly 218b69a387 [formerly 314bcffd15] [formerly c3e9f40479] [formerly 45f901c1b0 [formerly c3e9f40479 [formerly da48ac436f44dcff85723dfd5befaee9101b6978]]]]
Former-commit-id: 45f901c1b0
Former-commit-id: 38ae6f7f0a [formerly a608ba1a88] [formerly f773ae0c7fbeaee4d49304db8a1346465706b19a [formerly 54778e7490]]
Former-commit-id: cf8ab4529958f51c5a76113bfdaf60b39b30dab3 [formerly 7c4641be8e]
Former-commit-id: cec63c30c7
2012-12-18 13:08:40 -06:00
Greg Armendariz
0083fa8103 Merge "Issue #1416: added the python package shapely" into development
Former-commit-id: cd2c2ee429 [formerly 75ed78667c] [formerly 241db36518] [formerly cd2c2ee429 [formerly 75ed78667c] [formerly 241db36518] [formerly 2b5e44ff99 [formerly 241db36518 [formerly 85b378ef77ba7721e85327a1f0645e1a8eaa1d07]]]]
Former-commit-id: 2b5e44ff99
Former-commit-id: 26c02c9291 [formerly 1beb1152e7] [formerly 100ad803ba6438636a0a0e24b2db4e9a0d891b31 [formerly 770ff8c4d2]]
Former-commit-id: cd7295918927b2532bf387208d4f64a4e35219ab [formerly aecd76044d]
Former-commit-id: 30aea5c68d
2012-12-18 09:27:03 -06:00
Roger Ferrel
c0e1ddbbea Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc

Former-commit-id: ecec7603df [formerly 8c4e70fa9a] [formerly 0c5d10e66a] [formerly ecec7603df [formerly 8c4e70fa9a] [formerly 0c5d10e66a] [formerly 43fd607a30 [formerly 0c5d10e66a [formerly c1567c66f77077f9411a04f349a17d368424db5f]]]]
Former-commit-id: 43fd607a30
Former-commit-id: 50d3a97bcc [formerly 07fbeb2928] [formerly 6ca37b251db62a9996f567e8425299a3fb6ce14e [formerly 6d4946290f]]
Former-commit-id: 78c26237d387d6f1192593fb48dd3b17a26a6cb5 [formerly 95e6d9e752]
Former-commit-id: 7143fb78dd
2012-12-18 09:00:46 -06:00
Max Schenkelberg
c257a7f5ed Issue #1329 Fixed issues with tile intersection calculation.
Change-Id: I753abdfefc0ed38ef838c3f7b8de6d1cd1ee264a

Former-commit-id: 978c200f04 [formerly 14f102d8ae] [formerly b4952b003a] [formerly 978c200f04 [formerly 14f102d8ae] [formerly b4952b003a] [formerly 373de78320 [formerly b4952b003a [formerly 8b5bfd7e9010f9ffd4ce019c5fd961e1b370ff1e]]]]
Former-commit-id: 373de78320
Former-commit-id: 754fe67e13 [formerly 886c39f5a4] [formerly 94aad176091cd344656ab44ae8b6a7db61c25bf6 [formerly adf6aed592]]
Former-commit-id: c59b073430cdcff78da21b53fe38f82a966c2e90 [formerly c18d3486eb]
Former-commit-id: 7f708ac427
2012-12-17 17:05:34 -06:00
Bryan Kowal
15db8f220d Issue #1416: added the python package shapely
- shapely and dependencies will now be built as part of the
  32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
  MSFT Windows environment


Former-commit-id: efe8f338b0 [formerly ef0b12813d] [formerly 8d1e29448a] [formerly efe8f338b0 [formerly ef0b12813d] [formerly 8d1e29448a] [formerly 5e22c24657 [formerly 8d1e29448a [formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]]]
Former-commit-id: 5e22c24657
Former-commit-id: f8df1139b2 [formerly 976834171e] [formerly 6b0159b5868c1e9370ac2d621cc75a1b66d8575f [formerly 6103e7c485]]
Former-commit-id: 4b295307c700c42336969a858b4e15f0db107e36 [formerly bf96e5cf59]
Former-commit-id: f48df7de50
2012-12-17 15:27:43 -06:00
Richard Peter
9f692dacc3 Merge "Issue #1262:" into development
Former-commit-id: 9c718d9364 [formerly 0268ccd3a3] [formerly dc528d3e14] [formerly 9c718d9364 [formerly 0268ccd3a3] [formerly dc528d3e14] [formerly c4028fe005 [formerly dc528d3e14 [formerly 6ad2bed46b41a9071f6a7ef70ae267d57e824e1d]]]]
Former-commit-id: c4028fe005
Former-commit-id: 0da5730964 [formerly 35ff18eb2e] [formerly 27ca9986b0e3df8daf195e11ae9649b78d31c0d4 [formerly ce427112a9]]
Former-commit-id: c03ab715d9b497e813538e7142f0c621ab243099 [formerly 1ccf02fa4c]
Former-commit-id: 4057b2f0ef
2012-12-17 12:20:50 -06:00
Nate Jensen
07fd353ef4 Merge "Issue #1369 fix reproject geotiffs" into development
Former-commit-id: efe60ecc54 [formerly 0a262d7716] [formerly ed075faf68] [formerly efe60ecc54 [formerly 0a262d7716] [formerly ed075faf68] [formerly 0316240cf6 [formerly ed075faf68 [formerly 310f0e9e274ded8256d6b644ade33cea427638f0]]]]
Former-commit-id: 0316240cf6
Former-commit-id: 8513c006e0 [formerly 937220f430] [formerly b29aba8f03d8441a6e83c62c86c1b143a17ebaa1 [formerly 65dc6cbd0e]]
Former-commit-id: 418caff310ddd623e61e8cd286e295b15640c13f [formerly 43c5037070]
Former-commit-id: 995f614e67
2012-12-17 12:14:07 -06:00
Matt Nash
911c63dc7f Issue #1369 fix reproject geotiffs
Change-Id: I576fa38e88afc95914db26c9232acb9e9d3bd6ce

Former-commit-id: 4635b478d8 [formerly 159265e53e] [formerly 2ed0f446d9] [formerly 4635b478d8 [formerly 159265e53e] [formerly 2ed0f446d9] [formerly 323e97d617 [formerly 2ed0f446d9 [formerly 6b06041578eb02e8955ab7d614e2574b5838181e]]]]
Former-commit-id: 323e97d617
Former-commit-id: a6b098ffcd [formerly c4c8221582] [formerly 728357c6e1781fff5e24571640555ef73b3836b1 [formerly c3d94429f7]]
Former-commit-id: 7d1fe70efa9df95c3353d4697ff1379e6aafc3b9 [formerly 31d4a3c2af]
Former-commit-id: fabcff6dd5
2012-12-17 11:31:20 -06:00
Bryan Kowal
8b97e53cd3 Issue #1262:
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds

Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396

Former-commit-id: 8d50e95643 [formerly 7fb4e993e6] [formerly 660a9b615f] [formerly 8d50e95643 [formerly 7fb4e993e6] [formerly 660a9b615f] [formerly f39489c44c [formerly 660a9b615f [formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]]]
Former-commit-id: f39489c44c
Former-commit-id: 10960c5d62 [formerly 8579adf932] [formerly edcca021807dc76971231ad55a5724539778b5ee [formerly c44c4bd061]]
Former-commit-id: 3a025000c2fc42946086a1aefc9fe80303863bba [formerly f256955776]
Former-commit-id: 7e19ae6378
2012-12-16 21:40:26 -06:00
Richard Peter
f0aa37e7e3 Revert "Issue #1262:"
This reverts commit 1b76ff6159 [formerly 95a0a4664f] [formerly d1930ad031c0d2a89cee21d8471ec1e59e0c331d [formerly 83e1f8cc0a]] [formerly 333e7ab7d4 [formerly bad53d1b7f] [formerly 9daf66759db7f15cffd920e394ee9cbc9ce0ff8c [formerly 9490652103]]] [formerly 0970259114] [formerly 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 0970259114 [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]]]


Former-commit-id: 80a95c53ba [formerly 9d03a53fb5] [formerly 9a7cfa2383] [formerly 80a95c53ba [formerly 9d03a53fb5] [formerly 9a7cfa2383] [formerly f37f948456 [formerly 9a7cfa2383 [formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]]]]
Former-commit-id: f37f948456
Former-commit-id: 785b6c7bfe [formerly 2100b136a9] [formerly efeeaf09bb60e407eb7f16418882f2261396e41e [formerly 48641ca26f]]
Former-commit-id: e34ab9adbe7350bd6058678bd396dc8c65a91217 [formerly 463f7c5d9b]
Former-commit-id: 5faf3a22bd
2012-12-16 20:37:21 -06:00
Richard Peter
4bfa33055f Merge "Issue #1428: Optimize deserialize to directly lookup set method" into development
Former-commit-id: e97ab89d1d [formerly 8d28163deb] [formerly 76e643e876] [formerly e97ab89d1d [formerly 8d28163deb] [formerly 76e643e876] [formerly b0d47ed420 [formerly 76e643e876 [formerly a5d9b113bbf644a613015fe593f4b9d4070ab167]]]]
Former-commit-id: b0d47ed420
Former-commit-id: 2fd8ce1e29 [formerly 9007b1c424] [formerly 6df0cbdfa214b59e1ee4d4dd2cd80597fae9d106 [formerly 0295be792f]]
Former-commit-id: 556bd041eb68e0a0f7e84dd42c40e3b20d512ba0 [formerly e696e879e0]
Former-commit-id: a309307d51
2012-12-14 17:38:41 -06:00
Richard Peter
80e61745e3 Issue #1428: Optimize deserialize to directly lookup set method
Change-Id: I8efb8ea6d67a42e5e2b1f2e6587a2fcd785df914

Former-commit-id: 3c7eeaf557 [formerly db24b1c2fa] [formerly a4d36258d0] [formerly 3c7eeaf557 [formerly db24b1c2fa] [formerly a4d36258d0] [formerly 061104acf1 [formerly a4d36258d0 [formerly 33ecdcf14de180606cb487e13aa940e913a8a405]]]]
Former-commit-id: 061104acf1
Former-commit-id: 9eb797713e [formerly 35f6d17680] [formerly a6312d6d714294092e5615a4f8a82680eb9deebb [formerly 279fb8d21f]]
Former-commit-id: 6b77ed3934b8c2cffb92e3d276a31d495602e2af [formerly a754bee29d]
Former-commit-id: 7262a2ef05
2012-12-14 17:37:50 -06:00
Richard Peter
0f07a2fdd8 Merge "Issue #1262:" into development
Former-commit-id: 9810561c86 [formerly e3ffce8228] [formerly d091159ef2] [formerly 9810561c86 [formerly e3ffce8228] [formerly d091159ef2] [formerly 70d2347dca [formerly d091159ef2 [formerly cea057d02c0eba841295a25abce31ea17022e2e9]]]]
Former-commit-id: 70d2347dca
Former-commit-id: e453a5ad8a [formerly 0f41a375b2] [formerly a048871174fb2fd01f7fe18d3de5aedf8903e61b [formerly cd9fa8e508]]
Former-commit-id: f3460e7b0be33585414b1cbfe3efdaf460292621 [formerly aa2b9c3f74]
Former-commit-id: 587707ded9
2012-12-14 10:07:31 -06:00
Jonathan Sanchez
0a0c0cec25 Issue #1424 Removed coordinate truncate when adding vertex.
Former-commit-id: 165b798876 [formerly 8e83a6ea6d] [formerly ccc37dc454] [formerly 165b798876 [formerly 8e83a6ea6d] [formerly ccc37dc454] [formerly 351148804c [formerly ccc37dc454 [formerly 5531ffd29021d7e0db627f2c59ad7ef6de71a896]]]]
Former-commit-id: 351148804c
Former-commit-id: 1fc6cb399e [formerly c4e044d7b9] [formerly ef883515f518537c82b29725baa63e1069106693 [formerly 61f80591bb]]
Former-commit-id: a5b77f476ac80e1a407f0beb9e1d576fbfe06021 [formerly 88e931376e]
Former-commit-id: 937f3212f9
2012-12-14 07:42:39 -06:00
Ron Anderson
238e0d0311 Merge "Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item." into development
Former-commit-id: 6323e27238 [formerly e49ea6c147] [formerly 6f79ba14e6] [formerly 6323e27238 [formerly e49ea6c147] [formerly 6f79ba14e6] [formerly c17e0a19c9 [formerly 6f79ba14e6 [formerly 6e0bfe56d437622b9c5f6e3d4d8d9c0192fc5a46]]]]
Former-commit-id: c17e0a19c9
Former-commit-id: dfd0f22255 [formerly bf7960b5f9] [formerly 7db76158e2d550187b0635ca2f55bdd04ee50b19 [formerly cb4721ae15]]
Former-commit-id: 5b42167f76b92cbc521f79813320b14e12cc9e71 [formerly 5c59df1ae1]
Former-commit-id: d176bc1e2f
2012-12-13 15:47:04 -06:00
Ron Anderson
c62c47db45 Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1

Former-commit-id: e5c1e61664 [formerly 3e4aeeab8b] [formerly 753fa0487b] [formerly e5c1e61664 [formerly 3e4aeeab8b] [formerly 753fa0487b] [formerly 639b5abbd9 [formerly 753fa0487b [formerly a7657cf6b42a3d7a0f5fd64468820d1547ad1e9d]]]]
Former-commit-id: 639b5abbd9
Former-commit-id: 3ef1648013 [formerly 8b81f0bfb4] [formerly 268b50c70033e4dcada30393facee318b4eee737 [formerly 995f28220a]]
Former-commit-id: 478c9f69d24b78dec665e13375c109ca93983718 [formerly 676819adfa]
Former-commit-id: c341ac0f55
2012-12-13 15:25:24 -06:00
Nate Jensen
9963841a15 Merge "Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension" into development
Former-commit-id: 7490c6cc42 [formerly acccca74eb] [formerly 67d30566c0] [formerly 7490c6cc42 [formerly acccca74eb] [formerly 67d30566c0] [formerly 823bedcebd [formerly 67d30566c0 [formerly e7b347563598a3f4809cc74096de1f2dc0ef0788]]]]
Former-commit-id: 823bedcebd
Former-commit-id: fcf7aafab6 [formerly 31d8e9a9ae] [formerly 32e25181e7f0139f8b48852cbafe883b52ef0d59 [formerly 0388c1b179]]
Former-commit-id: 2cf7c76fd8fd723493b1da9f0463c7f6caac5b63 [formerly 6ac9952901]
Former-commit-id: 2b93ece40d
2012-12-13 14:25:56 -06:00
Lee Venable
43b45630d9 Merge "Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit." into development
Former-commit-id: 4bf40c5ec8 [formerly fabb15ab10] [formerly d098b2e271] [formerly 4bf40c5ec8 [formerly fabb15ab10] [formerly d098b2e271] [formerly 3ca1080fa0 [formerly d098b2e271 [formerly c7e9e83612df941e1c6a99cac5d07a724525bbb3]]]]
Former-commit-id: 3ca1080fa0
Former-commit-id: 004a3e2b60 [formerly 2c29835b63] [formerly f8cccdc45dae645e9f42ab67adf2ceb8844e185b [formerly 1be8e81228]]
Former-commit-id: 07382d4b01a66d8315536e0c31ad1b591f93534b [formerly d202b932b3]
Former-commit-id: 6002363f85
2012-12-13 14:24:55 -06:00
Nate Jensen
a3829335b0 Merge "Issue #1369 add pattern to p2-build.xml file to match the new cots product" into development
Former-commit-id: 1b65a390e9 [formerly c2bc33e51a] [formerly f0340fba98] [formerly 1b65a390e9 [formerly c2bc33e51a] [formerly f0340fba98] [formerly 59f315f14b [formerly f0340fba98 [formerly 4663e9a09db1fbf0e3f72dd9893e5daa73698f90]]]]
Former-commit-id: 59f315f14b
Former-commit-id: e5c633642d [formerly ceceed5b27] [formerly 6f589c91ef60b06f30015e490b30df8116e64654 [formerly e5ad2acde4]]
Former-commit-id: f7e6006f2e0855cb808690196e4707f9111788f7 [formerly af1c73a788]
Former-commit-id: c1c0b738e0
2012-12-13 14:13:57 -06:00
Roger Ferrel
b8a592b966 Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit.
Change-Id: Iaff7b8b64e2b1a94680c29087d174a27658c5873

Former-commit-id: 4ff3a1366c [formerly 9d770cf725] [formerly 65699f7a26] [formerly 4ff3a1366c [formerly 9d770cf725] [formerly 65699f7a26] [formerly 77c60c8925 [formerly 65699f7a26 [formerly 8eee3bf91d4e40b55b36f699ecf7ca37bc6591aa]]]]
Former-commit-id: 77c60c8925
Former-commit-id: 31c8e5a19b [formerly d3482bd513] [formerly a7cc30ec66b7398b4aabcaaab61e837fae4cb926 [formerly 258dd80db8]]
Former-commit-id: 45e7835645585e734d48523abb226f714852eeec [formerly e78f65e222]
Former-commit-id: 946b0f7477
2012-12-13 13:50:47 -06:00
Matt Nash
527ea263ab Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension
Change-Id: I6cc0d8eb6079efc224136b67962903b75330c8e1

Former-commit-id: 124beb0449 [formerly 9d35cdf724] [formerly c992d831af] [formerly 124beb0449 [formerly 9d35cdf724] [formerly c992d831af] [formerly 3ff52fb9ff [formerly c992d831af [formerly 8e1660c65bbb6ad76bdc44c3327819170c3244f5]]]]
Former-commit-id: 3ff52fb9ff
Former-commit-id: a34462a41c [formerly 3f76c7ab62] [formerly c78eb61c2fba2fc5c9840c27da3bf7ec82bebc91 [formerly 7d5f78c785]]
Former-commit-id: b71d32010308296d1afcc69fa9c013f5c54b5886 [formerly 86b7a7de3d]
Former-commit-id: 4284d53e3b
2012-12-13 13:00:09 -06:00
Matt Nash
d7931f4adf Issue #1369 add pattern to p2-build.xml file to match the new cots product
Change-Id: I5a30c7fd6067b1c59794983c67b8186775af3849

Former-commit-id: c9f7f64c87 [formerly a661c27de7] [formerly cf0090b7d4] [formerly c9f7f64c87 [formerly a661c27de7] [formerly cf0090b7d4] [formerly 87b4d4b4e6 [formerly cf0090b7d4 [formerly a862d259af867bd15d381e05e421d8d653ae4f21]]]]
Former-commit-id: 87b4d4b4e6
Former-commit-id: 06964bc4ed [formerly 5de49c6734] [formerly 366d969178f0966d239a5f229d0f375488b48401 [formerly 83b9a4dfb7]]
Former-commit-id: f5d2aa418aaf72d78aa1564e88fa01b0a75fcaf8 [formerly 778191a87a]
Former-commit-id: ef3d62999c
2012-12-13 12:42:40 -06:00
Bryan Kowal
1b76ff6159 Issue #1262:
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib


Former-commit-id: 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 0970259114 [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]]
Former-commit-id: 0970259114
Former-commit-id: 333e7ab7d4 [formerly bad53d1b7f] [formerly 9daf66759db7f15cffd920e394ee9cbc9ce0ff8c [formerly 9490652103]]
Former-commit-id: d1930ad031c0d2a89cee21d8471ec1e59e0c331d [formerly 83e1f8cc0a]
Former-commit-id: 95a0a4664f
2012-12-13 12:40:31 -06:00
Richard Peter
77ad5f9470 Merge "Issue #1415 fix or level node time matching Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a" into development
Former-commit-id: afd4a308c6 [formerly d773303870] [formerly 4b2e80da58] [formerly afd4a308c6 [formerly d773303870] [formerly 4b2e80da58] [formerly fffeaecbe5 [formerly 4b2e80da58 [formerly 1f04e62af4557d74f9a5378d88571a01060b9891]]]]
Former-commit-id: fffeaecbe5
Former-commit-id: 4142b13668 [formerly 541c2cf5e3] [formerly dab8e96293992116335e67e475857894ad606092 [formerly d0cdd8f533]]
Former-commit-id: a299f1e83ef6a0a06de348a71c9ff5afc2151508 [formerly e051ac15ec]
Former-commit-id: 2c06db239c
2012-12-13 11:57:37 -06:00
Ben Steffensmeier
3b4c20f640 Issue #1415 fix or level node time matching
Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a

Former-commit-id: 2a9016cf50 [formerly 80a3471237] [formerly 3ac43300fc] [formerly 2a9016cf50 [formerly 80a3471237] [formerly 3ac43300fc] [formerly 9da83d3f4f [formerly 3ac43300fc [formerly 7ad0749d76328eafcd2f02137c099f7a302e0387]]]]
Former-commit-id: 9da83d3f4f
Former-commit-id: 65f5a3a7e0 [formerly 1a3f91949c] [formerly e9f8a892d3dddee8f184c707fd4e36efb6840fc8 [formerly 199577ed39]]
Former-commit-id: 969bafc67a439b517f10d0ffa5eec19cee35ace6 [formerly 5826da0d8f]
Former-commit-id: c01596aa63
2012-12-13 11:35:15 -06:00
Nate Jensen
ce01fe5c89 Merge "Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore" into development
Former-commit-id: 5f6c90ab12 [formerly c2c508d495] [formerly 8953fcf4af] [formerly 5f6c90ab12 [formerly c2c508d495] [formerly 8953fcf4af] [formerly 8a6844e5a3 [formerly 8953fcf4af [formerly 93c0e07b71d33560678eb3781465e20e9222642d]]]]
Former-commit-id: 8a6844e5a3
Former-commit-id: 483cce46c2 [formerly a9395e64ab] [formerly 61b92d6c0296409e93f789207b40100073dd3d6f [formerly 8208937771]]
Former-commit-id: f8a85335a7525213de494cc3d79219a1a5f71de5 [formerly d57d70be63]
Former-commit-id: c47e4f7cc4
2012-12-13 11:05:12 -06:00
Richard Peter
8af8fc4503 Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7

Former-commit-id: 548b521f3f [formerly 3d4fb31161] [formerly 513dd75a23] [formerly 548b521f3f [formerly 3d4fb31161] [formerly 513dd75a23] [formerly 08919e73c3 [formerly 513dd75a23 [formerly fb25e736d298225d217a1775891a65de7e0bd50c]]]]
Former-commit-id: 08919e73c3
Former-commit-id: bcf2592bf1 [formerly e2007e61e1] [formerly a2ffba67b6efe6ed162228db4c9f67b3e99a3233 [formerly f7859723e5]]
Former-commit-id: de55462bfcfa800aad684c68d8bbf0ac46a8ab9d [formerly bf19dcd216]
Former-commit-id: 9b15f27832
2012-12-13 11:02:07 -06:00
Matt Nash
93b662e32f Issue #1369 add geosolutions project to cots feature
Change-Id: I62dd15c2f0d2ee017fcb3ad9483399b688c508f3

Former-commit-id: ce8795b271 [formerly 6949c1f105] [formerly 1d56d879fb] [formerly ce8795b271 [formerly 6949c1f105] [formerly 1d56d879fb] [formerly ab07a92d48 [formerly 1d56d879fb [formerly 01033bfd4b1b298095697267be60d978aa5c14a5]]]]
Former-commit-id: ab07a92d48
Former-commit-id: df28ed4abf [formerly 210da024a4] [formerly 5a514d93d7982a7df8191a39807e94e778ed2652 [formerly d24fab93dd]]
Former-commit-id: fd7e753d34910cbe83aaf4127c8059bb3ec72513 [formerly 349ba67388]
Former-commit-id: bf2dcdb733
2012-12-13 09:40:49 -06:00
Ben Steffensmeier
0cb5258750 Issue #1401 add the word Grid in front of load properties because that always makes things better.
Former-commit-id: 5d61ce529e [formerly 8b3667d646] [formerly 1848f614fd] [formerly 5d61ce529e [formerly 8b3667d646] [formerly 1848f614fd] [formerly d43336bcbd [formerly 1848f614fd [formerly 345673524a287d87efbdfcb60ef838dd78c33ae3]]]]
Former-commit-id: d43336bcbd
Former-commit-id: 4bd5d7cd65 [formerly 8c66a66834] [formerly 16556a74e89ddc5834e7541482d131ff5d1ede32 [formerly ff5a5cac4c]]
Former-commit-id: 71675829f6738171a95321a40057586c7a5667d1 [formerly cf30a422fc]
Former-commit-id: 5ac9e8b73c
2012-12-12 14:33:48 -06:00
Nate Jensen
25adbd46e2 Merge "Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny" into development
Former-commit-id: 580d27c4fa [formerly 291bb86680] [formerly d0fe7c860f] [formerly 580d27c4fa [formerly 291bb86680] [formerly d0fe7c860f] [formerly 6debcb5ff4 [formerly d0fe7c860f [formerly 9a388df8f163c1bbde711c12dcda1a7c8f70bf06]]]]
Former-commit-id: 6debcb5ff4
Former-commit-id: 78380dc03b [formerly 231ddfb978] [formerly b80429cabfa918f11b3de9f281d78d8a535850c9 [formerly 196fdc6110]]
Former-commit-id: f4d9619338c26bb107dc5e782c3f0f86d277ca27 [formerly 3de4dd0821]
Former-commit-id: 0c35a32997
2012-12-12 12:27:30 -06:00
Max Schenkelberg
8f83ab09b5 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: 24938de2d2 [formerly be99f6c7ca] [formerly 3e128b266a] [formerly 24938de2d2 [formerly be99f6c7ca] [formerly 3e128b266a] [formerly 5db71ca943 [formerly 3e128b266a [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]]
Former-commit-id: 5db71ca943
Former-commit-id: cf9e6ff3b2 [formerly d43e0c1c25] [formerly e215a3aeda7dede45a9e7e93feb2e2f2e9e6e34b [formerly b74d788909]]
Former-commit-id: 56e64154314976881dc1506547d9d9b8c9f9f150 [formerly 206116ab66]
Former-commit-id: 2030832669
2012-12-12 11:39:32 -06:00
Nate Jensen
cadd8a8feb Issue #1409 Initial implementation of hydro data access
Change-Id: I309694f9477384446658520794e19ca9493473fb

Former-commit-id: dbf9edd0fe [formerly c236b4e1ad] [formerly 817717fe0a] [formerly dbf9edd0fe [formerly c236b4e1ad] [formerly 817717fe0a] [formerly 85658e7e1d [formerly 817717fe0a [formerly ae7ac8a8bfc51d1c7dc3493c8fc036a87772f323]]]]
Former-commit-id: 85658e7e1d
Former-commit-id: 9eb19cc1c2 [formerly 94b9d10c81] [formerly bfc98151a081a65d7cfc11a95d3cd9c422ae9b3f [formerly 3c2865bbd7]]
Former-commit-id: 548d398be98e9d9da135ddf51e23b9bd63991c62 [formerly 13dca3b784]
Former-commit-id: 1aa8d304df
2012-12-12 11:20:42 -06:00
Ron Anderson
368f497d27 Issue #1395 Comment out change in p2-build.xml to fix build
Change-Id: I47d426383734b876d5def9ba03677ef7ff745403

Former-commit-id: 48dbe8b641 [formerly c5cd2304a9] [formerly 5327d88a6d] [formerly 48dbe8b641 [formerly c5cd2304a9] [formerly 5327d88a6d] [formerly 06fdf91a1c [formerly 5327d88a6d [formerly 4636ad873e7de401e6384dd42857265e962aa8d9]]]]
Former-commit-id: 06fdf91a1c
Former-commit-id: 620d8f31d7 [formerly f4624af03c] [formerly f46b472b52d9fa302dd37019f37fcd05c9d31c60 [formerly 17b983ba02]]
Former-commit-id: 9f850041211afbf81d99759f7b4d4c810f80e98b [formerly a41d5a1ad0]
Former-commit-id: 4a539b10ce
2012-12-12 09:09:28 -06:00
Ben Steffensmeier
16db40f89a Issue #1356 add javadoc to subgrid changes.
Former-commit-id: 24e1b8fed9 [formerly c44dad8a5c] [formerly 6da5ac2873] [formerly 24e1b8fed9 [formerly c44dad8a5c] [formerly 6da5ac2873] [formerly 7e6d6fa794 [formerly 6da5ac2873 [formerly 618c8a0accbfde0e95d47b76659f3804b32a7652]]]]
Former-commit-id: 7e6d6fa794
Former-commit-id: 0e733903aa [formerly 5d87636fb2] [formerly ddd3f1b8e6c6839c8b7da5dd2c5162c696cc8a43 [formerly 47cb87096a]]
Former-commit-id: 2525c99e68b9d452c7e65c184726e952bbf62a6a [formerly 77e3f5ea79]
Former-commit-id: 9c9170d0e4
2012-12-11 17:40:28 -06:00
Richard Peter
7a0909d8f8 Merge "Issue #1356 create subgrid for grib files with extra columns" into development
Former-commit-id: b6674338ed [formerly 559876930b] [formerly 9f9c32fc4e] [formerly b6674338ed [formerly 559876930b] [formerly 9f9c32fc4e] [formerly 4082968b07 [formerly 9f9c32fc4e [formerly d489dcb15e98ae3b07665df4fc2edd2bb852c7db]]]]
Former-commit-id: 4082968b07
Former-commit-id: 5f4f867295 [formerly f7de6135ca] [formerly 8f43d6e6261035b5da10173c59a560c1e52e1eba [formerly ada54d8e92]]
Former-commit-id: 84e562a6bae12a322ae3acd3f19b22c270427f0f [formerly bd1ae5fdfd]
Former-commit-id: 3986341ee0
2012-12-11 17:05:27 -06:00