Nate Jensen
32448a0eb1
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 ea3e6928ac
[formerly 102e82445c
] [formerly 00fa91223b
] [formerly 38cc0b46f6
[formerly 00fa91223b
[formerly c4baf73e044c156a942290b8be603d9c9621d9fe]]]]
Former-commit-id: 38cc0b46f6
Former-commit-id: 90f2bffa08
[formerly b48359ab38
] [formerly ad2f360b06523ca3b2159a0c46a2ac141c4bd619 [formerly be4943ae3d
]]
Former-commit-id: 7250f1f4dede35c78771a45b324b61e06027c66f [formerly 7ffe17a73e
]
Former-commit-id: 441577fb39
2013-11-25 08:34:40 -06:00
Nate Jensen
995990107f
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 00a1b179a5
[formerly db842ce2e6
] [formerly 4a4f50155c
] [formerly ed1b94ea07
[formerly 4a4f50155c
[formerly 4a9f2db86a148b58610680dbd2230b286d89e361]]]]
Former-commit-id: ed1b94ea07
Former-commit-id: a190895819
[formerly c836673ac6
] [formerly fd493067b795f91fd360af45d144c60e8d2248cb [formerly 3b0ed49de4
]]
Former-commit-id: 383fc00f4fd1d3c931d0e68ab958eba924870aaa [formerly 493f51eae7
]
Former-commit-id: a858617b6c
2013-11-22 15:54:22 -06:00
Richard Peter
8ba48221d9
Merge "Issue #2532 Fix grid displays of grids larger than the world." into development
...
Former-commit-id: 551ccf368d
[formerly 4b09affc7c
] [formerly b26e562845
] [formerly 551ccf368d
[formerly 4b09affc7c
] [formerly b26e562845
] [formerly be7c2ef08e
[formerly b26e562845
[formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]]]
Former-commit-id: be7c2ef08e
Former-commit-id: 26eb16cae1
[formerly d1201473cd
] [formerly b4dd124c6256f5d1be94fb46c9a4a162c713aed8 [formerly c51cc4bf17
]]
Former-commit-id: 1240ceeba1f5cebc78296a32d16f5394c461c1fa [formerly 91fcef9d3f
]
Former-commit-id: 5bb7b93078
2013-11-22 12:38:05 -06:00
Nate Jensen
7c42c962ed
Merge "Issue #2361 fix style manager's jaxb context" into development
...
Former-commit-id: 591dcce82e
[formerly 38fdf1edcf
] [formerly 9de7c7f434
] [formerly 591dcce82e
[formerly 38fdf1edcf
] [formerly 9de7c7f434
] [formerly 49ce4d4be3
[formerly 9de7c7f434
[formerly 0b018d8cd8f9738eb11897f07a83a5e370dcbcac]]]]
Former-commit-id: 49ce4d4be3
Former-commit-id: 873a26a6a7
[formerly e049c8aca2
] [formerly 562f912e8920c73d85c6d405361ce0180caa8daf [formerly 6ab6de4419
]]
Former-commit-id: 542ab93f11c94c56a2e2420009615e7c22781b7f [formerly 54c2d1e420
]
Former-commit-id: 3d4b802ead
2013-11-22 10:08:13 -06:00
Nate Jensen
3aab64af24
Issue #2361 fix style manager's jaxb context
...
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68
Former-commit-id: 905879ba90
[formerly 2c61b8f4d6
] [formerly 16329ab06b
] [formerly 905879ba90
[formerly 2c61b8f4d6
] [formerly 16329ab06b
] [formerly 328991e577
[formerly 16329ab06b
[formerly 2fddfc61fb8de88a67deb5b66a570ca548628ab3]]]]
Former-commit-id: 328991e577
Former-commit-id: bf3e9e95e6
[formerly 24e99ec924
] [formerly 3170492ca14e7028f5daf3a156117f991ebeea59 [formerly ebc3efdf80
]]
Former-commit-id: d6b3fce814c8cb24ee8a9a7b52224b71d77beaff [formerly b6748206e5
]
Former-commit-id: 3e24b4827e
2013-11-22 09:15:24 -06:00
Dave Hladky
3f842ea0de
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 162dcb3f42
[formerly 233238d8df
] [formerly 04c7e2cffc
] [formerly a9a3973319
[formerly 04c7e2cffc
[formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]]]
Former-commit-id: a9a3973319
Former-commit-id: ad8acfb5f4
[formerly cebf79ad44
] [formerly 72c3d32a8a4aa43ecf8d033ca096d32cb261c568 [formerly ebd6d5cbe1
]]
Former-commit-id: b147519b3153c2a930101210430242451206b975 [formerly 54af53ffb4
]
Former-commit-id: 2e254e0208
2013-11-21 14:46:47 -06:00
Nate Jensen
41a4389e68
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 9c2398a7dd
[formerly 32cbfd6150
] [formerly ddb0eaf0ff
] [formerly d851e6fc97
[formerly ddb0eaf0ff
[formerly 8f5078ce2a5369c62073a70b1772c2d0c96317fa]]]]
Former-commit-id: d851e6fc97
Former-commit-id: a95890a5c8
[formerly f5a2c7298a
] [formerly c5557070349346f520ff88e345376e2ce126e8b0 [formerly f60948fc36
]]
Former-commit-id: 76566b611d6aa3e7867c609059825a2c4c81d349 [formerly a5469c1d9e
]
Former-commit-id: f3bbaa5362
2013-11-21 10:12:11 -06:00
Nate Jensen
c0dc7865fb
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 d4f4868d96
[formerly ab96dde78a
] [formerly 982a664301
] [formerly 695262552f
[formerly 982a664301
[formerly 8c71361680cbe5860cbd4d76c3908cfbef23068f]]]]
Former-commit-id: 695262552f
Former-commit-id: 1627b502ff
[formerly 3d8c69c800
] [formerly 4c99413c1ea1c158d0f301ef0374d87a7997ca87 [formerly 198ff37bd7
]]
Former-commit-id: 3e824ef04f671fd70ccad61dc15b24fd744eca68 [formerly eb0f52cfca
]
Former-commit-id: ce8dd7468d
2013-11-21 08:36:59 -06:00
Bryan Kowal
4500b39058
Increment python release for gridslice update.
...
Former-commit-id: 1557e44d70
[formerly f413677106
] [formerly 5f634773fe
] [formerly 1557e44d70
[formerly f413677106
] [formerly 5f634773fe
] [formerly c48a946923
[formerly 5f634773fe
[formerly 5c5a81739c64ff1ab7f8812be8ac9390e8d85588]]]]
Former-commit-id: c48a946923
Former-commit-id: 7da2d374f6
[formerly 869781248b
] [formerly a42a37b4db425942f95c2badff68de48c45807dc [formerly f7438d4fa6
]]
Former-commit-id: 9d3a1012028a963c5bc7ac4997509241fc087b2f [formerly e39159052c
]
Former-commit-id: 7d66f1186d
2013-11-20 17:40:18 -06:00
Nate Jensen
aa5f825c11
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 8a2c4ced39
[formerly b3028b4f39
] [formerly 9371c63c41
] [formerly 2b6799712d
[formerly 9371c63c41
[formerly 0ed68f5ec6b2b2f3413f7de5f9c7b15291afb85c]]]]
Former-commit-id: 2b6799712d
Former-commit-id: 68ac9daf67
[formerly 87dc5fb261
] [formerly 6e959cad50fac90ee22febf459ef923945938143 [formerly 3e88de72dc
]]
Former-commit-id: e746ee27e1b0a4a2e4cc0607c58c2c3ae60a7acf [formerly 19b467c208
]
Former-commit-id: 3a5a066bf3
2013-11-20 17:33:53 -06:00
Brad Gonzales
10773a487c
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 c27778c4df
[formerly c7959336f5
] [formerly 93b47ce68b
] [formerly d2cfc5986a
[formerly 93b47ce68b
[formerly d8040be0d01c11fc7bfafe40a7afe509ba372ea0]]]]
Former-commit-id: d2cfc5986a
Former-commit-id: e28ac634ee
[formerly 4a83ff7971
] [formerly 76f67795d1d943ade561899bea989a7a700107d8 [formerly 04d7bff784
]]
Former-commit-id: 3cf69f16b9d575da662eec2f98764311030c0804 [formerly 70f66e5f7a
]
Former-commit-id: 65eefe2846
2013-11-20 15:49:27 -06:00
Ben Steffensmeier
70175dca9c
Issue #2528 Add brute force method of calculating geostationary envelope intersections.
...
Change-Id: Ie02ae1e493015dcca88468633db65c51cd701adf
Former-commit-id: 4d86af4f02
[formerly 9627cf0f6f
] [formerly 30d125f95a
] [formerly 4d86af4f02
[formerly 9627cf0f6f
] [formerly 30d125f95a
] [formerly 00af766143
[formerly 30d125f95a
[formerly 393aba6883e536912f7b1e34bd922d53eaa63727]]]]
Former-commit-id: 00af766143
Former-commit-id: 1b022bfd31
[formerly abdb1c504c
] [formerly cacb3acbd0ce426c88a1a423cb2359588872f550 [formerly 6faafa2dfc
]]
Former-commit-id: d647546ac1988d0bcf6c0706e18af03814592a9d [formerly c742abd06e
]
Former-commit-id: 67b724a541
2013-11-20 15:36:27 -06:00
Ron Anderson
f54ac1014a
Issue #2488 Change to use DejaVu fonts
...
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224
Former-commit-id: a83d214f40
[formerly 7a3c7d530e
] [formerly d72119409e
] [formerly a83d214f40
[formerly 7a3c7d530e
] [formerly d72119409e
] [formerly 633137d8c0
[formerly d72119409e
[formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]]]
Former-commit-id: 633137d8c0
Former-commit-id: bbb24dfdbd
[formerly 769df41dea
] [formerly ebfd4c9fd692514b821af5e75fe51a87a50ddecc [formerly f6b9e69738
]]
Former-commit-id: 88b789c28703f9bf73991585ff00bcc13e9d24bd [formerly a731f80011
]
Former-commit-id: e2f54e78d0
2013-11-20 13:43:25 -06:00
Greg Armendariz
62b562ea67
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 04e24a343a
[formerly 6efadcdeed
] [formerly 93daf9aff4
] [formerly bc6c4e2b32
[formerly 93daf9aff4
[formerly 243e06d507ee85bfa7e30f5da41c146afa4d1043]]]]
Former-commit-id: bc6c4e2b32
Former-commit-id: 73d62a6589
[formerly dd31a09cf9
] [formerly 14dad5a0dd830f24c2fd927b2961671ee2d5a727 [formerly ce2ef25207
]]
Former-commit-id: 0c03b5d8fd8e16e5965504d80c15987999c302f9 [formerly c94e59646b
]
Former-commit-id: 5d5f7c9d44
2013-11-20 12:26:30 -06:00
Brad Gonzales
ef39175130
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 2f37534433
[formerly 5576ac6134
] [formerly 053f20c70b
] [formerly 95a1914c71
[formerly 053f20c70b
[formerly c245f741b9e78d8e4503698336d9929536e72e0d]]]]
Former-commit-id: 95a1914c71
Former-commit-id: 3aa399c82e
[formerly 3c86e33ea4
] [formerly 19437f081eb72b80741e738e53af17b271610621 [formerly 04829d37e2
]]
Former-commit-id: abd02052274cc3ea864a223c7ac89c12b10c3e19 [formerly 6e19c4dab1
]
Former-commit-id: fc4850d7b2
2013-11-20 11:58:33 -06:00
Ben Steffensmeier
f3fb127460
Issue #2532 Fix grid displays of grids larger than the world.
...
Former-commit-id: f98ccd8c97
[formerly 6d878e3361
] [formerly d3ed1ba356
] [formerly f98ccd8c97
[formerly 6d878e3361
] [formerly d3ed1ba356
] [formerly 41753c40b5
[formerly d3ed1ba356
[formerly e607da0bb204d61cbc998595f52406605c1953e0]]]]
Former-commit-id: 41753c40b5
Former-commit-id: 7d6d765081
[formerly 7f441392b8
] [formerly c329e9c74d28818f4e37e2c7f57e4357d5175a4a [formerly 07743c4369
]]
Former-commit-id: 85824d9ffaa9ff82c417d5e8021819197e1fb138 [formerly 1bc4453a8d
]
Former-commit-id: 6cd151b427
2013-11-20 11:11:03 -06:00
Brian Clements
e7fb4b66f0
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 42f7214967
[formerly d35fc591d2
] [formerly fe58826a1e
] [formerly 0f40ae2b99
[formerly fe58826a1e
[formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 6c28068d21
[formerly 10e63616ff
] [formerly 2a623a799e9a08a389ada1365b70ef555ee0c5d1 [formerly b762864f88
]]
Former-commit-id: a1d8502b3240284d2507e2776811c33a9a4f1087 [formerly 2e4dc2000e
]
Former-commit-id: 6b8a853240
2013-11-20 08:40:12 -06:00
Brian Clements
53149f4869
Issue #2495 changed gridslice to use correct dimension datatype
...
Former-commit-id: dc7ad4d465
[formerly 4c3453a657
] [formerly aa24bc6fce
] [formerly dc7ad4d465
[formerly 4c3453a657
] [formerly aa24bc6fce
] [formerly 5e7f2f0bdf
[formerly aa24bc6fce
[formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]]]
Former-commit-id: 5e7f2f0bdf
Former-commit-id: b7a10192f4
[formerly 90601f6ff8
] [formerly a6c84a48a463eebfa267a1df2818691820f5dc81 [formerly 05b2a015cb
]]
Former-commit-id: 3e6817554d34956823e10a116728dc64ba182b44 [formerly a8c2c5870c
]
Former-commit-id: 9d3df8f842
2013-11-19 17:53:39 -06:00
Bryan Kowal
7882f4c770
Issue #2552 - replace Logger with UFStatus
...
Former-commit-id: 9ac4bb7691
[formerly c938d03deb
] [formerly ff968c9884
] [formerly 9ac4bb7691
[formerly c938d03deb
] [formerly ff968c9884
] [formerly 0bdb25bf43
[formerly ff968c9884
[formerly 10971eca8d10817c97073c6142ea7cf08b28fa27]]]]
Former-commit-id: 0bdb25bf43
Former-commit-id: 6fd3e0873b
[formerly be5b0b83c9
] [formerly bced7499ad52dec9e2951c50088549321f9c192b [formerly da148196ac
]]
Former-commit-id: ff17fac137dcbb72c0fc05d2a695de9ebf2ae501 [formerly 91367f57b6
]
Former-commit-id: ce6f126469
2013-11-19 17:11:36 -06:00
Steve Harris
2233e88c1d
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: 70c79bb7e6
[formerly d1b2cdd566
] [formerly 65ebfc1a18
] [formerly 70c79bb7e6
[formerly d1b2cdd566
] [formerly 65ebfc1a18
] [formerly c0bb3a1102
[formerly 65ebfc1a18
[formerly c333fe23736110bcb273aafd90ee6551ff7e921d]]]]
Former-commit-id: c0bb3a1102
Former-commit-id: 2ed2e93b03
[formerly eff32cfbf3
] [formerly 44a31523c0eab129c3c048ad551394d20361765b [formerly e8c6af3060
]]
Former-commit-id: b6a790b61eeb5fc024d51cb557cc7d0a67bec23d [formerly 70536b40ba
]
Former-commit-id: fbe9de41ad
2013-11-19 15:45:06 -06:00
Steve Harris
8a1ea4d35f
14.1.1-10 baseline
...
Former-commit-id: 69cef95302
[formerly 8251107646
] [formerly ca0f65bd9a
] [formerly 69cef95302
[formerly 8251107646
] [formerly ca0f65bd9a
] [formerly 9248695a1f
[formerly ca0f65bd9a
[formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]]
Former-commit-id: 9248695a1f
Former-commit-id: 2c49ed51ac
[formerly e35ec60f7e
] [formerly 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304
]]
Former-commit-id: 1da4cf492cf27e8f6e06f3cfbfcc4a4b3ce25255 [formerly 36d788890a
]
Former-commit-id: ea65181d19
2013-11-19 16:40:25 -05:00
Lee Venable
62b59bc20a
Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
...
Former-commit-id: 389f8c5e13
[formerly b6321334e6
] [formerly f8f0a0e41e
] [formerly 389f8c5e13
[formerly b6321334e6
] [formerly f8f0a0e41e
] [formerly d42c36f365
[formerly f8f0a0e41e
[formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]]]]
Former-commit-id: d42c36f365
Former-commit-id: 1468a92082
[formerly c680cc3ea9
] [formerly 84cbbb40a445a2c0f18f57bc065371cfaef10f48 [formerly da5cfb3d8e
]]
Former-commit-id: c74dc0479155e96d534cdcdfca9a709e0b351ba4 [formerly d3b12f6973
]
Former-commit-id: fd377ca4cc
2013-11-19 15:12:38 -06:00
Nate Jensen
036fa57da4
Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
...
Former-commit-id: 87a792417c
[formerly f7034f933e
] [formerly c6d6b07e3f
] [formerly 87a792417c
[formerly f7034f933e
] [formerly c6d6b07e3f
] [formerly a610825ef9
[formerly c6d6b07e3f
[formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]]]]
Former-commit-id: a610825ef9
Former-commit-id: 37f4ecfe9e
[formerly 789f050b27
] [formerly 4beedd31ac277b5c01f8da9cd36f06a6acf40875 [formerly 04de350ae7
]]
Former-commit-id: 5f448b6e0ae144458579d677da2387bf34095954 [formerly ac93e07973
]
Former-commit-id: 3cbf29226a
2013-11-19 14:11:01 -06:00
Richard Peter
5f779cd65c
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 4c9bcf718a
] [formerly d7bc1d2975
[formerly c82e143fe1
] [formerly 4c9bcf718a
] [formerly b296fd1d02
[formerly 4c9bcf718a
[formerly d3559746302f09db933f9b8deecfe410e63d8430]]]]
Former-commit-id: b296fd1d02
Former-commit-id: 69d4c311b9
[formerly 93dbc58a93
] [formerly 33f10b64c5308c0a5cabdcdc5cc87d9788e85a25 [formerly ba8fae576c
]]
Former-commit-id: 4b2d83eea9ab2121a3b0ee3f4520aa0974582293 [formerly 8efa7a1512
]
Former-commit-id: c5143e94e1
2013-11-19 13:18:05 -06:00
Nate Jensen
ca6de6494d
Issue #2361 don't initialize derived parameters on shutdown
...
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583
Former-commit-id: cd44881c08
[formerly 83c28fd04b
] [formerly c90a7d7b3c
] [formerly cd44881c08
[formerly 83c28fd04b
] [formerly c90a7d7b3c
] [formerly 5aee685557
[formerly c90a7d7b3c
[formerly 13cc948c57d52261c700157f8e86b6e6c75b4fe1]]]]
Former-commit-id: 5aee685557
Former-commit-id: cee86da089
[formerly 48632a81b3
] [formerly 28a62e8d27dd2659e289060d6d67eda25d130e3e [formerly e9adf706ba
]]
Former-commit-id: 16de96ff126e1735ea9cc6c041a171b1f7237755 [formerly cf87d1c335
]
Former-commit-id: 9cbe1a123e
2013-11-19 12:59:10 -06:00
Mike Duff
3d66f30af1
Issue #1531 - Made bandwidth utilization graph resizable.
...
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475
Former-commit-id: 31964ce934
[formerly c7c20c6ce8
] [formerly ed73a7e55a
] [formerly 31964ce934
[formerly c7c20c6ce8
] [formerly ed73a7e55a
] [formerly 71093a685e
[formerly ed73a7e55a
[formerly d6de10ca2c0609899bdb1f4c5f3de22a62d58998]]]]
Former-commit-id: 71093a685e
Former-commit-id: 4d18da0420
[formerly 8f9b847eff
] [formerly 12ad71e7abd9db2b712a0ed6f4e8a8e81bf4cc49 [formerly 437df90354
]]
Former-commit-id: 2c9c893948fa8f87a91c114556f3aaee31babb91 [formerly fcc96787c3
]
Former-commit-id: e380af2664
2013-11-19 12:51:06 -06:00
Nate Jensen
ca61ec3ac0
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 275bdc13ed
[formerly 50590a241f
] [formerly 6927e960b2
] [formerly 5885d8027b
[formerly 6927e960b2
[formerly 59c62c673625d7e87b3b86575b8ebfb9e328ff28]]]]
Former-commit-id: 5885d8027b
Former-commit-id: 2cc539c3d3
[formerly aba433c4bb
] [formerly a8aba4eda4a927d292566c88bac7dcffae609ef3 [formerly be3d016f93
]]
Former-commit-id: 44cf6ba23f8b185fae87852a8dfdfc12ad5c71bb [formerly 0015c66955
]
Former-commit-id: dcf7114d6b
2013-11-19 11:25:19 -06:00
Steve Harris
e167208631
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 ad200adacd
[formerly 920e06b8ff
] [formerly c37908caa8
] [formerly 39ab54c912
[formerly c37908caa8
[formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]]]]
Former-commit-id: 39ab54c912
Former-commit-id: 69710c8f63
[formerly 7b9bc1ae90
] [formerly f2b3feeb03238e38bba68b87041e15e6592d811b [formerly 94a60728ca
]]
Former-commit-id: 0dbdb8b56bcd9a174076ebaf21e6fcc45d778e86 [formerly 77d9b628fe
]
Former-commit-id: 99232f6c6c
2013-11-19 10:08:45 -06:00
Mike Duff
7b285740e2
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 7048853fd2
[formerly f8d5563973
] [formerly c908647259
] [formerly 665d9e7651
[formerly c908647259
[formerly cacc7a8560c589b24ea98191f152c31479c5631e]]]]
Former-commit-id: 665d9e7651
Former-commit-id: fd5a8b283d
[formerly 8221f50e8a
] [formerly fa1699e3e40e15a4fba251ecf2b68f464c00c042 [formerly 5afa90b967
]]
Former-commit-id: 82ed33c047718d5a5664b805503ccce5378442c1 [formerly d254f954c4
]
Former-commit-id: dd80768cc2
2013-11-19 08:55:27 -06:00
Nate Jensen
24bb2b914d
Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
...
Former-commit-id: 629d611145
[formerly accbd46ad6
] [formerly edf51dffc9
] [formerly 629d611145
[formerly accbd46ad6
] [formerly edf51dffc9
] [formerly 3d51d80170
[formerly edf51dffc9
[formerly b6420738e49d37840789c88089ecc8bab1103284]]]]
Former-commit-id: 3d51d80170
Former-commit-id: 32737415fc
[formerly 7da95f7b57
] [formerly d7ac7a454945a6f649dfab52f167467ddb507d1e [formerly f07f543cd3
]]
Former-commit-id: 1eb3dd2593616960f8702398df44a591a5441f49 [formerly a5abd4dad0
]
Former-commit-id: 1926ac3647
2013-11-18 12:50:38 -06:00
Nate Jensen
88725bf57b
Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
...
Former-commit-id: b64c20e99c
[formerly 493cdb287c
] [formerly 0dbe79344a
] [formerly b64c20e99c
[formerly 493cdb287c
] [formerly 0dbe79344a
] [formerly 827b7f5a93
[formerly 0dbe79344a
[formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]]]
Former-commit-id: 827b7f5a93
Former-commit-id: f640ecf96e
[formerly 3de7e3576b
] [formerly ab02400e12a733ec9507e8ac73837821fa31df90 [formerly 6900d4e47f
]]
Former-commit-id: b1e2fa733d9d12c12439bc83f67a8be4f1479985 [formerly b6fe32de06
]
Former-commit-id: 553a32f5a3
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
86418297ff
Issue #2543 fix gl buffer formating problems
...
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc
Former-commit-id: 830a28498b
[formerly 6b6c46afa8
] [formerly 105e3e359a
] [formerly 830a28498b
[formerly 6b6c46afa8
] [formerly 105e3e359a
] [formerly e7a068e595
[formerly 105e3e359a
[formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]]]
Former-commit-id: e7a068e595
Former-commit-id: 8e2b4353cc
[formerly 51c04680e2
] [formerly ae49586b08f646c42f059223597489c739f0cdce [formerly e605758e57
]]
Former-commit-id: 14e9b1c968978356e85b2e67c57fd8481fdfcd9a [formerly 9bd35b793d
]
Former-commit-id: 9fa1dbbfa5
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
c49ae5d321
Issue #2544 Fix recycling issues with Satellite resources.
...
Former-commit-id: 0a3d78555e
[formerly 15ae95075d
] [formerly e392185d78
] [formerly 0a3d78555e
[formerly 15ae95075d
] [formerly e392185d78
] [formerly 9ff1751f4e
[formerly e392185d78
[formerly 166957a22c3447fa2407b13362eece24943675c9]]]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 00088654a0
[formerly 0788a82a99
] [formerly 775873b42354a16c60bda95506731f0ccdc6e548 [formerly 1875f56695
]]
Former-commit-id: d79a110b1a53c8b830a2684f1f2f27e3e8b4309f [formerly 55f26e277f
]
Former-commit-id: 7de35d0111
2013-11-18 11:44:56 -06:00
Nate Jensen
64318dcc88
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
...
Former-commit-id: 9740e25c5e
[formerly 93e93de742
] [formerly 4f47800cae
] [formerly 9740e25c5e
[formerly 93e93de742
] [formerly 4f47800cae
] [formerly 0146ae59df
[formerly 4f47800cae
[formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]]]
Former-commit-id: 0146ae59df
Former-commit-id: f9cdff25f0
[formerly d9d0eb7354
] [formerly d73c34612b91ec5b6776253d400f6c0d34b344e2 [formerly a238ba2ba3
]]
Former-commit-id: 6f1ac0cbf7524da75f1cd4b4998b7cdb7a08bd26 [formerly 951c1ff2f3
]
Former-commit-id: 7e76b097c7
2013-11-18 11:39:12 -06:00
Steve Harris
065882f44e
Merge branch 'master_13.5.3' into development_on_RHEL5
...
Former-commit-id: 5ef89f10a1
[formerly 58325f2c17
] [formerly be0f3bf912
] [formerly 5ef89f10a1
[formerly 58325f2c17
] [formerly be0f3bf912
] [formerly d810aacaaa
[formerly be0f3bf912
[formerly 648659c6a364b85a8531f24910ab535c9bcf73ce]]]]
Former-commit-id: d810aacaaa
Former-commit-id: 582813fab6
[formerly c86e70be8c
] [formerly 91838a405f0441744a78ba5ded1f77d0c0ed5f87 [formerly 8ca6f8d14b
]]
Former-commit-id: c815079fc8e672fc80b9d4c37ec67cd1f1470d45 [formerly 4f6e7095a3
]
Former-commit-id: f3604b2fc8
2013-11-15 13:19:01 -06:00
Steve Harris
2d3311aace
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 f7878c44cb
[formerly 542a0946f2
] [formerly 0a36987a01
] [formerly 6d9efac6ef
[formerly 0a36987a01
[formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 3b074763ab
[formerly 3f9df61017
] [formerly 1978596c628755147b84f2d7e363ca602a98cedf [formerly 869b505f80
]]
Former-commit-id: aff5d0abe267c4419bbecd159b29ef6d6ca51480 [formerly c26818afe6
]
Former-commit-id: 87ce579deb
2013-11-15 13:15:25 -06:00
Steve Harris
1c4b82577c
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 117cac310b
[formerly dc4f3b7594
] [formerly 1015e180f1
] [formerly 2f0d53c9b2
[formerly 1015e180f1
[formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: b1d82b9c2c
[formerly 156395b85b
] [formerly 72d35279c7375fe7db3bdc163cd5fbd4a655ec1d [formerly d97edb20d1
]]
Former-commit-id: 29c5be7d12e460b8d18f00420279fd45027d33c8 [formerly 7127a1e665
]
Former-commit-id: c4e9fe1c94
2013-11-15 13:05:40 -06:00
Steve Harris
e3de9e104e
14.1.1-9 baseline
...
Former-commit-id: ba884f2a27
[formerly a32eadf384
] [formerly f8f995b697
] [formerly ba884f2a27
[formerly a32eadf384
] [formerly f8f995b697
] [formerly 5a0a40e67c
[formerly f8f995b697
[formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 7977f24d77
[formerly eab5bb1147
] [formerly 1abf0e99cad9d8f5d8540c9724d2144a5aab0211 [formerly 8c136f202d
]]
Former-commit-id: 7d3151fa65482d7fe7a3ae91e52a20bb86097b97 [formerly ea382798b5
]
Former-commit-id: ed58bc7f71
2013-11-15 12:47:49 -05:00
Steve Harris
3555ea5b7a
13.5.3-8 baseline
...
Former-commit-id: ed8ef11cb8
[formerly e644eb9219
] [formerly 4029c51fbf
] [formerly ed8ef11cb8
[formerly e644eb9219
] [formerly 4029c51fbf
] [formerly b05ffb2108
[formerly 4029c51fbf
[formerly 5623700c1cde2020ca0a8322edbfcf56afacb604]]]]
Former-commit-id: b05ffb2108
Former-commit-id: c52a724799
[formerly 28e5c8f540
] [formerly fecf6ab52aeb75463fdc9128c8ec88a97cf188f0 [formerly e86f211430
]]
Former-commit-id: ca64f840d41e81ff7eafd7f3183c06bb2bbd06df [formerly d1bf24b8b0
]
Former-commit-id: e494984ce7
2013-11-15 09:28:00 -05:00
Brad Gonzales
d72d725ba7
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 437c29c7f4
[formerly 938683ba4d
] [formerly aa8fb36fc1
] [formerly 53d4de12d9
[formerly aa8fb36fc1
[formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]]]
Former-commit-id: 53d4de12d9
Former-commit-id: 66a8a30092
[formerly 4ec5ee7f74
] [formerly e3193236411f9e577590904b1ee3e08e4ab9ffd5 [formerly 490c95d010
]]
Former-commit-id: e7ce2920a68b4911c5e309cad65b7a703bffe97b [formerly 4499a8d1de
]
Former-commit-id: 2c7e62ee89
2013-11-15 08:00:47 -06:00
Nate Jensen
6b09f38258
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 462878bf86
[formerly 757ca42a5f
] [formerly dd99aa3f47
] [formerly 462878bf86
[formerly 757ca42a5f
] [formerly dd99aa3f47
] [formerly 78b01f61c4
[formerly dd99aa3f47
[formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]]
Former-commit-id: 78b01f61c4
Former-commit-id: d8f4ecc2d7
[formerly d0d712ec6f
] [formerly dc8aea52f7c970fb95e7d9d99a858f44faa15501 [formerly d96cdbe761
]]
Former-commit-id: ec63b3c149df4d0ab77744254adbda1de3fcf101 [formerly f2c777ff48
]
Former-commit-id: 2e81364691
2013-11-14 17:41:24 -06:00
Mike Duff
8f7fe5026c
Issue #2548 - fix malformed comment
...
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034
Former-commit-id: 24dc37f03b
[formerly 0d83797a4e
] [formerly 414cb1cf68
] [formerly 24dc37f03b
[formerly 0d83797a4e
] [formerly 414cb1cf68
] [formerly 95fda38cc5
[formerly 414cb1cf68
[formerly 52462f299735aacee3db09faa6db9f28ba91f552]]]]
Former-commit-id: 95fda38cc5
Former-commit-id: bc96849913
[formerly a13aa64b65
] [formerly 041b2afc87e9fd510c3e653e8424f02271121cc3 [formerly 7be43c4a52
]]
Former-commit-id: 975d2f3e3965fd819361ea85039cd6dd56556377 [formerly 0f2626f79f
]
Former-commit-id: 44c4259ccc
2013-11-14 17:30:55 -06:00
Richard Peter
448c6c570e
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: 979fa16d04
[formerly 157e739623
] [formerly 14b1e924a1
] [formerly 979fa16d04
[formerly 157e739623
] [formerly 14b1e924a1
] [formerly 0bb5e2a61e
[formerly 14b1e924a1
[formerly dba301df2f593baa951c14b684e7ce4794e32019]]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 586b11c80d
[formerly 65e8ad1a62
] [formerly 29857e1e475c9363f0f62efb31ac6cf02ee6e84f [formerly 1a7dd7723b
]]
Former-commit-id: 267888101d1e70c5ebb253bbe68dc00463f279b2 [formerly 38d2c6564a
]
Former-commit-id: 8247da7774
2013-11-14 17:21:48 -06:00
Brian Clements
241564343a
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 cacdf313c5
] [formerly e8c8314abe
[formerly 55682480e1
] [formerly cacdf313c5
] [formerly 00490c2db2
[formerly cacdf313c5
[formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]]
Former-commit-id: 00490c2db2
Former-commit-id: 7625e0ef16
[formerly 878a677d18
] [formerly 8742dd3b5b719d9daf15294c04f9699017a3a49b [formerly ab24330f23
]]
Former-commit-id: 8e8a6bfd8a34aa6c97d6d0ea6b0fad6ad98a7ebf [formerly e7c355df52
]
Former-commit-id: 1a2b934e97
2013-11-14 17:12:02 -06:00
Mike Duff
0e3d39d133
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 223901d9cf
[formerly 8cc9c1de59
] [formerly 47011a70db
] [formerly 223901d9cf
[formerly 8cc9c1de59
] [formerly 47011a70db
] [formerly 47a0477587
[formerly 47011a70db
[formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]]]
Former-commit-id: 47a0477587
Former-commit-id: 0f848918e8
[formerly 44cc3d8776
] [formerly 33980f8e6df3009e6c047cfc2074778085a37612 [formerly b929b7aa02
]]
Former-commit-id: 0ff9a554b33df76684f00b9934e1c4b55b0cb9f6 [formerly 5fdf101af6
]
Former-commit-id: 769e81cd23
2013-11-14 17:07:54 -06:00
Nate Jensen
da110c93cc
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: 2d5752d3d6
[formerly 3b11ea8c5b
] [formerly b4bcd14a85
] [formerly 2d5752d3d6
[formerly 3b11ea8c5b
] [formerly b4bcd14a85
] [formerly c2aacfc437
[formerly b4bcd14a85
[formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]]]
Former-commit-id: c2aacfc437
Former-commit-id: 31392685aa
[formerly f0a0287230
] [formerly dcba58ed57cf3e8859d8471e47fda78c0e7ef984 [formerly a8a1e396fe
]]
Former-commit-id: 92e37cdfb10a78fc44861b3461fac1e50f9a0b14 [formerly 7ec18ba0b1
]
Former-commit-id: f6abd529f7
2013-11-14 16:34:28 -06:00
Bryan Kowal
14b78c5952
Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring.
...
Amend: datadelivery jaxables are now injected
Amend: created a getInstance method for EbxmlJaxbManager
Amend: use value instead of bean in spring configuration
Change-Id: Ib6c11b03964fbaeee24db352a8f0acc1b43fa3c0
Former-commit-id: 8b274264c9
[formerly 782675951b
] [formerly be78fab116
] [formerly 8b274264c9
[formerly 782675951b
] [formerly be78fab116
] [formerly ce16efc9a1
[formerly be78fab116
[formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]]]]
Former-commit-id: ce16efc9a1
Former-commit-id: e810496889
[formerly 512fc1a7c1
] [formerly 5e386da33f46128ec2187010bd711c2f5ecf11d8 [formerly a6ea71d46f
]]
Former-commit-id: a19458086623da11654c40c655f01519bd804871 [formerly 4275b195ce
]
Former-commit-id: bc25cbe7ad
2013-11-14 15:17:28 -06:00
Richard Peter
170aeb49af
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 9bebb21be8
[formerly 800effdc5a
] [formerly 8fb79e7b73
] [formerly 9bebb21be8
[formerly 800effdc5a
] [formerly 8fb79e7b73
] [formerly c42f931118
[formerly 8fb79e7b73
[formerly 13d284277bed2f0f731547ec443a262556df997c]]]]
Former-commit-id: c42f931118
Former-commit-id: b9da33bcea
[formerly e5dc8e2027
] [formerly d0ba6f0b34d98e888dee8eca0e8a59d14ff6436f [formerly 2b95bcfb31
]]
Former-commit-id: 6bd09bf526063f854e453bf474886432548c3c50 [formerly e7d8e5e560
]
Former-commit-id: 2025e073ef
2013-11-14 14:56:59 -06:00
Lee Venable
71f7f7f52f
Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
...
Former-commit-id: 2f134e6aa3
[formerly bd81ec8807
] [formerly 834c2ac8da
] [formerly 2f134e6aa3
[formerly bd81ec8807
] [formerly 834c2ac8da
] [formerly f0ebee3bb3
[formerly 834c2ac8da
[formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]]]
Former-commit-id: f0ebee3bb3
Former-commit-id: 0e326c2a12
[formerly e9b8ee42c7
] [formerly a74585351b2263565cb70d9d704cba8fb765886e [formerly 7d04b2e4ce
]]
Former-commit-id: 649ceeb15e5073f34a435cdd6eb59756c9c5ec8a [formerly ad77be1b44
]
Former-commit-id: 194a6760b7
2013-11-14 14:43:18 -06:00
Mike Duff
b4eaa45753
Issue #2538 - Check for existing adhoc queries in registry.
...
Peer review comments
Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0
Former-commit-id: c3aee76403
[formerly f6c4ca2bc0
] [formerly 87a4b1bec4
] [formerly c3aee76403
[formerly f6c4ca2bc0
] [formerly 87a4b1bec4
] [formerly a80964bc7c
[formerly 87a4b1bec4
[formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]]]
Former-commit-id: a80964bc7c
Former-commit-id: b27ee6803f
[formerly 48093514a6
] [formerly 0ded51344d49c52b18e3738df599260571f7155a [formerly 4557a06f42
]]
Former-commit-id: 1f88021dcffff2375d1ca1a6dd6252ce277c8f2c [formerly cf077ed7f9
]
Former-commit-id: 2b91b4b9ef
2013-11-14 14:40:33 -06:00