Commit graph

2725 commits

Author SHA1 Message Date
Roger Ferrel
b3c2730dae Issue #1790 Changes for non-blocking dialogs CountyStateDlg, CountyZoneUgcDlg, DataAdjustFactorDlg, DataIngestFilterDlg, DataPurgeParamsDlg and DatumDlg; also changes to hydro data mangagers to remove ArrayList for method interfaces.
Change-Id: Id5f56669045afd402bed893c13977641ef59835b

Former-commit-id: 2d0155e16d [formerly 2bcc5e655c] [formerly c761fd0938] [formerly 2d0155e16d [formerly 2bcc5e655c] [formerly c761fd0938] [formerly ec275df412 [formerly c761fd0938 [formerly 23bf9839c60aa33d7bf43492b72acbeedcf518b9]]]]
Former-commit-id: ec275df412
Former-commit-id: f153fbf391 [formerly 5406b16e40] [formerly dcda98a8ea83fdec4a81db28fcf173d7fc865497 [formerly ceb9d10fdc]]
Former-commit-id: 0909afd967d84cd9f72c1a998ceadf2d1c2545e4 [formerly 2ba89dc9f2]
Former-commit-id: aee78e2ae3
2013-04-19 13:42:46 -05:00
Greg Armendariz
077113ab37 Merge "Issue #1835 - minor updates to the ldm specification" into omaha_13.4.1
Former-commit-id: 35588c5cdb [formerly 0cd81b855f] [formerly 96877d71ff] [formerly 35588c5cdb [formerly 0cd81b855f] [formerly 96877d71ff] [formerly 5a4a2dea72 [formerly 96877d71ff [formerly 03868f608e9dcef1855e316a5ab825246c370406]]]]
Former-commit-id: 5a4a2dea72
Former-commit-id: 3b9d87dd82 [formerly 3f5af9ead4] [formerly 898329f44475094483e5fd4d1ef50e98c289c6ba [formerly 33a7a2cdb3]]
Former-commit-id: b3142908fd112439e74b8c62fddb0fa2ee4bfc92 [formerly 88eed1f685]
Former-commit-id: 7376a35a56
2013-04-19 10:42:29 -05:00
Bryan Kowal
81112baa20 Issue #1927 - fixed CAVE rpm dependency determination
Former-commit-id: 9409fd486d [formerly f78a58c6be] [formerly 79e22d6770] [formerly 9409fd486d [formerly f78a58c6be] [formerly 79e22d6770] [formerly 988fbfc8ad [formerly 79e22d6770 [formerly cc1a0ed662343a382f992bd43ba3b78c11cfd78b]]]]
Former-commit-id: 988fbfc8ad
Former-commit-id: 653013f6a1 [formerly 9423b26507] [formerly a9e3f8c9d4f59c0e1b79c4864806e4a23cf6cf6e [formerly c30292262a]]
Former-commit-id: 1231e3adb9136e1f67f848fff04408978fe63805 [formerly 7f7644be1e]
Former-commit-id: deacaaaf00
2013-04-19 08:36:10 -05:00
Bryan Kowal
41ecf1339d Issue #1805 - edex-environment will now use the 13.4.1 path to access the EDEX service script.
Change-Id: Idc3a9c692faf76ea81ba3d994e949f3fcb8416ca

Former-commit-id: 5b5651ecf5 [formerly f7eca8672c] [formerly 7c0f1eb0f7] [formerly 5b5651ecf5 [formerly f7eca8672c] [formerly 7c0f1eb0f7] [formerly c02a38d7f2 [formerly 7c0f1eb0f7 [formerly 20d26f1a073a74abd595455af1800da790c36c0a]]]]
Former-commit-id: c02a38d7f2
Former-commit-id: 93f2f81ec0 [formerly 3838fc2e43] [formerly b7ebb1bcfe002b6b0a32ee083653c5ea7453ada7 [formerly e6c490852b]]
Former-commit-id: 31c0c334b8577c6f749dbbdfb33bc73a50295faa [formerly 57f9348d05]
Former-commit-id: 7430785501
2013-04-19 06:55:00 -05:00
Bryan Kowal
0e77dc5020 Issue #1915 - updated Linux java to 6u43.
Change-Id: I39bdb6bbb0cc23c457ddb08ba151ce0b707ff3e7

Former-commit-id: e35586ce18 [formerly 8caf7c9404] [formerly c0227ea66d] [formerly e35586ce18 [formerly 8caf7c9404] [formerly c0227ea66d] [formerly 633b89da12 [formerly c0227ea66d [formerly 0f5b4acf4a33a8b3c9a0ba8a30eed16822d117bb]]]]
Former-commit-id: 633b89da12
Former-commit-id: 9371c54897 [formerly 02c0ea7d8b] [formerly 0063375cdb45d314d0460fcdb60109291b70ecea [formerly a2200c5742]]
Former-commit-id: 0310016c1adb4c95d7b7ae1bacdb197e9ef9254a [formerly 77d41548ab]
Former-commit-id: affe664f04
2013-04-18 23:51:54 -05:00
Nate Jensen
aba02431ff Issue #1926 speed up scan startup by not requesting PDOs since we have URIs
Change-Id: I7b223d9c94fb55931b1c650b115c545c7ca24180

Former-commit-id: 9fb04b5e48 [formerly 900f54d691] [formerly 96cdc7ce76] [formerly 9fb04b5e48 [formerly 900f54d691] [formerly 96cdc7ce76] [formerly 91476c8e80 [formerly 96cdc7ce76 [formerly 96e1427daa378280133f85a1ee24647a72c8e9af]]]]
Former-commit-id: 91476c8e80
Former-commit-id: 27ce2542dc [formerly c4125bb32b] [formerly d9d4f37bc25a0cde2368ecbc13e0637995973e0b [formerly 74a5a462de]]
Former-commit-id: 8c4f245eb2011c0ebd09fcbf149ee4be0945287a [formerly 7009fe2c69]
Former-commit-id: 09e87709c9
2013-04-18 18:29:15 -05:00
Bryan Kowal
bec76c97f0 Issue #1835 - minor updates to the ldm specification
- the ldm rpm will now print error descriptions when the installation fails
- declared a depdency on zlib which is required to build noaaport


Former-commit-id: 2d813c653f [formerly c305833e55] [formerly 1c40009549] [formerly 2d813c653f [formerly c305833e55] [formerly 1c40009549] [formerly 744f37dd96 [formerly 1c40009549 [formerly eaf0391abdd276d362930243a461ee6ad70d8e31]]]]
Former-commit-id: 744f37dd96
Former-commit-id: 6b02bf4333 [formerly db4e03f80e] [formerly 160e795f6ae9eef25248ac50eec421e042d411f8 [formerly 46fe3aee32]]
Former-commit-id: 2f73ade31b6b889d071eccf488905ad4b7abf544 [formerly 43ddbd484a]
Former-commit-id: c1de5d6b27
2013-04-18 16:18:57 -05:00
Richard Peter
1a44a95b01 Merge "Issue #1899 - edex-environment is now compatible with qpid 0.18." into omaha_13.4.1
Former-commit-id: 4f050ca78d [formerly ac2965df6b] [formerly 04a734a584] [formerly 4f050ca78d [formerly ac2965df6b] [formerly 04a734a584] [formerly ea75ad5525 [formerly 04a734a584 [formerly a62ac3a2c58bdacfd139d3c67cc769d185a1cef2]]]]
Former-commit-id: ea75ad5525
Former-commit-id: e9df9148e5 [formerly 342357e226] [formerly 2cb2d9fb4687ac9c9418911eff0be82eb6c4d5cc [formerly 3489d95e08]]
Former-commit-id: 26f1e38e0c96575644bfc4f194d0b8afcf13782a [formerly cb71460cf3]
Former-commit-id: e4bede2efb
2013-04-18 15:46:20 -05:00
Richard Peter
ed3f5eff39 Merge "Issue #1913 Fixed GFE level translation" into omaha_13.4.1
Former-commit-id: 8925064933 [formerly 0b160892bc] [formerly 0361d7a7bd] [formerly 8925064933 [formerly 0b160892bc] [formerly 0361d7a7bd] [formerly a47ca9d509 [formerly 0361d7a7bd [formerly 54c5a68656e4d9859daf1d3ff4510419f3f2516f]]]]
Former-commit-id: a47ca9d509
Former-commit-id: 85fbed8902 [formerly 8c54d1415e] [formerly 55a963ca062b76c3309f5afbb32a5c3680a08390 [formerly 914100d33d]]
Former-commit-id: 1eb3222085e693ad8060a4bd0e20d056ee94b5fd [formerly 8f580522de]
Former-commit-id: 8fe8d46ff4
2013-04-18 15:10:56 -05:00
Lee Venable
3229bbab99 Merge "Issue #1790 Changes for non-blocking CountyStateDlg." into development
Former-commit-id: d36f0f8e23 [formerly f12dec046b] [formerly cf1347c380] [formerly d36f0f8e23 [formerly f12dec046b] [formerly cf1347c380] [formerly 95b3e0dd4b [formerly cf1347c380 [formerly 839e6d466d59e78d906380d742ea1999ff1115c0]]]]
Former-commit-id: 95b3e0dd4b
Former-commit-id: 3fa13446f4 [formerly dfc4f50b3a] [formerly c0e87c19c52f790aabaed8d2bd37cd6e2c90438b [formerly 8444e9ff54]]
Former-commit-id: f3cb8a62bd88fa856731feddd1527af4cadc3d43 [formerly 39adf1bae0]
Former-commit-id: 9a04cf8a77
2013-04-18 14:42:48 -05:00
Bryan Kowal
caa561a4cb Issue #1899 - edex-environment is now compatible with qpid 0.18.
- added change history

Change-Id: Ie6a47ed2413a366f1475d2be848ea05569c4e646

Former-commit-id: 04c1bca946 [formerly 64d9276e2e] [formerly 0924bfd726] [formerly 04c1bca946 [formerly 64d9276e2e] [formerly 0924bfd726] [formerly 86d8e511b5 [formerly 0924bfd726 [formerly a38c6c2014c3252b740ba434b44d09adbebb9991]]]]
Former-commit-id: 86d8e511b5
Former-commit-id: 68244041e7 [formerly cf71d24fff] [formerly 0225f396c0bb9b4bc44f8a3a438673280a30a3ff [formerly ff64a23deb]]
Former-commit-id: 1b947eb6a2a4a24f81407f08c14c3453f1c4ca73 [formerly af1d6136e4]
Former-commit-id: 822094bc7c
2013-04-18 14:06:53 -05:00
Dustin Johnson
786f7d099d Merge "Issue #1914 Add email notification as a notification listener" into development
Former-commit-id: 6cab92d204 [formerly 1d906fecca] [formerly b593a2581c] [formerly 6cab92d204 [formerly 1d906fecca] [formerly b593a2581c] [formerly 4f60e45094 [formerly b593a2581c [formerly 1c6174bde3598fbe3b22aefb1c36a3a49968466b]]]]
Former-commit-id: 4f60e45094
Former-commit-id: 6086b6a361 [formerly ef7be9524e] [formerly ec133cc0e6f532c0d920c6320ea08c425d5043c8 [formerly 2c28b53ea4]]
Former-commit-id: 6bd54e9149e52637680f099fa9f39d8b5db2698f [formerly 1b83f30cdb]
Former-commit-id: f0e70659ec
2013-04-18 13:25:57 -05:00
Dustin Johnson
4ae1f3ee86 Issue #1914 Add email notification as a notification listener
Amend: Fix broken test

Change-Id: I3b692255b5d84fffce174c0447970fe627f4a61e

Former-commit-id: 218616b19a [formerly f3d53eb889] [formerly 74a9b93d05] [formerly 218616b19a [formerly f3d53eb889] [formerly 74a9b93d05] [formerly 067b20c684 [formerly 74a9b93d05 [formerly 45b5a9cffd6c57dc8ea1355ee623fcf6014dd377]]]]
Former-commit-id: 067b20c684
Former-commit-id: 5aada487ea [formerly 6ded48bcd8] [formerly 998ae332c315501b02bf0d45ac6eba4348b5bbde [formerly 7b09a0e477]]
Former-commit-id: 1eed5d7781294e062d2c97deba1e50e72f8f903e [formerly cf29290348]
Former-commit-id: e37b5f6fc0
2013-04-18 12:57:38 -05:00
Nate Jensen
331403932a Merge "Issue #1916 fast rendering of CWAT Local Threat" into omaha_13.4.1
Former-commit-id: ddfe76b9f0 [formerly fde67ea9bb] [formerly 2680043152] [formerly ddfe76b9f0 [formerly fde67ea9bb] [formerly 2680043152] [formerly d7248a4dd5 [formerly 2680043152 [formerly bcc532d51f7b38da2f37ff943358b489a6d248fe]]]]
Former-commit-id: d7248a4dd5
Former-commit-id: ccbb3dfdfc [formerly 068d35734a] [formerly b121000e836eecef3d0ac25d8bf2d7202b80c972 [formerly fe657596a7]]
Former-commit-id: fea05fc9b25cb88db9487c76a44cf1532050ea3c [formerly 2d8b398635]
Former-commit-id: 3932b05a6e
2013-04-18 12:42:27 -05:00
Dave Hladky
7f35053b42 Issue #1919 Fixed broken VGB processing
Change-Id: I4d0a1e3d2bdd13f474c33ded48620c740431719b

Former-commit-id: c885e35106 [formerly 179338b837] [formerly 30561c4d1b] [formerly c885e35106 [formerly 179338b837] [formerly 30561c4d1b] [formerly f682fe4482 [formerly 30561c4d1b [formerly d8b9e5d236f15145ff395dcbd3d741c931ef39f7]]]]
Former-commit-id: f682fe4482
Former-commit-id: 557234e509 [formerly 89ae841190] [formerly b065f26cf41dd3dc1a704644a1ca030dc53ba254 [formerly 4ffbe250a8]]
Former-commit-id: 01bb66d50b543ac34bca5b1fc3faf5adcf84f001 [formerly 773ced6623]
Former-commit-id: e6577edba9
2013-04-18 12:35:24 -05:00
Nate Jensen
57742ee51f Merge "Issue #1638 Added viz base feature as well as personalities cave project extracting out non-awips specific things in personalities awips project" into development
Former-commit-id: 9c8651029b [formerly 27efccb414] [formerly 8f04f5329c] [formerly 9c8651029b [formerly 27efccb414] [formerly 8f04f5329c] [formerly b8719b47c6 [formerly 8f04f5329c [formerly 2a198f5f3c8476888f2ea12679c1eb54f0b41c84]]]]
Former-commit-id: b8719b47c6
Former-commit-id: 72a923453c [formerly 880776f544] [formerly 4868aa6c57394acdd06380921f9e8048a1b91996 [formerly ad10365a43]]
Former-commit-id: f74224d152b23ef5f2665da8d5870436b9d678ec [formerly 56b4132856]
Former-commit-id: 0f8821fda4
2013-04-18 12:31:39 -05:00
Nate Jensen
61ce971d46 Issue #1916 fast rendering of CWAT Local Threat
Change-Id: Ia8129ac6a81f35b1ed4aca19edfb21022cee2344

Former-commit-id: ae0418fec6 [formerly a1896e138e] [formerly 91fbdd4ad1] [formerly ae0418fec6 [formerly a1896e138e] [formerly 91fbdd4ad1] [formerly 74edcf7706 [formerly 91fbdd4ad1 [formerly 66a036b90f75a844cbeed3eb1a483ccdc72ec11d]]]]
Former-commit-id: 74edcf7706
Former-commit-id: ae4f128942 [formerly 8b98d518c9] [formerly 03f7366194f084c1386bc38b2ae259936297b910 [formerly 22f54ab95e]]
Former-commit-id: 9704b16d2c954088611ae65e9a06b7f5739a4725 [formerly edb9a87c56]
Former-commit-id: 795c41543d
2013-04-18 12:19:36 -05:00
Ron Anderson
4e9c539742 Issue #1913 Fixed GFE level translation
Change-Id: I2e59228991243d4178c73721d169f695d6581b8a

Former-commit-id: 2bec2b18e5 [formerly fdb69afb73] [formerly 75f802d348] [formerly 2bec2b18e5 [formerly fdb69afb73] [formerly 75f802d348] [formerly 666263beb4 [formerly 75f802d348 [formerly ed32dc366aae2fa64c02c9f32202aafb95845765]]]]
Former-commit-id: 666263beb4
Former-commit-id: 2d4a498ef7 [formerly c21f5438be] [formerly 7067e9788ce1bab06c42fc0b779ae18cb293e3a8 [formerly 214738a19e]]
Former-commit-id: ada74680316a70e4a27eb70dab9cc5979b8f3af6 [formerly ae881d581b]
Former-commit-id: c11d94d88b
2013-04-18 11:43:24 -05:00
Dustin Johnson
03c7a81f76 Merge "Issue #1914 Add plugin based registry notification" into development
Former-commit-id: 7bcf7e0fa2 [formerly af04ecf92b] [formerly 1edba0cdc6] [formerly 7bcf7e0fa2 [formerly af04ecf92b] [formerly 1edba0cdc6] [formerly 67eb771ccb [formerly 1edba0cdc6 [formerly 0b7539d488388f4f96af0ccf97f5651c8e7d8259]]]]
Former-commit-id: 67eb771ccb
Former-commit-id: 92ccefec1f [formerly 912cc39887] [formerly 20dde77e0a188e6bc90b2ddbbb378e5bc7928672 [formerly 375221e524]]
Former-commit-id: 507b5f0c36a4696a6a672f36b99611241f9f1fa0 [formerly 48bd9cad66]
Former-commit-id: f38e3ba430
2013-04-18 11:00:57 -05:00
Benjamin Phillippe
bc9718de38 Issue #1905 Implemented registry notifications via email
Change-Id: I2753074c302d707066ac0de42ac5b0778049275d

Former-commit-id: ffd1810139 [formerly a44a4b69ff] [formerly a525a1430c] [formerly ffd1810139 [formerly a44a4b69ff] [formerly a525a1430c] [formerly 7e6b8eedca [formerly a525a1430c [formerly e8dba1178491176da3543a46c0d543c489b5fcb1]]]]
Former-commit-id: 7e6b8eedca
Former-commit-id: 0ba677c1c5 [formerly f38475de7d] [formerly b14344db751ad704d29f51e201bf0406386b8b95 [formerly 9742cc996f]]
Former-commit-id: 06a2f5beff302449ae8285ddca7b6fd69ac7b422 [formerly 26a762690a]
Former-commit-id: 82fbc777dc
2013-04-18 10:19:12 -05:00
Nate Jensen
0a575c31ce Merge "Issue #1916 overrode getDataTimes() to boost efficiency" into omaha_13.4.1
Former-commit-id: ea3e7c21c8 [formerly 45ad0cbb85] [formerly 0de50ae786] [formerly ea3e7c21c8 [formerly 45ad0cbb85] [formerly 0de50ae786] [formerly 7562ac5edc [formerly 0de50ae786 [formerly ec6edaaad3943caf55f97e8f7fd9974086e3b360]]]]
Former-commit-id: 7562ac5edc
Former-commit-id: ca24226a6f [formerly c79c2ce16e] [formerly 613d32cf54b8dbeb26ba86029009ed3f0717a0d9 [formerly 25dfadb872]]
Former-commit-id: 549f2cd24998031d18101f3dbe4381638174af7e [formerly bd1913e040]
Former-commit-id: 87555a8dae
2013-04-18 10:15:57 -05:00
Roger Ferrel
9080456b82 Issue #1790 Changes for non-blocking CountyStateDlg.
Change-Id: I101202dbe8f5c1fdd9bac9b86a629960d9681e7d

Former-commit-id: ad830b5513 [formerly 44bb7ab00d] [formerly 910adae4ee] [formerly ad830b5513 [formerly 44bb7ab00d] [formerly 910adae4ee] [formerly 9c428385ee [formerly 910adae4ee [formerly a1b5f0b08a08bed1b76f81094970594aeae0a1f3]]]]
Former-commit-id: 9c428385ee
Former-commit-id: e706801537 [formerly 09a615a7c1] [formerly 8ac21efa1effe59129260e75467031cb6b09cb6a [formerly 04cd4f7f37]]
Former-commit-id: 2722d6a2e7eb48d3782c07683083a046e6c0e282 [formerly e4e92dfa8d]
Former-commit-id: 85d2de0c8f
2013-04-18 07:49:08 -05:00
Ben Steffensmeier
39073beefb Issue #1912 Initial bulk hdf5 access for ffmp
Change-Id: If2b9afbd23d0388c16f05ddaaf47a1ac8dc6b339

Former-commit-id: bc87fa8d05 [formerly 7a5835a43a] [formerly 4db55d9a58] [formerly bc87fa8d05 [formerly 7a5835a43a] [formerly 4db55d9a58] [formerly fada8ae7dd [formerly 4db55d9a58 [formerly 972ca525d04ca13eb43816bdfeb9bf4fb4786d76]]]]
Former-commit-id: fada8ae7dd
Former-commit-id: 4243136ec9 [formerly 09c34a3eae] [formerly f246618fbf986ef5924afdd2acd62190209c724f [formerly 84ee23cc58]]
Former-commit-id: 3dfc17eb401243023ee5e958670c32ecada96013 [formerly 9582c84385]
Former-commit-id: dc914ac07c
2013-04-17 16:35:50 -05:00
Nate Jensen
1573745970 Issue #1916 overrode getDataTimes() to boost efficiency
Change-Id: Ic9b3c6ddd2885f3fdef56910cb1e829387d48872

Former-commit-id: 8e34962ce6 [formerly df2823edea] [formerly 834d36e1a9] [formerly 8e34962ce6 [formerly df2823edea] [formerly 834d36e1a9] [formerly f2b383d4d6 [formerly 834d36e1a9 [formerly cd6133708f29ea162ae3fe5456a2d8463e60dce3]]]]
Former-commit-id: f2b383d4d6
Former-commit-id: 1d0479b97f [formerly d4273c8b41] [formerly 5ccda62a353eef9ec22c9bbfe3fc406c3e88822d [formerly 181b717cf2]]
Former-commit-id: 56ee1d0b2905e90fe13208268a0e39855221cd57 [formerly 245fcec165]
Former-commit-id: 93868c334c
2013-04-17 16:21:20 -05:00
Dustin Johnson
76907bd13d Merge "Issue #1786 - Modify status handler to log to default handler if PlatformUI is not up. Peer review comments" into omaha_13.4.1
Former-commit-id: db353e6f2d [formerly eb096536b3] [formerly c2cdafa265] [formerly db353e6f2d [formerly eb096536b3] [formerly c2cdafa265] [formerly f6a63050a1 [formerly c2cdafa265 [formerly 4adb0045f3a22d9b07e2cca5630feebc78981492]]]]
Former-commit-id: f6a63050a1
Former-commit-id: ed715e30ab [formerly c6c0e2cd5a] [formerly cbf95d970036e37b651dbe1c823a64c4fd2e0459 [formerly f2e4d0c743]]
Former-commit-id: 9ab46fc38dbce126f080f70d9a270564d1ce9f7c [formerly b526eaadc8]
Former-commit-id: cc23ed1760
2013-04-17 13:03:16 -05:00
Richard Peter
465f0783d7 Merge "Issue #1868 Rewrite mergeAll in PluginDao Change-Id: I5f5706229029c9fe11c8b6a057e871aaf10baf9d" into omaha_13.4.1
Former-commit-id: e3004c3e16 [formerly 98021fc2be] [formerly c35d7575dc] [formerly e3004c3e16 [formerly 98021fc2be] [formerly c35d7575dc] [formerly ad5757729f [formerly c35d7575dc [formerly 636d54e9ac473d59a8293ade9814161ec06e6b50]]]]
Former-commit-id: ad5757729f
Former-commit-id: e82e7246ea [formerly c534c9eb36] [formerly 277484bdbf5839f46fcfa39b4f65b1dcdd9737c2 [formerly 35db65a6c1]]
Former-commit-id: 52a752999785b60e29afb0574a15083385bf7c51 [formerly bd3d8d0a85]
Former-commit-id: 3e427dc3c4
2013-04-17 12:46:02 -05:00
Dustin Johnson
a8fd0635da Issue #1914 Add plugin based registry notification
Change-Id: Ie450b60683e4c317ac19628cb923310b828747a7

Former-commit-id: 7969bc7c13 [formerly dd190be390] [formerly 91fe9ea501] [formerly 7969bc7c13 [formerly dd190be390] [formerly 91fe9ea501] [formerly 8989c09566 [formerly 91fe9ea501 [formerly c75a5f6664b3c6d79773f4eda52ce03dfb5ba877]]]]
Former-commit-id: 8989c09566
Former-commit-id: 8aff4559a7 [formerly 1ea04e20e0] [formerly b4d48734a00602595a718911f896fb0ef8075d17 [formerly 0e1994a03c]]
Former-commit-id: 58b87d96e59bae2b596c7c920f8f3c15cbe4c0c3 [formerly 0bf75efca4]
Former-commit-id: e589ca5e12
2013-04-17 12:17:23 -05:00
Greg Armendariz
eba54468e5 Merge "Issue #1835 - update LDM to 6.11.2" into omaha_13.4.1
Former-commit-id: 2872e384ed [formerly f87951189b] [formerly 18a660f406] [formerly 2872e384ed [formerly f87951189b] [formerly 18a660f406] [formerly e67819dbdc [formerly 18a660f406 [formerly a7a457820a74b1d9810b7e4112ede8885d5c7905]]]]
Former-commit-id: e67819dbdc
Former-commit-id: 4207ca887a [formerly 6e4fddd6c6] [formerly 7d426223034f342f4ac25cbbf0c848f9855d4778 [formerly 2af1a197aa]]
Former-commit-id: 089c28c896d94e9185488800286803d71adb19a4 [formerly 99b9ef5719]
Former-commit-id: 9a6d08ab4b
2013-04-17 12:03:22 -05:00
Ben Steffensmeier
63b7319cef Issue #1868 Rewrite mergeAll in PluginDao
Change-Id: I5f5706229029c9fe11c8b6a057e871aaf10baf9d

Former-commit-id: 3091b7614b [formerly d21778dbfb] [formerly 7dc1e34f1b] [formerly 3091b7614b [formerly d21778dbfb] [formerly 7dc1e34f1b] [formerly 3e83b37afd [formerly 7dc1e34f1b [formerly 93a4bc3f6e7ae7de959a25a563778f424d53f2d1]]]]
Former-commit-id: 3e83b37afd
Former-commit-id: a6d64052bd [formerly 0be0b444e4] [formerly dbb6fc7a3c04ac03c6ef33dc542236d4dad7d0e5 [formerly bf72ff3d37]]
Former-commit-id: bef4782cc94047fbd8e6097b25e51550ec3ac9ba [formerly 5779912e87]
Former-commit-id: f7adb5a99d
2013-04-17 11:58:41 -05:00
Max Schenkelberg
10ee43ad97 Issue #1638 Added viz base feature as well as personalities cave project extracting out non-awips specific things in personalities awips project
Amend: Removed eclipse feature all together, added os and arch to fragments.  Ensured unpack flag stayed same when changing features.

Change-Id: I78a2c5262ebdbe3ace3c180254b5f036011c0a65

Former-commit-id: 16cce70f9d [formerly 6ccef4d3c7] [formerly bd52681be3] [formerly 16cce70f9d [formerly 6ccef4d3c7] [formerly bd52681be3] [formerly 7513e5982b [formerly bd52681be3 [formerly dd4ddb8aacf82f7c69860b470c3f754a59f0c124]]]]
Former-commit-id: 7513e5982b
Former-commit-id: d0edd6a882 [formerly 1950aff01a] [formerly 0dd1d5c1eb848344c287d03fc5cb6b4556d376ab [formerly 57f34e9080]]
Former-commit-id: d0f63d287352e6fa8f52b87780f423ef41d87efa [formerly 2e5c1a7c32]
Former-commit-id: eb6a0d25d0
2013-04-17 11:42:46 -05:00
Mike Duff
ea920be92f Issue #1786 - Modify status handler to log to default handler if PlatformUI is not up.
Peer review comments

Change-Id: Idf195398fdfcf7f52abf0ce203b048c3ac1186cb

Former-commit-id: 13ab57916e [formerly 0935bc3e30] [formerly 1f80f38e8a] [formerly 13ab57916e [formerly 0935bc3e30] [formerly 1f80f38e8a] [formerly 866e27825f [formerly 1f80f38e8a [formerly dbdfc33769f7b179f9f4a3a2a2f9d509facb78d8]]]]
Former-commit-id: 866e27825f
Former-commit-id: 0f1f46b7fa [formerly e1e3449c71] [formerly e54fad69d6eabd08572e0f49ae8a05e83994c713 [formerly 17d3ed8fde]]
Former-commit-id: 7ccc204f41c35004cfc7fb3de6b5c45c78cc3390 [formerly 61c9dde6d0]
Former-commit-id: 9ff19270a5
2013-04-17 10:48:25 -05:00
Roger Ferrel
a405b36165 Issue #1790 Changes for non-blocking ArealDefinitionsDlg, CoopAgencyOfficeDlg, CopyNewLocationDlg and BenchmarkDlg.
Change-Id: Ie4b0cbe02f0ba74ec6678acb20c9d085b08a4cea

Former-commit-id: 6ed9702b31 [formerly be06f98b17] [formerly 3f79090c6b] [formerly 6ed9702b31 [formerly be06f98b17] [formerly 3f79090c6b] [formerly 5d23b6a450 [formerly 3f79090c6b [formerly f3eb94989b149efb8651f37d2171615829eabf9d]]]]
Former-commit-id: 5d23b6a450
Former-commit-id: 2b8146a650 [formerly 985d27c132] [formerly 75784c5e979fddec2c260da49688e6dfa60a6a03 [formerly 96e603043a]]
Former-commit-id: 5bb0275c8474423fae61ad884a9a69f8b5109986 [formerly 5eeaecd8a1]
Former-commit-id: 782ae7695f
2013-04-17 10:43:32 -05:00
Richard Peter
d8bfcb53e7 Merge "Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes." into omaha_13.4.1
Former-commit-id: eed58acdf9 [formerly 61c22f6715] [formerly 577c9c144d] [formerly eed58acdf9 [formerly 61c22f6715] [formerly 577c9c144d] [formerly 5b1df2ba1a [formerly 577c9c144d [formerly 81a40e8324f38f819039d179889b4b7c016d3dfe]]]]
Former-commit-id: 5b1df2ba1a
Former-commit-id: 1b8f7e9ef0 [formerly a4bbf3c07a] [formerly fcb496edc220202e948fdedecf6d596a4b97b012 [formerly c614e29a9c]]
Former-commit-id: c940d91b16949930da8875b2c1b5b34710b0d542 [formerly 8641f8617a]
Former-commit-id: 37ac8759d5
2013-04-17 09:33:06 -05:00
Bryan Kowal
ad6f08881b Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
Former-commit-id: 3ce54b57bf [formerly 3ac089fbf8] [formerly 0a92ecca56] [formerly 3ce54b57bf [formerly 3ac089fbf8] [formerly 0a92ecca56] [formerly a2cd90e16a [formerly 0a92ecca56 [formerly 43f7cd079a103ad11d21a903438aac5736d88654]]]]
Former-commit-id: a2cd90e16a
Former-commit-id: 3d3978671a [formerly 2f4b108057] [formerly c2f6ca580b63c3a27433272e519e77d2f90aa042 [formerly 74ba9ebc3f]]
Former-commit-id: b596fbc17046fee12a16eb3e8b0d6b949d814d8b [formerly 15af31e90f]
Former-commit-id: 69c1d4c465
2013-04-16 17:01:45 -05:00
Roger Ferrel
725064821e Issue #1790 Changes for non-blocking AdministrationDlg.
Change-Id: Iec8d71c747ef5167cd49909caba33176519cd07d

Former-commit-id: 608be1a2e2 [formerly f24bd5d02b] [formerly e8093a3a56] [formerly 608be1a2e2 [formerly f24bd5d02b] [formerly e8093a3a56] [formerly 0194324742 [formerly e8093a3a56 [formerly aa671a4bcfbd26ade407a8e52c6fe5eac69eb83f]]]]
Former-commit-id: 0194324742
Former-commit-id: 33d5b26893 [formerly 66ffbeb3a6] [formerly 959c191b1b339773345e06381c76570554579dd7 [formerly f3da79e406]]
Former-commit-id: b7d2a0342891be3da88c81d759bdb3a17cc7d59a [formerly 5766931c23]
Former-commit-id: f271510075
2013-04-16 16:34:00 -05:00
Bryan Kowal
621a9a740d Issue #1835 - update LDM to 6.11.2
- fixed hard-coded 6.8.1 version

Change-Id: Id201ea8703dd67e3b7aaadd9787fa97be2da8890

Former-commit-id: d7fba83690 [formerly dfd75571f3] [formerly 890a6c0afb] [formerly d7fba83690 [formerly dfd75571f3] [formerly 890a6c0afb] [formerly ba3a0ad7d5 [formerly 890a6c0afb [formerly 72ffc3204a1fa40fe2ae17801013cb93cd2961b8]]]]
Former-commit-id: ba3a0ad7d5
Former-commit-id: 6e93716097 [formerly fc4e0af835] [formerly 988bbc7b5ea322a6008397048e527d3ad02d4508 [formerly 6ef61185c9]]
Former-commit-id: 1df7a38db89e811b2b9b8f633d4055536286ffa9 [formerly 77242640b8]
Former-commit-id: 8cc6de9e57
2013-04-16 16:32:58 -05:00
Roger Ferrel
8a7a76df1a Issue #1790 Changes for non-blocking AddModifyLocationDlg.
Change-Id: Ice2d3a8bbeaff0689d2b4e0a2ba8bbee017fb080

Former-commit-id: c6d66c323d [formerly 2d6c308083] [formerly 3c42ad8145] [formerly c6d66c323d [formerly 2d6c308083] [formerly 3c42ad8145] [formerly f410ee5f89 [formerly 3c42ad8145 [formerly 8e78b6799404059032f10b97e62d385e07852c53]]]]
Former-commit-id: f410ee5f89
Former-commit-id: 8cfff00941 [formerly 9c8faa3b5b] [formerly acb0381216dbd21d5abf7928480021481cb8f17f [formerly f576747b38]]
Former-commit-id: d8bf47a0d520774040025ec3528671ccee61fc2b [formerly cca9aca98b]
Former-commit-id: 83fa6e1bf5
2013-04-16 15:54:02 -05:00
Brad Gonzales
9ac62c4895 Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes.
Amend: comment updates from peer review.
       added sequence delta script.

Change-Id: Id8685fa0790926564d5d575e43a3da24db27dcf1

Former-commit-id: c7318522e1 [formerly 005c935be6] [formerly dc37712fda] [formerly c7318522e1 [formerly 005c935be6] [formerly dc37712fda] [formerly b75ef08190 [formerly dc37712fda [formerly 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95]]]]
Former-commit-id: b75ef08190
Former-commit-id: 2c2f7f7edf [formerly a21b495206] [formerly a9e91f46554d9caefb1866f0820680559c325801 [formerly 16f030294d]]
Former-commit-id: 2d564f9f951487593ec967d020cee8f30658ea64 [formerly 00c0f59b6b]
Former-commit-id: 4a086703ea
2013-04-16 14:44:06 -05:00
Roger Ferrel
e85b4a101a Issue #1790 Changes for non-blocking ForecastAttributeDlg.
Change-Id: I3724d165f721f9664f69ede09864a9714e35405b

Former-commit-id: 1bd0ba22dc [formerly ad47a959f4] [formerly 2b2dabdc71] [formerly 1bd0ba22dc [formerly ad47a959f4] [formerly 2b2dabdc71] [formerly c1b7b2e3bd [formerly 2b2dabdc71 [formerly f4d3fdda15d34a454887c9a14b6deada7a698141]]]]
Former-commit-id: c1b7b2e3bd
Former-commit-id: 4538eac44d [formerly 6d6eb9b7c3] [formerly a6342b05034219fe11229fb6d01e8c3d9e82ec0b [formerly 1f0b994b9a]]
Former-commit-id: 97924a4932b42484723921112541f3ff49e8f5e0 [formerly 30dd322db4]
Former-commit-id: 4a70d016bf
2013-04-16 14:44:03 -05:00
Mike Duff
3ffce069e0 Issue #1786 - fix null pointer
Change-Id: Ie7bf3aa9afe6a8dcd9d288afc0e6dc537fdf043d

Former-commit-id: bc8ea0c031 [formerly ad08e0a6ac] [formerly 6b909c7902] [formerly bc8ea0c031 [formerly ad08e0a6ac] [formerly 6b909c7902] [formerly 7701902083 [formerly 6b909c7902 [formerly 6f14dfd04a696c71e2b2c9d12b86549287e7f0de]]]]
Former-commit-id: 7701902083
Former-commit-id: 53d8d2052c [formerly 69dd972313] [formerly f124021c7e3b89007a640c8dc93ef8657c1055a5 [formerly 53c87a865c]]
Former-commit-id: bfb2f8e9478544c3c4bb17de5b41b9a3cfa499c6 [formerly 4c9edcec56]
Former-commit-id: 6cbaa20526
2013-04-16 14:21:28 -05:00
Roger Ferrel
eee55dc50e Issue #1790 Changes for non-blocking StationReportingStatusDlg.
Change-Id: Icd11c338c2bc7399c10205d10d3c11ff034d61d7

Former-commit-id: 92e7fd93ae [formerly aa11977fd3] [formerly 1ba7a11037] [formerly 92e7fd93ae [formerly aa11977fd3] [formerly 1ba7a11037] [formerly af0aa091f3 [formerly 1ba7a11037 [formerly ec789fc71009b77d6f44b7eba606ba5259d253a8]]]]
Former-commit-id: af0aa091f3
Former-commit-id: 9bf8d730fe [formerly b49ab42ce1] [formerly c979a138d9f080bce3b8a3771ff07f0fc114701b [formerly 2020d82599]]
Former-commit-id: a2e4ae601f5fe8088132377f789482fb4b87e8f3 [formerly c1e1f3786f]
Former-commit-id: ae72f407b0
2013-04-16 12:51:18 -05:00
Dustin Johnson
28c46eecf0 Issue #1910 Add some tests of the LifecycleManager SubmitObjects functionality
Change-Id: Ieb1544cb52cf108836b157e3d800c470fa5cf3e1

Former-commit-id: 8e03494192 [formerly 67e49201d6] [formerly 255aea053b] [formerly 8e03494192 [formerly 67e49201d6] [formerly 255aea053b] [formerly 58b6899672 [formerly 255aea053b [formerly c4344f5402fe33e7e47515adc3b54913f9c13617]]]]
Former-commit-id: 58b6899672
Former-commit-id: 075d051b56 [formerly ce9f5a7365] [formerly c84b45e2152655f5a59d981bf77540a6031f9e67 [formerly cb899b3fa0]]
Former-commit-id: f8cd2df5b9ed6f18304af15249e41da5c1aeb6e8 [formerly 522549fc3a]
Former-commit-id: ea37022631
2013-04-16 11:30:06 -05:00
Dustin Johnson
318afbcd20 Issue #1906 Remove new registry plugin from datadelivery feature
Change-Id: I3ca4e0335af4b7d0de195f84fe4b3ae9c6fb8598

Former-commit-id: 33e650fa62 [formerly e44d3a8715] [formerly c8241840c5] [formerly 33e650fa62 [formerly e44d3a8715] [formerly c8241840c5] [formerly 977702e876 [formerly c8241840c5 [formerly 71b4bb07870f5490d89a1fe657429444c54a2689]]]]
Former-commit-id: 977702e876
Former-commit-id: f62c676204 [formerly ee0572026a] [formerly 8f6f2752a97faad2cc1abe1217e10c837c560006 [formerly 8170693941]]
Former-commit-id: 21eccbdc435b0685d83b3d9b97371ed96a747b6f [formerly 8095deee57]
Former-commit-id: ff9f489fea
2013-04-16 10:36:56 -05:00
Richard Peter
02428a03c0 Merge "Issue #1787 Fixed to support changes to D2D grid location" into omaha_13.4.1
Former-commit-id: 244e7ab8da [formerly 30e77171ab] [formerly 390bf03c39] [formerly 244e7ab8da [formerly 30e77171ab] [formerly 390bf03c39] [formerly 5a11d3cc1c [formerly 390bf03c39 [formerly 73e3a04a98ced3670c61b5debacdfc79d494ab29]]]]
Former-commit-id: 5a11d3cc1c
Former-commit-id: 865883a366 [formerly 4ed90bf67a] [formerly d87a04feb7e6045446d19ab85351d3ff8bbcfc93 [formerly 6be394ba64]]
Former-commit-id: 34fb3acaa8ea91a8bc7f1711b794a9c11e20ef9e [formerly d2354e13ec]
Former-commit-id: e4c7161748
2013-04-16 09:35:12 -05:00
Dustin Johnson
211b47bdc6 Issue #1906 Remove use of hibernate columnDefinition from SubscriptionType
Change-Id: I310914180865ca65290c48dc1c55f9dc11f3c044

Former-commit-id: 7e34412788 [formerly 3e5ace2cf3] [formerly 391a7bb999] [formerly 7e34412788 [formerly 3e5ace2cf3] [formerly 391a7bb999] [formerly 8b38dec4bb [formerly 391a7bb999 [formerly 67ff37feac0998378a30c09894fab7ea0dbd84f8]]]]
Former-commit-id: 8b38dec4bb
Former-commit-id: c4a90e6657 [formerly 395e4db621] [formerly febfd9de5ac996a392f5d941c8e8c6d3e649328a [formerly 80ff75c473]]
Former-commit-id: 28affc9bb37211f0061b20d17640270f1d93f550 [formerly 6302ad04b4]
Former-commit-id: 493f6d3aa5
2013-04-16 08:08:47 -05:00
Ron Anderson
c0f2c84b19 Issue #1787 Fixed to support changes to D2D grid location
Change-Id: I9ba8a45cf5b4f1ada6eaf1390f922bc5560d6e5c

Former-commit-id: f0e2bf8755 [formerly 4ea01a29ce] [formerly c233ce042d] [formerly f0e2bf8755 [formerly 4ea01a29ce] [formerly c233ce042d] [formerly 4cd87f2726 [formerly c233ce042d [formerly 5a15d9add4f47cb2016bbd453008039cef8f765f]]]]
Former-commit-id: 4cd87f2726
Former-commit-id: f10107fef4 [formerly 24a6a3590f] [formerly c8230f228e91a9f3155cde9baf0651765c522e16 [formerly e9f674a575]]
Former-commit-id: f8d56d18af251880f893a19b401fdc01b452c187 [formerly 89a2d99bfe]
Former-commit-id: 4dd37ae7cd
2013-04-15 18:02:47 -05:00
Dave Hladky
99d0c3901c Issue #1890 moved date keys to references in FFMPRecord instead of hard object in FFMPBasin
Change-Id: I840e0805422686856744f0d39dda0aeac4755bb8

Former-commit-id: bb6814beef [formerly c52445652a] [formerly 60fa768195] [formerly bb6814beef [formerly c52445652a] [formerly 60fa768195] [formerly 978e68d893 [formerly 60fa768195 [formerly 4c1e41a6a77ea89f2a0c0253671b8d6cca071c04]]]]
Former-commit-id: 978e68d893
Former-commit-id: 1ca77b427f [formerly d0ec4f0d87] [formerly c72d0a748e1272940a038261a3b8315e8fd1eeee [formerly 5789936212]]
Former-commit-id: a2225196ae722fa9348d20acb31f2d406f2af39b [formerly 0f7843f0b7]
Former-commit-id: 14a08d6f66
2013-04-15 17:58:06 -05:00
Bryan Kowal
de0546ca99 Issue #1814 - use the AWIPS II log4j.xml for qpid
Change-Id: I99b34003e81686c2794acc8d3567189dc8c3b3d1

Former-commit-id: 715befa75c [formerly e720bf74b5] [formerly e00a6207a5] [formerly 715befa75c [formerly e720bf74b5] [formerly e00a6207a5] [formerly 35b956fc4c [formerly e00a6207a5 [formerly b7297cb67055cafdef19595e0e0a481a33a9552e]]]]
Former-commit-id: 35b956fc4c
Former-commit-id: 02f01470fc [formerly 49b9046bb4] [formerly a0bd420b00b18b43fbffb1d90f2d5c751a02e44a [formerly cbc2742070]]
Former-commit-id: f2ac9bf75c2eac62c3ddae97b705ade27423325b [formerly 39bae3cc54]
Former-commit-id: 6ad82744d2
2013-04-15 16:38:00 -05:00
Lee Venable
99bf297190 Merge "Issue #1902 - FFMP permormance/cleanup peer review comments" into omaha_13.4.1
Former-commit-id: c23b6d31d5 [formerly 9ae56e2172] [formerly 8723d88a19] [formerly c23b6d31d5 [formerly 9ae56e2172] [formerly 8723d88a19] [formerly 8c8709f4a6 [formerly 8723d88a19 [formerly 042819679ba8e0d22695b41059772da841619f29]]]]
Former-commit-id: 8c8709f4a6
Former-commit-id: 953d3f79fb [formerly b18fa4f6bf] [formerly 3ebd30bd68f66548fee71c2096f5598c7cdba3aa [formerly 1674a59ed3]]
Former-commit-id: b694b850da12576a75b20bb91bfeb2f285ef290a [formerly ec3f0c0a11]
Former-commit-id: 783df0394c
2013-04-15 15:33:53 -05:00
Nate Jensen
2fa9a1cc65 Merge "Issue #1870 add package-info.java so that the empty src directory gets pushed to git" into development
Former-commit-id: 7e6cbbeca8 [formerly 56c1fe7422] [formerly 0cbf561f7c] [formerly 7e6cbbeca8 [formerly 56c1fe7422] [formerly 0cbf561f7c] [formerly d411aad285 [formerly 0cbf561f7c [formerly 3d866c91c40a5addb5268c274f2cf25eef8b5fc1]]]]
Former-commit-id: d411aad285
Former-commit-id: 959a8867e9 [formerly d785d3f1c2] [formerly 13c131b4ba733ec8bfe111d53be343dd584dd76c [formerly 9d0e3fd0c2]]
Former-commit-id: 8612484a7e2a30162bc90a91e8c23595f6b0fdca [formerly 2eaf49612c]
Former-commit-id: f8c3cb4589
2013-04-15 14:57:03 -05:00