Commit graph

3132 commits

Author SHA1 Message Date
Nate Jensen
d7c57f620c 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: 2e3f246a9b [formerly 2e3f246a9b [formerly 22c11a51effb42dc41c91ee5bce622cfd64da7e5]]
Former-commit-id: 1a0c6e540e
Former-commit-id: a288c26dbd
2013-07-12 09:22:12 -05:00
Nate Jensen
eb8279cede Issue #2142 fix ingest logback configuration
Change-Id: I8e21298a190eb1d4f1aac087ce3d7efb0c6accbc

Former-commit-id: 0a29d56ecb [formerly 0a29d56ecb [formerly 8b0f80f46c4d0e148cacfbae39d249e8ae040b88]]
Former-commit-id: ace22e2bf8
Former-commit-id: 6a565452b2
2013-07-12 08:58:53 -05:00
Nate Jensen
1303acb408 Merge "Issue #2142 fix radar server logging" into development
Former-commit-id: 90b000482e [formerly 90b000482e [formerly f9822d956e4d2bd473f0954560499837949b6f8e]]
Former-commit-id: 5f12c25177
Former-commit-id: 0948cc8925
2013-07-11 16:06:49 -05:00
Nate Jensen
69f59343b9 Issue #2142 fix radar server logging
Change-Id: Ic4678f22ffb7ab5edaa97f76b27e1e6ffd14b4ff

Former-commit-id: a6bd01028c [formerly a6bd01028c [formerly 8c139d0200e9619afaa2cd2cd95c8a5a7410ca19]]
Former-commit-id: a421f83b66
Former-commit-id: 641b52bbab
2013-07-11 14:25:36 -05:00
Matt Nash
2003f89be3 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: 0470e7531a [formerly 0470e7531a [formerly 894f51376ba69365192ad0b9c5dd19c9cfba4e5c]]
Former-commit-id: 3939a15ff9
Former-commit-id: 8bb5a46772
2013-07-11 13:32:26 -05:00
Roger Ferrel
f0845257e0 Issue #2088 Changes for non-blocking ContactsDlg.
Change-Id: I8e9bd796b6b811cbcbd4159d7b209733fffa23df

Former-commit-id: 9800f069e9 [formerly 9800f069e9 [formerly 82e4a0edf2dbe2d2eca430b42adb50f8ec4e8125]]
Former-commit-id: 88e0eeb81c
Former-commit-id: 69d3ccecf4
2013-07-11 13:02:13 -05:00
Dustin Johnson
f790277454 Issue #2106 Improve BandwidthManager performance, proposed changes are checked much quicker
Change-Id: I3a61de1904d7256de04a97f40f38bf18d78b1438

Former-commit-id: b36200d583 [formerly b36200d583 [formerly 59eafdd07754e3711e9c3babd946dfd18c161404]]
Former-commit-id: ec2ddd13b1
Former-commit-id: 580bc2cadf
2013-07-10 15:59:36 -05:00
Dustin Johnson
b613de41df Merge "Issue #2171 Got rid of dataURI" into development
Former-commit-id: ef69b489db [formerly ef69b489db [formerly cf64550e8a20afa75d7caada14a6efa0470adc38]]
Former-commit-id: 1beae9c973
Former-commit-id: b827522f92
2013-07-10 14:58:52 -05:00
Dave Hladky
7d6101ad6d Issue #2171 Got rid of dataURI
Change-Id: Ic0ad11dc76329726462455c8569b8d9fa7876723

Former-commit-id: aedb327acf [formerly aedb327acf [formerly e7533f6110da1803965f2266a7d7af322fd7b1fd]]
Former-commit-id: 613a74b5aa
Former-commit-id: 13c4727538
2013-07-10 12:42:17 -05:00
Mike Duff
38ed97d48b Issue #2166 - Select the site before opening Hydro TS Control dialog
Change-Id: I2220de3092430e6af36f9e3c2a4c8f0fa3b00163

Former-commit-id: 8a963939a8 [formerly 8a963939a8 [formerly bcf0b1285e46d62695515051cbec17945c2646f0]]
Former-commit-id: afe9e049b3
Former-commit-id: fc46308738
2013-07-10 11:45:56 -05:00
Lee Venable
4e6206ccc3 Issue #1928 - Removed SWT browser to prevent errors.
Change-Id: Ifad38700dfc12ec3cade8dc62fa8c46fbf06ed80

Former-commit-id: 6d15b7795f [formerly 6d15b7795f [formerly b69e08c40d305005b28c003b6165bcc8d4b41f10]]
Former-commit-id: d8335ecd23
Former-commit-id: 89f2a6666a
2013-07-09 17:10:22 -05:00
Roger Ferrel
73fd01fa51 Issue #2145 Verify movable ring coordinates prior to saving.
Change-Id: I4772e180d0af394985dbd1bdc65007a8c02feed0

Former-commit-id: f279672f6f [formerly f279672f6f [formerly 8048d0e91041d734239b11b18df34a87b5e75c35]]
Former-commit-id: 26ffb4d885
Former-commit-id: 9e195e5469
2013-07-09 14:05:35 -05:00
Roger Ferrel
b82c76157c Issue #2088 Non-blocking ColorScaleMgrDlg and ColorChooserDlg.
Change-Id: I6f14726a466780e0dbab13d8b64fa2c55acf55d0

Former-commit-id: d5e66e410d [formerly d5e66e410d [formerly 108c5a4957b6d3ab50eacd5792122f7cd2ff3cba]]
Former-commit-id: f3bdbde9d3
Former-commit-id: 696885dc4b
2013-07-09 11:13:43 -05:00
Mike Duff
70492fbb2d Issue #2137 - Change Data Browser Dialog to only allow a single data type to be selected
Review comments

Change-Id: Ic4f508ea98683f750b906292094740a4538950b1

Former-commit-id: 9aaf06ab73 [formerly 9aaf06ab73 [formerly 1015a76693e73c52d2bc56c18c4f3dfa25092771]]
Former-commit-id: 9f6213f9a5
Former-commit-id: 502a141297
2013-07-09 08:15:28 -05:00
Lee Venable
2b7feb420d Merge "Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking." into development
Former-commit-id: ab16e2c8a1 [formerly ab16e2c8a1 [formerly c2d9a2d394fc2ab0f60c63d11323af8db90655da]]
Former-commit-id: 2933cc2ca8
Former-commit-id: b36c421c9a
2013-07-08 17:06:42 -05:00
Dustin Johnson
7d21788705 Merge "Issue #2173 - Update unit tests for Java 1.7 and SLF4J" into development
Former-commit-id: f09225135c [formerly f09225135c [formerly 67b9b463a2463036a47f62b45bf140be8a0567eb]]
Former-commit-id: 6d84cb70a8
Former-commit-id: 7950c692a4
2013-07-08 17:00:59 -05:00
Mike Duff
2a6762694f Issue #2173 - Update unit tests for Java 1.7 and SLF4J
Change-Id: I7cd6378b17d1388d6006bc8ade9708f4797ff51a

Former-commit-id: 40f30c4e7a [formerly 40f30c4e7a [formerly 6c2646847984f3f8ef7a1640128bd06a2abb6a57]]
Former-commit-id: c76a29c074
Former-commit-id: 8751b44abf
2013-07-08 16:22:05 -05:00
Dustin Johnson
21a4444e0e Issue #2106 Move deploy test properties to unit test code
Change-Id: I2463848448789858843cca436f236f71f57d2d95

Former-commit-id: 04b9bf6b73 [formerly 04b9bf6b73 [formerly ee39ca286312d9cd7629ba30e56faf3635c5b128]]
Former-commit-id: ac8bed9a2f
Former-commit-id: f394cf27e8
2013-07-08 16:19:21 -05:00
Dustin Johnson
41ca04fcbd 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: f5d66a9f0d [formerly f5d66a9f0d [formerly 1a45a8604e35d0b14caf8465905a806e79a2461d]]
Former-commit-id: 59c1cd7a5e
Former-commit-id: 4db95fa534
2013-07-08 15:53:15 -05:00
Dustin Johnson
9c948e69c9 Merge "Issue #2106 Add ability to run deploy tests again" into development
Former-commit-id: 02ceb9d667 [formerly 02ceb9d667 [formerly 889fadcd5b4e6f261d275cab3a5b67e3edbb50d9]]
Former-commit-id: dc8ea99af9
Former-commit-id: f04680fb89
2013-07-08 15:52:12 -05:00
Nate Jensen
84e7cf173d Merge "Issue #2145 Added slection indicator and verificaton of lat, lon and radius." into development
Former-commit-id: 5f07ddf81b [formerly 5f07ddf81b [formerly 12b690f90ee9cf5ab2fe632236f56254efc09a11]]
Former-commit-id: c7ec0ba929
Former-commit-id: 829cb5d9eb
2013-07-08 14:42:59 -05:00
Dustin Johnson
ea2b206bc6 Issue #2106 Add ability to run deploy tests again
Change-Id: I912137e02d4decb0ff07f9d73d1debeb9d9226a1

Former-commit-id: 09b97672cd [formerly 09b97672cd [formerly 290c1fb3bc7e9fd4871799e9884fcb10a28db46f]]
Former-commit-id: 35305d2c1d
Former-commit-id: 36e0fd26d8
2013-07-08 14:00:40 -05:00
Nate Jensen
a42c398300 Merge "Issue #2154 Ensure all resource groups get removed from the time matcher." into development
Former-commit-id: 1287301152 [formerly 1287301152 [formerly 11ee25f7b9eb2f041e75e5922c9ebe95c1e64bab]]
Former-commit-id: 6bb28cddcf
Former-commit-id: 5ced5e04ff
2013-07-08 13:33:30 -05:00
Bryan Kowal
e8885bf9c8 Issue #2164 - fix 13.6.1 qpid build for slf4j / log4j
Change-Id: Iac18215b017ea4b285f6435b3b492a85bacf5da7

Former-commit-id: c91e636399 [formerly c91e636399 [formerly 0d4ba397163e0a365178d5481e520011784104d9]]
Former-commit-id: 86c27863fe
Former-commit-id: 594835f311
2013-07-08 10:43:14 -05:00
Dustin Johnson
84e6eb6c8d 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: 124edcbd15 [formerly 124edcbd15 [formerly e11242447c3c93f403cd546df4315381486e465c]]
Former-commit-id: a6575c3235
Former-commit-id: 11a1972265
2013-07-08 10:22:30 -05:00
Dustin Johnson
aae6466381 Merge "Issue #2138 - Fixed to not use filter if filter is disabled." into development
Former-commit-id: b8800c0616 [formerly b8800c0616 [formerly 35a2a6d54af2aa62cc3a256869e409cdb7868cb0]]
Former-commit-id: e2ffbd9b27
Former-commit-id: 56d1806f22
2013-07-08 08:39:14 -05:00
Dustin Johnson
47f8f65a38 Merge "Issue #2132 - review comments" into development
Former-commit-id: a414049f39 [formerly a414049f39 [formerly 62394f1d0d8ebcd9781b5c3e377469c04ebd7dc2]]
Former-commit-id: daf64a7923
Former-commit-id: 7606d9e7ff
2013-07-08 08:38:47 -05:00
Richard Peter
17f6319955 Merge "Issue #2133 - qpid is now a wrapped java application; incremented qpid release" into development
Former-commit-id: fbd6bb6421 [formerly fbd6bb6421 [formerly 44da96f5c268100f1e923b1f54120635c45d644c]]
Former-commit-id: 06f1945cbb
Former-commit-id: 89856968a8
2013-07-05 13:47:20 -05:00
Roger Ferrel
2a40a92307 Issue #2145 Added slection indicator and verificaton of lat, lon and radius.
Change-Id: I10492bdd2e74b5ea8fd9386528019665185ae584

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

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

Former-commit-id: b4df3267bd [formerly b4df3267bd [formerly b5f4fb2cfb101a9a43bb7036a952bf58ed388721]]
Former-commit-id: 92b2c6ae65
Former-commit-id: 5e4350392b
2013-07-03 19:36:42 -05:00
Bryan Kowal
22c2eef5ee 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: f6412117e1 [formerly f6412117e1 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]
Former-commit-id: 38aa7723c6
Former-commit-id: 32190c8848
2013-07-03 15:55:53 -05:00
Bryan Kowal
d262771d1b Issue #2164 - fix 13.6.1 wes2bridge build
Former-commit-id: 63345a298b [formerly 63345a298b [formerly 31b29f11b0e60c0741f69be824093d4f76961eb5]]
Former-commit-id: 9f632d9e2d
Former-commit-id: 4a492c0059
2013-07-03 15:35:12 -05:00
Ben Steffensmeier
17c7cd4734 Issue #2154 Ensure all resource groups get removed from the time matcher.
Former-commit-id: a7bfd8ee28 [formerly a7bfd8ee28 [formerly f652fd3f3126f04c2ced9ceb027875a47ea23f51]]
Former-commit-id: 519d0f3ef8
Former-commit-id: 4b9138dc0f
2013-07-03 14:42:59 -05:00
Nate Jensen
29f4bf22a3 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: f13bd6391a [formerly f13bd6391a [formerly 929f2145983f183722dbeacbbf996b78179657c6]]
Former-commit-id: 6465fb58ad
Former-commit-id: 6a9b54cd4e
2013-07-03 13:32:49 -05:00
Greg Armendariz
a4a653221d Merge "Issue #2142 attempt to fix build" into development
Former-commit-id: 40d7855af0 [formerly 40d7855af0 [formerly d41ed7c37f51551fd426a56a5e7762424fd00167]]
Former-commit-id: 27ba2d1d3c
Former-commit-id: 3360d5f0b2
2013-07-03 13:23:05 -05:00
Nate Jensen
f732b4ccbb Merge "Issue #2159 Synchronize TimeCache access in D2DTimeMatcher. Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55" into development
Former-commit-id: d4261fcc45 [formerly d4261fcc45 [formerly c9dd4fe32a28f20a3d5883d767787f37598e435d]]
Former-commit-id: 6b93db235f
Former-commit-id: 8793ca3101
2013-07-03 13:10:39 -05:00
Nate Jensen
2286c25c51 Issue #2142 attempt to fix build
Change-Id: I465de277a20aa354731e45abbb685e108cdb4377

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

Former-commit-id: a868d3d0b5 [formerly a868d3d0b5 [formerly 3eaca3d7a18ab9c8ab601fc7ed9fb899eced1134]]
Former-commit-id: 53d969d0db
Former-commit-id: dde0846fc3
2013-07-03 12:44:45 -05:00
Bryan Kowal
5c14f56265 Issue #2164 - fix 13.6.1 build
Change-Id: I9f4e29f8f19abf7700baad125617054c8a561ff3

Former-commit-id: c2b54d7c31 [formerly c2b54d7c31 [formerly ea1628be6840c42fffd2e8b8437386a4df3aacca]]
Former-commit-id: 1c49dff18e
Former-commit-id: 0787aca88b
2013-07-03 11:25:46 -05:00
Nate Jensen
64a7f0d148 Merge "Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code." into development
Former-commit-id: 7bd12afa02 [formerly 7bd12afa02 [formerly d679aae13498d67d79a1134275f1016699583e1f]]
Former-commit-id: 679bf314e0
Former-commit-id: c8d221b46c
2013-07-03 09:37:05 -05:00
Roger Ferrel
0fb0ff7a5a 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: fab96d28f2 [formerly fab96d28f2 [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]]
Former-commit-id: 752933c7fe
Former-commit-id: 3c24739b72
2013-07-02 17:27:22 -05:00
Mike Duff
3e20961fe0 Issue #2132 - review comments
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094

Former-commit-id: 4399429e74 [formerly 4399429e74 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]
Former-commit-id: 2618c1a4e4
Former-commit-id: 82d713083a
2013-07-02 16:08:37 -05:00
Max Schenkelberg
1e7b73c44e 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: 9709b0500a [formerly 9709b0500a [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]
Former-commit-id: fef6056519
Former-commit-id: dc78010e74
2013-07-02 15:22:31 -05:00
Mike Duff
c07d8ef10d Issue #2160 - Fix for MPE display 7x7 dialog, field changes
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

Former-commit-id: 655d9eb928 [formerly 655d9eb928 [formerly 1fbaa2721a4b2d79a06c1d4d8b8526b5b25150a9]]
Former-commit-id: 5b676b122d
Former-commit-id: d87b4bceb5
2013-07-02 12:31:10 -05:00
Richard Peter
f916bba7ad Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development
Former-commit-id: 37042f0b2a [formerly 37042f0b2a [formerly 556e2ca39b7c93355cfa10ece835bdc63fd12d2c]]
Former-commit-id: a3bd7b3e9c
Former-commit-id: 8e15d6aa0a
2013-07-02 10:30:51 -05:00
Nate Jensen
efcf0c8519 Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

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

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

Former-commit-id: cd511c1a0c [formerly cd511c1a0c [formerly d2fbc8fca1efa7c1a467fe9970da74d47d0ba759]]
Former-commit-id: 5c7fd77f98
Former-commit-id: 053082cb80
2013-07-01 11:53:07 -05:00
Richard Peter
3d6754337a 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: 162261c395 [formerly 162261c395 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]
Former-commit-id: 76bc31aa77
Former-commit-id: d3017ca60f
2013-07-01 00:04:43 -05:00