Commit graph

3529 commits

Author SHA1 Message Date
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
Roger Ferrel
25ebc33066 Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified.
Change-Id: I229ce3e40769961c9c1b296c7c42d919a21cfd0b

Former-commit-id: 8cab528dc8 [formerly ebb76daf14] [formerly fab96d28f2] [formerly 8cab528dc8 [formerly ebb76daf14] [formerly fab96d28f2] [formerly 752933c7fe [formerly fab96d28f2 [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]]]]
Former-commit-id: 752933c7fe
Former-commit-id: 2f5994b297 [formerly 477d8b0317] [formerly 0187d6cc339bec8a38231e4fb72a3c74d9c45138 [formerly 3c24739b72]]
Former-commit-id: 68c6ec861090e911963c0c012b7fd34292902451 [formerly 0fb0ff7a5a]
Former-commit-id: 9f8b831148
2013-07-02 17:27:22 -05:00
Bryan Kowal
36e343f8ab Issue #2153 - 13.5.1 build update
Change-Id: Ia57fe9a6ae3f31826eec1eede1c2b46c5c4fae05

Former-commit-id: 4dfb37f2df [formerly 2e46748156] [formerly 6a6cdd7f6d] [formerly 4dfb37f2df [formerly 2e46748156] [formerly 6a6cdd7f6d] [formerly dc177c90d1 [formerly 6a6cdd7f6d [formerly 8a021ef97c67a4fc7325ce91808cd5878fbd2cda]]]]
Former-commit-id: dc177c90d1
Former-commit-id: ba832ceb8a [formerly 94ecc8119c] [formerly 584813a4d670c8624b18ce891479c0cda0c9e5b8 [formerly 6bbe51aca9]]
Former-commit-id: c0242fd39084238abee13b55dd209e917f143ff7 [formerly a89ff261d0]
Former-commit-id: c0905c536e
2013-07-02 16:12:06 -05:00
Mike Duff
c14c159f24 Issue #2132 - review comments
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094

Former-commit-id: 876960a2cb [formerly 57d37e9761] [formerly 4399429e74] [formerly 876960a2cb [formerly 57d37e9761] [formerly 4399429e74] [formerly 2618c1a4e4 [formerly 4399429e74 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]]]
Former-commit-id: 2618c1a4e4
Former-commit-id: a48d17ef7e [formerly 617abbd8f1] [formerly 9f07a473781aa8232e833e400eac68c9f1b191a5 [formerly 82d713083a]]
Former-commit-id: 55f66b799033e6ea0cc6b2f2e3796e34fc925ef8 [formerly 3e20961fe0]
Former-commit-id: c1abe64b72
2013-07-02 16:08:37 -05:00
Max Schenkelberg
5bc6ca2784 Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code.
Amend: Fixed comment

Change-Id: I384a3fac3ad6e3ee8b4efd17246a26a1c4476c63

Former-commit-id: fa03e3f2ef [formerly bc91a9f6de] [formerly 9709b0500a] [formerly fa03e3f2ef [formerly bc91a9f6de] [formerly 9709b0500a] [formerly fef6056519 [formerly 9709b0500a [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]]]
Former-commit-id: fef6056519
Former-commit-id: 358ad28927 [formerly 63d69a5435] [formerly 41e73cad8a29f48a4d17728ff37661b0f76dc35e [formerly dc78010e74]]
Former-commit-id: cfc13968fb55ee8f651dcfb7836932ef8db807d9 [formerly 1e7b73c44e]
Former-commit-id: 738d6bcae8
2013-07-02 15:22:31 -05:00
Mike Duff
1f44740b1a Issue #2160 - Fix for MPE display 7x7 dialog, field changes
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

Former-commit-id: d82c72b52b [formerly cc4ac57b22] [formerly 655d9eb928] [formerly d82c72b52b [formerly cc4ac57b22] [formerly 655d9eb928] [formerly 5b676b122d [formerly 655d9eb928 [formerly 1fbaa2721a4b2d79a06c1d4d8b8526b5b25150a9]]]]
Former-commit-id: 5b676b122d
Former-commit-id: d09183f6d7 [formerly 70d25a48dd] [formerly d2cd687662b0530ea34852c00595d332ebbac558 [formerly d87b4bceb5]]
Former-commit-id: c2bd273134c49b3513fb573f9ca09154edc327da [formerly c07d8ef10d]
Former-commit-id: afedebecd4
2013-07-02 12:31:10 -05:00
Roger Ferrel
9eb3cffa65 Issue #1964 clean up of features and manifest.
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548

Former-commit-id: 559a54ea8f [formerly 3c31d8c2ac] [formerly 41c46e14c0] [formerly 559a54ea8f [formerly 3c31d8c2ac] [formerly 41c46e14c0] [formerly 7d3362d2b5 [formerly 41c46e14c0 [formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]]]]
Former-commit-id: 7d3362d2b5
Former-commit-id: 56b1a0713c [formerly b3437266d7] [formerly 8c2a8d0c95f2cee23027bf633469a1a45f0b1e94 [formerly 201e62a4ad]]
Former-commit-id: ead9e92b266c6bc5d2a1e8b5c9c7e8b4d7cb051d [formerly ea00a52ebe]
Former-commit-id: 1d3ee09895
2013-07-02 11:14:56 -05:00
Nate Jensen
42a50bee52 Merge "Issue #2139 Loaded maps at cave start up." into omaha_13.5.1
Former-commit-id: 4918ff844f [formerly c68cf47883] [formerly e4955f094c] [formerly 4918ff844f [formerly c68cf47883] [formerly e4955f094c] [formerly 01efa33cb9 [formerly e4955f094c [formerly 5865b5ff9909ff00d047f41174b7e89ca921bb8b]]]]
Former-commit-id: 01efa33cb9
Former-commit-id: 5784cf98aa [formerly 058e47192a] [formerly b78d9642086e4dba406ba61967972b761bb20b75 [formerly 150203f5cc]]
Former-commit-id: 72adc28e1298571758c3c5e67205ef8cc350aa68 [formerly d288dded44]
Former-commit-id: 6c95177bdf
2013-07-02 11:07:59 -05:00
Jonathan Sanchez
596ffc3b12 Issue #2139 Loaded maps at cave start up.
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: bbd2a9e5ab [formerly 58fcc4c896] [formerly a2328f0e06] [formerly bbd2a9e5ab [formerly 58fcc4c896] [formerly a2328f0e06] [formerly de24b8b431 [formerly a2328f0e06 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]]]]
Former-commit-id: de24b8b431
Former-commit-id: 767a7dd7d9 [formerly ab2e2f9a17] [formerly 092389edf48fb57d0afab52fb91a50a27f6e805d [formerly 4e1b0674e4]]
Former-commit-id: 549f5c664b546ffc489f5a28b764ce64bd4be1a4 [formerly 5431e5915d]
Former-commit-id: 28849d2a53
2013-07-02 11:04:26 -05:00
Richard Peter
4423b133b1 Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development
Former-commit-id: 2764b2edf4 [formerly f12b08401f] [formerly 37042f0b2a] [formerly 2764b2edf4 [formerly f12b08401f] [formerly 37042f0b2a] [formerly a3bd7b3e9c [formerly 37042f0b2a [formerly 556e2ca39b7c93355cfa10ece835bdc63fd12d2c]]]]
Former-commit-id: a3bd7b3e9c
Former-commit-id: 45070c3a98 [formerly aef289d287] [formerly 63a1c03ad480f03852b9a9486718f0c5cb33e35e [formerly 8e15d6aa0a]]
Former-commit-id: 488563ebe4e4e1a36b6d505d074d0811c7a48b51 [formerly f916bba7ad]
Former-commit-id: 06ed1bc66c
2013-07-02 10:30:51 -05:00
Roger Ferrel
d19356f2f7 Issue #1964 Changed com.raytheon.uf.viz.archive include files needed in the binary build.
Change-Id: Id5f135c25333d6906178f76782f2b370546863b9

Former-commit-id: 50d0a74305 [formerly 82b1712714] [formerly c3ebc0cc1c] [formerly 50d0a74305 [formerly 82b1712714] [formerly c3ebc0cc1c] [formerly 68be9bd65f [formerly c3ebc0cc1c [formerly 01585ddb95a65686eada207aacbe6f12a512c7f3]]]]
Former-commit-id: 68be9bd65f
Former-commit-id: 4983001f68 [formerly ff84f293fd] [formerly 7f4689f8c48052cf1d41fa2ab3c0f6db2685a931 [formerly 933009605a]]
Former-commit-id: f6a150ac8b1ba5cebfcf55c2645b0e107c8a7b4f [formerly 68c22b7073]
Former-commit-id: 5eee41410c
2013-07-01 15:45:14 -05:00
Nate Jensen
4f6c84f9bb Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]]
Former-commit-id: db6152e524
Former-commit-id: cce5d8e8ff [formerly 5a6b0f99cc] [formerly 2c4eb0e65e048d5b4c2a5c36ff3eca32312ad167 [formerly 6da64f329c]]
Former-commit-id: dedb130eb36dca918cdf2169d1ec2f249f45f829 [formerly efcf0c8519]
Former-commit-id: 86b096bc9b
2013-07-01 14:41:05 -05:00
Roger Ferrel
019989f5ee Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking.
Change-Id: I44d41a5e3e4e00d924df190e253ae2568988d987

Former-commit-id: 289011dc92 [formerly 1c3c9e461b] [formerly 1e7ae55676] [formerly 289011dc92 [formerly 1c3c9e461b] [formerly 1e7ae55676] [formerly 220818df3a [formerly 1e7ae55676 [formerly dd9ba84811ee60b4dae7fb940abf6ff2526869ba]]]]
Former-commit-id: 220818df3a
Former-commit-id: 97d130d022 [formerly ee5b120929] [formerly a92ee8e9a863e9b74742101f3ea578f6cb0c4219 [formerly 3cabedbd45]]
Former-commit-id: 115a4eef8bed57e9bdd3175321d311ae29f63f40 [formerly ac04c66be2]
Former-commit-id: d52ab020d1
2013-07-01 13:03:39 -05:00
Mike Duff
6a3af47bd8 Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog
Change-Id: I97ce5323002d6c1ae230c446de9837e541e02c86

Former-commit-id: 44e60899d3 [formerly 3fed839344] [formerly cd511c1a0c] [formerly 44e60899d3 [formerly 3fed839344] [formerly cd511c1a0c] [formerly 5c7fd77f98 [formerly cd511c1a0c [formerly d2fbc8fca1efa7c1a467fe9970da74d47d0ba759]]]]
Former-commit-id: 5c7fd77f98
Former-commit-id: 93bbabda66 [formerly 2250983ad8] [formerly 6861a04120f0e5954cbc5868c9ecf103bfd55a3d [formerly 053082cb80]]
Former-commit-id: 5f64883b2d48cc4b5ac676320fb89c1bc7a1cac6 [formerly 0f4b98626b]
Former-commit-id: 9eb197d124
2013-07-01 11:53:07 -05:00
Nate Jensen
dbd11273bf Merge "Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."" into omaha_13.5.1
Former-commit-id: 5b1d7fe401 [formerly b23dcab913] [formerly f7e743f388] [formerly 5b1d7fe401 [formerly b23dcab913] [formerly f7e743f388] [formerly 001fba449f [formerly f7e743f388 [formerly 8b91364fc675cfa8eb0cb6faefb2951cca1e365d]]]]
Former-commit-id: 001fba449f
Former-commit-id: c4edde79f5 [formerly 47d3441930] [formerly 27c725fc1f0951e0a75e945562aeea6cde35b4e0 [formerly 0cb9726554]]
Former-commit-id: 941bfb793aefcad79ab62db8cb3d7c09c08c774b [formerly 57d1375eed]
Former-commit-id: 89f8162e2b
2013-07-01 11:29:47 -05:00
Bryan Kowal
0a131779fb Issue #2153 - fix merge issue for build
Former-commit-id: eea749f828 [formerly 756fb4be59] [formerly f052982f8e] [formerly eea749f828 [formerly 756fb4be59] [formerly f052982f8e] [formerly 9c1aaa2bf5 [formerly f052982f8e [formerly 25560718fb861f13ff8701b9458a6b18adf523be]]]]
Former-commit-id: 9c1aaa2bf5
Former-commit-id: 1862ecd1a4 [formerly 08bb604ced] [formerly e6a347b2367d1c71b4d63cde07a471e571140e2f [formerly 37a5eb6c69]]
Former-commit-id: 6bb6713c6e6a75bf3d32f621f86e2d748d7f82f9 [formerly e6516def2a]
Former-commit-id: 29f21e56ee
2013-07-01 10:52:29 -05:00
Jonathan Sanchez
9ab3a75c3b Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."
This reverts commit b046ea220c79e69eec32fa15fca28a84b3cf419c [formerly e4c0188c14] [formerly 2d4a32ca64 [formerly ab8acf06e1] [formerly 81aad09d06] [formerly 2d4a32ca64 [formerly ab8acf06e1] [formerly 81aad09d06] [formerly e4c0188c14 [formerly 81aad09d06 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]]].


Former-commit-id: 772bf31dd0 [formerly 70ab67c3e5] [formerly c883b4e636] [formerly 772bf31dd0 [formerly 70ab67c3e5] [formerly c883b4e636] [formerly 7f74926bb4 [formerly c883b4e636 [formerly 765b5eea21f10ad1607aa99acb478eebf283e988]]]]
Former-commit-id: 7f74926bb4
Former-commit-id: 5794a0bc3f [formerly fa0887429d] [formerly 112930e6b78a31053cde5b486cd3ccabf8fe7fbb [formerly 41e94abee3]]
Former-commit-id: 65fd0b4e49c824f0bc4cff2669cc7a364faee3ef [formerly a08032627c]
Former-commit-id: 23fe9db31b
2013-07-01 10:40:48 -05:00
Richard Peter
8396898d25 Merge branch 'omaha_13.5.1' (13.5.1-4) into development
Conflicts:
	edexOsgi/build.edex/build.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml

Former-commit-id: 2368697938 [formerly edeb3e255b] [formerly 162261c395] [formerly 2368697938 [formerly edeb3e255b] [formerly 162261c395] [formerly 76bc31aa77 [formerly 162261c395 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]]
Former-commit-id: 76bc31aa77
Former-commit-id: 5bcfa6048d [formerly f8213c16bd] [formerly 86532f141a4385ff3262869d48ec5e99adacc4a2 [formerly d3017ca60f]]
Former-commit-id: 7e58477f239036376e80618fa5945526bec3a534 [formerly 3d6754337a]
Former-commit-id: cca3d4c19b
2013-07-01 00:04:43 -05:00
Richard Peter
6434a4025d Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
	edexOsgi/com.raytheon.uf.common.archive/build.properties
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
	edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java

Former-commit-id: 4ee66ab1f0 [formerly da54766cc8] [formerly 53258be797] [formerly 4ee66ab1f0 [formerly da54766cc8] [formerly 53258be797] [formerly 582f38bdd4 [formerly 53258be797 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]]
Former-commit-id: 582f38bdd4
Former-commit-id: 0da7509e6d [formerly 69f8807963] [formerly ba21e4d911005959317dc4193a88dd4c7ec1ee97 [formerly 1757da59ee]]
Former-commit-id: 1478532c079d144368b91a4562993c9aac0b7cd4 [formerly 7ceb1bb9ab]
Former-commit-id: da3eb1e75c
2013-06-30 23:46:32 -05:00
Brad Gonzales
7c8f8a018c Issue #1965 added edex archive to the build.edex build.xml.
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b

Former-commit-id: f95cf443d5 [formerly 2d1c6a0ec5] [formerly ba661b9e39] [formerly f95cf443d5 [formerly 2d1c6a0ec5] [formerly ba661b9e39] [formerly add108398a [formerly ba661b9e39 [formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]]]
Former-commit-id: add108398a
Former-commit-id: fb8caf6e22 [formerly bc766efb7a] [formerly 15de9e7faee3482eda51d0109f76645b35fd25bc [formerly 5c9ce05ce3]]
Former-commit-id: 795e5b8c49c2e0a6a652dcc5f274ef5fb1e2f348 [formerly c4daf04c32]
Former-commit-id: 245de9c408
2013-06-28 13:25:46 -05:00
Steve Harris
9f5469bc6e 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901 [formerly 640b022e84] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00