Commit graph

4355 commits

Author SHA1 Message Date
Richard Peter
753bb7d8ba Issue #2051: Fix Shef PurgeText
Change-Id: I7c72b69c9e0088943c279c824dfc5784d0f9baac

Former-commit-id: ad487befc7 [formerly c0c4dad633] [formerly 97fe8bd24b] [formerly a2028de5bc [formerly 97fe8bd24b [formerly f6d47991f62e99fa72ffafc2b6175eff8a0a83ac]]]
Former-commit-id: a2028de5bc
Former-commit-id: f6c2eea47423468305e8de35fb818c7b24ded26e [formerly 86d08ef574]
Former-commit-id: f75acec79c
2013-12-03 11:41:22 -06:00
Richard Peter
14ed9331d3 Issue #2170: Update Plugin Notification Framework
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277

Former-commit-id: f2d99af20e [formerly 5905c5d08d] [formerly 2085a9cd33] [formerly fbda83aeb9 [formerly 2085a9cd33 [formerly 081a19d5cfca3d717a332357dbaead199767e0b8]]]
Former-commit-id: fbda83aeb9
Former-commit-id: 92cc0eed5d5ca22d3b43329858c1619c9363e66a [formerly f7f9a4e57c]
Former-commit-id: 670e63d0dd
2013-12-03 11:41:21 -06:00
Nate Jensen
38c40514e6 Merge "Issue #2573 safer and faster progressive disclosure" into development
Former-commit-id: cc32c128f2 [formerly b8116e6724] [formerly ece38c85c0] [formerly 2daf0f2691 [formerly ece38c85c0 [formerly 2be1427cdcd61d47a5463f6e4e85910200fda931]]]
Former-commit-id: 2daf0f2691
Former-commit-id: 7e05c5f491df89f47bf393e694a7be30c7d2023e [formerly a5cf904e1f]
Former-commit-id: b6e54e2709
2013-12-03 09:41:02 -06:00
Lee Venable
2ad5976b0b Merge "Issue #2387. Added system status refresh." into development
Former-commit-id: 9ddd43be62 [formerly 8de2238748] [formerly deb003184f] [formerly 7109e994da [formerly deb003184f [formerly 3bb2756cd854c029d0656803efdcc686ccbae01f]]]
Former-commit-id: 7109e994da
Former-commit-id: a85eade7e9608af89c4b4f1956ac0d384b52c311 [formerly 883b960f48]
Former-commit-id: 3335ef660c
2013-12-03 09:05:04 -06:00
Nate Jensen
d035dbc831 Issue #2573 safer and faster progressive disclosure
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd

Former-commit-id: ccf897af6f [formerly 5c80b34e16] [formerly c0140fa0d91182080c96b83ad820144fcddbba66 [formerly 622cc1b223]] [formerly 90d6b5bd74 [formerly 622cc1b223 [formerly 36621eb21598f3730d0aa88973932e877367fecf]]]
Former-commit-id: 90d6b5bd74
Former-commit-id: dd9050e05479911da92df93995a1c5e0aaf757e8 [formerly e40c71acd1]
Former-commit-id: e5cfe76cac
2013-12-02 17:28:09 -06:00
Richard Peter
212fccb765 Merge "Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup VAA and remove dataURI" into development
Former-commit-id: daab4cdf27 [formerly 829744ced9] [formerly 10f32b5fc7] [formerly 02b11b3509 [formerly 10f32b5fc7 [formerly 62a6bb9b7fcf05701a26553a502cc33fc28a5c6b]]]
Former-commit-id: 02b11b3509
Former-commit-id: 2cafe53ae959bca215aefcacc88290c16da44bc2 [formerly 3113fe26cd]
Former-commit-id: 35d4e7239f
2013-12-02 16:52:40 -06:00
Nate Jensen
a25621ae6d Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup
VAA and remove dataURI

Change-Id: I984173a6e85eb7dc269fb98964af4915a9b5105e

Former-commit-id: 77c23c6d0e [formerly 9b3f871c21] [formerly 6bf1fd8d3c] [formerly 72c322c667 [formerly 6bf1fd8d3c [formerly 148e7113abefd684dcacb5ccc28bb77192ff45c8]]]
Former-commit-id: 72c322c667
Former-commit-id: 58b83a2d53b306277cdc9a0820852147a2519f74 [formerly 2831ceb356]
Former-commit-id: 476f9da5ad
2013-12-02 16:10:26 -06:00
Slav Korolev
4a2e195ea2 Issue #2387. Added system status refresh.
Former-commit-id: b9fa6d3622 [formerly b6a1724218] [formerly 1be43bc76c] [formerly f7f00b77d0 [formerly 1be43bc76c [formerly f3530467b1845a488fa0996ee7100a2dc145394a]]]
Former-commit-id: f7f00b77d0
Former-commit-id: 7af8f0fd5e64f264ed562426f6db9723c7967a2d [formerly 5e225387fd]
Former-commit-id: 3dc318418e
2013-12-02 16:14:45 -05:00
Brad Gonzales
2ac17d4f80 Issue #2541 Added exclude patterns to RequestPatterns.
Added an exclude pattern to grib.xml to exclude data delivery sbn files.

Change-Id: Id92865e1b58bdcf3744328bd0362636093a03521

Former-commit-id: 5a29ccf45a [formerly abafd2bc13] [formerly dc7e255d43] [formerly 8acfa99e77 [formerly dc7e255d43 [formerly 396a9a99863ce9a616eecde6466f1c4d43b8d566]]]
Former-commit-id: 8acfa99e77
Former-commit-id: ae02142a37272496582f2ecc88cfd8d603853aa7 [formerly dd8eb8c2b4]
Former-commit-id: f25d05d871
2013-12-02 11:44:09 -06:00
Benjamin Phillippe
615b5ce605 Issue #2534 Added reciprocated registry replication subscriptions
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27

Former-commit-id: 67f6ee0999 [formerly f4144fca06] [formerly 212bbeb379] [formerly 31b53f4ad9 [formerly 212bbeb379 [formerly 2c52a6ee6f7d491d484c423359b8440975ad6d1e]]]
Former-commit-id: 31b53f4ad9
Former-commit-id: 9bc982c030242d6a1ff819c729fdbb6438d12813 [formerly 2fa17aab7f]
Former-commit-id: 495f70a5cf
2013-11-27 12:07:59 -06:00
Nate Jensen
3eecc7fca3 Merge "Issue #2537 point data code cleanup." into development
Former-commit-id: 4d3135ae4a [formerly de593896f8] [formerly 9a4a4fba2d] [formerly d9ab670d45 [formerly 9a4a4fba2d [formerly 8ccafcec9155bdab49d4d41c3a463323946f1850]]]
Former-commit-id: d9ab670d45
Former-commit-id: 798f185f5ee43a9a59c7105331f7aa7b519c6504 [formerly 0a936e860a]
Former-commit-id: 1326b0ec0f
2013-11-26 17:48:53 -06:00
Ben Steffensmeier
b64e917cad Issue #2574 Fix conversion of null grid coverage in dataURI.
Former-commit-id: b790c592e3 [formerly e639a00fd8] [formerly 21f0abbca1] [formerly 6d14edd0a8 [formerly 21f0abbca1 [formerly 38352d01b6a4d85bd6961d791370db87d8800bf2]]]
Former-commit-id: 6d14edd0a8
Former-commit-id: fbbf2251bce73f0459ef7cb44f9d765edb9c2fce [formerly 089bdf97cb]
Former-commit-id: c300d0ee8a
2013-11-26 15:19:31 -06:00
Ben Steffensmeier
65147cfb78 Issue #2537 point data code cleanup.
Former-commit-id: 84dd9b10d6 [formerly 42107fba5c] [formerly a4e3a4a03b] [formerly 7889c14b35 [formerly a4e3a4a03b [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]]
Former-commit-id: 7889c14b35
Former-commit-id: ad0bd85eb3b2bf617012e11ec19831b5f9d526eb [formerly 62ca7b1df6]
Former-commit-id: a4e3bf34b8
2013-11-26 15:16:54 -06:00
Ben Steffensmeier
da8d574656 Issue #2574 Add DataURIFieldConverter for GridCoverages.
Former-commit-id: 7202b4a232 [formerly cf6ef77d78] [formerly 08be03d3fa] [formerly bdb0e111ea [formerly 08be03d3fa [formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]]]
Former-commit-id: bdb0e111ea
Former-commit-id: 5e670545fb6209a901b0d3032b1a1f721f3a2666 [formerly f7b1015dca]
Former-commit-id: d8f5e957d3
2013-11-25 12:17:36 -06:00
Nate Jensen
90f2bffa08 Merge "Issue #2359 add ability to ignore messages based on threads, ie ignore shef" into development
Former-commit-id: ea3e6928ac [formerly 102e82445c] [formerly 00fa91223b] [formerly 38cc0b46f6 [formerly 00fa91223b [formerly c4baf73e044c156a942290b8be603d9c9621d9fe]]]
Former-commit-id: 38cc0b46f6
Former-commit-id: ad2f360b06523ca3b2159a0c46a2ac141c4bd619 [formerly be4943ae3d]
Former-commit-id: b48359ab38
2013-11-25 08:34:40 -06:00
Nate Jensen
a190895819 Issue #2359 add ability to ignore messages based on threads, ie ignore
shef

Change-Id: I51d4b29e7accb3ce5bd90c7478c7f143bd76bb48

Former-commit-id: 00a1b179a5 [formerly db842ce2e6] [formerly 4a4f50155c] [formerly ed1b94ea07 [formerly 4a4f50155c [formerly 4a9f2db86a148b58610680dbd2230b286d89e361]]]
Former-commit-id: ed1b94ea07
Former-commit-id: fd493067b795f91fd360af45d144c60e8d2248cb [formerly 3b0ed49de4]
Former-commit-id: c836673ac6
2013-11-22 15:54:22 -06:00
Richard Peter
26eb16cae1 Merge "Issue #2532 Fix grid displays of grids larger than the world." into development
Former-commit-id: 551ccf368d [formerly 4b09affc7c] [formerly b26e562845] [formerly be7c2ef08e [formerly b26e562845 [formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]]
Former-commit-id: be7c2ef08e
Former-commit-id: b4dd124c6256f5d1be94fb46c9a4a162c713aed8 [formerly c51cc4bf17]
Former-commit-id: d1201473cd
2013-11-22 12:38:05 -06:00
Nate Jensen
873a26a6a7 Merge "Issue #2361 fix style manager's jaxb context" into development
Former-commit-id: 591dcce82e [formerly 38fdf1edcf] [formerly 9de7c7f434] [formerly 49ce4d4be3 [formerly 9de7c7f434 [formerly 0b018d8cd8f9738eb11897f07a83a5e370dcbcac]]]
Former-commit-id: 49ce4d4be3
Former-commit-id: 562f912e8920c73d85c6d405361ce0180caa8daf [formerly 6ab6de4419]
Former-commit-id: e049c8aca2
2013-11-22 10:08:13 -06:00
Nate Jensen
bf3e9e95e6 Issue #2361 fix style manager's jaxb context
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68

Former-commit-id: 905879ba90 [formerly 2c61b8f4d6] [formerly 16329ab06b] [formerly 328991e577 [formerly 16329ab06b [formerly 2fddfc61fb8de88a67deb5b66a570ca548628ab3]]]
Former-commit-id: 328991e577
Former-commit-id: 3170492ca14e7028f5daf3a156117f991ebeea59 [formerly ebc3efdf80]
Former-commit-id: 24e99ec924
2013-11-22 09:15:24 -06:00
Dave Hladky
ad8acfb5f4 Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
Former-commit-id: 162dcb3f42 [formerly 233238d8df] [formerly 04c7e2cffc] [formerly a9a3973319 [formerly 04c7e2cffc [formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]]
Former-commit-id: a9a3973319
Former-commit-id: 72c3d32a8a4aa43ecf8d033ca096d32cb261c568 [formerly ebd6d5cbe1]
Former-commit-id: cebf79ad44
2013-11-21 14:46:47 -06:00
Nate Jensen
a95890a5c8 Merge "Issue #2033 fix plots working with multiple plotModels dirs contributed by different plugins" into development
Former-commit-id: 9c2398a7dd [formerly 32cbfd6150] [formerly ddb0eaf0ff] [formerly d851e6fc97 [formerly ddb0eaf0ff [formerly 8f5078ce2a5369c62073a70b1772c2d0c96317fa]]]
Former-commit-id: d851e6fc97
Former-commit-id: c5557070349346f520ff88e345376e2ce126e8b0 [formerly f60948fc36]
Former-commit-id: f5a2c7298a
2013-11-21 10:12:11 -06:00
Nate Jensen
1627b502ff Merge "Issue #2448 Fixed problem that set subscription start time to first cycle time. Fixed problem that set subscription end time to end of day." into development
Former-commit-id: d4f4868d96 [formerly ab96dde78a] [formerly 982a664301] [formerly 695262552f [formerly 982a664301 [formerly 8c71361680cbe5860cbd4d76c3908cfbef23068f]]]
Former-commit-id: 695262552f
Former-commit-id: 4c99413c1ea1c158d0f301ef0374d87a7997ca87 [formerly 198ff37bd7]
Former-commit-id: 3d8c69c800
2013-11-21 08:36:59 -06:00
Nate Jensen
68ac9daf67 Issue #2033 fix plots working with multiple plotModels dirs contributed
by different plugins

Change-Id: I2d1ff75c62395ead5154398002610401faa4388d

Former-commit-id: 8a2c4ced39 [formerly b3028b4f39] [formerly 9371c63c41] [formerly 2b6799712d [formerly 9371c63c41 [formerly 0ed68f5ec6b2b2f3413f7de5f9c7b15291afb85c]]]
Former-commit-id: 2b6799712d
Former-commit-id: 6e959cad50fac90ee22febf459ef923945938143 [formerly 3e88de72dc]
Former-commit-id: 87dc5fb261
2013-11-20 17:33:53 -06:00
Brad Gonzales
e28ac634ee Issue #2448 Fixed problem that set subscription start time to first cycle time.
Fixed problem that set subscription end time to end of day.

Change-Id: Icccdbe4e38581f5194f6fde8d52f280d1a456a65

Former-commit-id: c27778c4df [formerly c7959336f5] [formerly 93b47ce68b] [formerly d2cfc5986a [formerly 93b47ce68b [formerly d8040be0d01c11fc7bfafe40a7afe509ba372ea0]]]
Former-commit-id: d2cfc5986a
Former-commit-id: 76f67795d1d943ade561899bea989a7a700107d8 [formerly 04d7bff784]
Former-commit-id: 4a83ff7971
2013-11-20 15:49:27 -06:00
Greg Armendariz
73d62a6589 Merge "Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring. Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription handlers will be injected through spring. Removed the SBN route from wfo mode." into development
Former-commit-id: 04e24a343a [formerly 6efadcdeed] [formerly 93daf9aff4] [formerly bc6c4e2b32 [formerly 93daf9aff4 [formerly 243e06d507ee85bfa7e30f5da41c146afa4d1043]]]
Former-commit-id: bc6c4e2b32
Former-commit-id: 14dad5a0dd830f24c2fd927b2961671ee2d5a727 [formerly ce2ef25207]
Former-commit-id: dd31a09cf9
2013-11-20 12:26:30 -06:00
Brad Gonzales
3aa399c82e Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added
monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode.  Added empty site and
shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring.
Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry
was configured to distinguish between insert and update events.  Moved subscriptionRoutesToSchedule bean (and other
beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files.  Removed the wfo and
ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription
handlers will be injected through spring.  Removed the SBN route from wfo mode.

Amend: Comment updates from peer review.

Change-Id: Ic4c0dca8ebf1e86537e46a6231af58bb65c83cf8

Former-commit-id: 2f37534433 [formerly 5576ac6134] [formerly 053f20c70b] [formerly 95a1914c71 [formerly 053f20c70b [formerly c245f741b9e78d8e4503698336d9929536e72e0d]]]
Former-commit-id: 95a1914c71
Former-commit-id: 19437f081eb72b80741e738e53af17b271610621 [formerly 04829d37e2]
Former-commit-id: 3c86e33ea4
2013-11-20 11:58:33 -06:00
Ben Steffensmeier
7d6d765081 Issue #2532 Fix grid displays of grids larger than the world.
Former-commit-id: f98ccd8c97 [formerly 6d878e3361] [formerly d3ed1ba356] [formerly 41753c40b5 [formerly d3ed1ba356 [formerly e607da0bb204d61cbc998595f52406605c1953e0]]]
Former-commit-id: 41753c40b5
Former-commit-id: c329e9c74d28818f4e37e2c7f57e4357d5175a4a [formerly 07743c4369]
Former-commit-id: 7f441392b8
2013-11-20 11:11:03 -06:00
Brian Clements
6c28068d21 Issue #2393 removed pypies interpolation
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code


Former-commit-id: 42f7214967 [formerly d35fc591d2] [formerly fe58826a1e] [formerly 0f40ae2b99 [formerly fe58826a1e [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 2a623a799e9a08a389ada1365b70ef555ee0c5d1 [formerly b762864f88]
Former-commit-id: 10e63616ff
2013-11-20 08:40:12 -06:00
Bryan Kowal
6fd3e0873b Issue #2552 - replace Logger with UFStatus
Former-commit-id: 9ac4bb7691 [formerly c938d03deb] [formerly ff968c9884] [formerly 0bdb25bf43 [formerly ff968c9884 [formerly 10971eca8d10817c97073c6142ea7cf08b28fa27]]]
Former-commit-id: 0bdb25bf43
Former-commit-id: bced7499ad52dec9e2951c50088549321f9c192b [formerly da148196ac]
Former-commit-id: be5b0b83c9
2013-11-19 17:11:36 -06:00
Lee Venable
1468a92082 Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
Former-commit-id: 389f8c5e13 [formerly b6321334e6] [formerly f8f0a0e41e] [formerly d42c36f365 [formerly f8f0a0e41e [formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]]]
Former-commit-id: d42c36f365
Former-commit-id: 84cbbb40a445a2c0f18f57bc065371cfaef10f48 [formerly da5cfb3d8e]
Former-commit-id: c680cc3ea9
2013-11-19 15:12:38 -06:00
Nate Jensen
37f4ecfe9e Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
Former-commit-id: 87a792417c [formerly f7034f933e] [formerly c6d6b07e3f] [formerly a610825ef9 [formerly c6d6b07e3f [formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]]]
Former-commit-id: a610825ef9
Former-commit-id: 4beedd31ac277b5c01f8da9cd36f06a6acf40875 [formerly 04de350ae7]
Former-commit-id: 789f050b27
2013-11-19 14:11:01 -06:00
Richard Peter
69d4c311b9 Merge "Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed" into development
Former-commit-id: d7bc1d2975 [formerly c82e143fe1] [formerly b0ea563ed196fcd033caf7b14297142a0c4e798f [formerly 4c9bcf718a]] [formerly b296fd1d02 [formerly 4c9bcf718a [formerly d3559746302f09db933f9b8deecfe410e63d8430]]]
Former-commit-id: b296fd1d02
Former-commit-id: 33f10b64c5308c0a5cabdcdc5cc87d9788e85a25 [formerly ba8fae576c]
Former-commit-id: 93dbc58a93
2013-11-19 13:18:05 -06:00
Nate Jensen
cee86da089 Issue #2361 don't initialize derived parameters on shutdown
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583

Former-commit-id: cd44881c08 [formerly 83c28fd04b] [formerly f0d6be27f5ee82f002ddbe68846abd862e00dee1 [formerly c90a7d7b3c]] [formerly 5aee685557 [formerly c90a7d7b3c [formerly 13cc948c57d52261c700157f8e86b6e6c75b4fe1]]]
Former-commit-id: 5aee685557
Former-commit-id: 28a62e8d27dd2659e289060d6d67eda25d130e3e [formerly e9adf706ba]
Former-commit-id: 48632a81b3
2013-11-19 12:59:10 -06:00
Mike Duff
4d18da0420 Issue #1531 - Made bandwidth utilization graph resizable.
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475

Former-commit-id: 31964ce934 [formerly c7c20c6ce8] [formerly ed73a7e55a] [formerly 71093a685e [formerly ed73a7e55a [formerly d6de10ca2c0609899bdb1f4c5f3de22a62d58998]]]
Former-commit-id: 71093a685e
Former-commit-id: 12ad71e7abd9db2b712a0ed6f4e8a8e81bf4cc49 [formerly 437df90354]
Former-commit-id: 8f9b847eff
2013-11-19 12:51:06 -06:00
Nate Jensen
2cc539c3d3 Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
Former-commit-id: 275bdc13ed [formerly 50590a241f] [formerly 6927e960b2] [formerly 5885d8027b [formerly 6927e960b2 [formerly 59c62c673625d7e87b3b86575b8ebfb9e328ff28]]]
Former-commit-id: 5885d8027b
Former-commit-id: a8aba4eda4a927d292566c88bac7dcffae609ef3 [formerly be3d016f93]
Former-commit-id: aba433c4bb
2013-11-19 11:25:19 -06:00
Steve Harris
69710c8f63 Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge
Former-commit-id: ad200adacd [formerly 920e06b8ff] [formerly c37908caa8] [formerly 39ab54c912 [formerly c37908caa8 [formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]]]
Former-commit-id: 39ab54c912
Former-commit-id: f2b3feeb03238e38bba68b87041e15e6592d811b [formerly 94a60728ca]
Former-commit-id: 7b9bc1ae90
2013-11-19 10:08:45 -06:00
Mike Duff
fd5a8b283d Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2

Former-commit-id: 7048853fd2 [formerly f8d5563973] [formerly c908647259] [formerly 665d9e7651 [formerly c908647259 [formerly cacc7a8560c589b24ea98191f152c31479c5631e]]]
Former-commit-id: 665d9e7651
Former-commit-id: fa1699e3e40e15a4fba251ecf2b68f464c00c042 [formerly 5afa90b967]
Former-commit-id: 8221f50e8a
2013-11-19 08:55:27 -06:00
Nate Jensen
32737415fc Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
Former-commit-id: 629d611145 [formerly accbd46ad6] [formerly edf51dffc9] [formerly 3d51d80170 [formerly edf51dffc9 [formerly b6420738e49d37840789c88089ecc8bab1103284]]]
Former-commit-id: 3d51d80170
Former-commit-id: d7ac7a454945a6f649dfab52f167467ddb507d1e [formerly f07f543cd3]
Former-commit-id: 7da95f7b57
2013-11-18 12:50:38 -06:00
Nate Jensen
f640ecf96e Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
Former-commit-id: b64c20e99c [formerly 493cdb287c] [formerly 0dbe79344a] [formerly 827b7f5a93 [formerly 0dbe79344a [formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]]
Former-commit-id: 827b7f5a93
Former-commit-id: ab02400e12a733ec9507e8ac73837821fa31df90 [formerly 6900d4e47f]
Former-commit-id: 3de7e3576b
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
8e2b4353cc Issue #2543 fix gl buffer formating problems
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc

Former-commit-id: 830a28498b [formerly 6b6c46afa8] [formerly 105e3e359a] [formerly e7a068e595 [formerly 105e3e359a [formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]]
Former-commit-id: e7a068e595
Former-commit-id: ae49586b08f646c42f059223597489c739f0cdce [formerly e605758e57]
Former-commit-id: 51c04680e2
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
00088654a0 Issue #2544 Fix recycling issues with Satellite resources.
Former-commit-id: 0a3d78555e [formerly 15ae95075d] [formerly e392185d78] [formerly 9ff1751f4e [formerly e392185d78 [formerly 166957a22c3447fa2407b13362eece24943675c9]]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 775873b42354a16c60bda95506731f0ccdc6e548 [formerly 1875f56695]
Former-commit-id: 0788a82a99
2013-11-18 11:44:56 -06:00
Nate Jensen
f9cdff25f0 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
Former-commit-id: 9740e25c5e [formerly 93e93de742] [formerly 4f47800cae] [formerly 0146ae59df [formerly 4f47800cae [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]]
Former-commit-id: 0146ae59df
Former-commit-id: d73c34612b91ec5b6776253d400f6c0d34b344e2 [formerly a238ba2ba3]
Former-commit-id: d9d0eb7354
2013-11-18 11:39:12 -06:00
Steve Harris
3b074763ab Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: f7878c44cb [formerly 542a0946f2] [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 1978596c628755147b84f2d7e363ca602a98cedf [formerly 869b505f80]
Former-commit-id: 3f9df61017
2013-11-15 13:15:25 -06:00
Steve Harris
b1d82b9c2c Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)

Former-commit-id: 117cac310b [formerly dc4f3b7594] [formerly 1015e180f1] [formerly 2f0d53c9b2 [formerly 1015e180f1 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: 72d35279c7375fe7db3bdc163cd5fbd4a655ec1d [formerly d97edb20d1]
Former-commit-id: 156395b85b
2013-11-15 13:05:40 -06:00
Steve Harris
7977f24d77 14.1.1-9 baseline
Former-commit-id: ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly 5a0a40e67c [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 1abf0e99cad9d8f5d8540c9724d2144a5aab0211 [formerly 8c136f202d]
Former-commit-id: eab5bb1147
2013-11-15 12:47:49 -05:00
Brad Gonzales
66a8a30092 Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications.
Added missing comma to com.raytheon.edex.plugin.text.

Change-Id: Ifc970d31d8f2db29dc5a4749967cdedad84b6162

Former-commit-id: 437c29c7f4 [formerly 938683ba4d] [formerly aa8fb36fc1] [formerly 53d4de12d9 [formerly aa8fb36fc1 [formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]]
Former-commit-id: 53d4de12d9
Former-commit-id: e3193236411f9e577590904b1ee3e08e4ab9ffd5 [formerly 490c95d010]
Former-commit-id: 4ec5ee7f74
2013-11-15 08:00:47 -06:00
Nate Jensen
d8f4ecc2d7 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 462878bf86 [formerly 757ca42a5f] [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly dd99aa3f47 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]
Former-commit-id: 78b01f61c4
Former-commit-id: dc8aea52f7c970fb95e7d9d99a858f44faa15501 [formerly d96cdbe761]
Former-commit-id: d0d712ec6f
2013-11-14 17:41:24 -06:00
Mike Duff
bc96849913 Issue #2548 - fix malformed comment
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034

Former-commit-id: 24dc37f03b [formerly 0d83797a4e] [formerly 414cb1cf68] [formerly 95fda38cc5 [formerly 414cb1cf68 [formerly 52462f299735aacee3db09faa6db9f28ba91f552]]]
Former-commit-id: 95fda38cc5
Former-commit-id: 041b2afc87e9fd510c3e653e8424f02271121cc3 [formerly 7be43c4a52]
Former-commit-id: a13aa64b65
2013-11-14 17:30:55 -06:00
Richard Peter
586b11c80d Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
Former-commit-id: 979fa16d04 [formerly 157e739623] [formerly 14b1e924a1] [formerly 0bb5e2a61e [formerly 14b1e924a1 [formerly dba301df2f593baa951c14b684e7ce4794e32019]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 29857e1e475c9363f0f62efb31ac6cf02ee6e84f [formerly 1a7dd7723b]
Former-commit-id: 65e8ad1a62
2013-11-14 17:21:48 -06:00
Brian Clements
7625e0ef16 Issue #2361 fixed ncwf hibernate pickup
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names


Former-commit-id: e8c8314abe [formerly 55682480e1] [formerly a741cec01e3c674aef92a9cc8641d62be829d023 [formerly cacdf313c5]] [formerly 00490c2db2 [formerly cacdf313c5 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]
Former-commit-id: 00490c2db2
Former-commit-id: 8742dd3b5b719d9daf15294c04f9699017a3a49b [formerly ab24330f23]
Former-commit-id: 878a677d18
2013-11-14 17:12:02 -06:00