Commit graph

3224 commits

Author SHA1 Message Date
Dustin Johnson
2a6030f923 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 59c1cd7a5e [formerly f5d66a9f0d [formerly 1a45a8604e35d0b14caf8465905a806e79a2461d]]]
Former-commit-id: 59c1cd7a5e
Former-commit-id: 39781ab4005ee62454d7a9dab360d7dc13e5d156 [formerly 4db95fa534]
Former-commit-id: 8746dda5a6
2013-07-08 15:53:15 -05:00
Dustin Johnson
fa0b3e36a4 Merge "Issue #2106 Add ability to run deploy tests again" into development
Former-commit-id: ccfe596544 [formerly 2cb1fe005c] [formerly 02ceb9d667] [formerly dc8ea99af9 [formerly 02ceb9d667 [formerly 889fadcd5b4e6f261d275cab3a5b67e3edbb50d9]]]
Former-commit-id: dc8ea99af9
Former-commit-id: cf20c8f4cbf8d7fd69266b953c2b144345985787 [formerly f04680fb89]
Former-commit-id: c43e4e1812
2013-07-08 15:52:12 -05:00
Nate Jensen
f8cfbb2831 Merge "Issue #2145 Added slection indicator and verificaton of lat, lon and radius." into development
Former-commit-id: cfcb88f730 [formerly 4bb1dc7493] [formerly 5f07ddf81b] [formerly c7ec0ba929 [formerly 5f07ddf81b [formerly 12b690f90ee9cf5ab2fe632236f56254efc09a11]]]
Former-commit-id: c7ec0ba929
Former-commit-id: 3515602ccae91b726e559d7e95a6e9fbb305c144 [formerly 829cb5d9eb]
Former-commit-id: d2c398392d
2013-07-08 14:42:59 -05:00
Dustin Johnson
3d28ac32fb Issue #2106 Add ability to run deploy tests again
Change-Id: I912137e02d4decb0ff07f9d73d1debeb9d9226a1

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

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

Former-commit-id: bb72b77398 [formerly 32c997aa00] [formerly 8dbd4df057b224e7dbada77a07f8bdad9e5560f6 [formerly c91e636399]] [formerly 86c27863fe [formerly c91e636399 [formerly 0d4ba397163e0a365178d5481e520011784104d9]]]
Former-commit-id: 86c27863fe
Former-commit-id: b33bf6be199d74747fbece34684c1b542a99bd8a [formerly 594835f311]
Former-commit-id: 37504822a2
2013-07-08 10:43:14 -05:00
Dustin Johnson
464d9be242 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 a6575c3235 [formerly 124edcbd15 [formerly e11242447c3c93f403cd546df4315381486e465c]]]
Former-commit-id: a6575c3235
Former-commit-id: d4952a728ac03fe7d839f8ba980dce46b32f902f [formerly 11a1972265]
Former-commit-id: aaa34b241a
2013-07-08 10:22:30 -05:00
Dustin Johnson
942dc9e2de Merge "Issue #2138 - Fixed to not use filter if filter is disabled." into development
Former-commit-id: 19a9d2fd4a [formerly 6101c8a586] [formerly b8800c0616] [formerly e2ffbd9b27 [formerly b8800c0616 [formerly 35a2a6d54af2aa62cc3a256869e409cdb7868cb0]]]
Former-commit-id: e2ffbd9b27
Former-commit-id: 3a4fa8ae9ab537c1fae481841ae814e1ae244482 [formerly 56d1806f22]
Former-commit-id: 86710ba9b6
2013-07-08 08:39:14 -05:00
Dustin Johnson
19e9081e8f Merge "Issue #2132 - review comments" into development
Former-commit-id: b14826f2a7 [formerly 93c7fe3ac9] [formerly a414049f39] [formerly daf64a7923 [formerly a414049f39 [formerly 62394f1d0d8ebcd9781b5c3e377469c04ebd7dc2]]]
Former-commit-id: daf64a7923
Former-commit-id: 262993bd643ffe079d6a52742f3b7b653b9015f8 [formerly 7606d9e7ff]
Former-commit-id: 2bee69bceb
2013-07-08 08:38:47 -05:00
Richard Peter
4711199fe2 Merge "Issue #2133 - qpid is now a wrapped java application; incremented qpid release" into development
Former-commit-id: fa04a866a2 [formerly 620838babe] [formerly fbd6bb6421] [formerly 06f1945cbb [formerly fbd6bb6421 [formerly 44da96f5c268100f1e923b1f54120635c45d644c]]]
Former-commit-id: 06f1945cbb
Former-commit-id: a6d83d3575d83c67c9470ca59ff81044725b6e4b [formerly 89856968a8]
Former-commit-id: d1c70fdff5
2013-07-05 13:47:20 -05:00
Roger Ferrel
db35f1e599 Issue #2145 Added slection indicator and verificaton of lat, lon and radius.
Change-Id: I10492bdd2e74b5ea8fd9386528019665185ae584

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

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

Former-commit-id: 8924d8fc22 [formerly 4815b78b6f] [formerly b4df3267bd] [formerly 92b2c6ae65 [formerly b4df3267bd [formerly b5f4fb2cfb101a9a43bb7036a952bf58ed388721]]]
Former-commit-id: 92b2c6ae65
Former-commit-id: 705f7197809a3a559d87c56da87de7baa0ca23a6 [formerly 5e4350392b]
Former-commit-id: ad1d8e35e0
2013-07-03 19:36:42 -05:00
Bryan Kowal
3c0cb232c2 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 38aa7723c6 [formerly f6412117e1 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]]
Former-commit-id: 38aa7723c6
Former-commit-id: 2f3b48fdc497c9180ad73d6b0dbc1d60d2ff66f5 [formerly 32190c8848]
Former-commit-id: 56c7afbc0f
2013-07-03 15:55:53 -05:00
Bryan Kowal
4076dec94a Issue #2164 - fix 13.6.1 wes2bridge build
Former-commit-id: c087e22ce2 [formerly f484a47d43] [formerly 63345a298b] [formerly 9f632d9e2d [formerly 63345a298b [formerly 31b29f11b0e60c0741f69be824093d4f76961eb5]]]
Former-commit-id: 9f632d9e2d
Former-commit-id: f3b3951a079ee2c3525215ec62394bf5fd3f4f19 [formerly 4a492c0059]
Former-commit-id: 588503289a
2013-07-03 15:35:12 -05:00
Ben Steffensmeier
ab4bea19cc Issue #2154 Ensure all resource groups get removed from the time matcher.
Former-commit-id: c95b7b3fb5 [formerly 808941ac45] [formerly a7bfd8ee28] [formerly 519d0f3ef8 [formerly a7bfd8ee28 [formerly f652fd3f3126f04c2ced9ceb027875a47ea23f51]]]
Former-commit-id: 519d0f3ef8
Former-commit-id: cecb39b36e774cbcea3c6b25c66d6a91990ce545 [formerly 4b9138dc0f]
Former-commit-id: 1c678fb024
2013-07-03 14:42:59 -05:00
Nate Jensen
aa6f46efd6 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 6465fb58ad [formerly f13bd6391a [formerly 929f2145983f183722dbeacbbf996b78179657c6]]]
Former-commit-id: 6465fb58ad
Former-commit-id: 490a3b990cacecdc884502035e965659982a0e8d [formerly 6a9b54cd4e]
Former-commit-id: 0cb178f835
2013-07-03 13:32:49 -05:00
Greg Armendariz
b727fab06d Merge "Issue #2142 attempt to fix build" into development
Former-commit-id: 425f676b5a [formerly 7f6ae6bca4] [formerly 40d7855af0] [formerly 27ba2d1d3c [formerly 40d7855af0 [formerly d41ed7c37f51551fd426a56a5e7762424fd00167]]]
Former-commit-id: 27ba2d1d3c
Former-commit-id: 02da8c26502280bd3b12ab7a8202f3d0ecf41d14 [formerly 3360d5f0b2]
Former-commit-id: a695123c7d
2013-07-03 13:23:05 -05:00
Nate Jensen
671a9a81ef Merge "Issue #2159 Synchronize TimeCache access in D2DTimeMatcher. Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55" into development
Former-commit-id: 3bb2890812 [formerly b7ddbeed41] [formerly d4261fcc45] [formerly 6b93db235f [formerly d4261fcc45 [formerly c9dd4fe32a28f20a3d5883d767787f37598e435d]]]
Former-commit-id: 6b93db235f
Former-commit-id: 0f31486a4098733feacb024f5bbfc2b05fa3cab2 [formerly 8793ca3101]
Former-commit-id: b688000175
2013-07-03 13:10:39 -05:00
Nate Jensen
f7920f833c Issue #2142 attempt to fix build
Change-Id: I465de277a20aa354731e45abbb685e108cdb4377

Former-commit-id: abb3ff9cec [formerly d5d5c5e674] [formerly 1fb11fbdf7] [formerly 47520c7b30 [formerly 1fb11fbdf7 [formerly a6e205373831d0d029f3a34cc6e34030cc496d9c]]]
Former-commit-id: 47520c7b30
Former-commit-id: 6cc45042cab77ebaeffcf4ae395f265095604db7 [formerly 577292d8d5]
Former-commit-id: 1bd4d15d7a
2013-07-03 13:05:57 -05:00
Ben Steffensmeier
679ef95297 Issue #2159 Synchronize TimeCache access in D2DTimeMatcher.
Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55

Former-commit-id: af51ecc7c9 [formerly 2d8e1e5e6c] [formerly 60ab89a3c68b3137496a7647972e3494926dcd06 [formerly a868d3d0b5]] [formerly 53d969d0db [formerly a868d3d0b5 [formerly 3eaca3d7a18ab9c8ab601fc7ed9fb899eced1134]]]
Former-commit-id: 53d969d0db
Former-commit-id: f9fb487f9e5019b31c24a98c3d01a0959d8527a4 [formerly dde0846fc3]
Former-commit-id: b18f4bbe89
2013-07-03 12:44:45 -05:00
Bryan Kowal
b94334199e Issue #2164 - fix 13.6.1 build
Change-Id: I9f4e29f8f19abf7700baad125617054c8a561ff3

Former-commit-id: 970eaad447 [formerly 34efd01a4f] [formerly c2b54d7c31] [formerly 1c49dff18e [formerly c2b54d7c31 [formerly ea1628be6840c42fffd2e8b8437386a4df3aacca]]]
Former-commit-id: 1c49dff18e
Former-commit-id: fe53471fbd73b96c7f069b638956ba81e12ff83b [formerly 0787aca88b]
Former-commit-id: c9fa275089
2013-07-03 11:25:46 -05:00
Greg Armendariz
d5bea0fc06 13.5.1-5 baseline
Former-commit-id: ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82]
Former-commit-id: d899faec3d
2013-07-03 12:20:27 -04:00
Nate Jensen
614cdb58a8 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 679bf314e0 [formerly 7bd12afa02 [formerly d679aae13498d67d79a1134275f1016699583e1f]]]
Former-commit-id: 679bf314e0
Former-commit-id: 0681c396fa825b8599c62566e72b40ac503776b2 [formerly c8d221b46c]
Former-commit-id: 7bb4d66cbf
2013-07-03 09:37:05 -05:00
Roger Ferrel
2f5994b297 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 752933c7fe [formerly fab96d28f2 [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]]]
Former-commit-id: 752933c7fe
Former-commit-id: 0187d6cc339bec8a38231e4fb72a3c74d9c45138 [formerly 3c24739b72]
Former-commit-id: 477d8b0317
2013-07-02 17:27:22 -05:00
Bryan Kowal
ba832ceb8a Issue #2153 - 13.5.1 build update
Change-Id: Ia57fe9a6ae3f31826eec1eede1c2b46c5c4fae05

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

Former-commit-id: 876960a2cb [formerly 57d37e9761] [formerly 4399429e74] [formerly 2618c1a4e4 [formerly 4399429e74 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]]
Former-commit-id: 2618c1a4e4
Former-commit-id: 9f07a473781aa8232e833e400eac68c9f1b191a5 [formerly 82d713083a]
Former-commit-id: 617abbd8f1
2013-07-02 16:08:37 -05:00
Max Schenkelberg
358ad28927 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 fef6056519 [formerly 9709b0500a [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]]
Former-commit-id: fef6056519
Former-commit-id: 41e73cad8a29f48a4d17728ff37661b0f76dc35e [formerly dc78010e74]
Former-commit-id: 63d69a5435
2013-07-02 15:22:31 -05:00
Mike Duff
d09183f6d7 Issue #2160 - Fix for MPE display 7x7 dialog, field changes
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

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

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

Former-commit-id: bbd2a9e5ab [formerly 58fcc4c896] [formerly f1fa0f3f388172b45f94e869ebbf2817c0829de8 [formerly a2328f0e06]] [formerly de24b8b431 [formerly a2328f0e06 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]]]
Former-commit-id: de24b8b431
Former-commit-id: 092389edf48fb57d0afab52fb91a50a27f6e805d [formerly 4e1b0674e4]
Former-commit-id: ab2e2f9a17
2013-07-02 11:04:26 -05:00
Richard Peter
45070c3a98 Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development
Former-commit-id: 2764b2edf4 [formerly f12b08401f] [formerly 37042f0b2a] [formerly a3bd7b3e9c [formerly 37042f0b2a [formerly 556e2ca39b7c93355cfa10ece835bdc63fd12d2c]]]
Former-commit-id: a3bd7b3e9c
Former-commit-id: 63a1c03ad480f03852b9a9486718f0c5cb33e35e [formerly 8e15d6aa0a]
Former-commit-id: aef289d287
2013-07-02 10:30:51 -05:00
Roger Ferrel
4983001f68 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 68be9bd65f [formerly c3ebc0cc1c [formerly 01585ddb95a65686eada207aacbe6f12a512c7f3]]]
Former-commit-id: 68be9bd65f
Former-commit-id: 7f4689f8c48052cf1d41fa2ab3c0f6db2685a931 [formerly 933009605a]
Former-commit-id: ff84f293fd
2013-07-01 15:45:14 -05:00
Nate Jensen
cce5d8e8ff Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

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

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

Former-commit-id: 44e60899d3 [formerly 3fed839344] [formerly cd511c1a0c] [formerly 5c7fd77f98 [formerly cd511c1a0c [formerly d2fbc8fca1efa7c1a467fe9970da74d47d0ba759]]]
Former-commit-id: 5c7fd77f98
Former-commit-id: 6861a04120f0e5954cbc5868c9ecf103bfd55a3d [formerly 053082cb80]
Former-commit-id: 2250983ad8
2013-07-01 11:53:07 -05:00
Nate Jensen
c4edde79f5 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 001fba449f [formerly f7e743f388 [formerly 8b91364fc675cfa8eb0cb6faefb2951cca1e365d]]]
Former-commit-id: 001fba449f
Former-commit-id: 27c725fc1f0951e0a75e945562aeea6cde35b4e0 [formerly 0cb9726554]
Former-commit-id: 47d3441930
2013-07-01 11:29:47 -05:00
Bryan Kowal
1862ecd1a4 Issue #2153 - fix merge issue for build
Former-commit-id: eea749f828 [formerly 756fb4be59] [formerly f052982f8e] [formerly 9c1aaa2bf5 [formerly f052982f8e [formerly 25560718fb861f13ff8701b9458a6b18adf523be]]]
Former-commit-id: 9c1aaa2bf5
Former-commit-id: e6a347b2367d1c71b4d63cde07a471e571140e2f [formerly 37a5eb6c69]
Former-commit-id: 08bb604ced
2013-07-01 10:52:29 -05:00
Jonathan Sanchez
5794a0bc3f 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 e4c0188c14 [formerly 81aad09d06 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]].


Former-commit-id: 772bf31dd0 [formerly 70ab67c3e5] [formerly c883b4e636] [formerly 7f74926bb4 [formerly c883b4e636 [formerly 765b5eea21f10ad1607aa99acb478eebf283e988]]]
Former-commit-id: 7f74926bb4
Former-commit-id: 112930e6b78a31053cde5b486cd3ccabf8fe7fbb [formerly 41e94abee3]
Former-commit-id: fa0887429d
2013-07-01 10:40:48 -05:00
Richard Peter
5bcfa6048d 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 76bc31aa77 [formerly 162261c395 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]
Former-commit-id: 76bc31aa77
Former-commit-id: 86532f141a4385ff3262869d48ec5e99adacc4a2 [formerly d3017ca60f]
Former-commit-id: f8213c16bd
2013-07-01 00:04:43 -05:00
Richard Peter
0da7509e6d 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 582f38bdd4 [formerly 53258be797 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]
Former-commit-id: 582f38bdd4
Former-commit-id: ba21e4d911005959317dc4193a88dd4c7ec1ee97 [formerly 1757da59ee]
Former-commit-id: 69f8807963
2013-06-30 23:46:32 -05:00
Brad Gonzales
fb8caf6e22 Issue #1965 added edex archive to the build.edex build.xml.
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b

Former-commit-id: f95cf443d5 [formerly 2d1c6a0ec5] [formerly 6e50d5db4002b3feebcb544d0d67167622133263 [formerly ba661b9e39]] [formerly add108398a [formerly ba661b9e39 [formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]]
Former-commit-id: add108398a
Former-commit-id: 15de9e7faee3482eda51d0109f76645b35fd25bc [formerly 5c9ce05ce3]
Former-commit-id: bc766efb7a
2013-06-28 13:25:46 -05:00
Steve Harris
43bb696901 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]
Former-commit-id: 640b022e84
2013-06-28 09:46:25 -04:00
Brad Gonzales
1c6ca60919 Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive.
Amend: Added archive feature to the viz product build.
       Added archive feature to the viz developer product.

Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07

Former-commit-id: aca1486801 [formerly 65507d4424] [formerly c28d1e5d4d] [formerly f4bb78381c [formerly c28d1e5d4d [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]]
Former-commit-id: f4bb78381c
Former-commit-id: 5f9272a26bf176a83743b4b654221c8613a071d6 [formerly d842d8d9d0]
Former-commit-id: 6e99019a25
2013-06-27 17:40:07 -05:00
Brad Gonzales
df7670676b Issue #1965 added File filtering by file date extension in archive purge.
Amend: updated purge cron time to once every hour.
       moved archive.purge.cron to cron.properties.
       removed purge code from DataArchiver.
       added back isHoursToKeep in DataArchiver.
       updated CategoryFileDateHelper for CategoryConfig dirPattern lists.
       updates from peer review.
       updated test cases to work with Roger's refactoring.
       fixes for ArchiveConfigManager createArchive.
       clean up of ArchiveConfigManager purgeFile.

Change-Id: I096c2a103211caab7b7ec00f18111077cfe3e519

Former-commit-id: 90f363d722 [formerly 67b4a2e202] [formerly c4b2f73dd1daaad9333db436ba709a2fa135112c [formerly 137c66539e]] [formerly 276f05233f [formerly 137c66539e [formerly 2094b7f9fde97873c759da217498bcf62254a287]]]
Former-commit-id: 276f05233f
Former-commit-id: ca13651aece598f209306490fbd73fd98936b032 [formerly 4f54596904]
Former-commit-id: d6fb315096
2013-06-27 11:46:44 -05:00
Dave Hladky
9637e9c427 Issue #2096 First steps to getting CAVE to display MADIS data
Change-Id: I68925eef139c31e751bcb47f05f05cfd83b380b9

Former-commit-id: d5990cacc0 [formerly 083dff9e43] [formerly f5d3a5f012] [formerly ee50b5c7be [formerly f5d3a5f012 [formerly 1f33631d527ecbcecef31c255ac963556f5e1a4e]]]
Former-commit-id: ee50b5c7be
Former-commit-id: 88c29ca5236793d376facb832530516c7a151d13 [formerly 2b90920d8f]
Former-commit-id: 08a81cdaaf
2013-06-27 11:07:27 -05:00
Roger Ferrel
79c0bbb140 Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up.
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3

Former-commit-id: 713f39c429 [formerly 6f07f6f3bd] [formerly ee409c0819] [formerly f66681f62b [formerly ee409c0819 [formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]]
Former-commit-id: f66681f62b
Former-commit-id: 91667b1a98b4d6dfebf3dbfd34ceea45670f8fe7 [formerly 45dcfe3ad8]
Former-commit-id: 5f35643c2d
2013-06-27 07:51:56 -05:00
Dave Hladky
07227d8a4d Issue #2146 Deleted uneeded jars from crawl4j plugin
Change-Id: I52581c7c5ffb085f3cef1b05f7347dcf02bc2a01

Former-commit-id: 9f621ed6f6 [formerly 2eded94be4] [formerly d92e039e72] [formerly d298749486 [formerly d92e039e72 [formerly d16c25b55eb004223430e65a47f844d0ec8fba79]]]
Former-commit-id: d298749486
Former-commit-id: dc3c08fc586f55d74f5997ba1f7d8bdaee7b0ba7 [formerly 00ed2353ad]
Former-commit-id: e8ac45c21f
2013-06-26 14:59:22 -05:00