Commit graph

2709 commits

Author SHA1 Message Date
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
Matt Nash
35f5d4167e Issue #1870 add package-info.java so that the empty src directory gets pushed to git
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840

Former-commit-id: 24711d9f2c [formerly 7ffb45758d] [formerly 0d12fb16bc] [formerly 24711d9f2c [formerly 7ffb45758d] [formerly 0d12fb16bc] [formerly 4b896002ac [formerly 0d12fb16bc [formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]]]
Former-commit-id: 4b896002ac
Former-commit-id: c3b78dcb45 [formerly 317cbf0950] [formerly 3171c53715c04eee22a513fc63775f14cec341d2 [formerly 87af6d2809]]
Former-commit-id: 07f95159ba72d1a2635b6c0d391a0b4e90166b2a [formerly a2e421048c]
Former-commit-id: a8358a4b40
2013-04-15 14:53:07 -05:00
Lee Venable
a0b531c77c Merge "Issue #1904 - FFMPConfig no longer able to be reset." into development
Former-commit-id: 8e6df2e9d3 [formerly 966085d878] [formerly c5c885b28b] [formerly 8e6df2e9d3 [formerly 966085d878] [formerly c5c885b28b] [formerly 770f473bf7 [formerly c5c885b28b [formerly 72178a388b7114f92146ba7fbb1eb062cbeb7aa4]]]]
Former-commit-id: 770f473bf7
Former-commit-id: e3cbfade68 [formerly 42aefd0d77] [formerly 5f29c43af6ad720000ce8d1a56c8387e3b877f46 [formerly 668a5133f6]]
Former-commit-id: fa5006089d4ea7509db536bbacb7cf61a6246369 [formerly e1c360ca37]
Former-commit-id: 71870d782c
2013-04-15 13:11:34 -05:00
Mike Duff
02bf3e1d48 Issue #1904 - FFMPConfig no longer able to be reset.
Change-Id: I9e7a7628ca1cd77964574fbc84c2cd2f78364872

Former-commit-id: 9a8923cf82 [formerly 2323505f91] [formerly 18e5561dd2] [formerly 9a8923cf82 [formerly 2323505f91] [formerly 18e5561dd2] [formerly f9c0de442f [formerly 18e5561dd2 [formerly 5775e40e5f939ca847527ae562cba71dc3984a60]]]]
Former-commit-id: f9c0de442f
Former-commit-id: 26608d531a [formerly b847733566] [formerly 36fc9749d17f3bc86588c0116afda4c80360c858 [formerly c0f6fe5199]]
Former-commit-id: b31f526c50f353b0f4a46389e95c78a739532bb3 [formerly 5253e6e535]
Former-commit-id: 00b3600ad6
2013-04-15 13:02:58 -05:00
Richard Peter
06b54e67c5 Issue #1814: Change baseline memory configuration and baseline default log configuration
Change-Id: I83969cb5ff2962fe293b8cfee02c4b7c4108f2c3

Former-commit-id: 81749b9af5 [formerly c10d2f7520] [formerly 0c869ee231] [formerly 81749b9af5 [formerly c10d2f7520] [formerly 0c869ee231] [formerly 78b230aaaf [formerly 0c869ee231 [formerly 6ce6d876a153a6fe0fd1c4939dae8b719ec470e3]]]]
Former-commit-id: 78b230aaaf
Former-commit-id: 227dcdbd81 [formerly a281d26608] [formerly 9271b9a667b720d809e7d8db48bb876251b35cf8 [formerly d967301cfc]]
Former-commit-id: b526a87e57e2ff9413674036431ad8b679510a09 [formerly 4e9789f56d]
Former-commit-id: ec77d423fe
2013-04-15 12:52:40 -05:00
Dustin Johnson
f612144af5 Merge "Issue #1802 Implemented ebxml registry replication" into development
Former-commit-id: 7adacb156f [formerly 20ee731e62] [formerly 4276b4efa1] [formerly 7adacb156f [formerly 20ee731e62] [formerly 4276b4efa1] [formerly 52095664e0 [formerly 4276b4efa1 [formerly 51fea5de5df2ff5ad2169614fb6f4d64ea586c6b]]]]
Former-commit-id: 52095664e0
Former-commit-id: c4c9410c7c [formerly 7268795739] [formerly a00faa9243a806c03f5904839eb3dd5753530c7d [formerly fdf0f29feb]]
Former-commit-id: 0f1cce6c8e48e5dd09a26d1bc35a69cf65027124 [formerly a66aceef23]
Former-commit-id: e5c79edc53
2013-04-15 12:42:23 -05:00
Bryan Kowal
b36387d51a Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
Former-commit-id: 52f1aa5fda [formerly 0800c14061] [formerly cca3f43736] [formerly 52f1aa5fda [formerly 0800c14061] [formerly cca3f43736] [formerly c797715efe [formerly cca3f43736 [formerly d0fe712b37f7890c547470b24139635183ee9e1e]]]]
Former-commit-id: c797715efe
Former-commit-id: 763c9b7ca1 [formerly 8e27924557] [formerly b54c980ffdd49821d2302b071c9aecdca092cc4e [formerly 671e600a62]]
Former-commit-id: 0fab5d61e84d36cac7de1d7a1c9c9c43112cb824 [formerly fa59505e28]
Former-commit-id: 7db0542069
2013-04-15 09:40:43 -05:00
Mike Duff
c53f202b19 Issue #1902 - FFMP permormance/cleanup
peer review comments

Change-Id: Id0c238906a1189c9c88e3dc99aa0a60cbfa00a15

Former-commit-id: dc8e37c0df [formerly 8271eaf328] [formerly 020713663a] [formerly dc8e37c0df [formerly 8271eaf328] [formerly 020713663a] [formerly 85f1aba297 [formerly 020713663a [formerly 15b28d081af503387ed1c350f4ec23258c41d68f]]]]
Former-commit-id: 85f1aba297
Former-commit-id: 41b00b0d6d [formerly 7a1809afca] [formerly 3c48d99b3e2289bad30a4264bbe35a37469181cf [formerly f61bae1c3e]]
Former-commit-id: 4b99fb61085242237b0321d02bcd5fb3d32fea55 [formerly 812599d8db]
Former-commit-id: feb9fc93ef
2013-04-15 09:40:07 -05:00
Steve Harris
0d89c11bf1 Merge branch 'master_13.3.1' into omaha_13.4.1
Former-commit-id: bc46b3803f [formerly 97790b0d3e] [formerly 6dc19411c1] [formerly bc46b3803f [formerly 97790b0d3e] [formerly 6dc19411c1] [formerly bdefa9f20f [formerly 6dc19411c1 [formerly cb0c44c44331d64e566905a166abf132f6a5817b]]]]
Former-commit-id: bdefa9f20f
Former-commit-id: c425411d92 [formerly a6ccaf52d4] [formerly 8c3599e7ee240df84defae2bc7978ccea1279afd [formerly 85bebd026e]]
Former-commit-id: 8f17443f179dc02a6109a68f0452c0dbc8b41a4e [formerly 7144ec32e9]
Former-commit-id: b446c96698
2013-04-15 09:37:29 -05:00
Steve Harris
aded012c47 Merge branch 'master_13.3.1' into master_13.4.1
Former-commit-id: 9d57ad1675 [formerly 035878a846] [formerly 7957c52dec] [formerly 9d57ad1675 [formerly 035878a846] [formerly 7957c52dec] [formerly e6d37f3e6d [formerly 7957c52dec [formerly 59bd064351a843fd514514de9dc942d13c6d7793]]]]
Former-commit-id: e6d37f3e6d
Former-commit-id: f5ccd224d4 [formerly e11088fefd] [formerly 0cf541c2cb1fdf3ce52a0d77346996fa9e50b39b [formerly ad51361408]]
Former-commit-id: 715a0385d4823349042ed884044c65dde8a975bf [formerly 01dfc19f60]
Former-commit-id: 7dbffd78a1
2013-04-15 09:34:45 -05:00
Steve Harris
99d89adc2e 13.3.1-20 baseline
Former-commit-id: 9e73c3f1ed [formerly 07f7e6e2b4] [formerly 25432cc388] [formerly 9e73c3f1ed [formerly 07f7e6e2b4] [formerly 25432cc388] [formerly 446bec6f49 [formerly 25432cc388 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]]]
Former-commit-id: 446bec6f49
Former-commit-id: 1749ff8a3c [formerly 8535bceb4c] [formerly 48c43f807cd6cab814e5d057a67effdc5c9ea638 [formerly 4b71131386]]
Former-commit-id: 03e22585dd1936fc2af32023a5ae3b65d4f222f9 [formerly 44cd8d47fb]
Former-commit-id: 953ffdab87
2013-04-15 08:58:59 -05:00
Ron Anderson
f96fdd67ef Merge "Issue #1845: Fix gfeNotify with java qpid broker" into omaha_13.4.1
Former-commit-id: e129ae4a36 [formerly 4e62fbdd54] [formerly df06966a09] [formerly e129ae4a36 [formerly 4e62fbdd54] [formerly df06966a09] [formerly 428fdebd9e [formerly df06966a09 [formerly f23561f863b623b230b19ef2075560507fc61fb6]]]]
Former-commit-id: 428fdebd9e
Former-commit-id: c831fc3292 [formerly b60c6b19e6] [formerly 7037a1c300eb4f108baf28b024ae5151c842fd6c [formerly c4d754d75e]]
Former-commit-id: 5aadb48146ad8988f94e7065e62dd3b1f0cc181f [formerly e01f6a0f7f]
Former-commit-id: dca0eeb302
2013-04-15 08:27:42 -05:00
Nate Jensen
4ea7202999 Merge "Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil." into omaha_13.4.1
Former-commit-id: d3517fbb70 [formerly ea2c0e6c40] [formerly b24ccfd7a3] [formerly d3517fbb70 [formerly ea2c0e6c40] [formerly b24ccfd7a3] [formerly a422709ab6 [formerly b24ccfd7a3 [formerly bc12d9c818b72ae16c485a33719817bd15301bca]]]]
Former-commit-id: a422709ab6
Former-commit-id: 0e59bce548 [formerly bee4f5fafd] [formerly e364f2da4f532bb4457a194e508a8bcd3c974e67 [formerly 32ea01b8b8]]
Former-commit-id: cd1b8414b4907b1d08d2be7d5ff13465b1732892 [formerly e2f072f2d5]
Former-commit-id: f1c3f25368
2013-04-12 12:39:12 -05:00
Richard Peter
f9e73b5287 Issue #1845: Fix gfeNotify with java qpid broker
Change-Id: I792b4598a296dcd7a8bafbd89c184dc709fdc193

Former-commit-id: efe0dce3ed [formerly 4e3e044281] [formerly 025600f4cb] [formerly efe0dce3ed [formerly 4e3e044281] [formerly 025600f4cb] [formerly a6ffc663a9 [formerly 025600f4cb [formerly 9f3806e9579cef66d0a40a290d9d36a089f2b3d6]]]]
Former-commit-id: a6ffc663a9
Former-commit-id: 1900f948ea [formerly c613cfb4da] [formerly 39f79af483b4fc0c6b07a413de9dad0dd3860164 [formerly 207b4cafcc]]
Former-commit-id: 73092e863762bde5401473994af6d738c9656237 [formerly 153e552f8a]
Former-commit-id: 2110908015
2013-04-12 12:04:54 -05:00
Benjamin Phillippe
3733212782 Issue #1802 Implemented ebxml registry replication
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531

Former-commit-id: fa6cdf46db [formerly e3f3483b51] [formerly 120906de78] [formerly fa6cdf46db [formerly e3f3483b51] [formerly 120906de78] [formerly ec69cdeb44 [formerly 120906de78 [formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]]]
Former-commit-id: ec69cdeb44
Former-commit-id: 0a930ce83c [formerly e5fbf006dd] [formerly 8dba2ff501e80c05042800d7e6c73e3267e77ee2 [formerly c0099a8a39]]
Former-commit-id: 95c16add15912c7c114c1119ff48e3bd9099e7ee [formerly d9b5511b8b]
Former-commit-id: 1967c632e5
2013-04-12 11:27:45 -05:00
Roger Ferrel
1d036eb29c Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil.
Change-Id: Iaa88a15c0406bf5b0c9ffeb5af7f31701be226a9

Former-commit-id: 04ab641171 [formerly 1258e12e11] [formerly 842852d975] [formerly 04ab641171 [formerly 1258e12e11] [formerly 842852d975] [formerly 4c15be46a0 [formerly 842852d975 [formerly 7cf9c217010a260281480eccdcc4e0b8d83fcd1f]]]]
Former-commit-id: 4c15be46a0
Former-commit-id: a8534ec26f [formerly 0b7d85a43f] [formerly 7701c00608738698fe5760f22807ef2cffec9b97 [formerly e3bacfb9f0]]
Former-commit-id: c26b591296e8b58697fbaeae88fdab31fbcd248d [formerly 94c372088d]
Former-commit-id: 5a6926dfa3
2013-04-12 11:10:13 -05:00
Bryan Kowal
646d4f067b Issue #1901 - EDEX will no longer automatically be killed during shutdown
Former-commit-id: 45b8575578 [formerly fabebb7adf] [formerly 36fa6f932b] [formerly 45b8575578 [formerly fabebb7adf] [formerly 36fa6f932b] [formerly 81423bdca1 [formerly 36fa6f932b [formerly 5b6452684b4a64620586e265f54dbcfa15c974ff]]]]
Former-commit-id: 81423bdca1
Former-commit-id: 90a8ca12d2 [formerly d2cb482ead] [formerly 609c94b5216a83b09b52f79feb470218cac58979 [formerly 694e7fe9ee]]
Former-commit-id: 8c1a7fda765eab54cc27b183d9a9717bfa14e11c [formerly 28570210c6]
Former-commit-id: 272441938c
2013-04-12 10:36:15 -05:00