xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4505 commits 31 branches 40 tags 3.8 GiB
Commit graph

4505 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nate Jensen
e6c012c071 Merge "Issue #2537 point data code cleanup." into development 
Former-commit-id: de593896f8 [formerly 9a4a4fba2d] [formerly de593896f8 [formerly 9a4a4fba2d] [formerly d9ab670d45 [formerly 8ccafcec9155bdab49d4d41c3a463323946f1850]]]
Former-commit-id: d9ab670d45
Former-commit-id: 1326b0ec0f [formerly 0a936e860a]
Former-commit-id: 3b00fc37a5
 2013-11-26 17:48:53 -06:00
Ben Steffensmeier
d06d42ec24 Issue #2528 Allow geostationary data to display on an identical projection. 
Change-Id: I930cd35a2e2fd7f6b1347cd9d5063fe9cd578d46

Former-commit-id: 5369a757ce [formerly 048f968147] [formerly 5369a757ce [formerly 048f968147] [formerly 59d806fa7e [formerly c2b5cca6c1c02122a8d006704f415868debe4f75]]]
Former-commit-id: 59d806fa7e
Former-commit-id: a78188ecb9 [formerly 37f6acbb99]
Former-commit-id: 14d7341d68
 2013-11-26 17:38:29 -06:00
Ben Steffensmeier
38ca6a726c Issue #2574 Fix conversion of null grid coverage in dataURI. 
Former-commit-id: e639a00fd8 [formerly 21f0abbca1] [formerly e639a00fd8 [formerly 21f0abbca1] [formerly 6d14edd0a8 [formerly 38352d01b6a4d85bd6961d791370db87d8800bf2]]]
Former-commit-id: 6d14edd0a8
Former-commit-id: c300d0ee8a [formerly 089bdf97cb]
Former-commit-id: 63d163c00e
 2013-11-26 15:19:31 -06:00
Ben Steffensmeier
b29fbe64a8 Issue #2537 point data code cleanup. 
Former-commit-id: 42107fba5c [formerly a4e3a4a03b] [formerly 42107fba5c [formerly a4e3a4a03b] [formerly 7889c14b35 [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]]
Former-commit-id: 7889c14b35
Former-commit-id: a4e3bf34b8 [formerly 62ca7b1df6]
Former-commit-id: 8c386a2aac
 2013-11-26 15:16:54 -06:00
Ben Steffensmeier
5ee4468108 Issue #2574 Add DataURIFieldConverter for GridCoverages. 
Former-commit-id: cf6ef77d78 [formerly 08be03d3fa] [formerly cf6ef77d78 [formerly 08be03d3fa] [formerly bdb0e111ea [formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]]]
Former-commit-id: bdb0e111ea
Former-commit-id: d8f5e957d3 [formerly f7b1015dca]
Former-commit-id: b1de6a34eb
 2013-11-25 12:17:36 -06:00
Ben Steffensmeier
d307af23eb Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images 
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: 8a7d3ceab1 [formerly 927801985a] [formerly 8a7d3ceab1 [formerly 927801985a] [formerly 3696896b49 [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]]
Former-commit-id: 3696896b49
Former-commit-id: ca5e771451 [formerly 70ca78c7b5]
Former-commit-id: a3f5fcabf6
 2013-11-25 11:31:57 -06:00
Nate Jensen
441577fb39 Merge "Issue #2359 add ability to ignore messages based on threads, ie ignore shef" into development 
Former-commit-id: 102e82445c [formerly 00fa91223b] [formerly 102e82445c [formerly 00fa91223b] [formerly 38cc0b46f6 [formerly c4baf73e044c156a942290b8be603d9c9621d9fe]]]
Former-commit-id: 38cc0b46f6
Former-commit-id: b48359ab38 [formerly be4943ae3d]
Former-commit-id: 7ffe17a73e
 2013-11-25 08:34:40 -06:00
Nate Jensen
a858617b6c Issue #2359 add ability to ignore messages based on threads, ie ignore 
shef

Change-Id: I51d4b29e7accb3ce5bd90c7478c7f143bd76bb48

Former-commit-id: db842ce2e6 [formerly 4a4f50155c] [formerly db842ce2e6 [formerly 4a4f50155c] [formerly ed1b94ea07 [formerly 4a9f2db86a148b58610680dbd2230b286d89e361]]]
Former-commit-id: ed1b94ea07
Former-commit-id: c836673ac6 [formerly 3b0ed49de4]
Former-commit-id: 493f51eae7
 2013-11-22 15:54:22 -06:00
Richard Peter
5bb7b93078 Merge "Issue #2532 Fix grid displays of grids larger than the world." into development 
Former-commit-id: 4b09affc7c [formerly b26e562845] [formerly 4b09affc7c [formerly b26e562845] [formerly be7c2ef08e [formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]]
Former-commit-id: be7c2ef08e
Former-commit-id: d1201473cd [formerly c51cc4bf17]
Former-commit-id: 91fcef9d3f
 2013-11-22 12:38:05 -06:00
Nate Jensen
3d4b802ead Merge "Issue #2361 fix style manager's jaxb context" into development 
Former-commit-id: 38fdf1edcf [formerly 9de7c7f434] [formerly 38fdf1edcf [formerly 9de7c7f434] [formerly 49ce4d4be3 [formerly 0b018d8cd8f9738eb11897f07a83a5e370dcbcac]]]
Former-commit-id: 49ce4d4be3
Former-commit-id: e049c8aca2 [formerly 6ab6de4419]
Former-commit-id: 54c2d1e420
 2013-11-22 10:08:13 -06:00
Nate Jensen
3e24b4827e Issue #2361 fix style manager's jaxb context 
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68

Former-commit-id: 2c61b8f4d6 [formerly 16329ab06b] [formerly 2c61b8f4d6 [formerly 16329ab06b] [formerly 328991e577 [formerly 2fddfc61fb8de88a67deb5b66a570ca548628ab3]]]
Former-commit-id: 328991e577
Former-commit-id: 24e99ec924 [formerly ebc3efdf80]
Former-commit-id: b6748206e5
 2013-11-22 09:15:24 -06:00
Dave Hladky
2e254e0208 Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display 
Former-commit-id: 233238d8df [formerly 04c7e2cffc] [formerly 233238d8df [formerly 04c7e2cffc] [formerly a9a3973319 [formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]]
Former-commit-id: a9a3973319
Former-commit-id: cebf79ad44 [formerly ebd6d5cbe1]
Former-commit-id: 54af53ffb4
 2013-11-21 14:46:47 -06:00
Nate Jensen
f3bbaa5362 Merge "Issue #2033 fix plots working with multiple plotModels dirs contributed by different plugins" into development 
Former-commit-id: 32cbfd6150 [formerly ddb0eaf0ff] [formerly 32cbfd6150 [formerly ddb0eaf0ff] [formerly d851e6fc97 [formerly 8f5078ce2a5369c62073a70b1772c2d0c96317fa]]]
Former-commit-id: d851e6fc97
Former-commit-id: f5a2c7298a [formerly f60948fc36]
Former-commit-id: a5469c1d9e
 2013-11-21 10:12:11 -06:00
Nate Jensen
ce8dd7468d 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: ab96dde78a [formerly 982a664301] [formerly ab96dde78a [formerly 982a664301] [formerly 695262552f [formerly 8c71361680cbe5860cbd4d76c3908cfbef23068f]]]
Former-commit-id: 695262552f
Former-commit-id: 3d8c69c800 [formerly 198ff37bd7]
Former-commit-id: eb0f52cfca
 2013-11-21 08:36:59 -06:00
Bryan Kowal
7d66f1186d Increment python release for gridslice update. 
Former-commit-id: f413677106 [formerly 5f634773fe] [formerly f413677106 [formerly 5f634773fe] [formerly c48a946923 [formerly 5c5a81739c64ff1ab7f8812be8ac9390e8d85588]]]
Former-commit-id: c48a946923
Former-commit-id: 869781248b [formerly f7438d4fa6]
Former-commit-id: e39159052c
 2013-11-20 17:40:18 -06:00
Nate Jensen
3a5a066bf3 Issue #2033 fix plots working with multiple plotModels dirs contributed 
by different plugins

Change-Id: I2d1ff75c62395ead5154398002610401faa4388d

Former-commit-id: b3028b4f39 [formerly 9371c63c41] [formerly b3028b4f39 [formerly 9371c63c41] [formerly 2b6799712d [formerly 0ed68f5ec6b2b2f3413f7de5f9c7b15291afb85c]]]
Former-commit-id: 2b6799712d
Former-commit-id: 87dc5fb261 [formerly 3e88de72dc]
Former-commit-id: 19b467c208
 2013-11-20 17:33:53 -06:00
Brad Gonzales
65eefe2846 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: c7959336f5 [formerly 93b47ce68b] [formerly c7959336f5 [formerly 93b47ce68b] [formerly d2cfc5986a [formerly d8040be0d01c11fc7bfafe40a7afe509ba372ea0]]]
Former-commit-id: d2cfc5986a
Former-commit-id: 4a83ff7971 [formerly 04d7bff784]
Former-commit-id: 70f66e5f7a
 2013-11-20 15:49:27 -06:00
Ben Steffensmeier
67b724a541 Issue #2528 Add brute force method of calculating geostationary envelope intersections. 
Change-Id: Ie02ae1e493015dcca88468633db65c51cd701adf

Former-commit-id: 9627cf0f6f [formerly 30d125f95a] [formerly 9627cf0f6f [formerly 30d125f95a] [formerly 00af766143 [formerly 393aba6883e536912f7b1e34bd922d53eaa63727]]]
Former-commit-id: 00af766143
Former-commit-id: abdb1c504c [formerly 6faafa2dfc]
Former-commit-id: c742abd06e
 2013-11-20 15:36:27 -06:00
Ron Anderson
e2f54e78d0 Issue #2488 Change to use DejaVu fonts 
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224

Former-commit-id: 7a3c7d530e [formerly d72119409e] [formerly 7a3c7d530e [formerly d72119409e] [formerly 633137d8c0 [formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]]
Former-commit-id: 633137d8c0
Former-commit-id: 769df41dea [formerly f6b9e69738]
Former-commit-id: a731f80011
 2013-11-20 13:43:25 -06:00
Greg Armendariz
5d5f7c9d44 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: 6efadcdeed [formerly 93daf9aff4] [formerly 6efadcdeed [formerly 93daf9aff4] [formerly bc6c4e2b32 [formerly 243e06d507ee85bfa7e30f5da41c146afa4d1043]]]
Former-commit-id: bc6c4e2b32
Former-commit-id: dd31a09cf9 [formerly ce2ef25207]
Former-commit-id: c94e59646b
 2013-11-20 12:26:30 -06:00
Brad Gonzales
fc4850d7b2 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: 5576ac6134 [formerly 053f20c70b] [formerly 5576ac6134 [formerly 053f20c70b] [formerly 95a1914c71 [formerly c245f741b9e78d8e4503698336d9929536e72e0d]]]
Former-commit-id: 95a1914c71
Former-commit-id: 3c86e33ea4 [formerly 04829d37e2]
Former-commit-id: 6e19c4dab1
 2013-11-20 11:58:33 -06:00
Ben Steffensmeier
6cd151b427 Issue #2532 Fix grid displays of grids larger than the world. 
Former-commit-id: 6d878e3361 [formerly d3ed1ba356] [formerly 6d878e3361 [formerly d3ed1ba356] [formerly 41753c40b5 [formerly e607da0bb204d61cbc998595f52406605c1953e0]]]
Former-commit-id: 41753c40b5
Former-commit-id: 7f441392b8 [formerly 07743c4369]
Former-commit-id: 1bc4453a8d
 2013-11-20 11:11:03 -06:00
Brian Clements
6b8a853240 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: d35fc591d2 [formerly fe58826a1e] [formerly d35fc591d2 [formerly fe58826a1e] [formerly 0f40ae2b99 [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 10e63616ff [formerly b762864f88]
Former-commit-id: 2e4dc2000e
 2013-11-20 08:40:12 -06:00
Brian Clements
9d3df8f842 Issue #2495 changed gridslice to use correct dimension datatype 
Former-commit-id: 4c3453a657 [formerly aa24bc6fce] [formerly 4c3453a657 [formerly aa24bc6fce] [formerly 5e7f2f0bdf [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]]
Former-commit-id: 5e7f2f0bdf
Former-commit-id: 90601f6ff8 [formerly 05b2a015cb]
Former-commit-id: a8c2c5870c
 2013-11-19 17:53:39 -06:00
Bryan Kowal
ce6f126469 Issue #2552 - replace Logger with UFStatus 
Former-commit-id: c938d03deb [formerly ff968c9884] [formerly c938d03deb [formerly ff968c9884] [formerly 0bdb25bf43 [formerly 10971eca8d10817c97073c6142ea7cf08b28fa27]]]
Former-commit-id: 0bdb25bf43
Former-commit-id: be5b0b83c9 [formerly da148196ac]
Former-commit-id: 91367f57b6
 2013-11-19 17:11:36 -06:00
Steve Harris
fbe9de41ad Merge branch 'master_14.1.1' into omaha_14.1.1 
Former-commit-id: d1b2cdd566 [formerly 65ebfc1a18] [formerly d1b2cdd566 [formerly 65ebfc1a18] [formerly c0bb3a1102 [formerly c333fe23736110bcb273aafd90ee6551ff7e921d]]]
Former-commit-id: c0bb3a1102
Former-commit-id: eff32cfbf3 [formerly e8c6af3060]
Former-commit-id: 70536b40ba
 2013-11-19 15:45:06 -06:00
Steve Harris
ea65181d19 14.1.1-10 baseline 
Former-commit-id: 8251107646 [formerly ca0f65bd9a] [formerly 8251107646 [formerly ca0f65bd9a] [formerly 9248695a1f [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: e35ec60f7e [formerly ef6e0b0304]
Former-commit-id: 36d788890a
 2013-11-19 16:40:25 -05:00
Lee Venable
fd377ca4cc Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development 
Former-commit-id: b6321334e6 [formerly f8f0a0e41e] [formerly b6321334e6 [formerly f8f0a0e41e] [formerly d42c36f365 [formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]]]
Former-commit-id: d42c36f365
Former-commit-id: c680cc3ea9 [formerly da5cfb3d8e]
Former-commit-id: d3b12f6973
 2013-11-19 15:12:38 -06:00
Nate Jensen
3cbf29226a Merge "Issue #2361 don't initialize derived parameters on shutdown" into development 
Former-commit-id: f7034f933e [formerly c6d6b07e3f] [formerly f7034f933e [formerly c6d6b07e3f] [formerly a610825ef9 [formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]]]
Former-commit-id: a610825ef9
Former-commit-id: 789f050b27 [formerly 04de350ae7]
Former-commit-id: ac93e07973
 2013-11-19 14:11:01 -06:00
Richard Peter
c5143e94e1 Merge "Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed" into development 
Former-commit-id: c82e143fe1 [formerly 4c9bcf718a] [formerly c82e143fe1 [formerly 4c9bcf718a] [formerly b296fd1d02 [formerly d3559746302f09db933f9b8deecfe410e63d8430]]]
Former-commit-id: b296fd1d02
Former-commit-id: 93dbc58a93 [formerly ba8fae576c]
Former-commit-id: 8efa7a1512
 2013-11-19 13:18:05 -06:00
Nate Jensen
9cbe1a123e Issue #2361 don't initialize derived parameters on shutdown 
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583

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

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

Former-commit-id: f8d5563973 [formerly c908647259] [formerly f8d5563973 [formerly c908647259] [formerly 665d9e7651 [formerly cacc7a8560c589b24ea98191f152c31479c5631e]]]
Former-commit-id: 665d9e7651
Former-commit-id: 8221f50e8a [formerly 5afa90b967]
Former-commit-id: d254f954c4
 2013-11-19 08:55:27 -06:00
Nate Jensen
1926ac3647 Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development 
Former-commit-id: accbd46ad6 [formerly edf51dffc9] [formerly accbd46ad6 [formerly edf51dffc9] [formerly 3d51d80170 [formerly b6420738e49d37840789c88089ecc8bab1103284]]]
Former-commit-id: 3d51d80170
Former-commit-id: 7da95f7b57 [formerly f07f543cd3]
Former-commit-id: a5abd4dad0
 2013-11-18 12:50:38 -06:00
Nate Jensen
553a32f5a3 Merge "Issue #2544 Fix recycling issues with Satellite resources." into development 
Former-commit-id: 493cdb287c [formerly 0dbe79344a] [formerly 493cdb287c [formerly 0dbe79344a] [formerly 827b7f5a93 [formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]]
Former-commit-id: 827b7f5a93
Former-commit-id: 3de7e3576b [formerly 6900d4e47f]
Former-commit-id: b6fe32de06
 2013-11-18 12:50:19 -06:00
Ben Steffensmeier
9fa1dbbfa5 Issue #2543 fix gl buffer formating problems 
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc

Former-commit-id: 6b6c46afa8 [formerly 105e3e359a] [formerly 6b6c46afa8 [formerly 105e3e359a] [formerly e7a068e595 [formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]]
Former-commit-id: e7a068e595
Former-commit-id: 51c04680e2 [formerly e605758e57]
Former-commit-id: 9bd35b793d
 2013-11-18 11:51:51 -06:00
Ben Steffensmeier
7de35d0111 Issue #2544 Fix recycling issues with Satellite resources. 
Former-commit-id: 15ae95075d [formerly e392185d78] [formerly 15ae95075d [formerly e392185d78] [formerly 9ff1751f4e [formerly 166957a22c3447fa2407b13362eece24943675c9]]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 0788a82a99 [formerly 1875f56695]
Former-commit-id: 55f26e277f
 2013-11-18 11:44:56 -06:00
Nate Jensen
7e76b097c7 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development 
Former-commit-id: 93e93de742 [formerly 4f47800cae] [formerly 93e93de742 [formerly 4f47800cae] [formerly 0146ae59df [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]]
Former-commit-id: 0146ae59df
Former-commit-id: d9d0eb7354 [formerly a238ba2ba3]
Former-commit-id: 951c1ff2f3
 2013-11-18 11:39:12 -06:00
Steve Harris
f3604b2fc8 Merge branch 'master_13.5.3' into development_on_RHEL5 
Former-commit-id: 58325f2c17 [formerly be0f3bf912] [formerly 58325f2c17 [formerly be0f3bf912] [formerly d810aacaaa [formerly 648659c6a364b85a8531f24910ab535c9bcf73ce]]]
Former-commit-id: d810aacaaa
Former-commit-id: c86e70be8c [formerly 8ca6f8d14b]
Former-commit-id: 4f6e7095a3
 2013-11-15 13:19:01 -06:00
Steve Harris
87ce579deb 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: 542a0946f2 [formerly 0a36987a01] [formerly 542a0946f2 [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 3f9df61017 [formerly 869b505f80]
Former-commit-id: c26818afe6
 2013-11-15 13:15:25 -06:00
Steve Harris
c4e9fe1c94 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: dc4f3b7594 [formerly 1015e180f1] [formerly dc4f3b7594 [formerly 1015e180f1] [formerly 2f0d53c9b2 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: 156395b85b [formerly d97edb20d1]
Former-commit-id: 7127a1e665
 2013-11-15 13:05:40 -06:00
Steve Harris
ed58bc7f71 14.1.1-9 baseline 
Former-commit-id: a32eadf384 [formerly f8f995b697] [formerly a32eadf384 [formerly f8f995b697] [formerly 5a0a40e67c [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: eab5bb1147 [formerly 8c136f202d]
Former-commit-id: ea382798b5
 2013-11-15 12:47:49 -05:00
Steve Harris
e494984ce7 13.5.3-8 baseline 
Former-commit-id: e644eb9219 [formerly 4029c51fbf] [formerly e644eb9219 [formerly 4029c51fbf] [formerly b05ffb2108 [formerly 5623700c1cde2020ca0a8322edbfcf56afacb604]]]
Former-commit-id: b05ffb2108
Former-commit-id: 28e5c8f540 [formerly e86f211430]
Former-commit-id: d1bf24b8b0
 2013-11-15 09:28:00 -05:00
Brad Gonzales
2c7e62ee89 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: 938683ba4d [formerly aa8fb36fc1] [formerly 938683ba4d [formerly aa8fb36fc1] [formerly 53d4de12d9 [formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]]
Former-commit-id: 53d4de12d9
Former-commit-id: 4ec5ee7f74 [formerly 490c95d010]
Former-commit-id: 4499a8d1de
 2013-11-15 08:00:47 -06:00
Nate Jensen
2e81364691 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE 
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

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

Former-commit-id: 0d83797a4e [formerly 414cb1cf68] [formerly 0d83797a4e [formerly 414cb1cf68] [formerly 95fda38cc5 [formerly 52462f299735aacee3db09faa6db9f28ba91f552]]]
Former-commit-id: 95fda38cc5
Former-commit-id: a13aa64b65 [formerly 7be43c4a52]
Former-commit-id: 0f2626f79f
 2013-11-14 17:30:55 -06:00
Richard Peter
8247da7774 Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development 
Former-commit-id: 157e739623 [formerly 14b1e924a1] [formerly 157e739623 [formerly 14b1e924a1] [formerly 0bb5e2a61e [formerly dba301df2f593baa951c14b684e7ce4794e32019]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 65e8ad1a62 [formerly 1a7dd7723b]
Former-commit-id: 38d2c6564a
 2013-11-14 17:21:48 -06:00
Brian Clements
1a2b934e97 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: 55682480e1 [formerly cacdf313c5] [formerly 55682480e1 [formerly cacdf313c5] [formerly 00490c2db2 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]
Former-commit-id: 00490c2db2
Former-commit-id: 878a677d18 [formerly ab24330f23]
Former-commit-id: e7c355df52
 2013-11-14 17:12:02 -06:00