Commit graph

4113 commits

Author SHA1 Message Date
Nate Jensen
723a53858c Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development
Former-commit-id: 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 38a5ae5e5f [formerly f5feb9330f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: 794d57fe7b [formerly c27c435cea] [formerly 6bfd1d4e327eb46835ec16594b542ffb4c74bf7e [formerly 1b7ac545f8]]
Former-commit-id: ac8b2a6231c9af1c1a85121d551f6695b476f896 [formerly acec588299]
Former-commit-id: acccf2c827
2013-11-07 10:21:42 -06:00
Dave Hladky
ea9d193ed9 Issue #2529 Move DD edex event plugin from DD feature to DD core feature.
Former-commit-id: 9505706e96 [formerly 1a5ddfbd5e] [formerly f6996f9f5a] [formerly 9505706e96 [formerly 1a5ddfbd5e] [formerly f6996f9f5a] [formerly 5d3023d2f5 [formerly f6996f9f5a [formerly cce7fc47a0a4cdb55712ee3af942e93cb8a7c797]]]]
Former-commit-id: 5d3023d2f5
Former-commit-id: f081565dc7 [formerly f62685926a] [formerly cf4c6bb96f1a6ffce51a7751fd886b822c652e36 [formerly 5891412fb3]]
Former-commit-id: 61deb96b4063ff7d6a82bbc2cf7bd4504f9b42b6 [formerly a70f11148c]
Former-commit-id: 18724a945f
2013-11-07 10:08:01 -06:00
Nate Jensen
39a9444ece Merge "Issue #2511 fix for edex localization adapter to allow filename to appear in path" into development
Former-commit-id: 4c311bb740 [formerly 812f3fefce] [formerly 348a968aed] [formerly 4c311bb740 [formerly 812f3fefce] [formerly 348a968aed] [formerly 68c7d378cf [formerly 348a968aed [formerly c2ca50713aa5e69aecdc6a5a0b04c7261305514c]]]]
Former-commit-id: 68c7d378cf
Former-commit-id: bc622dacd0 [formerly 2f4c4833d3] [formerly e622a77e09362970afb8d20642b1057a2b7d7989 [formerly d1f45128aa]]
Former-commit-id: a1ca2b7306fbb5776d4cd6f317db5ac537431543 [formerly 64f064e15f]
Former-commit-id: 6446dbabbe
2013-11-07 09:15:02 -06:00
Nate Jensen
dcbee2bb80 Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 1da0e31b88 [formerly 0f4ba6f90e [formerly 2c506552014e60344c5b2014bed32edab2630f47]]]]
Former-commit-id: 1da0e31b88
Former-commit-id: d2bb313a16 [formerly 048d52722f] [formerly 60a2289740b7f6e8da01f653e591eb2ce94a6c58 [formerly aef895c447]]
Former-commit-id: 5e1c394f1e0afad2bb68c0406f91df8e82544280 [formerly 0ae0e070c9]
Former-commit-id: f9be4065ec
2013-11-06 17:07:10 -06:00
Lee Venable
51842a1676 Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 20726d4e7c [formerly 8585080cd1 [formerly 13672783e6a5e452cb4105669a98708329b35541]]]]
Former-commit-id: 20726d4e7c
Former-commit-id: a6557a089e [formerly 9a8a813cf8] [formerly 907b407668322fa5a6d3d3f60d0cc9f6969d6ada [formerly 0c4566c411]]
Former-commit-id: 17cb4eac030cecf14dfda06979b1f5d64d077baf [formerly 5627ef0cc8]
Former-commit-id: 3cc206a34f
2013-11-06 15:42:40 -06:00
Nate Jensen
2e73b9e045 Merge "Issue #2525 GSD doesn't want "/wfs" appended by the DPA. Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370" into development
Former-commit-id: 428bff44e7 [formerly 53e94b4bdc] [formerly 4309555b45] [formerly 428bff44e7 [formerly 53e94b4bdc] [formerly 4309555b45] [formerly eae6b2526d [formerly 4309555b45 [formerly a6cf090becd6da2c3fba1a2d46297c475be9d610]]]]
Former-commit-id: eae6b2526d
Former-commit-id: bdf7ba948a [formerly e4c3c3a2ad] [formerly 028b9b6ed361721f72c3b96a53739079cd89fd01 [formerly ed9515eea8]]
Former-commit-id: 7609129d8d0477388dfe611d8af9afb8f7b5d232 [formerly 97034141b3]
Former-commit-id: 1a1a280d43
2013-11-06 15:41:29 -06:00
Lee Venable
d1e67a79d3 Merge "Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects." into development
Former-commit-id: 34753b0b7e [formerly ac2630eed4] [formerly ea5470af90] [formerly 34753b0b7e [formerly ac2630eed4] [formerly ea5470af90] [formerly e80418a639 [formerly ea5470af90 [formerly 10789718f6ece30c3d766ec95b9fff0a5c03ee2c]]]]
Former-commit-id: e80418a639
Former-commit-id: 798de61ac1 [formerly 55b68b6d2a] [formerly 1a7b7e706e5102b13229f96f72c064827c5fc575 [formerly fab0fab6a9]]
Former-commit-id: c3fac5c99d56f602c066a951f6abe956b7282dde [formerly dca845a22d]
Former-commit-id: 8e7bbca733
2013-11-06 15:41:02 -06:00
Nate Jensen
9eaf76fa66 Merge "Issue #2522 removing WCS and WMS from baseline" into development
Former-commit-id: 784f6dca81 [formerly 327f44aaff] [formerly 1020b453f2] [formerly 784f6dca81 [formerly 327f44aaff] [formerly 1020b453f2] [formerly f3ea98778e [formerly 1020b453f2 [formerly c4f29baf5ac830404a7e7739626b9a861844ec06]]]]
Former-commit-id: f3ea98778e
Former-commit-id: bc7db2cd24 [formerly 8cacf1c915] [formerly f7629521b564f5f8ff6aae8cc5a34298c12d3144 [formerly 3169c86070]]
Former-commit-id: f0ee16eb2b93bc88adb959652bf0b98159a10d27 [formerly da640f45d9]
Former-commit-id: 7ae88e6a91
2013-11-06 15:40:16 -06:00
Dave Hladky
0f88775389 Issue #2525 GSD doesn't want "/wfs" appended by the DPA.
Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370

Former-commit-id: 305739eb13 [formerly 62cd5b514d] [formerly b0d929231c] [formerly 305739eb13 [formerly 62cd5b514d] [formerly b0d929231c] [formerly b2b44cd1d2 [formerly b0d929231c [formerly 03cfdbd4c8c74da4200781b8b716181eac759195]]]]
Former-commit-id: b2b44cd1d2
Former-commit-id: ac0d00e3d6 [formerly 7ddd6d4c61] [formerly 4dc511c73e193c9587b7cdc0e8b0ac3f2f661db4 [formerly 35bc4378ca]]
Former-commit-id: ad849d66b0caa535fb7690f603fd59b0b3a80bf4 [formerly d3bd916cf4]
Former-commit-id: ffaa5d5480
2013-11-06 15:23:02 -06:00
Max Schenkelberg
fe791cc7f7 Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
Amend: Fixed precision issue with float comparison, made factory better synchronized.

Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2

Former-commit-id: 3af5098e1b [formerly d7c8b8f662] [formerly 3369fbec2d] [formerly 3af5098e1b [formerly d7c8b8f662] [formerly 3369fbec2d] [formerly c28fd2b38d [formerly 3369fbec2d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]]]
Former-commit-id: c28fd2b38d
Former-commit-id: f88d913d31 [formerly e4b7f3618c] [formerly aa835a1580556a0e2e44448d20c96e5e1b78baed [formerly d53db3ddb6]]
Former-commit-id: 2e6b0a3f93931cd0f795d381bd6ddbc9268e4f25 [formerly 751b8f2315]
Former-commit-id: 53363b9bf7
2013-11-06 15:07:18 -06:00
Richard Peter
1dcfb3623b Merge "Issue #2494 Updated to use thread logger" into development
Former-commit-id: ff8db01e5f [formerly 3c49575ca0] [formerly 22bd1521be] [formerly ff8db01e5f [formerly 3c49575ca0] [formerly 22bd1521be] [formerly 10160e3783 [formerly 22bd1521be [formerly 8eb668a14e1674b3a67816c26b2baeb7c8f45fba]]]]
Former-commit-id: 10160e3783
Former-commit-id: 17c915ea58 [formerly b10d5952c0] [formerly fcaf2937a71343d6834a55f38f658f6c7fdbaa88 [formerly 88dbe31908]]
Former-commit-id: e8555088e0c72303d6f761ef669d51817d7e2de9 [formerly 28744971c4]
Former-commit-id: 70d5d65f35
2013-11-06 14:03:34 -06:00
Richard Peter
c0a20759e1 Merge "Issue #2450 - Send notifications to Notification Center when subscriptions expire. peer review comments" into development
Former-commit-id: 8ce3319d80 [formerly a699fed28b] [formerly 2e162de539] [formerly 8ce3319d80 [formerly a699fed28b] [formerly 2e162de539] [formerly d9c878bc51 [formerly 2e162de539 [formerly e52828f36303bd39521381149b0f585b6eb38439]]]]
Former-commit-id: d9c878bc51
Former-commit-id: 81b11b8309 [formerly e480cefa56] [formerly 886471047e9c7c9cec1530df34593c4836a27792 [formerly cdc4a81cc5]]
Former-commit-id: ead7424c788d1482ff79182612b8e1f6341946a8 [formerly a76579cf4e]
Former-commit-id: fda9c8fbba
2013-11-06 14:02:51 -06:00
Ben Steffensmeier
235cea183a Issue #2493 remove mesowest.
Former-commit-id: c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly 36916fedcd [formerly d0b7966458 [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]]
Former-commit-id: 36916fedcd
Former-commit-id: 726d1728fd [formerly 5d31aad5c2] [formerly 80b4ead107b43174bee5092e0af3bc24e421205f [formerly baebe37ba6]]
Former-commit-id: 855d5e9d4e64a0a70aaec8f5743dc44310b552bb [formerly afe014af99]
Former-commit-id: 925d8bca38
2013-11-06 13:42:38 -06:00
Slav Korolev
67bcc06687 Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects.
Former-commit-id: ff13287f05 [formerly cc90a7af4b] [formerly 076865bb61] [formerly ff13287f05 [formerly cc90a7af4b] [formerly 076865bb61] [formerly c25204d75b [formerly 076865bb61 [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]]]
Former-commit-id: c25204d75b
Former-commit-id: 5cd1d585b1 [formerly 8fbf625667] [formerly 2d965e7d5b9ce80b4a1638b7546c6d8d63a4d209 [formerly 3223cd19cd]]
Former-commit-id: 101603d2c5fe98d981f819cb5aec1f27534314e0 [formerly b8ebc9ac63]
Former-commit-id: a2e60dbe60
2013-11-06 14:38:55 -05:00
Matt Nash
c545b523bd Issue #2511 fix for edex localization adapter to allow filename to appear in path
Change-Id: I9fea157a67799e1168d4b5f7efaf5ef6cdd64933

Former-commit-id: a8dfdabe2a [formerly 5ab51caf38] [formerly 19bfe014c9] [formerly a8dfdabe2a [formerly 5ab51caf38] [formerly 19bfe014c9] [formerly b3ac4b7a9c [formerly 19bfe014c9 [formerly 8404299627c7d27731910821befc068767c43aa1]]]]
Former-commit-id: b3ac4b7a9c
Former-commit-id: a59609ecd8 [formerly 14e606f17d] [formerly cff015b05c205c6fec43bba94210ba6eaa1072af [formerly 65696b4148]]
Former-commit-id: deaab20a5011b3a3d8e09725b1406337afa02da4 [formerly 3445b9cbb5]
Former-commit-id: b08dedefae
2013-11-06 13:35:11 -06:00
Mike Duff
27409bd03a Issue #2450 - Send notifications to Notification Center when subscriptions expire.
peer review comments

Change-Id: I18eb322d73ee25f30cd1d032b403ea156bc63653

Former-commit-id: a3931125da [formerly 2a97da896d] [formerly 00bb57b481] [formerly a3931125da [formerly 2a97da896d] [formerly 00bb57b481] [formerly f3d07a9185 [formerly 00bb57b481 [formerly fc6fe49db0576c70e2068cd8fac125553806e4c0]]]]
Former-commit-id: f3d07a9185
Former-commit-id: 4a2d377291 [formerly ecaef4d639] [formerly 34a98de0a9a5f176bd195b64d5d776dae48eef59 [formerly cc3846be0b]]
Former-commit-id: 76ee46484cca60f12689d07b9d08fdf8fbbdbc0e [formerly 70fbb031a2]
Former-commit-id: 8a8eb6ba4e
2013-11-06 12:23:09 -06:00
Mike Duff
0280c05aa7 Issue #2358 - Move config file management code to the subscription manager dialog.
Change-Id: I61b8093b1306404006c5d01b73874997054c4f2f

Former-commit-id: e8a14d975d [formerly 65f9da04a9] [formerly e1180868e7] [formerly e8a14d975d [formerly 65f9da04a9] [formerly e1180868e7] [formerly 35c4911e7e [formerly e1180868e7 [formerly 100fe3e61e5156dba32419005da4473bcd6d1e8b]]]]
Former-commit-id: 35c4911e7e
Former-commit-id: 89c7970f8b [formerly e1b9c9daa8] [formerly 046ac466943d54b80185d43c7b3cbf79bd485473 [formerly 7e28ffcaad]]
Former-commit-id: 61abd603abd41c6ab9bfa16115d3995c7257e435 [formerly 39dda9d18c]
Former-commit-id: 4cede401ec
2013-11-06 12:00:04 -06:00
Brian Clements
91e76074e8 Issue #2522 removing WCS and WMS from baseline
removed dependencies on static URN constants in NativeCrsAuthority and abstract wxxm translator


Former-commit-id: ae897e75a8 [formerly 09f8fe5d95] [formerly f50c286820] [formerly ae897e75a8 [formerly 09f8fe5d95] [formerly f50c286820] [formerly 4144db8bfc [formerly f50c286820 [formerly 6f113f3c68f13ebac010bd2f8e22d3534c0a8072]]]]
Former-commit-id: 4144db8bfc
Former-commit-id: 3ce0fcde29 [formerly d70dcff9c7] [formerly d4f122bf8a2d95ba614b5b019ae7f79564344707 [formerly 3d02cc5aac]]
Former-commit-id: 6423970255126b841b4b9f51156761b733d5ab4e [formerly 919592bebc]
Former-commit-id: 60101ea00a
2013-11-06 09:55:45 -06:00
Nate Jensen
a3350d45f3 Merge "Issue #2516 Remove classes causing WCS to not compile." into development
Former-commit-id: d79da040f5 [formerly 387fe10d2b] [formerly 52c5a3a966] [formerly d79da040f5 [formerly 387fe10d2b] [formerly 52c5a3a966] [formerly b6afeae19b [formerly 52c5a3a966 [formerly 9f8341790c94cc59b79a1226e23635298092670f]]]]
Former-commit-id: b6afeae19b
Former-commit-id: f1112a3619 [formerly 981146e079] [formerly 3879a062951e36862341027934369ea35b848fbf [formerly b1d6d16182]]
Former-commit-id: e39275355bb1b42427f165c28100e9e06968657e [formerly 57c1f7b87c]
Former-commit-id: 4094bce5c4
2013-11-06 08:56:17 -06:00
Dave Hladky
5e52684f9e Issue #2494 Updated to use thread logger
Former-commit-id: 493083a836 [formerly 8be14ab6b0] [formerly f890152abc] [formerly 493083a836 [formerly 8be14ab6b0] [formerly f890152abc] [formerly 14469d6e22 [formerly f890152abc [formerly 56505490277f53f77ad80e93aa6a31756a950db6]]]]
Former-commit-id: 14469d6e22
Former-commit-id: bbcccf221a [formerly 4911d0b9c4] [formerly 01427bbf31a9f9022b31a67d324f17fd8159e998 [formerly a2ff05afb9]]
Former-commit-id: 0add07317c3415d3d604303521b42b73433b310b [formerly ae9bde9f57]
Former-commit-id: 43dd4f308d
2013-11-06 08:26:25 -06:00
Ben Steffensmeier
74a25404a0 Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64

Former-commit-id: 3273b6fc5f [formerly 4639cd69f4] [formerly 5b53cb4c98] [formerly 3273b6fc5f [formerly 4639cd69f4] [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 5b53cb4c98 [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]]
Former-commit-id: 1d35086e8d
Former-commit-id: 41a54ad666 [formerly b64221f27b] [formerly 5548cad8f6d7873bdd2beafefec42e2d00821e99 [formerly 8aefe5ff02]]
Former-commit-id: ba475ead914b07016d89a22aaa936b7307336535 [formerly a97ec9b8e5]
Former-commit-id: 5cf9a6ed01
2013-11-05 17:33:41 -06:00
Nate Jensen
f03196cb13 Merge "Issue #2521 DatasetMetaData URL update failure for point data. Change-Id: I3421bb6acdc3f44ef7341279c0b253acea2e59ea" into development
Former-commit-id: 63d6c69d5e [formerly e9c2738ffd] [formerly 29293977f5] [formerly 63d6c69d5e [formerly e9c2738ffd] [formerly 29293977f5] [formerly 0b5dfb8ecd [formerly 29293977f5 [formerly 56158b31325ccf0a06fe031790988eb8f39af7d9]]]]
Former-commit-id: 0b5dfb8ecd
Former-commit-id: 56b76616a9 [formerly 6e228eca0f] [formerly 6f41ca43b174e17527967bca7dd25d79c17bc3ca [formerly 5515ce94c7]]
Former-commit-id: 1a1b740d657ecac96808769874ec6ef8eeb79e7f [formerly 154c132ae4]
Former-commit-id: c84829347f
2013-11-05 15:57:00 -06:00
Nate Jensen
72dceb2918 Merge "Issue #2250 refactor JUtil to be less dependent on certain elements, make DAF easier to use" into development
Former-commit-id: 90c895ed1a [formerly 0251b0fc44] [formerly 02dad36407] [formerly 90c895ed1a [formerly 0251b0fc44] [formerly 02dad36407] [formerly 8c4d84c429 [formerly 02dad36407 [formerly 2192c52604b66e1a675c005c4bb9d972a166f5fb]]]]
Former-commit-id: 8c4d84c429
Former-commit-id: 599602729c [formerly 90bc290c33] [formerly f6fa5cb4e5df65c4b0fc7ad8a42711fff7f94d51 [formerly 59126bf527]]
Former-commit-id: d751985745fa77f6ea748b820108edb6a8c8c07d [formerly 68d0c9e726]
Former-commit-id: cb282cc273
2013-11-05 15:56:13 -06:00
Nate Jensen
02fdb50918 Merge "Issue #2520 - Update rpm query calls" into development
Former-commit-id: c846df9697 [formerly f5440862f3] [formerly 183f46df4b] [formerly c846df9697 [formerly f5440862f3] [formerly 183f46df4b] [formerly 76d21878e4 [formerly 183f46df4b [formerly d1234253ea620effba3f7bdb32f3e478562da92d]]]]
Former-commit-id: 76d21878e4
Former-commit-id: 8035a69b64 [formerly 131e6c803f] [formerly 8737a75125579709844d32b9db60c1910275a9a1 [formerly e604ea08f6]]
Former-commit-id: d8d8c9e937eea69cdef73530c9aee90b9f1d7edf [formerly 701fd08dd1]
Former-commit-id: 10e392a7e3
2013-11-05 15:55:57 -06:00
Richard Peter
47a5809924 Merge "Issue #1679 Minor changes to support custom registry query plugins" into development
Former-commit-id: 0bacb2f6c2 [formerly f3e6ed22b2] [formerly 962b21efa1] [formerly 0bacb2f6c2 [formerly f3e6ed22b2] [formerly 962b21efa1] [formerly 82ad286653 [formerly 962b21efa1 [formerly 1c367816d3acbdbef01b4889a85e35abaf6623e4]]]]
Former-commit-id: 82ad286653
Former-commit-id: d12258b80a [formerly 6f24910797] [formerly 2bf8a5aa179a0c9478cbd7b84c4dbed94a3ca5c0 [formerly 48ccfe2cd8]]
Former-commit-id: 740a9aec3807f158d3b165a44f81cde120298143 [formerly 69dccad4be]
Former-commit-id: ab072bf5f0
2013-11-05 15:50:34 -06:00
Richard Peter
8d283ef464 Merge "Issue #2494 Changed logging structure in DD" into development
Former-commit-id: 2f1d004e1e [formerly 14cd82a6b8] [formerly df4e003cf3] [formerly 2f1d004e1e [formerly 14cd82a6b8] [formerly df4e003cf3] [formerly 462ed0141a [formerly df4e003cf3 [formerly fbf54761279f40b3553b1d5d1c77f6129de18cb4]]]]
Former-commit-id: 462ed0141a
Former-commit-id: 0f1d3e4e82 [formerly 888f3383e3] [formerly 1120192979610914230a38e6a1fc7f0dde2161b3 [formerly d787096ee8]]
Former-commit-id: c0778fbb460bfa59bf3564e0db9d34cfca54c346 [formerly 0888991d6c]
Former-commit-id: 0c7859f720
2013-11-05 15:50:17 -06:00
Dave Hladky
04e5a53386 Issue #2521 DatasetMetaData URL update failure for point data.
Change-Id: I3421bb6acdc3f44ef7341279c0b253acea2e59ea

Former-commit-id: 96ea2d36b6 [formerly bade1cd3bd] [formerly 0a331e84ed] [formerly 96ea2d36b6 [formerly bade1cd3bd] [formerly 0a331e84ed] [formerly ef1efac63c [formerly 0a331e84ed [formerly 4821b94172554f98496a59f0d688a3edb5a43a63]]]]
Former-commit-id: ef1efac63c
Former-commit-id: 0b45a7a439 [formerly 8f459c229f] [formerly 0f57eef863b63bcc36dd3d3eddc5e25a2e8ab3ac [formerly 100786338a]]
Former-commit-id: 7a33d0e6e20b4b3dbeb5e23f1c01ab4a928383a1 [formerly dc4e4ac4d0]
Former-commit-id: d41abda3c8
2013-11-05 15:19:42 -06:00
Greg Armendariz
2a365a1c76 Issue #2520 - Update rpm query calls
Change-Id: I2fc1ac0fa8b9e199149fd2db3ab25bac9ba90024

Former-commit-id: 4bce15db12 [formerly 67ae7d2244] [formerly 62324b5194] [formerly 4bce15db12 [formerly 67ae7d2244] [formerly 62324b5194] [formerly b078f57dc7 [formerly 62324b5194 [formerly 95c604d179e14d110e0782a5a911f8b6d5104941]]]]
Former-commit-id: b078f57dc7
Former-commit-id: 403fa63efd [formerly 9959fe56ae] [formerly d4116fc6b4626874796f71816cf22b488b6628df [formerly f125f963b3]]
Former-commit-id: feb4196537e2e11c66da3b64b721548e61419d14 [formerly 2c581c0c73]
Former-commit-id: bb2f387371
2013-11-05 13:30:01 -06:00
Matt Nash
e8bf713df2 Issue #2250 refactor JUtil to be less dependent on certain elements, make DAF easier to use
Change-Id: Ic89f4669529ac13f3c69ede8553cf57bbfd73760

Former-commit-id: 312ec66384 [formerly dc160577cc] [formerly b3573e90c9] [formerly 312ec66384 [formerly dc160577cc] [formerly b3573e90c9] [formerly c2d6c2af41 [formerly b3573e90c9 [formerly 48c392d8000d8cc3a5c8371319fddd776566ef32]]]]
Former-commit-id: c2d6c2af41
Former-commit-id: d41115860f [formerly 8d3cf15469] [formerly 53e526c2f13fdf394ffb581d1c56b5b036a55a63 [formerly a3ec6e58f5]]
Former-commit-id: 6eeffd4b2e522a3cd13333efb9630fa550620ceb [formerly ca4f824b37]
Former-commit-id: 054cf29e4b
2013-11-05 12:27:12 -06:00
Benjamin Phillippe
bc1d84e229 Issue #1679 Minor changes to support custom registry query plugins
Change-Id: I8ae98c80c243b710179e605a0ad1db302e86921b

Former-commit-id: bf7de26703 [formerly 0fa6977442] [formerly 08706e9a94] [formerly bf7de26703 [formerly 0fa6977442] [formerly 08706e9a94] [formerly 6a3fc6c059 [formerly 08706e9a94 [formerly 85e2b4a7717e24983b417a930402a8095d0c6021]]]]
Former-commit-id: 6a3fc6c059
Former-commit-id: dfdbf93ab2 [formerly cafe62bf4c] [formerly 38f8b3c5acc50c9c911e49d2ae3305899cd7d612 [formerly 7f37efd83a]]
Former-commit-id: 0599deef552f5b096c0b3bc73fb9887a89b6c370 [formerly a87445ba09]
Former-commit-id: 7db190aca8
2013-11-05 10:50:47 -06:00
Dave Hladky
27247d0150 Issue #2516 Remove classes causing WCS to not compile.
Former-commit-id: 98dc28b271 [formerly f7a742dddf] [formerly 8245ffd968] [formerly 98dc28b271 [formerly f7a742dddf] [formerly 8245ffd968] [formerly 66085bc43b [formerly 8245ffd968 [formerly 66955c6af6c40067f4bf1fb7917ad59951f007e1]]]]
Former-commit-id: 66085bc43b
Former-commit-id: 7f82567897 [formerly 5db75b194d] [formerly 3ab4593c75697e2f1b883c9d016794aa80e06419 [formerly 5062e96e7c]]
Former-commit-id: ad5763f76fdd4684009068d0090d35f6301de44c [formerly 25a94d9483]
Former-commit-id: 55aaeb5f6f
2013-11-05 10:25:53 -06:00
Richard Peter
06d2574f04 Merge "Issue #1538 Moved data delivery specific web services out of registry plugins -- Added registry federation admin page -- Made registry service clients non-static" into development
Former-commit-id: f2919db4e8 [formerly 311c749cb2] [formerly bed067dc4e] [formerly f2919db4e8 [formerly 311c749cb2] [formerly bed067dc4e] [formerly 3d293fce88 [formerly bed067dc4e [formerly 44665bcb3b4745532ce0febf26a6b5a000e1a0bc]]]]
Former-commit-id: 3d293fce88
Former-commit-id: c2a0e9f6b1 [formerly b442f6c3fa] [formerly a6caa3d19afcbe528bd1125fdd02d97ed47dab15 [formerly c70e6f127b]]
Former-commit-id: df6c76147c89143e7cfd707149165191bd1c92b5 [formerly 25ffcdf751]
Former-commit-id: 07500c21d8
2013-11-05 10:09:42 -06:00
Nate Jensen
77af40049b Merge "Issue #2472 Replacing lost commit" into development
Former-commit-id: 0a64209482 [formerly ab969fde67] [formerly 68e60576dc] [formerly 0a64209482 [formerly ab969fde67] [formerly 68e60576dc] [formerly f595fc9bb3 [formerly 68e60576dc [formerly 82513b3d8d53a089f9884e0922de5e8ebdc26a37]]]]
Former-commit-id: f595fc9bb3
Former-commit-id: df5e99425d [formerly 7fb0844a84] [formerly 18e2570f35f96550538b024e247026d93639993d [formerly 6f29a5f7a0]]
Former-commit-id: 32211750e106628f8c0b760381d61f6a059fe3b3 [formerly 4be0b1a196]
Former-commit-id: 60d1b1e3e5
2013-11-04 16:53:17 -06:00
Dave Hladky
fdf3928bf9 Issue #2494 Changed logging structure in DD
Former-commit-id: 5887e2ae3c [formerly 042f5213f3] [formerly cbe4572b65] [formerly 5887e2ae3c [formerly 042f5213f3] [formerly cbe4572b65] [formerly 180cf8b770 [formerly cbe4572b65 [formerly ddefe46379c9603bc4c8b603793c5053bce2b476]]]]
Former-commit-id: 180cf8b770
Former-commit-id: daaea66bef [formerly 5ae6480a78] [formerly a910fd84a65de0665ed7afd15e2f9c63f144e28a [formerly 32abcfccd2]]
Former-commit-id: 6df87dc9000daee651033a4e0760102c8b26c0c0 [formerly f94d3eafd3]
Former-commit-id: 061594260a
2013-11-04 16:35:49 -06:00
Dave Hladky
02a0a1170c Issue #2472 Replacing lost commit
Former-commit-id: a6182c2af0 [formerly 62d08dbe93] [formerly 1f1469fe82] [formerly a6182c2af0 [formerly 62d08dbe93] [formerly 1f1469fe82] [formerly 9c6a430d40 [formerly 1f1469fe82 [formerly 7c1f7ad737361b55e85bdf48dad24c7a60b36e99]]]]
Former-commit-id: 9c6a430d40
Former-commit-id: aaa709a11d [formerly 2a2b35d62c] [formerly 5ba22e77f9a88fb32b78daae0e95bb5adceda6ea [formerly 47b946fc3b]]
Former-commit-id: ded942728a3b08cb39f24160cce93702bdc3e92e [formerly d5a1042ba3]
Former-commit-id: 5eefed071f
2013-11-04 16:24:14 -06:00
Ron Anderson
b43d1ea112 Merge "Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization." into development
Former-commit-id: 0c45807d11 [formerly 196e2fc2d1] [formerly 8e1c3a80a7] [formerly 0c45807d11 [formerly 196e2fc2d1] [formerly 8e1c3a80a7] [formerly 8ecd11fe71 [formerly 8e1c3a80a7 [formerly 1caad52e03dfddb4e3c64fff79d5b6aca9c73a6f]]]]
Former-commit-id: 8ecd11fe71
Former-commit-id: adbe3c511c [formerly 20e455c431] [formerly cd7dd37b55235c539cc6af0609aee88341b550b7 [formerly 844146fcd7]]
Former-commit-id: 0bb3819e3395ea19d80c15b7efe19222bc655815 [formerly a04c8c3536]
Former-commit-id: d01be57d35
2013-11-04 15:55:36 -06:00
Ron Anderson
d5d154772b Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization.
Change-Id: I0edcf4e113f7226650a8363a3d7f0225f482c8f8

Former-commit-id: 950fc4f17d [formerly a5820f8ddf] [formerly b6eb0df14c] [formerly 950fc4f17d [formerly a5820f8ddf] [formerly b6eb0df14c] [formerly 9a737b2d4a [formerly b6eb0df14c [formerly fe6f8beb1174e605a1935899eb2e5ad6d1babd57]]]]
Former-commit-id: 9a737b2d4a
Former-commit-id: e9771d375e [formerly 99a63bc182] [formerly 7116ac3154251e73e3e8c936fce97daf3822c787 [formerly 833e84b5b8]]
Former-commit-id: 06ce391d05008392f1598c3bedf9f1390edacbd4 [formerly 559f1e56f7]
Former-commit-id: 846d4001b4
2013-11-04 15:22:32 -06:00
Nate Jensen
ec5482009d Issue #2361 remove ISerializableObject from redbook and hydro
Change-Id: Ib48dea5d734f19a9919da9fea752b5e0f38a2141

Former-commit-id: 16074e6a14 [formerly 27f09b8096] [formerly 6064000389] [formerly 16074e6a14 [formerly 27f09b8096] [formerly 6064000389] [formerly b36d28c9fd [formerly 6064000389 [formerly 2626a79c976ac016352a091bdf66890e929edc85]]]]
Former-commit-id: b36d28c9fd
Former-commit-id: 3cfb49215f [formerly 5d2ec98600] [formerly e86e430428d15356370e7a0929a62a10de34aaa1 [formerly 3e3400dc7c]]
Former-commit-id: 2c3aadd73710a197c7d25f5c10c535419d7755b1 [formerly 27b1f123f0]
Former-commit-id: f15331607d
2013-11-04 14:30:00 -06:00
Nate Jensen
e2421889af Issue #2361 remove XML annotations from bufrmos
Former-commit-id: e7f7b77e3c [formerly b1409d4002] [formerly 9b9d57bc94] [formerly e7f7b77e3c [formerly b1409d4002] [formerly 9b9d57bc94] [formerly 1a25186415 [formerly 9b9d57bc94 [formerly f6a873e20e4cb7ce6fb47654ce3292b4f3bab99e]]]]
Former-commit-id: 1a25186415
Former-commit-id: 73117fd1ce [formerly 173bff3eb8] [formerly 5eae392eb0ff88203cd5c173328a6f33e1e2156c [formerly b2847dd446]]
Former-commit-id: fbca2b170b41c30a43dbb4cdcda61022e00eec41 [formerly e1ecfb468a]
Former-commit-id: 7f50ec893e
2013-11-04 13:34:01 -06:00
Ben Steffensmeier
4dfe17eca2 Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: c91c0d3f1a [formerly d386c6bc76] [formerly ff5f08d23a] [formerly c91c0d3f1a [formerly d386c6bc76] [formerly ff5f08d23a] [formerly 5a928e6ad5 [formerly ff5f08d23a [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]]]
Former-commit-id: 5a928e6ad5
Former-commit-id: dd2bb59742 [formerly d38879158d] [formerly c694721b6dae8a56fdf9390a3bc7d8934e8b3711 [formerly 08e73de883]]
Former-commit-id: 6bf4ce1b85d10c2151244620ecdee96d3fb2244e [formerly a0f4c08cfd]
Former-commit-id: dacf863d66
2013-11-04 13:01:49 -06:00
Nate Jensen
0648e10011 Merge "Issue #2361 remove XML annotations from TAF and CCFP" into development
Former-commit-id: 2ee0cfe872 [formerly 8688681a8a] [formerly a72197e828] [formerly 2ee0cfe872 [formerly 8688681a8a] [formerly a72197e828] [formerly 3ef349882c [formerly a72197e828 [formerly 0a74b17463864bb9fb50b4e9450592b04a4dd481]]]]
Former-commit-id: 3ef349882c
Former-commit-id: c8e354e52a [formerly 823de65f07] [formerly e0223b638af06335d366d69114aeb47d9cfde773 [formerly 6bab0640a7]]
Former-commit-id: b5f611f62bb168b475509332b2b6fd682e38c08a [formerly bdadadec83]
Former-commit-id: 3e4f5cdc53
2013-11-04 11:48:04 -06:00
Lee Venable
df31e0e089 Merge "Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler." into development
Former-commit-id: 04c2b7d6a8 [formerly bfc83fa74e] [formerly 0b3346d699] [formerly 04c2b7d6a8 [formerly bfc83fa74e] [formerly 0b3346d699] [formerly 3e7b7cec8f [formerly 0b3346d699 [formerly 325439c2d4243f775d3ccb8af7f332bf13d4aad0]]]]
Former-commit-id: 3e7b7cec8f
Former-commit-id: 07e89ee05d [formerly c7d03bf267] [formerly 608f6b9d8262abfc44e2d399f8c52580ba4437af [formerly f6f1b16c0c]]
Former-commit-id: 0c17348ed817ee9581a108ac2cd15b5da9890b49 [formerly 52da34fc55]
Former-commit-id: ade7b14670
2013-11-02 10:43:48 -05:00
Slav Korolev
ca6efe6484 Issue #2431. Changed labels on the table.
Former-commit-id: 858b167938 [formerly 8874f76878] [formerly dd1ff63737] [formerly 858b167938 [formerly 8874f76878] [formerly dd1ff63737] [formerly 0801f8dedd [formerly dd1ff63737 [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]]]
Former-commit-id: 0801f8dedd
Former-commit-id: 4b225552e2 [formerly 6b3481ca26] [formerly 77ecd7c42b3304b4ff77b15d1213ecb427f5661a [formerly 7d0198b356]]
Former-commit-id: 5146d816bee2418137c01850b925e11cdce09d47 [formerly f8e429a1b9]
Former-commit-id: e4a2b6d619
2013-11-01 15:06:19 -04:00
Nate Jensen
a7846af6d0 Issue #2361 remove XML annotations from TAF and CCFP
Former-commit-id: bc61b966b0 [formerly c52c207c80] [formerly 942936e815] [formerly bc61b966b0 [formerly c52c207c80] [formerly 942936e815] [formerly cd49daccf9 [formerly 942936e815 [formerly 2587a9b13ec6576007081a165f6042dd5a82b7eb]]]]
Former-commit-id: cd49daccf9
Former-commit-id: 97ddb715af [formerly a6cfeb5626] [formerly 88bb0c0a4afa8b6b966ef66dfd8c75302ba2c2cb [formerly d935c4f547]]
Former-commit-id: c241139fa71f916cb26400e739096ef94c514689 [formerly 6dafd588d0]
Former-commit-id: 1d8522d45d
2013-11-01 13:19:28 -05:00
Nate Jensen
2d337c30bb Merge "Issue #2361 move ebxml away from using SerializationUtil for XML processing" into development
Former-commit-id: eb504de3a0 [formerly 1ac6a4ea18] [formerly 7156ac5d4f] [formerly eb504de3a0 [formerly 1ac6a4ea18] [formerly 7156ac5d4f] [formerly 6fac918395 [formerly 7156ac5d4f [formerly 84226cbd63d12c6c1624dfc1dd72b42360d0e54d]]]]
Former-commit-id: 6fac918395
Former-commit-id: 064fa413cf [formerly 8c3eb7612c] [formerly 9d0ec1d71c57a9298742cd4dc01ef04de0897694 [formerly b5d457f566]]
Former-commit-id: 0bbda3dbc6008120f19a0673634c1f1625090efe [formerly 7691a13fec]
Former-commit-id: a3cb4309d1
2013-11-01 12:27:21 -05:00
Nate Jensen
66f7549b72 Issue #2361 move ebxml away from using SerializationUtil for XML processing
Change-Id: I04decec05b44a9c1881963f1a902adf6742aafa9

Former-commit-id: 37eaab4490 [formerly 2e28d72fb7] [formerly 2413c854c0] [formerly 37eaab4490 [formerly 2e28d72fb7] [formerly 2413c854c0] [formerly 5efd1b7218 [formerly 2413c854c0 [formerly ebf2c3c32945fefe8fd8c054b163fba238ac0ee5]]]]
Former-commit-id: 5efd1b7218
Former-commit-id: a9a4963f09 [formerly 3753b45c0c] [formerly c4286e81e6c3ef5daac753ed4597591ab4297c22 [formerly f4cdcb2fae]]
Former-commit-id: 86c0b5067bdcc4d17f2ccdab389fb0d29eb56085 [formerly 96cd52250a]
Former-commit-id: 2ee7f2e275
2013-11-01 12:09:43 -05:00
Ron Anderson
a9c8950fe6 Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly cc991ed528 [formerly 9e9dd04bfd [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]]
Former-commit-id: cc991ed528
Former-commit-id: a0f67a006f [formerly f453d92818] [formerly c1140f67ed8f586264c71a61de18f87988cedd70 [formerly deb89a88f5]]
Former-commit-id: b4e8d1a865f6177e1d0672dcd506844aafc34864 [formerly 84adff8e96]
Former-commit-id: 638b57e188
2013-11-01 11:07:39 -05:00
Dave Hladky
eba1c80d0b Issue #2292 Stopped subscriptions from checking against themselves. This prevented subscriptions from being updatable.
Former-commit-id: 07c70d72cc [formerly 1594cc6a72] [formerly e5896397f6] [formerly 07c70d72cc [formerly 1594cc6a72] [formerly e5896397f6] [formerly 422dabf3eb [formerly e5896397f6 [formerly 6edfeb94cfb14785d68d90b41fc636faa2ece074]]]]
Former-commit-id: 422dabf3eb
Former-commit-id: fd96474a8b [formerly d589bced40] [formerly c56edc32fb745fdee96b63e71aaf76cca3d28fa8 [formerly ca1f2fc340]]
Former-commit-id: b5130373dbabc32643d34913298bac79e8bc89eb [formerly 448d13c266]
Former-commit-id: b8b78939e3
2013-11-01 10:23:56 -05:00
Slav Korolev
50d1a73c83 Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: 2487e015b9 [formerly feb9d8db5a] [formerly 7ca47690af] [formerly 2487e015b9 [formerly feb9d8db5a] [formerly 7ca47690af] [formerly f7d1939b36 [formerly 7ca47690af [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]]]
Former-commit-id: f7d1939b36
Former-commit-id: 9c8b7d1e96 [formerly fcbe5d09da] [formerly 3a1615d06dc67187bd2ec2e01aff550ea0b6e6b1 [formerly 386db59985]]
Former-commit-id: f9f5e3df75e6feba297093a0bd714b22f8fc7384 [formerly 57fc9a2183]
Former-commit-id: 884ca2167c
2013-11-01 11:03:06 -04:00
Benjamin Phillippe
32725adb31 Issue #1538 Moved data delivery specific web services out of registry plugins
-- Added registry federation admin page
            -- Made registry service clients non-static

Change-Id: I9672f11b4886019dcd8834b4bae417a0aa4809ad

Former-commit-id: 311fa32377 [formerly 98b56cf02a] [formerly a7e53870fb] [formerly 311fa32377 [formerly 98b56cf02a] [formerly a7e53870fb] [formerly d8de923f8b [formerly a7e53870fb [formerly 0a67c8d68548ed8daa76d782ca3213956b984795]]]]
Former-commit-id: d8de923f8b
Former-commit-id: e9b49b288f [formerly 7cb19682c1] [formerly 628fd3115dbabe88f9d202b5257352679e5c521b [formerly 221d197c01]]
Former-commit-id: 8e5cdd4d72fc495f2978e8dd7305962714cf62b8 [formerly 73c53ed846]
Former-commit-id: c3f684e7fb
2013-11-01 09:20:00 -05:00