Commit graph

3249 commits

Author SHA1 Message Date
Nate Jensen
fe957cbbf6 Merge "Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things" into development
Former-commit-id: bd8525143d [formerly ef1d88ffc6] [formerly 2e3f246a9b] [formerly bd8525143d [formerly ef1d88ffc6] [formerly 2e3f246a9b] [formerly 1a0c6e540e [formerly 2e3f246a9b [formerly 22c11a51effb42dc41c91ee5bce622cfd64da7e5]]]]
Former-commit-id: 1a0c6e540e
Former-commit-id: 54833aba7d [formerly f265de8ff2] [formerly 6c2a821114eaef3cf9be268201e12764ac327b26 [formerly a288c26dbd]]
Former-commit-id: 8b0266710e35b5922f3c7b117a370a6cde76f6df [formerly d7c57f620c]
Former-commit-id: 67fda060da
2013-07-12 09:22:12 -05:00
Dustin Johnson
2ebda62400 Issue #2106 Create SubscriptionRetrievalAttributes to only load Subscription objects when required
Amend: Peer review comments, also fixed bug where subscriptions weren't being loaded on changing bandwidth

Change-Id: I8b5a122b0434d54dcfcbff9df6283edad68d7eb1

Former-commit-id: aa7c916c05 [formerly a821cdac28] [formerly 050b38fa9a] [formerly aa7c916c05 [formerly a821cdac28] [formerly 050b38fa9a] [formerly 5f38365571 [formerly 050b38fa9a [formerly 4da045d4c13a7d14cdbea3269409f2020e0c78f1]]]]
Former-commit-id: 5f38365571
Former-commit-id: e661886f15 [formerly 2756292e27] [formerly 16859d755061ef88819854b3e926a64c2319151e [formerly 6992ae7a11]]
Former-commit-id: cc6bde95b0633ccbb060512d7a72c99115c94a82 [formerly 273928f386]
Former-commit-id: 5f55b64857
2013-07-12 09:01:05 -05:00
Nate Jensen
1c4aa6f91b Issue #2142 fix ingest logback configuration
Change-Id: I8e21298a190eb1d4f1aac087ce3d7efb0c6accbc

Former-commit-id: 7ccf58ee3b [formerly 2da58b4567] [formerly 0a29d56ecb] [formerly 7ccf58ee3b [formerly 2da58b4567] [formerly 0a29d56ecb] [formerly ace22e2bf8 [formerly 0a29d56ecb [formerly 8b0f80f46c4d0e148cacfbae39d249e8ae040b88]]]]
Former-commit-id: ace22e2bf8
Former-commit-id: f54aced105 [formerly 795f43f53d] [formerly 58d0d4b6773b1d3576b2e002281771de92068ee1 [formerly 6a565452b2]]
Former-commit-id: 28c7365017601f643231f275b039d9a169bcdb43 [formerly eb8279cede]
Former-commit-id: 41469baa50
2013-07-12 08:58:53 -05:00
Nate Jensen
c67cf9e81d Merge "Issue #2142 fix radar server logging" into development
Former-commit-id: f28b440fa8 [formerly e9684f0add] [formerly 90b000482e] [formerly f28b440fa8 [formerly e9684f0add] [formerly 90b000482e] [formerly 5f12c25177 [formerly 90b000482e [formerly f9822d956e4d2bd473f0954560499837949b6f8e]]]]
Former-commit-id: 5f12c25177
Former-commit-id: 4e52491e63 [formerly af75ff0ffb] [formerly 4c84ae155cc7d80b9af9489a4b726757d8fac8a3 [formerly 0948cc8925]]
Former-commit-id: 8ab0111a7983662937080358e1030f49fa88407d [formerly 1303acb408]
Former-commit-id: 133c793f60
2013-07-11 16:06:49 -05:00
Nate Jensen
4c394503c6 Issue #2142 fix radar server logging
Change-Id: Ic4678f22ffb7ab5edaa97f76b27e1e6ffd14b4ff

Former-commit-id: b4265150dd [formerly 0857f9334a] [formerly a6bd01028c] [formerly b4265150dd [formerly 0857f9334a] [formerly a6bd01028c] [formerly a421f83b66 [formerly a6bd01028c [formerly 8c139d0200e9619afaa2cd2cd95c8a5a7410ca19]]]]
Former-commit-id: a421f83b66
Former-commit-id: 4212d6f808 [formerly c551c5ea8f] [formerly 3a5c003e612589c93adb927cf083a1622dfa0422 [formerly 641b52bbab]]
Former-commit-id: f09ddaaebb7b95d5d83d683c7669c4811e140866 [formerly 69f59343b9]
Former-commit-id: cf151e4e1b
2013-07-11 14:25:36 -05:00
Matt Nash
09e4900a66 Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things
Change-Id: I025fb4b799193478250b61bc492e5b0dbdfd973d

Former-commit-id: e41b83f7fb [formerly d2e5e7284a] [formerly 0470e7531a] [formerly e41b83f7fb [formerly d2e5e7284a] [formerly 0470e7531a] [formerly 3939a15ff9 [formerly 0470e7531a [formerly 894f51376ba69365192ad0b9c5dd19c9cfba4e5c]]]]
Former-commit-id: 3939a15ff9
Former-commit-id: 10dd336a9a [formerly 388c2b5b13] [formerly 489cbf67d681e142ef6ece3175ed698665d35b62 [formerly 8bb5a46772]]
Former-commit-id: 2736d4159ada8d436e94524bda62b3c4fcc015bf [formerly 2003f89be3]
Former-commit-id: caec447a3e
2013-07-11 13:32:26 -05:00
Roger Ferrel
d7681669d0 Issue #2088 Changes for non-blocking ContactsDlg.
Change-Id: I8e9bd796b6b811cbcbd4159d7b209733fffa23df

Former-commit-id: 3231633fb5 [formerly 11625b6eb3] [formerly 9800f069e9] [formerly 3231633fb5 [formerly 11625b6eb3] [formerly 9800f069e9] [formerly 88e0eeb81c [formerly 9800f069e9 [formerly 82e4a0edf2dbe2d2eca430b42adb50f8ec4e8125]]]]
Former-commit-id: 88e0eeb81c
Former-commit-id: 2447f8c5c8 [formerly 52ce08d4f7] [formerly 9a47b039c83c5069185d5f85810abd6143d5b5a2 [formerly 69d3ccecf4]]
Former-commit-id: 7e0c46a7b10c0a6b03044942d2cc673094eb40fc [formerly f0845257e0]
Former-commit-id: 3f8ac119d0
2013-07-11 13:02:13 -05:00
Dustin Johnson
9379f38d12 Issue #2106 Improve BandwidthManager performance, proposed changes are checked much quicker
Change-Id: I3a61de1904d7256de04a97f40f38bf18d78b1438

Former-commit-id: 285d121278 [formerly 0c6d48d985] [formerly b36200d583] [formerly 285d121278 [formerly 0c6d48d985] [formerly b36200d583] [formerly ec2ddd13b1 [formerly b36200d583 [formerly 59eafdd07754e3711e9c3babd946dfd18c161404]]]]
Former-commit-id: ec2ddd13b1
Former-commit-id: 0d59700692 [formerly 10884ca137] [formerly 4c84440e7d3de0a3cf51c58f0f79d1dab4671dba [formerly 580bc2cadf]]
Former-commit-id: 21cb6ab75b11045be7ea86ca087b255c6561c64b [formerly f790277454]
Former-commit-id: e556493c77
2013-07-10 15:59:36 -05:00
Dustin Johnson
b481615567 Merge "Issue #2171 Got rid of dataURI" into development
Former-commit-id: fd54ae0d38 [formerly 058739c5a6] [formerly ef69b489db] [formerly fd54ae0d38 [formerly 058739c5a6] [formerly ef69b489db] [formerly 1beae9c973 [formerly ef69b489db [formerly cf64550e8a20afa75d7caada14a6efa0470adc38]]]]
Former-commit-id: 1beae9c973
Former-commit-id: 3b514a63ef [formerly 13983d843b] [formerly e7cf2eaadd21890a0f5daf90c474326a830bfd0e [formerly b827522f92]]
Former-commit-id: 8352b6f061b6036d8b3eb2666f203cacfefed368 [formerly b613de41df]
Former-commit-id: 945170b973
2013-07-10 14:58:52 -05:00
Dave Hladky
cc9858113b Issue #2171 Got rid of dataURI
Change-Id: Ic0ad11dc76329726462455c8569b8d9fa7876723

Former-commit-id: c95deb9e43 [formerly a0ed26d963] [formerly aedb327acf] [formerly c95deb9e43 [formerly a0ed26d963] [formerly aedb327acf] [formerly 613a74b5aa [formerly aedb327acf [formerly e7533f6110da1803965f2266a7d7af322fd7b1fd]]]]
Former-commit-id: 613a74b5aa
Former-commit-id: 78910b5352 [formerly 4bab9fe03a] [formerly 86f2a1127f23fc3947a441c61f2d0f1dfc7b9677 [formerly 13c4727538]]
Former-commit-id: 245482491257b942c7f571d64aacbc3a2955df71 [formerly 7d6101ad6d]
Former-commit-id: e84ebf35c3
2013-07-10 12:42:17 -05:00
Mike Duff
dfcf2969ce Issue #2166 - Select the site before opening Hydro TS Control dialog
Change-Id: I2220de3092430e6af36f9e3c2a4c8f0fa3b00163

Former-commit-id: d34d1a83e3 [formerly bcd4a0aff1] [formerly 8a963939a8] [formerly d34d1a83e3 [formerly bcd4a0aff1] [formerly 8a963939a8] [formerly afe9e049b3 [formerly 8a963939a8 [formerly bcf0b1285e46d62695515051cbec17945c2646f0]]]]
Former-commit-id: afe9e049b3
Former-commit-id: 6a9ef8c64e [formerly a8fd06f8d3] [formerly 92ea947252a95dc424e84118b95d086a15965d25 [formerly fc46308738]]
Former-commit-id: e48cb5c3a7cd213a3c508376405f28e06ccb6369 [formerly 38ed97d48b]
Former-commit-id: 6a0a9400ad
2013-07-10 11:45:56 -05:00
Greg Armendariz
df73c0e2e9 13.5.1-6 baseline
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]]
Former-commit-id: b9044b1195
Former-commit-id: f23d42e977 [formerly 93b71934c0] [formerly 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]]
Former-commit-id: cca9e123a3f6f9da3810eec2cc36ef7c717f111a [formerly ec2637676d]
Former-commit-id: b601345c9f
2013-07-10 10:04:22 -04:00
Ben Steffensmeier
7b48c5038a Issue #1869 Switch location hibernate type to use hibernate spatial.
Former-commit-id: 9d1910ba9d [formerly f8596f1f5a] [formerly 7a31fbb386] [formerly 9d1910ba9d [formerly f8596f1f5a] [formerly 7a31fbb386] [formerly bbdd5cdc79 [formerly 7a31fbb386 [formerly b434131d412788c478ec45114a86abe925a79d4c]]]]
Former-commit-id: bbdd5cdc79
Former-commit-id: 87cc8f9112 [formerly a524c3f17d] [formerly 4c381305878cb140792b9d6b0b8239024c1f483f [formerly d0b0d981cc]]
Former-commit-id: abce4baedd0fd36fcdcf80fdb8b4981ea85727b7 [formerly db54975911]
Former-commit-id: c02d27fe9e
2013-07-09 18:25:11 -05:00
Lee Venable
86372d82f9 Issue #1928 - Removed SWT browser to prevent errors.
Change-Id: Ifad38700dfc12ec3cade8dc62fa8c46fbf06ed80

Former-commit-id: bf34a474cb [formerly 6a63ae3a79] [formerly 6d15b7795f] [formerly bf34a474cb [formerly 6a63ae3a79] [formerly 6d15b7795f] [formerly d8335ecd23 [formerly 6d15b7795f [formerly b69e08c40d305005b28c003b6165bcc8d4b41f10]]]]
Former-commit-id: d8335ecd23
Former-commit-id: 3ed855e5a5 [formerly 1da9605d7e] [formerly 1cbe32dc15cbff8f589b7c4963e68ad944c7c06d [formerly 89f2a6666a]]
Former-commit-id: 63080882ac719b523830120e48e41c191a5031b7 [formerly 4e6206ccc3]
Former-commit-id: d82304ac79
2013-07-09 17:10:22 -05:00
Dustin Johnson
e46cb588f2 Issue #2038 Correct unregisterFromBandwidthEventBus() to actually do it
Change-Id: Ic82c974dcf354d9fb871b1b2f81cea52e2502fe8

Former-commit-id: 215e3fbd8d [formerly 2cfe1506a4] [formerly 0393cec5d5] [formerly 215e3fbd8d [formerly 2cfe1506a4] [formerly 0393cec5d5] [formerly 9f6bd8b32b [formerly 0393cec5d5 [formerly 198c9895608d22b3e3a616f2812628be32da514b]]]]
Former-commit-id: 9f6bd8b32b
Former-commit-id: d506f63c65 [formerly 617fdd6b44] [formerly d307875965a1a0d3fecaaf627504cf76ab5c4496 [formerly 3cb8e1336c]]
Former-commit-id: 8c41760d6ddca7ab7a22a2d092e358ead6a94526 [formerly b9f992626c]
Former-commit-id: 06ce541b67
2013-07-09 14:55:22 -05:00
Roger Ferrel
1928fea36e Issue #2145 Verify movable ring coordinates prior to saving.
Change-Id: I4772e180d0af394985dbd1bdc65007a8c02feed0

Former-commit-id: c5b3bd54d0 [formerly f31f880a19] [formerly f279672f6f] [formerly c5b3bd54d0 [formerly f31f880a19] [formerly f279672f6f] [formerly 26ffb4d885 [formerly f279672f6f [formerly 8048d0e91041d734239b11b18df34a87b5e75c35]]]]
Former-commit-id: 26ffb4d885
Former-commit-id: e2b92d0f6e [formerly cd63b071db] [formerly 35e26514d690b9801a953a0caef8eb7312b009f4 [formerly 9e195e5469]]
Former-commit-id: 260ba1fc066ce6baf8e00db8d351248d58ced2bc [formerly 73fd01fa51]
Former-commit-id: 5d1d211890
2013-07-09 14:05:35 -05:00
Ben Steffensmeier
b6764e390e Issue #1869 Format Calendar when making Constraint Mapping.
Former-commit-id: bbea2d76c5 [formerly 2cccbc8e0d] [formerly f53f702b9e] [formerly bbea2d76c5 [formerly 2cccbc8e0d] [formerly f53f702b9e] [formerly c3f48bac0a [formerly f53f702b9e [formerly 58d020c1b09b4f5efc1fc9b558ef7defef80adba]]]]
Former-commit-id: c3f48bac0a
Former-commit-id: 3555a55bda [formerly 4bdec4b2bb] [formerly efa98dc017879571de4c3992f60b9a80924bd274 [formerly 1017dfae5b]]
Former-commit-id: 028655e89b75a3bb704036327e99d1ed4a519937 [formerly 236ec98da1]
Former-commit-id: 364a7ec1b6
2013-07-09 14:01:13 -05:00
Roger Ferrel
a9e593136c Issue #2088 Non-blocking ColorScaleMgrDlg and ColorChooserDlg.
Change-Id: I6f14726a466780e0dbab13d8b64fa2c55acf55d0

Former-commit-id: bcfe29ffeb [formerly e73559b871] [formerly d5e66e410d] [formerly bcfe29ffeb [formerly e73559b871] [formerly d5e66e410d] [formerly f3bdbde9d3 [formerly d5e66e410d [formerly 108c5a4957b6d3ab50eacd5792122f7cd2ff3cba]]]]
Former-commit-id: f3bdbde9d3
Former-commit-id: dc01673b13 [formerly 44724d9487] [formerly 2c591fb8750544921169d97733aea020a1760e66 [formerly 696885dc4b]]
Former-commit-id: 544f386fbd37410b6480e9f28944dc4523aac519 [formerly b82c76157c]
Former-commit-id: 9f1f91258f
2013-07-09 11:13:43 -05:00
Brad Gonzales
86569acffd Issue #1965 Changed to use File.delete() instead of Apache FileUtil.deleteQuietly().
Amend: Update from peer review.

Change-Id: Ia58b75f8f8be62f3aaddbe46aed5558714d276bd

Former-commit-id: cc89d3939d [formerly 2ced007de9] [formerly b462162996] [formerly cc89d3939d [formerly 2ced007de9] [formerly b462162996] [formerly 503d6d6cca [formerly b462162996 [formerly defb699314eec545eff3b3b603b059ef05ac1a23]]]]
Former-commit-id: 503d6d6cca
Former-commit-id: 2a3706a8f1 [formerly 222965ca7f] [formerly ece70e73a38f366159776702fbedeee0c1c366ee [formerly 4f80abebaa]]
Former-commit-id: 84d33297e2e3c72a87a8cbf7c52ee2f49f1d1d66 [formerly 6de2098f63]
Former-commit-id: 1405b1f061
2013-07-09 09:07:38 -05:00
Mike Duff
ee0718d7e6 Issue #2137 - Change Data Browser Dialog to only allow a single data type to be selected
Review comments

Change-Id: Ic4f508ea98683f750b906292094740a4538950b1

Former-commit-id: cb4624fc42 [formerly 53ebc492e1] [formerly 9aaf06ab73] [formerly cb4624fc42 [formerly 53ebc492e1] [formerly 9aaf06ab73] [formerly 9f6213f9a5 [formerly 9aaf06ab73 [formerly 1015a76693e73c52d2bc56c18c4f3dfa25092771]]]]
Former-commit-id: 9f6213f9a5
Former-commit-id: 34da0216ca [formerly 7a8d39b1da] [formerly 04153a198540f2b015eac4a85a12d4eb9b845dca [formerly 502a141297]]
Former-commit-id: 6539c57a5fac000e28d3b7eb56933b11ade3e991 [formerly 70492fbb2d]
Former-commit-id: fee7cdb0f1
2013-07-09 08:15:28 -05:00
Bryan Kowal
66be02b953 Issue #2153 - fix commons-logging dependencies for wes2bridge
Former-commit-id: a9f9517cfc [formerly 8485164fa2] [formerly 650509604a] [formerly a9f9517cfc [formerly 8485164fa2] [formerly 650509604a] [formerly c3a87eadea [formerly 650509604a [formerly 3eab5b0c2ae5ed93526edd0b13c40180d6d7cc65]]]]
Former-commit-id: c3a87eadea
Former-commit-id: a5d925cf35 [formerly bdabcac203] [formerly 7544cc885821cce005f9f789f2f8be15b1c17560 [formerly 2dc96499d0]]
Former-commit-id: 9d0ccc0282df419cdba68586b88024f8b87a7069 [formerly b3a93df1df]
Former-commit-id: 259a7d99b1
2013-07-08 20:14:11 -05:00
Lee Venable
173110a514 Merge "Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking." into development
Former-commit-id: bc4b9ebf7b [formerly 7cf71c36af] [formerly ab16e2c8a1] [formerly bc4b9ebf7b [formerly 7cf71c36af] [formerly ab16e2c8a1] [formerly 2933cc2ca8 [formerly ab16e2c8a1 [formerly c2d9a2d394fc2ab0f60c63d11323af8db90655da]]]]
Former-commit-id: 2933cc2ca8
Former-commit-id: 3e1ccaba1f [formerly 33ec4dd688] [formerly 63d100710b7892d9a2dcff5fa651609f6ed21112 [formerly b36c421c9a]]
Former-commit-id: 059c92abf6f0f15b7aeb19a4899d031d3c99c698 [formerly 2b7feb420d]
Former-commit-id: 4b90569add
2013-07-08 17:06:42 -05:00
Dustin Johnson
6d514fac43 Merge "Issue #2173 - Update unit tests for Java 1.7 and SLF4J" into development
Former-commit-id: 1e404f2e51 [formerly d11f3977cc] [formerly f09225135c] [formerly 1e404f2e51 [formerly d11f3977cc] [formerly f09225135c] [formerly 6d84cb70a8 [formerly f09225135c [formerly 67b9b463a2463036a47f62b45bf140be8a0567eb]]]]
Former-commit-id: 6d84cb70a8
Former-commit-id: bcc5f523b3 [formerly 31e45da3d0] [formerly 1a6fecb2f24d5536d64c34ac33e1d4bc3883f924 [formerly 7950c692a4]]
Former-commit-id: 263a1e6f70c707afb3811414c18a33c5d267037a [formerly 7d21788705]
Former-commit-id: 21ac764524
2013-07-08 17:00:59 -05:00
Mike Duff
521766a794 Issue #2173 - Update unit tests for Java 1.7 and SLF4J
Change-Id: I7cd6378b17d1388d6006bc8ade9708f4797ff51a

Former-commit-id: 63998469f8 [formerly bbd008a012] [formerly 40f30c4e7a] [formerly 63998469f8 [formerly bbd008a012] [formerly 40f30c4e7a] [formerly c76a29c074 [formerly 40f30c4e7a [formerly 6c2646847984f3f8ef7a1640128bd06a2abb6a57]]]]
Former-commit-id: c76a29c074
Former-commit-id: 2c78748c63 [formerly f7e2ee9e2f] [formerly 670b7b901a1f1387ba1044b5c27baefab36b6aa3 [formerly 8751b44abf]]
Former-commit-id: dd10b1e80f5abd2e61fbfd5415159cb093b70f57 [formerly 2a6762694f]
Former-commit-id: ae17ffbf93
2013-07-08 16:22:05 -05:00
Dustin Johnson
b102fb3490 Issue #2106 Move deploy test properties to unit test code
Change-Id: I2463848448789858843cca436f236f71f57d2d95

Former-commit-id: b90c928b0b [formerly 77ce8e1acb] [formerly 04b9bf6b73] [formerly b90c928b0b [formerly 77ce8e1acb] [formerly 04b9bf6b73] [formerly ac8bed9a2f [formerly 04b9bf6b73 [formerly ee39ca286312d9cd7629ba30e56faf3635c5b128]]]]
Former-commit-id: ac8bed9a2f
Former-commit-id: 6e93ea970d [formerly 96b277ce09] [formerly 6014928e88eea88030ae7e26bb617e335ca5f703 [formerly f394cf27e8]]
Former-commit-id: b83f4acceb68c9fa98c480d6bfa31b5be474f690 [formerly 21a4444e0e]
Former-commit-id: 482a4463c8
2013-07-08 16:19:21 -05:00
Dustin Johnson
c3295adae5 Merge "Issue #2106 Improve BandwidthManager performance - Use copy constructors - Separate BandwidthBucket handling into a DAO - Preparations to remove all in-memory object handling" into development
Former-commit-id: ed0ff8ff85 [formerly f519f21b79] [formerly f5d66a9f0d] [formerly ed0ff8ff85 [formerly f519f21b79] [formerly f5d66a9f0d] [formerly 59c1cd7a5e [formerly f5d66a9f0d [formerly 1a45a8604e35d0b14caf8465905a806e79a2461d]]]]
Former-commit-id: 59c1cd7a5e
Former-commit-id: 2a6030f923 [formerly 8746dda5a6] [formerly 39781ab4005ee62454d7a9dab360d7dc13e5d156 [formerly 4db95fa534]]
Former-commit-id: d54b6089164fe7a7ae594e619c161d49eb5ead76 [formerly 41ca04fcbd]
Former-commit-id: b886f349c5
2013-07-08 15:53:15 -05:00
Dustin Johnson
2a296d51e7 Merge "Issue #2106 Add ability to run deploy tests again" into development
Former-commit-id: ccfe596544 [formerly 2cb1fe005c] [formerly 02ceb9d667] [formerly ccfe596544 [formerly 2cb1fe005c] [formerly 02ceb9d667] [formerly dc8ea99af9 [formerly 02ceb9d667 [formerly 889fadcd5b4e6f261d275cab3a5b67e3edbb50d9]]]]
Former-commit-id: dc8ea99af9
Former-commit-id: fa0b3e36a4 [formerly c43e4e1812] [formerly cf20c8f4cbf8d7fd69266b953c2b144345985787 [formerly f04680fb89]]
Former-commit-id: bc87f485bf2c3ca7dbf4eb867c866a4ca7153091 [formerly 9c948e69c9]
Former-commit-id: 8d55090453
2013-07-08 15:52:12 -05:00
Nate Jensen
6f88b60e12 Merge "Issue #2145 Added slection indicator and verificaton of lat, lon and radius." into development
Former-commit-id: cfcb88f730 [formerly 4bb1dc7493] [formerly 5f07ddf81b] [formerly cfcb88f730 [formerly 4bb1dc7493] [formerly 5f07ddf81b] [formerly c7ec0ba929 [formerly 5f07ddf81b [formerly 12b690f90ee9cf5ab2fe632236f56254efc09a11]]]]
Former-commit-id: c7ec0ba929
Former-commit-id: f8cfbb2831 [formerly d2c398392d] [formerly 3515602ccae91b726e559d7e95a6e9fbb305c144 [formerly 829cb5d9eb]]
Former-commit-id: 1ad2c7dfe6993ac7db8107f43a6f371cca480546 [formerly 84e7cf173d]
Former-commit-id: 27b9cde410
2013-07-08 14:42:59 -05:00
Dustin Johnson
bf74f5bb6c Issue #2106 Add ability to run deploy tests again
Change-Id: I912137e02d4decb0ff07f9d73d1debeb9d9226a1

Former-commit-id: 7d940d102c [formerly ccef13f8cd] [formerly 09b97672cd] [formerly 7d940d102c [formerly ccef13f8cd] [formerly 09b97672cd] [formerly 35305d2c1d [formerly 09b97672cd [formerly 290c1fb3bc7e9fd4871799e9884fcb10a28db46f]]]]
Former-commit-id: 35305d2c1d
Former-commit-id: 3d28ac32fb [formerly 79205e287a] [formerly 8d7dc49f0b67ceddea9ae25296f5f90069dbd3cc [formerly 36e0fd26d8]]
Former-commit-id: b461c44e9e288d7a70db918069280a96ca423e5d [formerly ea2b206bc6]
Former-commit-id: 8d4c94b29b
2013-07-08 14:00:40 -05:00
Nate Jensen
943f34244b Merge "Issue #2154 Ensure all resource groups get removed from the time matcher." into development
Former-commit-id: 817b4b80da [formerly 84ccd3140d] [formerly 1287301152] [formerly 817b4b80da [formerly 84ccd3140d] [formerly 1287301152] [formerly 6bb28cddcf [formerly 1287301152 [formerly 11ee25f7b9eb2f041e75e5922c9ebe95c1e64bab]]]]
Former-commit-id: 6bb28cddcf
Former-commit-id: 6cd7b2c546 [formerly ed0df5c004] [formerly 81c4a8a651ae50c86d9f296b775b9ee67245a9b7 [formerly 5ced5e04ff]]
Former-commit-id: 3f53748fde1740a45b5e198155cb454f33d7cdfb [formerly a42c398300]
Former-commit-id: 6f4d06acfe
2013-07-08 13:33:30 -05:00
Ben Steffensmeier
f23a0b83b6 Issue #1869 Fix goes sounding updates.
Change-Id: Ib974c8e88bea021e0e8505e6fb2974f4e108dc80

Former-commit-id: 4f6bd4efc3 [formerly 309624cb7b] [formerly dbe74b56e5] [formerly 4f6bd4efc3 [formerly 309624cb7b] [formerly dbe74b56e5] [formerly 21abe429ec [formerly dbe74b56e5 [formerly 127609cb0ced4b4554943ad78d4263cb70489a90]]]]
Former-commit-id: 21abe429ec
Former-commit-id: be1edd618a [formerly 0b9c18aa23] [formerly e8ccecad63676e5cbd08522fca1e434bdfd7efdc [formerly e92d1e9cad]]
Former-commit-id: a132328ae92b20ca4260cd587a4b886795dc5001 [formerly c74c93af71]
Former-commit-id: 812a14c5cc
2013-07-08 11:47:08 -05:00
Bryan Kowal
bd346aaa1b Issue #2164 - fix 13.6.1 qpid build for slf4j / log4j
Change-Id: Iac18215b017ea4b285f6435b3b492a85bacf5da7

Former-commit-id: bb72b77398 [formerly 32c997aa00] [formerly c91e636399] [formerly bb72b77398 [formerly 32c997aa00] [formerly c91e636399] [formerly 86c27863fe [formerly c91e636399 [formerly 0d4ba397163e0a365178d5481e520011784104d9]]]]
Former-commit-id: 86c27863fe
Former-commit-id: ae8c2c45d7 [formerly 37504822a2] [formerly b33bf6be199d74747fbece34684c1b542a99bd8a [formerly 594835f311]]
Former-commit-id: 09ea5f3a3736867fb383fa3d618dd08dc5f10631 [formerly e8885bf9c8]
Former-commit-id: d4f13dac41
2013-07-08 10:43:14 -05:00
Dustin Johnson
17a8d0362c Issue #2106 Improve BandwidthManager performance
- Use copy constructors
- Separate BandwidthBucket handling into a DAO
- Preparations to remove all in-memory object handling

Amend: Copy more calendar and byte array objects

Change-Id: I72f4813c0780586585409a9a64c7915adc1ccbae

Former-commit-id: 01193120be [formerly 4526635405] [formerly 124edcbd15] [formerly 01193120be [formerly 4526635405] [formerly 124edcbd15] [formerly a6575c3235 [formerly 124edcbd15 [formerly e11242447c3c93f403cd546df4315381486e465c]]]]
Former-commit-id: a6575c3235
Former-commit-id: 464d9be242 [formerly aaa34b241a] [formerly d4952a728ac03fe7d839f8ba980dce46b32f902f [formerly 11a1972265]]
Former-commit-id: 6a00922f133290039d2b4f4d16f91d3abbb9094f [formerly 84e6eb6c8d]
Former-commit-id: c9ee1602f8
2013-07-08 10:22:30 -05:00
Dustin Johnson
5b583e69f8 Merge "Issue #2138 - Fixed to not use filter if filter is disabled." into development
Former-commit-id: 19a9d2fd4a [formerly 6101c8a586] [formerly b8800c0616] [formerly 19a9d2fd4a [formerly 6101c8a586] [formerly b8800c0616] [formerly e2ffbd9b27 [formerly b8800c0616 [formerly 35a2a6d54af2aa62cc3a256869e409cdb7868cb0]]]]
Former-commit-id: e2ffbd9b27
Former-commit-id: 942dc9e2de [formerly 86710ba9b6] [formerly 3a4fa8ae9ab537c1fae481841ae814e1ae244482 [formerly 56d1806f22]]
Former-commit-id: 3a142b27749d64823dd4ee5eff8e774a0ce51db5 [formerly aae6466381]
Former-commit-id: 0a1abe8f7c
2013-07-08 08:39:14 -05:00
Dustin Johnson
d1c9bc4fa2 Merge "Issue #2132 - review comments" into development
Former-commit-id: b14826f2a7 [formerly 93c7fe3ac9] [formerly a414049f39] [formerly b14826f2a7 [formerly 93c7fe3ac9] [formerly a414049f39] [formerly daf64a7923 [formerly a414049f39 [formerly 62394f1d0d8ebcd9781b5c3e377469c04ebd7dc2]]]]
Former-commit-id: daf64a7923
Former-commit-id: 19e9081e8f [formerly 2bee69bceb] [formerly 262993bd643ffe079d6a52742f3b7b653b9015f8 [formerly 7606d9e7ff]]
Former-commit-id: 7ad1e6a136df87854445a2f40a0f902c63671166 [formerly 47f8f65a38]
Former-commit-id: 9b724cea3f
2013-07-08 08:38:47 -05:00
Richard Peter
51718311ed Merge "Issue #2133 - qpid is now a wrapped java application; incremented qpid release" into development
Former-commit-id: fa04a866a2 [formerly 620838babe] [formerly fbd6bb6421] [formerly fa04a866a2 [formerly 620838babe] [formerly fbd6bb6421] [formerly 06f1945cbb [formerly fbd6bb6421 [formerly 44da96f5c268100f1e923b1f54120635c45d644c]]]]
Former-commit-id: 06f1945cbb
Former-commit-id: 4711199fe2 [formerly d1c70fdff5] [formerly a6d83d3575d83c67c9470ca59ff81044725b6e4b [formerly 89856968a8]]
Former-commit-id: 74d04ffc16e1e0397ef0224db42f48862bf12633 [formerly 17f6319955]
Former-commit-id: 34dd16ad3b
2013-07-05 13:47:20 -05:00
Roger Ferrel
1667335d31 Issue #2145 Added slection indicator and verificaton of lat, lon and radius.
Change-Id: I10492bdd2e74b5ea8fd9386528019665185ae584

Former-commit-id: 42739e0b9c [formerly a438c9ff2a] [formerly c44c11279d] [formerly 42739e0b9c [formerly a438c9ff2a] [formerly c44c11279d] [formerly 5224ab80f0 [formerly c44c11279d [formerly ab2bd047048b72ea69566925046b329dc67091ab]]]]
Former-commit-id: 5224ab80f0
Former-commit-id: db35f1e599 [formerly b057f27a94] [formerly 3067acf59089b99bda24cc02c6cb85cc6b0ea28d [formerly 895d0dc823]]
Former-commit-id: 9629611bc051ba0038531db6463e2b02223ee5dc [formerly 2a40a92307]
Former-commit-id: 87b937b6d9
2013-07-05 13:33:53 -05:00
Mike Duff
4bd011f31a Issue #2138 - Fixed to not use filter if filter is disabled.
Change-Id: Id40d60b3a478572a1ff09bc92f20fbed9b199d4d

Former-commit-id: a785cb459f [formerly cb024359ad] [formerly 4442946626] [formerly a785cb459f [formerly cb024359ad] [formerly 4442946626] [formerly c493182fa4 [formerly 4442946626 [formerly 2ced83baa19c11c0eb37f02779ae344e75d108b7]]]]
Former-commit-id: c493182fa4
Former-commit-id: 630ea0ab01 [formerly a4dfdd7313] [formerly 80ed31360dd4b4afc6a14bb6dee09aa0b1c8a521 [formerly 49cf68617f]]
Former-commit-id: 906ff993aeed3fe23cda67fa565b36ee5531597e [formerly bd9ee4c7d3]
Former-commit-id: 1ec831f66c
2013-07-05 12:35:53 -05:00
Bryan Kowal
c39a671b1d Issue #2164 - fix pde build for RadarServer.
Change-Id: I439fb9db7d26d1e80bff5e1620691246c92608e3

Former-commit-id: 8924d8fc22 [formerly 4815b78b6f] [formerly b4df3267bd] [formerly 8924d8fc22 [formerly 4815b78b6f] [formerly b4df3267bd] [formerly 92b2c6ae65 [formerly b4df3267bd [formerly b5f4fb2cfb101a9a43bb7036a952bf58ed388721]]]]
Former-commit-id: 92b2c6ae65
Former-commit-id: 27686fad8b [formerly ad1d8e35e0] [formerly 705f7197809a3a559d87c56da87de7baa0ca23a6 [formerly 5e4350392b]]
Former-commit-id: 568e321d20a3d8de2757a381fc09aed57c4492e4 [formerly b07e3f47da]
Former-commit-id: e34d55b8bd
2013-07-03 19:36:42 -05:00
Bryan Kowal
fc184536e0 Issue #2133 - qpid is now a wrapped java application; incremented qpid release
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: 93e2de5223 [formerly 1932480e2b] [formerly f6412117e1] [formerly 93e2de5223 [formerly 1932480e2b] [formerly f6412117e1] [formerly 38aa7723c6 [formerly f6412117e1 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]]]
Former-commit-id: 38aa7723c6
Former-commit-id: 3c0cb232c2 [formerly 56c7afbc0f] [formerly 2f3b48fdc497c9180ad73d6b0dbc1d60d2ff66f5 [formerly 32190c8848]]
Former-commit-id: 81c0dc9cc92256c552f8824baaacb4018e281a6a [formerly 22c2eef5ee]
Former-commit-id: f56e42195e
2013-07-03 15:55:53 -05:00
Bryan Kowal
be2e2452b3 Issue #2164 - fix 13.6.1 wes2bridge build
Former-commit-id: c087e22ce2 [formerly f484a47d43] [formerly 63345a298b] [formerly c087e22ce2 [formerly f484a47d43] [formerly 63345a298b] [formerly 9f632d9e2d [formerly 63345a298b [formerly 31b29f11b0e60c0741f69be824093d4f76961eb5]]]]
Former-commit-id: 9f632d9e2d
Former-commit-id: 4076dec94a [formerly 588503289a] [formerly f3b3951a079ee2c3525215ec62394bf5fd3f4f19 [formerly 4a492c0059]]
Former-commit-id: 2f68c08bc3944257714151fa3149a9fbc42295c8 [formerly d262771d1b]
Former-commit-id: 1dff626fef
2013-07-03 15:35:12 -05:00
Ben Steffensmeier
5630ec9b85 Issue #2154 Ensure all resource groups get removed from the time matcher.
Former-commit-id: c95b7b3fb5 [formerly 808941ac45] [formerly a7bfd8ee28] [formerly c95b7b3fb5 [formerly 808941ac45] [formerly a7bfd8ee28] [formerly 519d0f3ef8 [formerly a7bfd8ee28 [formerly f652fd3f3126f04c2ced9ceb027875a47ea23f51]]]]
Former-commit-id: 519d0f3ef8
Former-commit-id: ab4bea19cc [formerly 1c678fb024] [formerly cecb39b36e774cbcea3c6b25c66d6a91990ce545 [formerly 4b9138dc0f]]
Former-commit-id: dfd1d7ec13443ca9d72d91b79ff193e33eded7a1 [formerly 17c7cd4734]
Former-commit-id: 86b0a0a2c3
2013-07-03 14:42:59 -05:00
Nate Jensen
3563e5ae4d Merge "Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified." into development
Former-commit-id: 22ee16a803 [formerly d883392d05] [formerly f13bd6391a] [formerly 22ee16a803 [formerly d883392d05] [formerly f13bd6391a] [formerly 6465fb58ad [formerly f13bd6391a [formerly 929f2145983f183722dbeacbbf996b78179657c6]]]]
Former-commit-id: 6465fb58ad
Former-commit-id: aa6f46efd6 [formerly 0cb178f835] [formerly 490a3b990cacecdc884502035e965659982a0e8d [formerly 6a9b54cd4e]]
Former-commit-id: f9e981c314aed87eb685eb09a10d5c5eb4286016 [formerly 29f4bf22a3]
Former-commit-id: 3f990ebc8a
2013-07-03 13:32:49 -05:00
Greg Armendariz
de6e453ebd Merge "Issue #2142 attempt to fix build" into development
Former-commit-id: 425f676b5a [formerly 7f6ae6bca4] [formerly 40d7855af0] [formerly 425f676b5a [formerly 7f6ae6bca4] [formerly 40d7855af0] [formerly 27ba2d1d3c [formerly 40d7855af0 [formerly d41ed7c37f51551fd426a56a5e7762424fd00167]]]]
Former-commit-id: 27ba2d1d3c
Former-commit-id: b727fab06d [formerly a695123c7d] [formerly 02da8c26502280bd3b12ab7a8202f3d0ecf41d14 [formerly 3360d5f0b2]]
Former-commit-id: 75423ae1d361028aac17f082658ee87372571c8c [formerly a4a653221d]
Former-commit-id: c5473d9dca
2013-07-03 13:23:05 -05:00
Nate Jensen
7370ec316d Merge "Issue #2159 Synchronize TimeCache access in D2DTimeMatcher. Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55" into development
Former-commit-id: 3bb2890812 [formerly b7ddbeed41] [formerly d4261fcc45] [formerly 3bb2890812 [formerly b7ddbeed41] [formerly d4261fcc45] [formerly 6b93db235f [formerly d4261fcc45 [formerly c9dd4fe32a28f20a3d5883d767787f37598e435d]]]]
Former-commit-id: 6b93db235f
Former-commit-id: 671a9a81ef [formerly b688000175] [formerly 0f31486a4098733feacb024f5bbfc2b05fa3cab2 [formerly 8793ca3101]]
Former-commit-id: 58174f88e02ed157fc82bf0834031e8b68e4610f [formerly f732b4ccbb]
Former-commit-id: 5e7b468622
2013-07-03 13:10:39 -05:00
Nate Jensen
23a02c5519 Issue #2142 attempt to fix build
Change-Id: I465de277a20aa354731e45abbb685e108cdb4377

Former-commit-id: abb3ff9cec [formerly d5d5c5e674] [formerly 1fb11fbdf7] [formerly abb3ff9cec [formerly d5d5c5e674] [formerly 1fb11fbdf7] [formerly 47520c7b30 [formerly 1fb11fbdf7 [formerly a6e205373831d0d029f3a34cc6e34030cc496d9c]]]]
Former-commit-id: 47520c7b30
Former-commit-id: f7920f833c [formerly 1bd4d15d7a] [formerly 6cc45042cab77ebaeffcf4ae395f265095604db7 [formerly 577292d8d5]]
Former-commit-id: 83cd7dbef7f71c6ac8b00c29a8e5131a52824b75 [formerly 2286c25c51]
Former-commit-id: 28ae926f33
2013-07-03 13:05:57 -05:00
Ben Steffensmeier
51559078de Issue #2159 Synchronize TimeCache access in D2DTimeMatcher.
Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55

Former-commit-id: af51ecc7c9 [formerly 2d8e1e5e6c] [formerly a868d3d0b5] [formerly af51ecc7c9 [formerly 2d8e1e5e6c] [formerly a868d3d0b5] [formerly 53d969d0db [formerly a868d3d0b5 [formerly 3eaca3d7a18ab9c8ab601fc7ed9fb899eced1134]]]]
Former-commit-id: 53d969d0db
Former-commit-id: 679ef95297 [formerly b18f4bbe89] [formerly f9fb487f9e5019b31c24a98c3d01a0959d8527a4 [formerly dde0846fc3]]
Former-commit-id: 2c5f78ab0eb4866cb5826c16f9208561eabb617f [formerly 6804d5f9b3]
Former-commit-id: e7443b5ef6
2013-07-03 12:44:45 -05:00
Bryan Kowal
7826d2a96d Issue #2164 - fix 13.6.1 build
Change-Id: I9f4e29f8f19abf7700baad125617054c8a561ff3

Former-commit-id: 970eaad447 [formerly 34efd01a4f] [formerly c2b54d7c31] [formerly 970eaad447 [formerly 34efd01a4f] [formerly c2b54d7c31] [formerly 1c49dff18e [formerly c2b54d7c31 [formerly ea1628be6840c42fffd2e8b8437386a4df3aacca]]]]
Former-commit-id: 1c49dff18e
Former-commit-id: b94334199e [formerly c9fa275089] [formerly fe53471fbd73b96c7f069b638956ba81e12ff83b [formerly 0787aca88b]]
Former-commit-id: a5cdeeff20003c17b4c880bb19089237906e7df1 [formerly 5c14f56265]
Former-commit-id: ca7f9097f6
2013-07-03 11:25:46 -05:00
Greg Armendariz
5e1549062b 13.5.1-5 baseline
Former-commit-id: ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]]
Former-commit-id: ea7ac37930
Former-commit-id: d5bea0fc06 [formerly d899faec3d] [formerly 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82]]
Former-commit-id: 22058c6a24f6da687ba40d05b28790e525082567 [formerly dc881f4ed8]
Former-commit-id: 13ac0b1062
2013-07-03 12:20:27 -04:00
Nate Jensen
95cd15b40b Merge "Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code." into development
Former-commit-id: 7b6481ba36 [formerly ae004c8c77] [formerly 7bd12afa02] [formerly 7b6481ba36 [formerly ae004c8c77] [formerly 7bd12afa02] [formerly 679bf314e0 [formerly 7bd12afa02 [formerly d679aae13498d67d79a1134275f1016699583e1f]]]]
Former-commit-id: 679bf314e0
Former-commit-id: 614cdb58a8 [formerly 7bb4d66cbf] [formerly 0681c396fa825b8599c62566e72b40ac503776b2 [formerly c8d221b46c]]
Former-commit-id: 33fa2337cb05e1f1a2732d5c07392dd6d2407b9b [formerly 64a7f0d148]
Former-commit-id: d97721eda9
2013-07-03 09:37:05 -05:00