Commit graph

1801 commits

Author SHA1 Message Date
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
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
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
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
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
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
Dave Hladky
128a7c3854 Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires.
Change-Id: I75269bad24731990720d30683ebf5f27344661f3

Former-commit-id: f79ba58a3a [formerly 0eba787d3e] [formerly 4227f3a59f] [formerly f79ba58a3a [formerly 0eba787d3e] [formerly 4227f3a59f] [formerly 9161962813 [formerly 4227f3a59f [formerly 060e719f27c20f24bae9a5603cc51d90434b8fa4]]]]
Former-commit-id: 9161962813
Former-commit-id: ea17726866 [formerly ba31efaf03] [formerly cc3ebf4fc7bd5a908a51ab6d7ccbfde59ee5656b [formerly d55d68fe5a]]
Former-commit-id: 94e7a513a18ed9462a0201d4dece78d3907851ba [formerly 85003bf022]
Former-commit-id: e30272c56b
2013-11-01 08:23:16 -05:00
Nate Jensen
3efcc68e75 Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly 0270e6bde3 [formerly 43b2f50a0a [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]]]
Former-commit-id: 0270e6bde3
Former-commit-id: 685c6034b2 [formerly 6ed6df6ed0] [formerly 1d11102b6e40b4f27646f1cf7aba32281be912e3 [formerly 47fc100053]]
Former-commit-id: 3b5342860c273add5e1cf001ce17db765d7f54d6 [formerly 6164feb2da]
Former-commit-id: 3858434dc3
2013-10-31 18:11:13 -05:00
Ben Steffensmeier
a15afe6f6c Issue #2491 Fix collaboration Xml.
Former-commit-id: 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly fdeff81da2 [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]]
Former-commit-id: fdeff81da2
Former-commit-id: d27369f59b [formerly 89c999410e] [formerly 6d36de8b83b8bd6d75e28507dfdb4314d2a89f81 [formerly 49ffb7e92c]]
Former-commit-id: 8474d807f157d7a0e7fc99090b358e9a371bb8fe [formerly a0e805ded6]
Former-commit-id: a92af46f59
2013-10-31 14:06:37 -05:00
Ron Anderson
2b4809ead7 Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c

Former-commit-id: f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly 42e924e021 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]]
Former-commit-id: 42e924e021
Former-commit-id: dd1b50d116 [formerly 2f23072e41] [formerly e573e83de25a263065e03ab739ab5d58c0ca7fb1 [formerly eef9d2dfb0]]
Former-commit-id: 6420457c498cf2f6184538b3831ba133f0623c15 [formerly e3a0440825]
Former-commit-id: 49ea9c0444
2013-10-31 14:04:55 -05:00
Richard Peter
2baf599758 Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly b482eb2b48 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]]
Former-commit-id: b482eb2b48
Former-commit-id: 7b0ad6bacc [formerly fca3d73aa7] [formerly f7dbb5f3661236898b603e2fdf7604e44f42274a [formerly 73462fa134]]
Former-commit-id: 1019515624c081b6c221e0d3722489ce94b4ad06 [formerly 300f907c46]
Former-commit-id: ab890140fb
2013-10-31 11:46:25 -05:00
Mike Duff
e48beadbc6 Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments

Change-Id: I33df9cc7e368778943e25420d18b343781304c7a

Former-commit-id: fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly 3fc811102e [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]]
Former-commit-id: 3fc811102e
Former-commit-id: ce2afdf1b3 [formerly b0c54d7c17] [formerly ac9b1be9e56f34d03174be87fbb48c2a6a187cdc [formerly 4da0648461]]
Former-commit-id: ece01cf9cf7d6b3d925c922f4d1d6fe84edf0f17 [formerly 26ca1b4d72]
Former-commit-id: 5ff3fe2791
2013-10-31 09:22:50 -05:00
David Gillingham
c7e966b43e Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.

Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c

Former-commit-id: ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 297fd6c3d4 [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 2ddacaea30 [formerly 68b0b2e3db] [formerly 0f0aefb2c1b9d5dfbee8cd33020b863e61f2b01f [formerly 996817f124]]
Former-commit-id: 88b3c16c68fc66755ed20e6b4157548ca26d3124 [formerly eef2c93d6c]
Former-commit-id: 75acd532a1
2013-10-30 11:34:46 -05:00
Nate Jensen
86eed97dac Merge "Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code" into development
Former-commit-id: 79eb4d400a [formerly 411b909107] [formerly d92bd5b69a] [formerly 79eb4d400a [formerly 411b909107] [formerly d92bd5b69a] [formerly 62a5739feb [formerly d92bd5b69a [formerly 05de1d88cdc4841483864a623346ad16b015d395]]]]
Former-commit-id: 62a5739feb
Former-commit-id: 937981d2f9 [formerly 90d99fe627] [formerly 9bd9983d48f00002ef7fd475ecf0bf5a3403c4c1 [formerly 5c4d8b4310]]
Former-commit-id: 5bb580041f80eda58be2a045874066d9241a9953 [formerly 68658bf885]
Former-commit-id: fdb54d5810
2013-10-30 11:28:58 -05:00
Brad Gonzales
5442f43210 Issue #2267 Removed java.nio.file dependencies from FilenameFilter.
Change-Id: I6af1cafe17609a6468a7805ccab61b28ecc0a733

Former-commit-id: 95afe3cd1e [formerly 433ee7d942] [formerly 011c42b806] [formerly 95afe3cd1e [formerly 433ee7d942] [formerly 011c42b806] [formerly 057ba113b5 [formerly 011c42b806 [formerly 36571478911119efe7195d51f6c820d6e745ccee]]]]
Former-commit-id: 057ba113b5
Former-commit-id: d1d0dc770e [formerly 3c0bd6db16] [formerly 65615958da30edfa31cf83debed3017ef1f056db [formerly 9325d477a9]]
Former-commit-id: 4c8ee2bdc7d28f6fb8e681a48e9619289c46c73b [formerly 759c3b2cef]
Former-commit-id: 7be6923520
2013-10-29 17:04:00 -05:00
Brad Gonzales
2c902ab8e7 Issue #2267 Remove java.nio.file dependencies from the SbnSimulator. Fixed handler setting for UFStatus in test env.
Change-Id: I8245eef53573b6596546e17a7900a1538455cee2

Former-commit-id: 250730c308 [formerly ac8136bd82] [formerly f1480cfc62] [formerly 250730c308 [formerly ac8136bd82] [formerly f1480cfc62] [formerly 6bc585aaf6 [formerly f1480cfc62 [formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]]]]
Former-commit-id: 6bc585aaf6
Former-commit-id: bf1d2cb85a [formerly 47690ea8d0] [formerly 3ebdb55d0083b9e2bf2524a8b3b7cd9acaf899a2 [formerly aeccaa2329]]
Former-commit-id: 9142f489480470f702fc2b3671eb72d8c6bfc6e1 [formerly 3b2127c103]
Former-commit-id: af7e9dd4ef
2013-10-29 15:10:20 -05:00
Nate Jensen
89b3b81ab3 Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]]
Former-commit-id: 6880a18f1a
Former-commit-id: dced4c4d11 [formerly 19043faeaa] [formerly df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e]]
Former-commit-id: 15fd50423e5c76bf2d7d7f54653759492ef97c8d [formerly e8c199f108]
Former-commit-id: f2184b9379
2013-10-29 14:33:53 -05:00
Dave Hladky
35b2feb1f3 Issue #2361 Moved to private JAXB
Former-commit-id: c863bb2c97 [formerly be351c82ed] [formerly 5b5e1ca293] [formerly c863bb2c97 [formerly be351c82ed] [formerly 5b5e1ca293] [formerly 33a0890d31 [formerly 5b5e1ca293 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]]]]
Former-commit-id: 33a0890d31
Former-commit-id: fab58a547c [formerly 3eff51897b] [formerly 6708b8f73ec0bd3504932f11002f618a7640713b [formerly b55b05fa8b]]
Former-commit-id: ba45b80971f8793e70e8c68f88baa52539e1a3e3 [formerly b5e892c16e]
Former-commit-id: cec7d35505
2013-10-29 13:45:05 -05:00
Dave Hladky
beee858d72 Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: 91e69b800d [formerly f5b9d3be39] [formerly 6cb541d1a1] [formerly 91e69b800d [formerly f5b9d3be39] [formerly 6cb541d1a1] [formerly 15aed68c02 [formerly 6cb541d1a1 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]]]]
Former-commit-id: 15aed68c02
Former-commit-id: ba1de528c3 [formerly b5e309f973] [formerly 0423445a8ccf01b94283305bba59e4481390d48e [formerly a8ab9072cc]]
Former-commit-id: 7ee18cf5142219fe531e31224b5735ba2e4b8bd8 [formerly 072fa5de62]
Former-commit-id: 90d3c540a6
2013-10-29 13:05:47 -05:00
Nate Jensen
aa404f688d Merge "Issue #2361 Harvester JAXB fixed up" into development
Former-commit-id: e38de1ea51 [formerly c45f619260] [formerly a5f2414070] [formerly e38de1ea51 [formerly c45f619260] [formerly a5f2414070] [formerly 4879c19e0b [formerly a5f2414070 [formerly 2421a960399e6deeb911cf25f968e6eead666bd6]]]]
Former-commit-id: 4879c19e0b
Former-commit-id: 7ab5fe0249 [formerly 96c901b958] [formerly 78c6fcd26016e4e02e9043303063932ef64058c0 [formerly 4929a59b3e]]
Former-commit-id: b6bc982d0a5ee6e24e7db4cf785f029a2bcd0a04 [formerly cbe8c35605]
Former-commit-id: f377a942fa
2013-10-29 12:31:08 -05:00
Dave Hladky
04f84889d0 Issue #2361 Harvester JAXB fixed up
Former-commit-id: daf770c215 [formerly 1deca13487] [formerly 70d2ad2cdc] [formerly daf770c215 [formerly 1deca13487] [formerly 70d2ad2cdc] [formerly bcfa7d7a8f [formerly 70d2ad2cdc [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]]]]
Former-commit-id: bcfa7d7a8f
Former-commit-id: 8e3023b575 [formerly 1a889e84b1] [formerly 4a4db7d882a3b343c5cb1266afa5a2391bddced2 [formerly c5137923c0]]
Former-commit-id: 274ae1d3799435ba4fd3f169d0b7cd96b97db8f6 [formerly 64a9973089]
Former-commit-id: 0d562b64fd
2013-10-29 12:20:53 -05:00
Richard Peter
e97a563366 Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: f5208d359a [formerly 6cdbad069a] [formerly 1d85220363] [formerly f5208d359a [formerly 6cdbad069a] [formerly 1d85220363] [formerly 1b7b6f0134 [formerly 1d85220363 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]]]]
Former-commit-id: 1b7b6f0134
Former-commit-id: e5ae2ac89f [formerly 4b612a3fa0] [formerly 0cd653cbbf4d6de4d91974c87380cb964aeb3f6f [formerly c27c764c61]]
Former-commit-id: 5434f1ea5812c8edd641cbe3b74d006b0a8ed158 [formerly 3d812fdeb9]
Former-commit-id: 6ba24ad909
2013-10-29 12:18:55 -05:00
Richard Peter
573ca1001f Merge "Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager" into development
Former-commit-id: 767cbbf4f2 [formerly 5f1c6f5625] [formerly f75b431a40] [formerly 767cbbf4f2 [formerly 5f1c6f5625] [formerly f75b431a40] [formerly 89b992c01c [formerly f75b431a40 [formerly 5b492459c0156a49eb12dea54a38ecec532fb58d]]]]
Former-commit-id: 89b992c01c
Former-commit-id: 4386e3b451 [formerly 66d7ccb859] [formerly e5e56997f9e05d9ac3a79690595406c220de7aa3 [formerly c56806b9b7]]
Former-commit-id: cb5d0cecaa758ef70657cd278220a27ea64c5e62 [formerly e4b3ff9029]
Former-commit-id: 74d2e4189c
2013-10-29 12:17:14 -05:00
Richard Peter
75ed6cd788 Merge "Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box." into development
Former-commit-id: 8b8f09f176 [formerly bfc87a0607] [formerly fe45d2b7e6] [formerly 8b8f09f176 [formerly bfc87a0607] [formerly fe45d2b7e6] [formerly b6ffed0066 [formerly fe45d2b7e6 [formerly ef99656b07406288bf419037b05e85a5cf5771d6]]]]
Former-commit-id: b6ffed0066
Former-commit-id: b4c3c775f6 [formerly 5baa99e9c9] [formerly d90ab5bca99a3ce62195970bf8966d8c71b5ec87 [formerly 4765eaefad]]
Former-commit-id: a1d272f4a32086548120bb113252741efc701345 [formerly f1d5148c49]
Former-commit-id: 5ee9b1ce9d
2013-10-29 12:15:35 -05:00
Ben Steffensmeier
1270a5862d Issue #2489 Fix SfcObs NPE.
Former-commit-id: 4f29903ddc [formerly 59d8afc639] [formerly f9ee49fac5] [formerly 4f29903ddc [formerly 59d8afc639] [formerly f9ee49fac5] [formerly ddf506ceac [formerly f9ee49fac5 [formerly 3013c7d2bbf38ab9c27491eb3cade83eaafc35aa]]]]
Former-commit-id: ddf506ceac
Former-commit-id: 552f33af6e [formerly 32427d8b3d] [formerly d7e2058fb64a230ba953b4f8ca0bc8b0b881fbe4 [formerly ca5a125829]]
Former-commit-id: d6ba06d23f105cfc8f54f5aa5fa5ceda635d3600 [formerly bab495ab35]
Former-commit-id: f7f75c86da
2013-10-29 10:59:36 -05:00
Bryan Kowal
71a8ee5a68 Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: 90a54524c6 [formerly df575b7be1] [formerly a6d7822698] [formerly 90a54524c6 [formerly df575b7be1] [formerly a6d7822698] [formerly cda8d04831 [formerly a6d7822698 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]]]
Former-commit-id: cda8d04831
Former-commit-id: 3e68d9aaac [formerly 27d2e33769] [formerly 3fa0f0dac5587960c496629c316aa2a1a2f464bc [formerly cc0f6832c9]]
Former-commit-id: 822576469c2608f5a2fcb3645efe10ba1e12bfce [formerly 2615ad7324]
Former-commit-id: 819cb0bcb7
2013-10-28 14:50:28 -05:00
Ron Anderson
b0f0709755 Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 306a5d72f4 [formerly 3575496955] [formerly 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1]]
Former-commit-id: 53c38fe54d2869c9707556e4244b69af6f55a908 [formerly 1daa0f8649]
Former-commit-id: 643624f1a9
2013-10-28 12:59:44 -05:00
Ben Steffensmeier
5ac77f7f76 Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]]
Former-commit-id: 44a6f05986
Former-commit-id: 2400380daf [formerly 0e3cf8b47f] [formerly 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]]
Former-commit-id: d4c767bc5d9a92f47044beb03900b35fdf1a24a2 [formerly 0c3bb6ef3e]
Former-commit-id: 47d3fb8249
2013-10-28 10:14:08 -05:00
Nate Jensen
f76f5e9257 Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: fa1bd6b2a4 [formerly 8aa02150c4] [formerly ca27ae050bf35e88c84ec39cb3554276213a3fe7 [formerly aa0e2ca80a]]
Former-commit-id: 0b16e90747665fb5bad2de4fb36673726f33e59a [formerly 2741cb4348]
Former-commit-id: 8feeb6be16
2013-10-28 09:07:04 -05:00
Ben Steffensmeier
20d9922f17 Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: 694511af94 [formerly 4eea088717] [formerly ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456]]
Former-commit-id: 122ec98ee5a18fcf8773f9c00abd54bcb37bbc42 [formerly 5645da0b45]
Former-commit-id: ddd58aa99c
2013-10-25 15:50:10 -05:00
Nate Jensen
8e6b5e9e9c Issue #2361 remove ISerializableObject from harvester plugin
Former-commit-id: 2903ad6e2b [formerly 540d0ee576] [formerly 5f457fbad6] [formerly 2903ad6e2b [formerly 540d0ee576] [formerly 5f457fbad6] [formerly 68150f49ef [formerly 5f457fbad6 [formerly f80e24871b5fb2e6f990cc099532adfcb802ae13]]]]
Former-commit-id: 68150f49ef
Former-commit-id: 7b789fed6f [formerly 403ba0f9cb] [formerly 05df7516efbadb27700857f955931c8c7e2bf6fe [formerly 2002f94568]]
Former-commit-id: 0422f932ce46aaef20084e9af3ff45c5a690a599 [formerly c2f1e3f838]
Former-commit-id: 8cb574a419
2013-10-24 20:06:08 -05:00
Nate Jensen
e95a9d9144 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]]
Former-commit-id: 5a99163569
Former-commit-id: 264555b5d7 [formerly b511177fa1] [formerly 4719aa1e26e1f8f1e10b15401b23c42814a2069f [formerly cf63b37257]]
Former-commit-id: aa9fcf1acc90fd6b11cfb0a4d5eca4720d7a4f65 [formerly c4161d09ba]
Former-commit-id: 213478f84b
2013-10-24 20:02:18 -05:00
Nate Jensen
b9dcdb5c57 Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
Former-commit-id: c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly b1244552e4 [formerly b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]]
Former-commit-id: b1244552e4
Former-commit-id: e6e0942d70 [formerly 3a1856b168] [formerly 7e842a91bf165a8db2e89fabd3906c256ec6db0e [formerly 803c9a8217]]
Former-commit-id: 644254ee88425258cfd9ef4563cdae5a400c8634 [formerly 9b582b0d83]
Former-commit-id: 9dc852ba9c
2013-10-24 19:52:13 -05:00
Nate Jensen
38b3b9aa7c Merge "Issue #2454 Ice model, general ensemble model troubles, null cycle times" into development
Former-commit-id: 5e54da3258 [formerly b2cdbd6fc5] [formerly 5d96feb00e] [formerly 5e54da3258 [formerly b2cdbd6fc5] [formerly 5d96feb00e] [formerly 298114500c [formerly 5d96feb00e [formerly 58686a03e01b6d151b3774bd63ee55b0276b1880]]]]
Former-commit-id: 298114500c
Former-commit-id: d21d7c5283 [formerly 39e7b0fd95] [formerly 251c8ae97f34417aa2812c59e32158d427e4285e [formerly fc1898234d]]
Former-commit-id: 1132a61d15ce06b66c1ae9e4f6b2a86199c6bf77 [formerly 797002f959]
Former-commit-id: f73752af0e
2013-10-24 19:51:49 -05:00