Commit graph

2736 commits

Author SHA1 Message Date
Nate Jensen
9637af4b1c Issue #1989 disable camel JMX to speed up edex
Change-Id: I982228927752e03fdda399396c90ed093d01f019

Former-commit-id: 2c6fbd0c68 [formerly bc8d798973] [formerly bfcdcb607a] [formerly 2c6fbd0c68 [formerly bc8d798973] [formerly bfcdcb607a] [formerly d905453660 [formerly bfcdcb607a [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]]]
Former-commit-id: d905453660
Former-commit-id: 009ed8605d [formerly b57c84d12b] [formerly 29c74ab437171949434e0b34fa54e7aeadcdb266 [formerly c3bafc88cd]]
Former-commit-id: 63ab17d89857f4c72875a4b36cdcf089deec1a18 [formerly 75499add43]
Former-commit-id: 2396b63eda
2013-05-16 17:13:46 -05:00
Nate Jensen
298b3ed015 Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266

Former-commit-id: b01f942e66 [formerly 9f8654e4ff] [formerly 1ecdd989df] [formerly b01f942e66 [formerly 9f8654e4ff] [formerly 1ecdd989df] [formerly ce2579a289 [formerly 1ecdd989df [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]]]]
Former-commit-id: ce2579a289
Former-commit-id: d71f246645 [formerly 53f994c0a8] [formerly 2076bee14faf74bd27ac75d44642ca376db29ce9 [formerly 04c7c4a4da]]
Former-commit-id: 3719af426331d3f6e0af07178ef4589133d1d3c9 [formerly b9bfcead05]
Former-commit-id: 6a1c713e6f
2013-05-16 10:25:38 -05:00
Nate Jensen
d88235afb8 Merge "Issue #1989 removing dead plugins from repo" into development
Former-commit-id: 3777b1bdec [formerly 5b4c91d734] [formerly 03f93712a2] [formerly 3777b1bdec [formerly 5b4c91d734] [formerly 03f93712a2] [formerly 367784bd99 [formerly 03f93712a2 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]]]
Former-commit-id: 367784bd99
Former-commit-id: c90f9d93c4 [formerly 1355010c38] [formerly 02ae66490caf635a65f4c6e90eb7bba1df7b05a1 [formerly e4b47d1eb9]]
Former-commit-id: 2785a34bbe8a1c607b8c364ffe9c42d09ffc2745 [formerly 6408ef5425]
Former-commit-id: 7549733d5d
2013-05-16 09:27:48 -05:00
Ben Steffensmeier
40a94337d0 Issue #1869 Switch acars back to original plot resource.
Change-Id: I7da1e53f7626c73cfb6a9d6e38f0716634db1a85

Former-commit-id: da6bf90b2d [formerly 5a8118b5a8] [formerly 51015cd592] [formerly da6bf90b2d [formerly 5a8118b5a8] [formerly 51015cd592] [formerly 1a1592ea3d [formerly 51015cd592 [formerly 567b7b5baeb7bbc6b37b5f03927c9f3f34255ebf]]]]
Former-commit-id: 1a1592ea3d
Former-commit-id: 7c5e49cf35 [formerly 4fa2a21323] [formerly 039dcec9a1c91a057d7e28627ea17b7cb99824f6 [formerly 4a8a5b16af]]
Former-commit-id: 601b971edf39643b03ec3724bb9b4c3795ab4cab [formerly 3b5a3a8a3b]
Former-commit-id: 017e025cc6
2013-05-15 18:22:25 -05:00
Richard Peter
b273bbc62e Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
Former-commit-id: 55bface874 [formerly 9a8bc5871f] [formerly fc5b621973] [formerly 55bface874 [formerly 9a8bc5871f] [formerly fc5b621973] [formerly a073bf2702 [formerly fc5b621973 [formerly 52cf035fb73af40aa04008ebc6a1627ad377566f]]]]
Former-commit-id: a073bf2702
Former-commit-id: d3dc818b4d [formerly 671aaba9d9] [formerly af31e934cdfd6faede0ff3cfe67eded5377faa3f [formerly 57698cc95b]]
Former-commit-id: 38615ab734b29000de74fb917a15e321fd838928 [formerly da0fc8057c]
Former-commit-id: ff16d49977
2013-05-15 18:14:00 -05:00
Dustin Johnson
3a9c527c52 Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
Former-commit-id: 29bdf1cf7e [formerly 28a4f02216] [formerly 8eeb2f4f9c] [formerly 29bdf1cf7e [formerly 28a4f02216] [formerly 8eeb2f4f9c] [formerly d62e51ad7e [formerly 8eeb2f4f9c [formerly 59cd748665d90aa98d228f23a058bdb13eb65850]]]]
Former-commit-id: d62e51ad7e
Former-commit-id: f1217c2623 [formerly 6fa299ecd8] [formerly 3b08746afcd2e96a955f14302d482d194318a5f7 [formerly 00e9f3305d]]
Former-commit-id: 66af9d7b31af34412d5e4dfb1226fa1ecc7dbabb [formerly ab15adabe2]
Former-commit-id: 0f69c0b64d
2013-05-15 17:06:42 -05:00
Dustin Johnson
cc22cc26f5 Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c

Former-commit-id: 38714c1547 [formerly 695c64a9f4] [formerly 8a9e1f643a] [formerly 38714c1547 [formerly 695c64a9f4] [formerly 8a9e1f643a] [formerly ef1e80b61f [formerly 8a9e1f643a [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]]]
Former-commit-id: ef1e80b61f
Former-commit-id: 7f1f50d8b9 [formerly 31fbf71aa2] [formerly c86021e68028c259d0aabec26dbd9c639da89626 [formerly b8d6f54206]]
Former-commit-id: dba720af9d4803f1f30ad86c52b06ec7de70c160 [formerly 6db9b3f8d9]
Former-commit-id: a7a948bf3a
2013-05-15 16:54:40 -05:00
Nate Jensen
55e1bc3c3c Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4

Former-commit-id: a818b84f5f [formerly b7076f6947] [formerly 2abccdfe2b] [formerly a818b84f5f [formerly b7076f6947] [formerly 2abccdfe2b] [formerly 662fac5b31 [formerly 2abccdfe2b [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]]]]
Former-commit-id: 662fac5b31
Former-commit-id: eb47297ab1 [formerly 8b1298777c] [formerly 2ff5c10f02a0d7646fee845f2165008d3070734a [formerly ae5df55dba]]
Former-commit-id: f0cc9509547a8408a39b42e1b6bcfdd0b303dcd8 [formerly 8cffed1451]
Former-commit-id: 99bd7bc4eb
2013-05-15 16:25:23 -05:00
Richard Peter
b4fdaba9b9 Merge "Issue #1989 removing unused jars" into development
Former-commit-id: 1a8735e760 [formerly 3e1fe851e4] [formerly 303267be4d] [formerly 1a8735e760 [formerly 3e1fe851e4] [formerly 303267be4d] [formerly ad43b7bab5 [formerly 303267be4d [formerly 544b8830ec6c95ff88726b1095662fac5438cfcb]]]]
Former-commit-id: ad43b7bab5
Former-commit-id: e793f3059a [formerly a504d84327] [formerly ed0ec7ef2315281996de0732e565ee6419744cc5 [formerly fb1197ecb7]]
Former-commit-id: bb5c721343de2683698c8a352460e9894b02d9ff [formerly 44b7de35fc]
Former-commit-id: 06a146f5d3
2013-05-15 16:17:57 -05:00
Bryan Kowal
0fcc9710db Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
Former-commit-id: 9dd01b7aa4 [formerly 07408178a8] [formerly 5811585229] [formerly 9dd01b7aa4 [formerly 07408178a8] [formerly 5811585229] [formerly 41f4075e6f [formerly 5811585229 [formerly 3bbc0996f4e5e6ab9d11a7481aff39d6a9ee0044]]]]
Former-commit-id: 41f4075e6f
Former-commit-id: cdbb3688b8 [formerly edaa5339d7] [formerly 023dd6e87a45202d9e0ada7c2ab1ebac1e398460 [formerly aabc22cc2e]]
Former-commit-id: 08c73a92e3555cbf97b0e5d192ab214be962489b [formerly e39c66a454]
Former-commit-id: a6ba3a9ba2
2013-05-15 15:37:16 -05:00
Ben Steffensmeier
d747955f91 Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: 84e531ba2c [formerly 89fe0b301d] [formerly 080b43444a] [formerly 84e531ba2c [formerly 89fe0b301d] [formerly 080b43444a] [formerly bbe2667522 [formerly 080b43444a [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]]]]
Former-commit-id: bbe2667522
Former-commit-id: 6afa65fd07 [formerly b3a2cd22c7] [formerly 2d0c00b44c52062e4bb1a079d156e9a7a0b2bbdf [formerly f813b40379]]
Former-commit-id: 79b3d6cecdc82a411f33e7b4a0cf38659cb9b6fd [formerly 6333ed4841]
Former-commit-id: 1824606f71
2013-05-15 15:35:02 -05:00
Nate Jensen
75548c60a0 Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301

Former-commit-id: 25c2e983c1 [formerly c75bfeb9a5] [formerly 9c2b6bad3e] [formerly 25c2e983c1 [formerly c75bfeb9a5] [formerly 9c2b6bad3e] [formerly f4b8c0dc60 [formerly 9c2b6bad3e [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]]]]
Former-commit-id: f4b8c0dc60
Former-commit-id: fb7be885b0 [formerly 6caa681ed3] [formerly 9069cdd6843363f31f735d05691b1d9c3ac3ae91 [formerly 0234e6788b]]
Former-commit-id: db84ddfbe9fc0fca2f629a37b1125a0264b003d1 [formerly 2b72b5c530]
Former-commit-id: 546249897b
2013-05-15 14:44:30 -05:00
Richard Peter
b9fb88aa95 Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
Former-commit-id: 9112e3b2b0 [formerly 186f7169af] [formerly 286ec23fab] [formerly 9112e3b2b0 [formerly 186f7169af] [formerly 286ec23fab] [formerly bcbe24f489 [formerly 286ec23fab [formerly 3b822a67f95e98b4b56d66fde64d9065f0b29a11]]]]
Former-commit-id: bcbe24f489
Former-commit-id: 54bde542cd [formerly 589fcada8b] [formerly 7f3ecaa744db0e047ec3e78cd18a3055a56c4668 [formerly ce6452daac]]
Former-commit-id: 3ebcf7ea8588f9e68e7ca960f1c0e0ac9a590f92 [formerly 89fc805bfe]
Former-commit-id: 6117554b65
2013-05-15 14:41:04 -05:00
David Gillingham
548460bba4 Issue #1842: Use GetNextEtnRequest to handle ETN assignment for GFE VTEC
products.

Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d

Former-commit-id: df43f4a624 [formerly 0cbf36df79] [formerly 9c688f7070] [formerly df43f4a624 [formerly 0cbf36df79] [formerly 9c688f7070] [formerly 84158e76c7 [formerly 9c688f7070 [formerly 13d5d8dd7c59fcf399d62e83c9eb7021bca4c2d1]]]]
Former-commit-id: 84158e76c7
Former-commit-id: cde903747e [formerly 9f79748cd2] [formerly a8636a4e98415e0e3d55ec975e4e04cbd7c92415 [formerly ca10ac1598]]
Former-commit-id: 64bc35705c55219582fe0567cdb66be892479739 [formerly fab4021ce4]
Former-commit-id: 7f956add77
2013-05-15 13:56:53 -05:00
Bryan Kowal
9e2e30d040 Issue #2002 - do not include .gitignore files in the rpm
Former-commit-id: f2f288c6b5 [formerly 4132370301] [formerly 60ae5df378] [formerly f2f288c6b5 [formerly 4132370301] [formerly 60ae5df378] [formerly 107055781d [formerly 60ae5df378 [formerly 33160e9835e8e153d60b76619b75e22bd3f75fc8]]]]
Former-commit-id: 107055781d
Former-commit-id: 9380276341 [formerly 43db530ddb] [formerly bb8d7b3c8d6efce463993268a92f760caeb8a894 [formerly 7df8e11ed3]]
Former-commit-id: d8ce8c65d5537e46c70fd2d88c8b72e99a58dd5e [formerly a2a6d0bdad]
Former-commit-id: 9e9498b002
2013-05-15 13:31:24 -05:00
Nate Jensen
ec4eaafaf3 Merge "Issue #1927 - add quartz as a RadarServer build dependency" into development
Former-commit-id: 7ba3ba65ce [formerly 6952b172cf] [formerly 591eb2d6e2] [formerly 7ba3ba65ce [formerly 6952b172cf] [formerly 591eb2d6e2] [formerly b621d417e5 [formerly 591eb2d6e2 [formerly 5db35fcaef26b2817bfcd4a051f4c1f05d8fdcdd]]]]
Former-commit-id: b621d417e5
Former-commit-id: 5090118058 [formerly 93568fff0b] [formerly 67c7b9f57a05eab1450a9b79f580931ffe0dd774 [formerly b9275b3c2b]]
Former-commit-id: 099be49fe02c4a4fa0b28c84d214401a6f31ce1c [formerly 0a49169575]
Former-commit-id: 1329d58062
2013-05-15 13:02:58 -05:00
Ben Steffensmeier
330f048d66 Issue #1869 Remove DataURI from goes/poes soundings.
Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416

Former-commit-id: 61b468a9f5 [formerly 22b20b5f8e] [formerly b905ee013c] [formerly 61b468a9f5 [formerly 22b20b5f8e] [formerly b905ee013c] [formerly 1c3e60a5ff [formerly b905ee013c [formerly 836239896aace50e37896f6219015a75aea117b7]]]]
Former-commit-id: 1c3e60a5ff
Former-commit-id: 676bd25f45 [formerly cb335861c2] [formerly 20ed4a4554d6c5b51d73a5b064aa0c228a1bc816 [formerly 8ea143a147]]
Former-commit-id: 37ce01ea9d49382306b604a118d3474e0c68f44b [formerly ff9ce2b7c4]
Former-commit-id: 7a8b41876e
2013-05-15 12:50:08 -05:00
Richard Peter
0f429b89e0 Merge "Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen." into development
Former-commit-id: 5714866fc5 [formerly d81cee387b] [formerly 0523d790f8] [formerly 5714866fc5 [formerly d81cee387b] [formerly 0523d790f8] [formerly 82ccd32ee0 [formerly 0523d790f8 [formerly 3abbb84fdb4b2a9e52757d4b5f2e8cb9fb94899e]]]]
Former-commit-id: 82ccd32ee0
Former-commit-id: 9b717cdeea [formerly e0c4287959] [formerly 27cc1cc3fc9fe261074c7a9de671269bbc5b9df3 [formerly b40e0ca1c9]]
Former-commit-id: eda0a11482b84ccb38cc8a9693c5ea13d48b7463 [formerly 69ce5d7529]
Former-commit-id: d847f413af
2013-05-15 12:44:48 -05:00
Richard Peter
56cc89710e Merge "Issue #1869 Revert changes to bufrmos types used by ncep." into development
Former-commit-id: 60a4188f71 [formerly b687ddef04] [formerly f1d65e7028] [formerly 60a4188f71 [formerly b687ddef04] [formerly f1d65e7028] [formerly 48b67522d5 [formerly f1d65e7028 [formerly ce880367eb70abdd85664841e3775142f6e28c50]]]]
Former-commit-id: 48b67522d5
Former-commit-id: 9ad1a480b7 [formerly 11b33a5b14] [formerly b8c78f36b1d54e7e04b3aaf573e5c0adf1294f6f [formerly aa3ef28527]]
Former-commit-id: d625e98fc125a6d40146cef2354875f5b5f31846 [formerly 3e60ceec03]
Former-commit-id: 04be1d3807
2013-05-15 12:44:28 -05:00
Bryan Kowal
47d6de2275 Issue #1927 - add quartz as a RadarServer build dependency
Change-Id: I1bc64bc347ebd54e249dbd8e4b2cadfa65c28b56

Former-commit-id: 1b8179bbf2 [formerly 01413b17dd] [formerly 047a3de7bd] [formerly 1b8179bbf2 [formerly 01413b17dd] [formerly 047a3de7bd] [formerly 99a5290083 [formerly 047a3de7bd [formerly f3dc0db70d9c3c680b56c07f18c84e2fbc2daaa2]]]]
Former-commit-id: 99a5290083
Former-commit-id: 0493669c67 [formerly f57a730309] [formerly 5c17e84fa3ea240adbc88fa40b2adcf31c7cdca3 [formerly 63fa948ba8]]
Former-commit-id: 4859ba98ba249ddd22070655c299a50b4c825a27 [formerly 7692701168]
Former-commit-id: 2deeffdb51
2013-05-15 12:38:02 -05:00
Ben Steffensmeier
303f78c36c Issue #1869 Revert changes to bufrmos types used by ncep.
Former-commit-id: b4d305a294 [formerly 507ce28888] [formerly 62b85f3afe] [formerly b4d305a294 [formerly 507ce28888] [formerly 62b85f3afe] [formerly dd320f2a56 [formerly 62b85f3afe [formerly 71808a9d82233a395c5e5a394b0708b07405f553]]]]
Former-commit-id: dd320f2a56
Former-commit-id: ba431afe94 [formerly 884922687e] [formerly 2e8fafbd0cebabab9a93928b43dce63087f74a5a [formerly 27b0b4a289]]
Former-commit-id: db209fe116e60bf2d98255a94ca37075cceafab8 [formerly 7ce819184a]
Former-commit-id: 1846170387
2013-05-15 11:45:51 -05:00
Dustin Johnson
4b96e46b34 Merge "Issue #2000 Fix reinitializing of bandwidth manager" into development
Former-commit-id: c6fa2f32bf [formerly a00364b294] [formerly 8a70a773d5] [formerly c6fa2f32bf [formerly a00364b294] [formerly 8a70a773d5] [formerly c88be3579c [formerly 8a70a773d5 [formerly f300554c735266999f57e0331eda63420e5a6ef3]]]]
Former-commit-id: c88be3579c
Former-commit-id: 481448d7e5 [formerly bd7c38a160] [formerly cdf0ad13731bf68d4757c42695e449473ae213b4 [formerly 8c26413d23]]
Former-commit-id: 8825a05e4b32a73bac97ca0e563cb9ad5f2ad61a [formerly 8276c2a9c9]
Former-commit-id: dbde58d5eb
2013-05-15 10:50:53 -05:00
Dustin Johnson
07e46d67b1 Issue #2000 Fix reinitializing of bandwidth manager
Change-Id: I8af056eea7d40a13e9189afa81414f7088690267

Former-commit-id: 0116e7d8eb [formerly b700ef7a95] [formerly e38e8d7dc5] [formerly 0116e7d8eb [formerly b700ef7a95] [formerly e38e8d7dc5] [formerly e374011c49 [formerly e38e8d7dc5 [formerly 1073806e6f0a84da0538160d83ee3c12b92d84d5]]]]
Former-commit-id: e374011c49
Former-commit-id: f8f13e2df7 [formerly b6a3c3ae80] [formerly 2a13a12e33f3def4628a8d4825d9db80db97e449 [formerly 98d99250b2]]
Former-commit-id: 1307f944d20ca6686d6659f27ae54e1ed3a729d6 [formerly c2c849fe7e]
Former-commit-id: 7240a99ce7
2013-05-15 10:24:33 -05:00
Richard Peter
a01285caea Merge "Issue #1869 Remove DataURI column from bufrmos. Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e" into development
Former-commit-id: c5fd30cc75 [formerly 1a7fbec35e] [formerly f1920eb8d9] [formerly c5fd30cc75 [formerly 1a7fbec35e] [formerly f1920eb8d9] [formerly 47124d2411 [formerly f1920eb8d9 [formerly 5c73f61cf2401ccc901771f92147bfb4bc6d9c25]]]]
Former-commit-id: 47124d2411
Former-commit-id: 988b13568b [formerly 1a5bb1a9d5] [formerly 0cbdc780eedd77f2c627579858cde2eb3b5dca17 [formerly f4974ebd19]]
Former-commit-id: 1d8e1b961915c722d5a41f096bf38b55d01237cb [formerly 6cc24d855f]
Former-commit-id: a9a4b2cfcc
2013-05-15 10:00:19 -05:00
Ben Steffensmeier
2525042e00 Issue #1869 Remove DataURI column from bufrmos.
Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e

Former-commit-id: 713a2f201f [formerly cad31c0ce6] [formerly 026a824e60] [formerly 713a2f201f [formerly cad31c0ce6] [formerly 026a824e60] [formerly fabbc29fe8 [formerly 026a824e60 [formerly 5b740e5d614d9cac2476335a0754ccd0e1185c84]]]]
Former-commit-id: fabbc29fe8
Former-commit-id: 004b6c5431 [formerly 6acaa99256] [formerly bdfc9d0288dcc101dced1e3fe9647450c44c4879 [formerly 3f540d16f0]]
Former-commit-id: 78e6dc9083406a294a017bf3a8454bffa8578815 [formerly 5dc7de691b]
Former-commit-id: 2ffe811d07
2013-05-15 09:40:05 -05:00
Nate Jensen
e25bc42522 Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89

Former-commit-id: b1ed04a275 [formerly 0c718e1cd1] [formerly 5280b54277] [formerly b1ed04a275 [formerly 0c718e1cd1] [formerly 5280b54277] [formerly 4e63b88031 [formerly 5280b54277 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]]]
Former-commit-id: 4e63b88031
Former-commit-id: 47be3995a9 [formerly 65fdf84101] [formerly 5cf8e53ac89e47650c22747cbc9c44014230f489 [formerly 1e059ee8d9]]
Former-commit-id: 94a45bae766a98d27590ffd7fb1d2a8f5125013f [formerly 4973acb807]
Former-commit-id: 338bbc4216
2013-05-15 09:22:16 -05:00
Nate Jensen
e9f7997013 Issue #1989 jetty fixes
Change-Id: I01c00ee8f754132b9c57d84f971d744c16dda07d

Former-commit-id: 6578fafd0f [formerly ce19737a49] [formerly d894aca768] [formerly 6578fafd0f [formerly ce19737a49] [formerly d894aca768] [formerly 958ed1f6a2 [formerly d894aca768 [formerly fecb2dc4da19aba5a188834780e33c791d312e1b]]]]
Former-commit-id: 958ed1f6a2
Former-commit-id: d178b7c93c [formerly a121523049] [formerly a478967fde18d8834a997cdaea56725162418e3e [formerly 1b62b066c9]]
Former-commit-id: b1d43957a2a9fe7b2876c02641e66c82e2cbfb86 [formerly 58eeca454a]
Former-commit-id: 122aea2c8e
2013-05-14 18:27:00 -05:00
Nate Jensen
55a9265069 Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development
Former-commit-id: a9dcdd018b [formerly 8c03ad79d6] [formerly a6f8174d0c] [formerly a9dcdd018b [formerly 8c03ad79d6] [formerly a6f8174d0c] [formerly 44cfe00b5e [formerly a6f8174d0c [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]]]]
Former-commit-id: 44cfe00b5e
Former-commit-id: 3e3ca41da5 [formerly eb75eaf6ce] [formerly f100c9c2896648c965a1faa49f8fe19b7324d50e [formerly e7f638ce3b]]
Former-commit-id: 94d5b020ad5a983848f33c8876f83ea28fdd5cee [formerly dc98eb524f]
Former-commit-id: 8ca2d65342
2013-05-14 16:36:47 -05:00
Nate Jensen
24f0c91d8f Merge "Issue #1869 Get plots working without dataURI" into development
Former-commit-id: 45c3d17eb7 [formerly 521420916e] [formerly 6c42b5af64] [formerly 45c3d17eb7 [formerly 521420916e] [formerly 6c42b5af64] [formerly 661482f1dd [formerly 6c42b5af64 [formerly 3d4bbfa57651c97bc94d88ea83583a366a09200b]]]]
Former-commit-id: 661482f1dd
Former-commit-id: 11d5713451 [formerly 9680f63df2] [formerly 48e574f0b537470c8877c74ef60bb21105a29b84 [formerly 301b294d66]]
Former-commit-id: 81a8f79896bc5e0272fc76a5a6788130d1d04f84 [formerly 851885b8c5]
Former-commit-id: befeae603d
2013-05-14 16:23:00 -05:00
Nate Jensen
6b9fa8445b Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]]
Former-commit-id: 6f1684b85c
Former-commit-id: 575b6335c3 [formerly dac803ca07] [formerly 1baaa254282ed154b97e2ddd86e72bbfaeb0e555 [formerly 22c23492c4]]
Former-commit-id: ab22f7f711aa7fbda2856f8ecf6ccf6a6defb61d [formerly 925339b84c]
Former-commit-id: 0080d492e2
2013-05-14 16:16:13 -05:00
Dustin Johnson
e190b625c3 Merge "Issue #2000 Subscription duplication/overlap detection" into development
Former-commit-id: dd1b2d0472 [formerly c302fafbd2] [formerly 341ce0c8c2] [formerly dd1b2d0472 [formerly c302fafbd2] [formerly 341ce0c8c2] [formerly a5a0e3e280 [formerly 341ce0c8c2 [formerly db10de3aca3d0ef373df68a3de9871483128b645]]]]
Former-commit-id: a5a0e3e280
Former-commit-id: dac25447e5 [formerly 66126d5411] [formerly 21a28c8d1bddb4689b443e78a68fb08d1fd36c4b [formerly 21e66394be]]
Former-commit-id: 220f6cb041c88ef444eef674b7d25c34d09422c8 [formerly f625b26373]
Former-commit-id: bf3655da4c
2013-05-14 15:48:58 -05:00
Dustin Johnson
2ca9de593d Issue #2000 Subscription duplication/overlap detection
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5

Former-commit-id: b4e94bbebe [formerly 3447a3726b] [formerly db2e3cd9bb] [formerly b4e94bbebe [formerly 3447a3726b] [formerly db2e3cd9bb] [formerly fdf3ac7897 [formerly db2e3cd9bb [formerly 95df3d38914f451471f10d6095ad2bc6badbab72]]]]
Former-commit-id: fdf3ac7897
Former-commit-id: cb3d9d1bb9 [formerly 5f2de42ebe] [formerly d257155045c32d99334087cafb3c78dab9537c29 [formerly 085058e788]]
Former-commit-id: bd1d3fd5f7fec484cbf5181d789776032eec615a [formerly aa591995c6]
Former-commit-id: 1503e4c8e5
2013-05-14 15:34:08 -05:00
Ben Steffensmeier
ba722e2186 Issue #1869 Get plots working without dataURI
Former-commit-id: 7267acf078 [formerly 2ce2fc8a17] [formerly 79139629a6] [formerly 7267acf078 [formerly 2ce2fc8a17] [formerly 79139629a6] [formerly a84c975426 [formerly 79139629a6 [formerly 855d95e8563c47e5601c80c9efe5006280bda76e]]]]
Former-commit-id: a84c975426
Former-commit-id: 05c7617fae [formerly 9ebbfb262d] [formerly 9e224448a5b9a9f4dba22a128d1db00c81a90c9d [formerly 2dfb65b594]]
Former-commit-id: b9144a5e31a842f23186c5b3c6e7b238968908c4 [formerly 8a1b518934]
Former-commit-id: 98bb0ea551
2013-05-14 14:42:47 -05:00
Roger Ferrel
1c434f4901 Issue #1966 Initial setup.
Change-Id: I9b63433524fe419099e5646d028391377784d193

Former-commit-id: ab2caee84c [formerly fad208e0ee] [formerly 0a02d5e018] [formerly ab2caee84c [formerly fad208e0ee] [formerly 0a02d5e018] [formerly 9f9f85f875 [formerly 0a02d5e018 [formerly e36e62d3c146f10ef20a0d84abd26a96b9740827]]]]
Former-commit-id: 9f9f85f875
Former-commit-id: c233a43561 [formerly fb15e2d0a6] [formerly 1979b4a6badaebd7c518bd6e2d3e6e39ee777737 [formerly ab75cd5107]]
Former-commit-id: 781e3641b1d9f236c4e0b0f924f6e0472f4ad74c [formerly 532787c043]
Former-commit-id: 4dbb2fda4a
2013-05-14 13:49:53 -05:00
Richard Peter
1ecaa93d18 Merge "Issue #1869 Modified D2D height Graphs to work without dataURI column." into development
Former-commit-id: 3a6d627a69 [formerly 7683bfd122] [formerly 57d6790d5e] [formerly 3a6d627a69 [formerly 7683bfd122] [formerly 57d6790d5e] [formerly 6c406d6a8e [formerly 57d6790d5e [formerly 4503fe27c4760d681a3026fd0d9b4fd77f1b13cb]]]]
Former-commit-id: 6c406d6a8e
Former-commit-id: 0bb437873f [formerly b4e46593a8] [formerly 261e579f04551c139fed42c204c4a8c3d9be208b [formerly 3309e0c3b7]]
Former-commit-id: d16a7bd63c965117fe1af4e955370487108040eb [formerly a734c8594a]
Former-commit-id: 5f097830db
2013-05-14 09:40:21 -05:00
Richard Peter
657ab54ec3 Merge "Issue #1869 Remove DataURI column from GFE. Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488" into development
Former-commit-id: 012b3554a6 [formerly 9bf35d621a] [formerly 2f4b1d54a1] [formerly 012b3554a6 [formerly 9bf35d621a] [formerly 2f4b1d54a1] [formerly b76d402c98 [formerly 2f4b1d54a1 [formerly f7d2c39ca0c70b627b2e72f5982fba11a6a683bd]]]]
Former-commit-id: b76d402c98
Former-commit-id: 421523312b [formerly 824407f930] [formerly be0704603aa06bbc18e627d6fbecdc0faa7ef388 [formerly 17407e863a]]
Former-commit-id: bac7ecf2828aa3aa56f728f10c11738b28b303ba [formerly b7fc98ce28]
Former-commit-id: 848cd582e9
2013-05-14 09:37:18 -05:00
Ben Steffensmeier
b577c72634 Issue #1869 Modified D2D height Graphs to work without dataURI column.
Former-commit-id: 51d638c7d3 [formerly 4d3f9ee7d0] [formerly f856d0e02b] [formerly 51d638c7d3 [formerly 4d3f9ee7d0] [formerly f856d0e02b] [formerly 1d900e6b94 [formerly f856d0e02b [formerly acb500b1581d4725eb31e73b362fd523752b11d9]]]]
Former-commit-id: 1d900e6b94
Former-commit-id: 246c696a0c [formerly edcd8df871] [formerly 33d95552094ab81225c39706c24033b1385d6730 [formerly d0e1ff7ce3]]
Former-commit-id: bb43a8aeb3d4f463c7829c813e5a3dfec8e5a8fb [formerly 386ba183bf]
Former-commit-id: 81f1cbfdbd
2013-05-13 18:33:24 -05:00
Ben Steffensmeier
7b8c567978 Issue #1869 Remove DataURI column from GFE.
Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488

Former-commit-id: d18ca94fe5 [formerly 35da7528bf] [formerly 2536042f6d] [formerly d18ca94fe5 [formerly 35da7528bf] [formerly 2536042f6d] [formerly 8661bde0cc [formerly 2536042f6d [formerly 4c35aa22bdd5058992984eca824083e927d8deda]]]]
Former-commit-id: 8661bde0cc
Former-commit-id: 7c6b15e731 [formerly c6d8809f87] [formerly b2435c4d7c07b9baad1b96408593aa5885e2d2bf [formerly 039a92d9b9]]
Former-commit-id: 5724ab14d4328750679c29594ded9abf07624b2a [formerly d78e7bcd78]
Former-commit-id: ba5555930e
2013-05-13 17:35:00 -05:00
Richard Peter
dd2ceed4ae Merge branch 'omaha_13.4.1' (13.4.1-7) into development
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly c5040038d3 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]]
Former-commit-id: c5040038d3
Former-commit-id: 994357c357 [formerly 6c09ab9bdf] [formerly 4a7cd13915319fef7cf3e6405d041ffee0348571 [formerly bcf4dcc810]]
Former-commit-id: 10a9ca07796d13205616f7696c5af614917400a1 [formerly f7470fbd8f]
Former-commit-id: c7755a649b
2013-05-13 17:11:05 -05:00
Richard Peter
8083ef6c71 Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFELockDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
	nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
	nativeLib/files.native/adapt/climate/bin/Linux/build_f6
	nativeLib/files.native/adapt/climate/bin/Linux/create_climate
	nativeLib/files.native/adapt/climate/bin/Linux/display_climate
	nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
	nativeLib/files.native/adapt/climate/bin/Linux/format_climate
	nativeLib/files.native/adapt/climate/bin/Linux/init_climate
	nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
	nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
	nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
	nativeLib/files.native/edex/lib/native/linux32/libXm.so
	nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
	nativeLib/files.native/edex/lib/native/linux32/libtcl.so
	nativeLib/files.native/edex/lib/native/linux32/libtk.so
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e

Former-commit-id: b374309faf [formerly 4ae23b93d9] [formerly 8062c38b71] [formerly b374309faf [formerly 4ae23b93d9] [formerly 8062c38b71] [formerly ba590e2f93 [formerly 8062c38b71 [formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]]]
Former-commit-id: ba590e2f93
Former-commit-id: b2b66da141 [formerly faf22cc925] [formerly 845e355d3758a8223bad200d62847aef296e66cc [formerly 8e5929406c]]
Former-commit-id: 77b1abb6a3a5f5a94bfd365fc6227f35dbc435c5 [formerly 4b5869684b]
Former-commit-id: 9623d4c82e
2013-05-13 16:33:50 -05:00
Dustin Johnson
1bc6c5d661 Merge "Issue #1948 Modified registry permgen memory size to accomodate additional Spring container" into development
Former-commit-id: 8c31b75ff5 [formerly 23fa59f25b] [formerly 0b2bdf1848] [formerly 8c31b75ff5 [formerly 23fa59f25b] [formerly 0b2bdf1848] [formerly ab755981a9 [formerly 0b2bdf1848 [formerly 46b88ec783b7721448940f158e5eb2ad168a3a97]]]]
Former-commit-id: ab755981a9
Former-commit-id: fa132f89c3 [formerly 82a35120b8] [formerly 31893e63d3fb90ba4e62961c1b180bf1ba75acaf [formerly 0796694014]]
Former-commit-id: b07b41661425802a088b7775032457c4e8fcd528 [formerly a6532af8c9]
Former-commit-id: c284d00e3d
2013-05-13 15:26:19 -05:00
Benjamin Phillippe
a281ffec70 Issue #1948 Modified registry permgen memory size to accomodate additional Spring container
Change-Id: I0492d5440f6753896fa6b278f0cf642a2ef13d65

Former-commit-id: 04de3a97bf [formerly 037b40e59a] [formerly 5a113f1c43] [formerly 04de3a97bf [formerly 037b40e59a] [formerly 5a113f1c43] [formerly 4165759e58 [formerly 5a113f1c43 [formerly 4e375316f389f1db4b21708893c0087587c3f3e9]]]]
Former-commit-id: 4165759e58
Former-commit-id: cdc4d7a1b8 [formerly 9768a187f9] [formerly c8137a14242feb12d84eb7718a3f6a0287d7be37 [formerly 2768c62541]]
Former-commit-id: 1e9bdaacbcb88947b074bdd8861f0e3b719be7cf [formerly b8a47cc9be]
Former-commit-id: 38caf6c225
2013-05-13 15:20:28 -05:00
Steve Harris
a2c35a5f3f 13.4.1-7 baseline
Former-commit-id: 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]]
Former-commit-id: 8347bed50e
Former-commit-id: 6e1e454a9f [formerly ff7a21ac37] [formerly f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661]]
Former-commit-id: fa4cea9874a8ab4f41eefd7e3ce4a2ea2b2883b4 [formerly dffa6d3bdc]
Former-commit-id: c7c6ea343e
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
6146cdb6a7 Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
Former-commit-id: 1823c1850c [formerly 926da8983e] [formerly e5fc3f3835] [formerly 1823c1850c [formerly 926da8983e] [formerly e5fc3f3835] [formerly 598ce2ae6c [formerly e5fc3f3835 [formerly 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937]]]]
Former-commit-id: 598ce2ae6c
Former-commit-id: c9c011aecc [formerly bb257fc9e5] [formerly f1b73d9e52924ffdea1445f4fde629bcef0cc742 [formerly b4c645f99f]]
Former-commit-id: 80fd9099ac8e1ac91feebe6357d012569d5239f4 [formerly 62db2bdcd3]
Former-commit-id: 85eda2ea78
2013-05-13 11:42:54 -05:00
Richard Peter
795becb3e2 Merge "Issue #1869 Modified D2D time series of point data to work without dataURI. Change-Id: I80f39877903e50338add58700f6ffeb39e848a32" into development
Former-commit-id: bb6090df3f [formerly f8881f6e02] [formerly 18c5ad2727] [formerly bb6090df3f [formerly f8881f6e02] [formerly 18c5ad2727] [formerly 045a8c0b5d [formerly 18c5ad2727 [formerly ac7b7bdf702eb75bb41631febe433354acf78589]]]]
Former-commit-id: 045a8c0b5d
Former-commit-id: 56c6ad458d [formerly e6c820c2c5] [formerly 49c3308fa18b7030ca7a2ae7164c607dd5dd6af7 [formerly c598cd3be0]]
Former-commit-id: c6a924d713336c420ff609ff4f8cc734aa152367 [formerly 570a330497]
Former-commit-id: aa83bde84c
2013-05-13 11:42:23 -05:00
Ben Steffensmeier
6e978ea97a Issue #1869 Modified D2D time series of point data to work without dataURI.
Change-Id: I80f39877903e50338add58700f6ffeb39e848a32

Former-commit-id: 019f4ce7ef [formerly 8e550124f4] [formerly 2b4dd1521b] [formerly 019f4ce7ef [formerly 8e550124f4] [formerly 2b4dd1521b] [formerly baf051a27e [formerly 2b4dd1521b [formerly 3f246d2d473050ae89a4db65bc01d7729dc0aa01]]]]
Former-commit-id: baf051a27e
Former-commit-id: e261ac41b8 [formerly c862d04d57] [formerly 1be14a07a2404076176e3055753709833e1992be [formerly 9aab9c6034]]
Former-commit-id: ad99a5e496076dba6fb0e2b8b555e8d90b2cc790 [formerly e17c6f6857]
Former-commit-id: c917c7f592
2013-05-13 11:26:47 -05:00
Mike Duff
4bf51528c4 Issue #1919 - Fix VGBs in FFMP
Former-commit-id: 66f929fb14 [formerly d087b03eb3] [formerly f887a41875] [formerly 66f929fb14 [formerly d087b03eb3] [formerly f887a41875] [formerly 7874521269 [formerly f887a41875 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]]]
Former-commit-id: 7874521269
Former-commit-id: 8fa2b8ce8c [formerly 311ce09129] [formerly 130559fc1d4fb0be58387838e519191858bc2120 [formerly d262dc63f0]]
Former-commit-id: fa578f48226237d69efec1581a00bc9a6b2069a3 [formerly 83304c3e4c]
Former-commit-id: 3df65a2ad9
2013-05-10 09:58:02 -05:00
Dustin Johnson
ea752736f3 Merge "Issue #1967 undo mistake" into development
Former-commit-id: 54523a03ee [formerly 403ae0d458] [formerly e82d454167] [formerly 54523a03ee [formerly 403ae0d458] [formerly e82d454167] [formerly 519d46724a [formerly e82d454167 [formerly f0529c591755d871796a6d5acae43c443c8c301c]]]]
Former-commit-id: 519d46724a
Former-commit-id: 7452c3b960 [formerly 6ffe9cd833] [formerly c5635770089f58abb29f991ae55d67d79bd89a90 [formerly b3be6bb88b]]
Former-commit-id: ba4e497d5447c577b09ff60bc5c95b8e9d6fdb2a [formerly da159a9c31]
Former-commit-id: dc30897353
2013-05-10 09:25:58 -05:00
Nate Jensen
54a4447f63 Issue #1967 undo mistake
Change-Id: Ib74893b356edf16b045e1f8f5165bef59388422b

Former-commit-id: 5fffb10b86 [formerly f149e3f645] [formerly 250548dc66] [formerly 5fffb10b86 [formerly f149e3f645] [formerly 250548dc66] [formerly 47e402afc9 [formerly 250548dc66 [formerly 2cd8c512ca8cbf0b7070587f659e9bc12f53e580]]]]
Former-commit-id: 47e402afc9
Former-commit-id: a37054e071 [formerly af2fded870] [formerly dda418c83d076d0fbe15b2943c468e91f6f132a3 [formerly f8cd2effdf]]
Former-commit-id: 1ce00fb886fdd9a2e1d9bf1d9cf07ca2557e7fe4 [formerly f3989b7187]
Former-commit-id: d4789e5e87
2013-05-10 09:20:17 -05:00
Bryan Kowal
89b90b78b2 Issue #1995 - Wes2Bridge jar construction is now compatible with Eclipse 3.8.
Former-commit-id: 4e902e0a03 [formerly 6b7afdbb53] [formerly e7bc2fecc6] [formerly 4e902e0a03 [formerly 6b7afdbb53] [formerly e7bc2fecc6] [formerly c80ba9633e [formerly e7bc2fecc6 [formerly 70d82ca1c40d02b1918d539d57b342f59d67e12b]]]]
Former-commit-id: c80ba9633e
Former-commit-id: 4ca2eded54 [formerly 0292eb3b03] [formerly ec9c1249e88bc06c300e8cba09fe8b7a87a3502c [formerly 7cd6653d71]]
Former-commit-id: 0d83685a466bbfa61541c9b4486f9b0980ff4cb4 [formerly 7896fa119b]
Former-commit-id: 067fabb8eb
2013-05-09 19:51:32 -05:00