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

2027 commits

Author SHA1 Message Date
Nate Jensen
264555b5d7 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development 
Former-commit-id: 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]
Former-commit-id: 5a99163569
Former-commit-id: 4719aa1e26e1f8f1e10b15401b23c42814a2069f [formerly cf63b37257]
Former-commit-id: b511177fa1
 2013-10-24 20:02:18 -05:00
Nate Jensen
e6e0942d70 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 b1244552e4 [formerly b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]
Former-commit-id: b1244552e4
Former-commit-id: 7e842a91bf165a8db2e89fabd3906c256ec6db0e [formerly 803c9a8217]
Former-commit-id: 3a1856b168
 2013-10-24 19:52:13 -05:00
Nate Jensen
d21d7c5283 Merge "Issue #2454 Ice model, general ensemble model troubles, null cycle times" into development 
Former-commit-id: 5e54da3258 [formerly b2cdbd6fc5] [formerly 5d96feb00e] [formerly 298114500c [formerly 5d96feb00e [formerly 58686a03e01b6d151b3774bd63ee55b0276b1880]]]
Former-commit-id: 298114500c
Former-commit-id: 251c8ae97f34417aa2812c59e32158d427e4285e [formerly fc1898234d]
Former-commit-id: 39e7b0fd95
 2013-10-24 19:51:49 -05:00
Dave Hladky
e44f20606e Issue #2484 Added originatingSite to id for Subscription registry objects. 
Former-commit-id: 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 36d7c60914 [formerly 3c33f6e5ea [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]]
Former-commit-id: 36d7c60914
Former-commit-id: 84058224c1b44f8002df97e875e14dd66e8446ce [formerly 2b5ffeab74]
Former-commit-id: db33e9cafa
 2013-10-24 13:52:45 -05:00
Jonathan Sanchez
7e7e0c1b27 Issue #2496 Updated gfe spring files to support GFE grids in hazard services. 
Change-Id: Icd58f77266a9e6c67c001badcdd1f7590640b162

Former-commit-id: 2c38de5fc5 [formerly c289f77965] [formerly ec2f7c8ce7] [formerly cb5ac5c835 [formerly ec2f7c8ce7 [formerly 0946721292171cc2d14b173a60c273731b73af12]]]
Former-commit-id: cb5ac5c835
Former-commit-id: 0d0f8c6a10f942e9061f2231cc9721b46526f419 [formerly 2420f1a231]
Former-commit-id: d8e14ca6e9
 2013-10-24 12:22:02 -05:00
Benjamin Phillippe
1664af6b9d Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager 
Change-Id: I7e0e98517ff7d2213957004c6a94e38cf7063cce

Former-commit-id: 9a8c43a777 [formerly 127b5a3b70] [formerly be09ba9fcf] [formerly 0905d6ffdd [formerly be09ba9fcf [formerly 40fec1c49a0a4aa2ecb4afdf4cf225e6359efd28]]]
Former-commit-id: 0905d6ffdd
Former-commit-id: df866e1f5581eb7f04abe632e8f4bbc1bb498f33 [formerly 041ce07803]
Former-commit-id: a169585a0a
 2013-10-24 11:51:11 -05:00
Bryan Kowal
1e76925994 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: e72cf1aa46 [formerly 6e0737e65f] [formerly a7b85498ef] [formerly 49eed21398 [formerly a7b85498ef [formerly 1bfc1a0c02691dfe620909a8c551fa2a79c5a484]]]
Former-commit-id: 49eed21398
Former-commit-id: bb3214224b85612967ba09e2cd193a2dff2d5f0d [formerly 3c6f5cc08f]
Former-commit-id: e87a77d017
 2013-10-24 11:32:04 -05:00
Ben Steffensmeier
3b4ae67ded Issue #2491 Use reflections to build Procedure JAXB context. 
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: f98448d19f [formerly a935ffadf7] [formerly bfc3faf08f] [formerly fa0a0619bc [formerly bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 0c6ad2e7a6ad44d264169d56b0486e1f819a8499 [formerly d927e6b2d7]
Former-commit-id: 09a3276d51
 2013-10-24 11:28:06 -05:00
Dave Hladky
60c57083ec Issue #2469 Refined deletion of adhoc subs. 
Former-commit-id: f6763481a2 [formerly e02868bf2a] [formerly 988bb90523] [formerly 6b5543501a [formerly 988bb90523 [formerly f8d93b233f32623864f86edf822b77b68aa5e0a0]]]
Former-commit-id: 6b5543501a
Former-commit-id: 14b9d536bae75aa52c4b4574d3c9332befc403b5 [formerly 14ea0393a1]
Former-commit-id: 05c2ce9bc3
 2013-10-24 09:32:41 -05:00
Brad Gonzales
1449b0270b Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs 
on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box.

Amend: Added excludes to sbnSimulator modes.
       Updated FileUtil.listPaths to close the stream and use a LinkedList.
       Added additional logging to SbnSimulator.

Change-Id: I89ff7d4afdd18ba51b8fd4812bb0b871ffc6d3af

Former-commit-id: e4f3bcf7ee [formerly 5145ec3dfe] [formerly bd7e5d8940] [formerly f7a635ebef [formerly bd7e5d8940 [formerly f9e593974811896dec76c512c2a76b5769c7a68a]]]
Former-commit-id: f7a635ebef
Former-commit-id: c3d8e35cadd5927e79213f8c47d73c2feded21ff [formerly c36cbae577]
Former-commit-id: 88a20aeae1
 2013-10-23 18:44:41 -05:00
Richard Peter
ca392195cb Merge "Issue #2446 Added cluster lock and check for purgeable data to publish." into development 
Former-commit-id: ddcfb3785f [formerly 32131b3b27] [formerly 2220ce9aa3] [formerly b5072746fe [formerly 2220ce9aa3 [formerly d41377864a0a20fa6e09f6a035e33402b0d79c16]]]
Former-commit-id: b5072746fe
Former-commit-id: c433dcb03f3a6c8f1b7988a97befddc483c4253f [formerly f71d65d257]
Former-commit-id: feb1655ae3
 2013-10-23 16:57:28 -05:00
Richard Peter
330a333933 Merge "Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer" into development 
Former-commit-id: 6d62f99937 [formerly 859dd8272d] [formerly 5fc3956337] [formerly 1750224476 [formerly 5fc3956337 [formerly 381be8f02831002b29a8a90831b1c116d023c48f]]]
Former-commit-id: 1750224476
Former-commit-id: 2a01606c61164f3088d8d81dc3e051f71ec538b1 [formerly 383a774fad]
Former-commit-id: bf7a5b48b1
 2013-10-23 16:53:22 -05:00
Richard Peter
a1eebaaf69 Merge "Issue #1682 Fixed registry query that prevented deletions of subscriptions" into development 
Former-commit-id: 3cd286ba60 [formerly 2e7836431e] [formerly 7ec76c0634] [formerly 6b4c675600 [formerly 7ec76c0634 [formerly 3054f3682a955395f381d3d9c78728c4a4492b69]]]
Former-commit-id: 6b4c675600
Former-commit-id: 97c05a8e322561ee200f9573a86e4869891f59bd [formerly 109474aec7]
Former-commit-id: 3843947a17
 2013-10-23 16:41:57 -05:00
Richard Peter
337cf9ab3b Merge "Issue #1538 Reworked registry database connection strategy" into development 
Former-commit-id: e79bc34c91 [formerly b6541dfb40] [formerly 58d4da8db6] [formerly ffb7a6e6ae [formerly 58d4da8db6 [formerly 2051ba7e62c8ba4fc953917bd0be72afbdacae76]]]
Former-commit-id: ffb7a6e6ae
Former-commit-id: 632e36362375d729c2d4dffa12a4dedf09c7fd15 [formerly 1b74f629f7]
Former-commit-id: a8f9146990
 2013-10-23 16:33:29 -05:00
Roger Ferrel
50e00ff50a Issue #2478 Make database archive date format thread safe. 
Change-Id: I0b864b5678ce60c88dfc6bb19857d97421a9e5f6

Former-commit-id: 6f62c2c226 [formerly 64b20ed2b3] [formerly 1551a51954] [formerly 65b11b22b4 [formerly 1551a51954 [formerly a33202aa75cc3ba5be71288c3dd49bb395535826]]]
Former-commit-id: 65b11b22b4
Former-commit-id: 6ca39d866e473596e1e69d707aa06c3d0413494a [formerly 613ae43736]
Former-commit-id: f809ada9c2
 2013-10-23 16:23:50 -05:00
Ron Anderson
88f6e5d9d7 Issue #2446 Added cluster lock and check for purgeable data to publish. 
Change-Id: Ib54c1f917251eb59920254682b1c707b7fdca089

Former-commit-id: 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly cc28fca175 [formerly 002bb6ab89 [formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]]]
Former-commit-id: cc28fca175
Former-commit-id: 4b9ce7666378daf235ca6c2275644a5d5cc7407a [formerly 20fcbd322e]
Former-commit-id: 0d9df14596
 2013-10-23 16:02:40 -05:00
Richard Peter
b29e037e05 Merge branch 'development' into development_on_RHEL6 
Conflicts:
	cots/org.jep.linux64/libjep.so

Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d

Former-commit-id: 9b5d2fa69f [formerly f69bbf7952] [formerly cb33f5ada7] [formerly 14d5b8656e [formerly cb33f5ada7 [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]]
Former-commit-id: 14d5b8656e
Former-commit-id: e43a9bab4c68a481f2c9959d56447b4b556d21ba [formerly 6ecb80e892]
Former-commit-id: a49c67203e
 2013-10-23 15:50:25 -05:00
Nate Jensen
d2af0d52a6 Issue #2361 remove dependencies on mesowest and delete dead grichardson code 
Former-commit-id: bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]
Former-commit-id: 2f79b34a77
Former-commit-id: a01d69eb125667dc0511591658732e612649a73e [formerly 1adac8829f]
Former-commit-id: 2419a99ac7
 2013-10-23 14:52:29 -05:00
Brad Gonzales
a6b82470eb Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler. 
Amend: Also applied old patch to fix tool tips on message bar.

Change-Id: I2f83bbd07be9cb07d51c23a7e068144692f44771

Former-commit-id: 3a450cd3c0 [formerly df1e60b078] [formerly 60d7a13afd] [formerly e3883dba15 [formerly 60d7a13afd [formerly 3abca4ca950facaaa5a29cf2aaa6fccdcf469e95]]]
Former-commit-id: e3883dba15
Former-commit-id: 626bc6ac4ce722cbc6c9e2cd43b6ed575ca56112 [formerly b8cd1d5446]
Former-commit-id: 086dfe9ebc
 2013-10-23 14:13:03 -05:00
Nate Jensen
20f05bb5f6 Merge "Issue #2361 once again try to remove more common ISerializableObject" into development 
Former-commit-id: dd641d8c1a [formerly d3a21bc431] [formerly 4c7bee41a7] [formerly 65962ae15a [formerly 4c7bee41a7 [formerly 5ec014c2fccf9b5e417738310b50beccd70ee62d]]]
Former-commit-id: 65962ae15a
Former-commit-id: f1ec56fa0b5f76ec6ff24f29eb75e8200ccfbdb2 [formerly 6bd779e459]
Former-commit-id: 56be5c199e
 2013-10-23 14:00:28 -05:00
Benjamin Phillippe
2e77c00d1b Issue #1682 Fixed registry query that prevented deletions of subscriptions 
Change-Id: I92da9f43cfb86711d6238c07a86cad94742777f2

Former-commit-id: 142639abf7 [formerly 9f03f26ad6] [formerly 22c8ed7add] [formerly 3a3fb00f78 [formerly 22c8ed7add [formerly b3ef0276414f5009f79e55e3b08c58daeeb56e26]]]
Former-commit-id: 3a3fb00f78
Former-commit-id: b4d42937ab7872a879f37d968df6b96635a96729 [formerly c07e7fac10]
Former-commit-id: 7eadbf5175
 2013-10-23 13:03:25 -05:00
Nate Jensen
5c2e8c802f Issue #2361 once again try to remove more common ISerializableObject 
Change-Id: I149fa1009b2d85b2c2f5e9247515eecb835dad09

Former-commit-id: a085291451 [formerly 46edfda4da] [formerly 40d8e42b87] [formerly 4b80a31f22 [formerly 40d8e42b87 [formerly 05585a1d0f9fdab55c8ad2ce83d8e979450521ba]]]
Former-commit-id: 4b80a31f22
Former-commit-id: deae503ad96698888f88175ce8cef56e53c6078d [formerly f782d20320]
Former-commit-id: 1742f9a3fa
 2013-10-23 11:40:13 -05:00
Benjamin Phillippe
9e693c9c05 Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer 
Change-Id: I2d22199f9e1e35b3425e294ce3884ebb9d2cc99f

Former-commit-id: e697b3d9d3 [formerly 0400391864] [formerly cd55f3e328] [formerly 68eeb03630 [formerly cd55f3e328 [formerly 18737abc6781a353b831d9c012cc293f60731f89]]]
Former-commit-id: 68eeb03630
Former-commit-id: adf849c746259a16325f2fd041da2d7418ca427d [formerly 84d5c28331]
Former-commit-id: c20c08dc73
 2013-10-23 11:05:38 -05:00
Benjamin Phillippe
ff5a939ffa Issue #1538 Reworked registry database connection strategy 
Change-Id: I6c8a18946ec9cecbd91ac5fbc48407841f28e7ae

Former-commit-id: cf109fea6b [formerly 16cf053ba9] [formerly b192fd81c4] [formerly ef0d0e2393 [formerly b192fd81c4 [formerly e9e4d1ae4bbe6098f637dbca64f684c90313d478]]]
Former-commit-id: ef0d0e2393
Former-commit-id: bb1aae881f66d72dc6ea40bef73dbcee83f6f04e [formerly 5aa04a9a43]
Former-commit-id: e2383dc624
 2013-10-23 10:48:40 -05:00
Richard Peter
c2514c8bdd Merge "Issue #1538 Made http timeouts configurable on registry service http connections" into development 
Former-commit-id: 8dc43c5bc1 [formerly d7036ceeb4] [formerly 4776e83979] [formerly 9cf347fe7f [formerly 4776e83979 [formerly a12bc6ddd2fd4388fc541015926e2e51aa40e090]]]
Former-commit-id: 9cf347fe7f
Former-commit-id: b0d2a2ed02d8a815274915d8dfbbf4e797fb3dd5 [formerly 7e171abbb8]
Former-commit-id: 1724640945
 2013-10-23 10:01:00 -05:00
Benjamin Phillippe
2cd2b88750 Issue #1538 Made http timeouts configurable on registry service http connections 
Change-Id: I2f91b713475027a3e514d0fd98605fc83bdac447

Former-commit-id: 23af775648 [formerly 71168e4791] [formerly dd57ea1cd4] [formerly 2c39b78ded [formerly dd57ea1cd4 [formerly cf9f51098a2778f747984940a764ab5089afd231]]]
Former-commit-id: 2c39b78ded
Former-commit-id: dd5a45642652d7ef7fb50f8716df3e35f4f3ad6b [formerly 16b21fe41c]
Former-commit-id: d9fbb6737e
 2013-10-23 09:57:52 -05:00
Dave Hladky
9f5d35cb7f Issue #2454 Ice model, general ensemble model troubles, null cycle times 
Former-commit-id: 589f99beb8 [formerly 7659bcd183] [formerly ba2e1ed3fc] [formerly 94b5bd79f9 [formerly ba2e1ed3fc [formerly 5fd82b153d87228037e594c838dc3c445c8874aa]]]
Former-commit-id: 94b5bd79f9
Former-commit-id: 1e5d302194edf9e9e0cbae3f10c84d2f621ff942 [formerly 5ca57c8edd]
Former-commit-id: ba0bef4aa3
 2013-10-22 16:48:54 -05:00
Nate Jensen
b1a5a615f3 Merge "Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image." into development 
Former-commit-id: 09ec04b9f4 [formerly 4aa40ad61a] [formerly 50bf735240] [formerly aa0554d073 [formerly 50bf735240 [formerly 41462b804bf079368bead7c1271b1abdb7d4bf63]]]
Former-commit-id: aa0554d073
Former-commit-id: ae45b51290b85ce8a744919e605659b1f78cc2cc [formerly d8a821746c]
Former-commit-id: a58f2a6c10
 2013-10-21 14:44:17 -05:00
Ben Steffensmeier
ff1eaaf4b4 Issue #2379 Fix bufrssmi null pointer exception. 
Former-commit-id: 6ad2a699d3 [formerly 9d749300cb] [formerly 7a82e94390] [formerly 02264afc30 [formerly 7a82e94390 [formerly 1fa24e52c8d5bded0bc60f14c13e88f9c33ed895]]]
Former-commit-id: 02264afc30
Former-commit-id: 94e0cfde01177d63de591f831acf4131122e97db [formerly bc7ed15ce5]
Former-commit-id: 8c0885db2d
 2013-10-21 13:19:03 -05:00
Dave Hladky
b57cadd40a Issue #2466 Returned to original harvesterThreadPool 
Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d

Former-commit-id: 0c8360db45 [formerly 73aa2c69ac] [formerly 1c37f0f765] [formerly beb0e573c1 [formerly 1c37f0f765 [formerly 534a6e392dab175f4e683af522c5e800cbb1391d]]]
Former-commit-id: beb0e573c1
Former-commit-id: 71bbc39b27da704277849a3577ea2b6de0371e48 [formerly 06ad289dc9]
Former-commit-id: ef46aa1575
 2013-10-21 12:40:37 -05:00
Richard Peter
55fef9db2b Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 5f838e4573 [formerly cab9619532] [formerly 556cebeff9] [formerly 17d8bd319d [formerly 556cebeff9 [formerly 1a2207e085ad7d30ffad56f42fa3d28c584a8a08]]]
Former-commit-id: 17d8bd319d
Former-commit-id: 372a7c3ca36d4d893ececd3dacf1355093854138 [formerly bb03c736ce]
Former-commit-id: 4e53ede48c
 2013-10-20 21:56:33 -05:00
Benjamin Phillippe
69f8efc8d6 Issue #1682 Fixed replication/query errors and added synchronous notification delivery 
Change-Id: Ia6a07c3abf6c48ef18d354dc2866ed981e6f1478

Former-commit-id: d0e72c91fc [formerly c88eb406bf] [formerly 64b0a4d065] [formerly d94f22fda8 [formerly 64b0a4d065 [formerly 2f6dc771e86cf290bb72743f1855f02c616e57d5]]]
Former-commit-id: d94f22fda8
Former-commit-id: 5de22c44f318ece31c6105adf801e2c7d76a5903 [formerly 9153069a87]
Former-commit-id: 8c85c73660
 2013-10-20 16:02:10 -05:00
Benjamin Phillippe
40ccc490a4 Issue #1682 Refactored Registry querying to conform to EBXML 4.0 spec 
Change-Id: If6d3579305afbb279057a264033736fc126b7849

Former-commit-id: 9bc1058db1 [formerly 12d23800c7] [formerly a4e5cd5fd7] [formerly ed23a786d6 [formerly a4e5cd5fd7 [formerly 5112ee9931a1678fee37dd725a28dd6fff1e7ec9]]]
Former-commit-id: ed23a786d6
Former-commit-id: 0d452b3343313b1a38b897d43d2a6fef69eb7481 [formerly a51d2fe3b9]
Former-commit-id: 11b9198589
 2013-10-18 09:20:40 -05:00
Steve Harris
9f45bcf5e3 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 65be1b928e [formerly 9a282049b0] [formerly f927209446] [formerly 67136a50f2 [formerly f927209446 [formerly 608378b8e086a845f38e238eda127c7792f09b53]]]
Former-commit-id: 67136a50f2
Former-commit-id: 8e3dca09afd27063e0daca5c2fb240d07113d443 [formerly a1544c7c74]
Former-commit-id: ef45113f4a
 2013-10-17 18:20:56 -05:00
Max Schenkelberg
af48a7e839 Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image. 
Change-Id: I6ec7c0808516cc1ce87e3325b54041366392d191

Former-commit-id: 3ec1b334cd [formerly 08cafadf8f] [formerly 676493c6e2] [formerly 004720f7a9 [formerly 676493c6e2 [formerly b4249acf8655c2c31e491cf945f2bb4fc00f7fad]]]
Former-commit-id: 004720f7a9
Former-commit-id: 28d6f1e7606f37b873f1fed4610372d4a7014d7e [formerly 872652cab9]
Former-commit-id: df3b18d237
 2013-10-17 12:59:23 -05:00
Ben Steffensmeier
09b63a0bb9 Issue #2402 decrease ingestGrib max memory. 
Former-commit-id: def205a734 [formerly 127f7abab2] [formerly ed88949e9d] [formerly 62177dcea7 [formerly ed88949e9d [formerly e647c2bc33b696c1f45089e0d9560009071e34ef]]]
Former-commit-id: 62177dcea7
Former-commit-id: 9e42f89a554c7fe7f8c96b569be4ad1d634ab20f [formerly ee7009f8cf]
Former-commit-id: 513e42c5cf
 2013-10-17 12:30:10 -05:00
Steve Harris
1aabbf3a48 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 3c454bf7c9 [formerly c320bd2f81] [formerly 17ce229623] [formerly f87858a67c [formerly 17ce229623 [formerly 27ef21af38cf81037a6d819d409cf7981bec7028]]]
Former-commit-id: f87858a67c
Former-commit-id: 9ede86de3ae6d66385178b974f9a5c97bdf094ba [formerly bc7fc16a4a]
Former-commit-id: c8ad5d903f
 2013-10-17 09:26:10 -05:00
Brad Gonzales
70a9b07483 Issue #2267 Reverted HibernateBandwidthInitializer to check for local only. 
Change-Id: If51cad02663bf584f90588c8586c2215340fc1e4

Former-commit-id: 38c9eeed8e [formerly d943481576] [formerly a86b767af4] [formerly eb7a1ebf62 [formerly a86b767af4 [formerly 1b9ac343acea0eb70cada015e6af257058217f36]]]
Former-commit-id: eb7a1ebf62
Former-commit-id: 6b577c9dbb8b5b2c3a298282454f0d86580f9ee2 [formerly f8fc02cdfc]
Former-commit-id: 825fcf55af
 2013-10-16 17:03:17 -05:00
Steve Harris
4044fca7d8 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: d9e952066a [formerly f2f25e0d24] [formerly 1d321b3f2c] [formerly 777da949d7 [formerly 1d321b3f2c [formerly 0fd535fb95343956cda9e96ebb5aa5c56387da72]]]
Former-commit-id: 777da949d7
Former-commit-id: 89810042f2ff379e76548931e65f9ee71525f009 [formerly fcbf80b05a]
Former-commit-id: a6d96b87a0
 2013-10-16 17:01:21 -05:00
Nate Jensen
d5f4a38b36 Merge "Issue #2473 Clean up grib plugin." into development 
Former-commit-id: 7bf61fad14 [formerly 1f801da99f] [formerly 7e7d375cea] [formerly 1f44eb5e8d [formerly 7e7d375cea [formerly 4d0cc0385afc3a0e4f1789d6f6d88c26fcbdf386]]]
Former-commit-id: 1f44eb5e8d
Former-commit-id: 8705ddcac93460d7604302b13f118ff4797c9f8b [formerly 475d94751a]
Former-commit-id: 5d1465347f
 2013-10-16 15:26:20 -05:00
Steve Harris
9aeacf4dab Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 9f7f030e2d [formerly b702ec9521] [formerly fb8b8c221e] [formerly d173ac97e0 [formerly fb8b8c221e [formerly deaff8aefae6514ab261812987ce094e43fa017a]]]
Former-commit-id: d173ac97e0
Former-commit-id: 7e17724b464660bf48f1075b72e5d212dda89e6f [formerly 6e16c3c0d6]
Former-commit-id: 6938093b4d
 2013-10-16 11:07:44 -05:00
Ben Steffensmeier
4f7d1ac3cd Issue #2473 Clean up grib plugin. 
Former-commit-id: 0b3565ed1c [formerly c7cfc6aaf6] [formerly 4a17225301] [formerly ae9e1160e8 [formerly 4a17225301 [formerly 6fda3bf42a0735ecb5ae9f7ef1ae0e08dac22a5b]]]
Former-commit-id: ae9e1160e8
Former-commit-id: 5436916453fe5d858877adf4340a0548d19ce74f [formerly 297109c181]
Former-commit-id: 5d12980041
 2013-10-16 10:47:30 -05:00
Dave Hladky
aa5fd1ba3f Issue #2460 Product browser display of adhoc subscriptions 
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

Former-commit-id: e14b51258b [formerly 7b6ef7ee9a] [formerly 6076f46549] [formerly 477fbd3d59 [formerly 6076f46549 [formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]]
Former-commit-id: 477fbd3d59
Former-commit-id: a483ea67e7e78c9b17eaf6a48fb26ebec56271c3 [formerly 639019eff1]
Former-commit-id: 9880c82a36
 2013-10-16 09:06:00 -05:00
Richard Peter
bd18628df9 Merge "Issue #2473 Remove unneeded ncgrib functionality. Change-Id: If38138650660c75745091a82c231cd0fe8c92e38" into development 
Former-commit-id: 596907fdf1 [formerly 74d34e7fb3] [formerly 9b987e8000] [formerly e1a0403c01 [formerly 9b987e8000 [formerly 1fb60210f841ee2ee9f127db33fe30df4222ff57]]]
Former-commit-id: e1a0403c01
Former-commit-id: 020e5955a6649bd7d4bb4c47058c6a42a54c0392 [formerly 4c983c7429]
Former-commit-id: 00f89efbca
 2013-10-15 16:36:38 -05:00
Ben Steffensmeier
50f81cf656 Issue #2473 Remove unneeded ncgrib functionality. 
Change-Id: If38138650660c75745091a82c231cd0fe8c92e38

Former-commit-id: 0c0e339894 [formerly 10f74a1812] [formerly d25df40634] [formerly 51cd71c373 [formerly d25df40634 [formerly 49a3700d37c07f42991f7ca4a65f0fd4c7010f91]]]
Former-commit-id: 51cd71c373
Former-commit-id: 91c71836947d0b2aea377fc28fa97fda33b6fd59 [formerly 24a6795677]
Former-commit-id: dcae8c6aa2
 2013-10-15 16:30:38 -05:00
Nate Jensen
84b16b89b5 Issue #2361 Added startup timing statements 
Change-Id: I347b3e671ecd7c7c61b88e008e2d4c56d19e6108

Former-commit-id: 0d7d2257cc [formerly 3f107e931f] [formerly 323f594de4] [formerly d265f4ddf4 [formerly 323f594de4 [formerly 3f93aeeb8259600b1c6e0ff47641ff95337df605]]]
Former-commit-id: d265f4ddf4
Former-commit-id: 02d772fe8febbecc8657a8eacb5c61f6d3d41e3e [formerly d72a7f3c69]
Former-commit-id: 521c019757
 2013-10-15 14:23:59 -05:00
Richard Peter
210927720b Merge branch 'omaha_13.5.3' (13.5.2-10) into development 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: cbf18e7a32 [formerly cbf53120dd] [formerly 9264b9c5559b76abd686cb8133cdc03e7ea2acc7 [formerly cd504e4e98]] [formerly 0787e7cc86 [formerly cd504e4e98 [formerly 1af6e051089c8f0a216307647e044d19d41f6828]]]
Former-commit-id: 0787e7cc86
Former-commit-id: 36f2423845a35dba4181db0c68f0634fbfc9eaef [formerly 1a62020265]
Former-commit-id: 9896b051c1
 2013-10-15 11:36:12 -05:00
Nate Jensen
c328d581cc Merge "Issue #2361 remove XML annotations and IDecoderGettable from a variety of plugins" into development 
Former-commit-id: 9acb414570 [formerly 78f641d082] [formerly 040918f9a4] [formerly d7c9a39d16 [formerly 040918f9a4 [formerly 445f2c0779e98ed7277c8ff95552d062f7b70197]]]
Former-commit-id: d7c9a39d16
Former-commit-id: d3bb0beba9a02cac129348cbac085050de08447d [formerly 7256edab5a]
Former-commit-id: 4e5db943b2
 2013-10-15 11:21:39 -05:00
Ben Steffensmeier
57a93ec3b8 Issue #2402 Up grib split to 2 threads make it configureable. 
Former-commit-id: 5facc316a8 [formerly b089df5ca1] [formerly d644235fe1] [formerly 29e77f2e6c [formerly d644235fe1 [formerly f3308c200407bae39175f2620559c6489aa5c788]]]
Former-commit-id: 29e77f2e6c
Former-commit-id: 5f642b260d2dce3d25572a8f35b68043bb3074e4 [formerly 4f7eca694d]
Former-commit-id: f82a3ee63f
 2013-10-15 10:59:50 -05:00
Richard Peter
aef98d5342 Merge "Issue #2473 Remove deprecated grib functionality Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23" into development 
Former-commit-id: 7068ab9e88 [formerly 8f54e49398] [formerly 48b3816b84] [formerly 2d0bb0b56b [formerly 48b3816b84 [formerly 6ce82e330ef6caa5defd9252458a4b81b087d64d]]]
Former-commit-id: 2d0bb0b56b
Former-commit-id: 5c8366a821b77ac3e8b3d1bba8cee7c7d0b876ca [formerly ef49a322f2]
Former-commit-id: 60e49cf211
 2013-10-15 10:49:13 -05:00