Commit graph

3136 commits

Author SHA1 Message Date
Lee Venable
f033449c77 Issue #2065 Added code to alert user to use the clear button to close SCAN dialogs
Change-Id: I9668a953f76a4dfa1ff4fb61ff6b15e21f77d755

Former-commit-id: ab915939f2 [formerly 6b6d351996] [formerly 2099f63370] [formerly ab915939f2 [formerly 6b6d351996] [formerly 2099f63370] [formerly ef425c9807 [formerly 2099f63370 [formerly 399a031eeb9e3eeabf60533cae11df7062446797]]]]
Former-commit-id: ef425c9807
Former-commit-id: 2dff1c8507 [formerly cece058287] [formerly c649e169992723b0a871f5e28ab91cc2e5124356 [formerly 08b70b3bcb]]
Former-commit-id: 94ce233c38d58eea3b0e949917e0ca642ff2ca5f [formerly 3a11e51ff9]
Former-commit-id: 85a068fab9
2013-06-06 12:04:33 -05:00
Nate Jensen
a5613d8794 Merge "Issue #2069 populate the procedures list dialog asynchronously" into development
Former-commit-id: ed75a39665 [formerly ea9c792e1f] [formerly 4d87b2fbc7] [formerly ed75a39665 [formerly ea9c792e1f] [formerly 4d87b2fbc7] [formerly 0d1b039ca5 [formerly 4d87b2fbc7 [formerly caecc0c54e223f87294a8a49d824576dbf9899e2]]]]
Former-commit-id: 0d1b039ca5
Former-commit-id: ba3ca161de [formerly b056cb499d] [formerly 67c09922047050b831d312b0fac1d821830d22c4 [formerly 553e2412ca]]
Former-commit-id: c56d6fa6184701990af072ed5422624dece8b85f [formerly 5090880514]
Former-commit-id: a13437abed
2013-06-06 10:40:21 -05:00
Nate Jensen
46487bebb9 Merge "Issue #1638 Moved python localization project out of common.base feature to keep it minimal." into development
Former-commit-id: 49fab9650c [formerly 3db4c65c00] [formerly da536f4e31] [formerly 49fab9650c [formerly 3db4c65c00] [formerly da536f4e31] [formerly a389d8541e [formerly da536f4e31 [formerly 838f9848e888c852af567dc5a21009038f324348]]]]
Former-commit-id: a389d8541e
Former-commit-id: 75d2a38ed6 [formerly a84a66fd6d] [formerly 7c87d87ae96f8f95868d658d39803e2584614d5e [formerly b1dbc661c9]]
Former-commit-id: 053977fcfa8b06c9cddcf352fbfdb908d2f14bd9 [formerly d8b5589091]
Former-commit-id: 6ba5304a08
2013-06-06 09:54:20 -05:00
Matt Nash
52e4b9bc1b Issue #2069 populate the procedures list dialog asynchronously
Change-Id: I770f87a9de4d73084ca8c022038597405e594766

Former-commit-id: 798b51e6b3 [formerly a8b39e28c1] [formerly 5c21ce0644] [formerly 798b51e6b3 [formerly a8b39e28c1] [formerly 5c21ce0644] [formerly 3b442729e4 [formerly 5c21ce0644 [formerly fe4d566519ff114d739777e0663d01b903a2c4ae]]]]
Former-commit-id: 3b442729e4
Former-commit-id: 7b0b0c27a4 [formerly fed71d1d30] [formerly 6a4a4b8317bb448bcb02d34ace2fab2bf069690e [formerly f87969c8cf]]
Former-commit-id: 9996f0b87f806f93f7a40b6228463433dbbac38c [formerly 30e32c167d]
Former-commit-id: fece314774
2013-06-06 09:44:46 -05:00
Richard Peter
c447ae7c17 Merge "Issue #2041 Switch derived parameters to use concurrent python for threading. Change-Id: I791eb2f4803b5d29928dd153bbcf157ae643534f" into development
Former-commit-id: 3e16004aca [formerly 7b5ff91bae] [formerly f30c0f93ed] [formerly 3e16004aca [formerly 7b5ff91bae] [formerly f30c0f93ed] [formerly 24d7cbdf6c [formerly f30c0f93ed [formerly a82fb1b8dc3940c3a59c289ead9bdff3cefbd82a]]]]
Former-commit-id: 24d7cbdf6c
Former-commit-id: 877ec71d0f [formerly b5f0306900] [formerly 4a9d20946ab5546de0bacbbd868b658a9dd19c2f [formerly 9a23ebef30]]
Former-commit-id: be0b5c65f150523dd49813c4edc74891204aeb5d [formerly 865cb2da29]
Former-commit-id: e573be4d48
2013-06-06 09:43:22 -05:00
Richard Peter
b63c0ee0d6 Merge "Issue #2041 Improve exception handing in grid resources. Change-Id: I9edcb10da3ec9bfce16650cbf8c480af94dc6d39" into development
Former-commit-id: e3dcd577d0 [formerly dd7bfffe1c] [formerly 6f277bd0b8] [formerly e3dcd577d0 [formerly dd7bfffe1c] [formerly 6f277bd0b8] [formerly 93c936373e [formerly 6f277bd0b8 [formerly 07c9ee624f8e9271cd4d8ab53d4409a26378622f]]]]
Former-commit-id: 93c936373e
Former-commit-id: 4418e57f2d [formerly 54dd8ec956] [formerly 89f481349eee600da9e4c9f626e91640521fb3dd [formerly e3540e0330]]
Former-commit-id: bf87b8afdec750aced34c5d4706e8008d3438fc0 [formerly 67122a3c05]
Former-commit-id: bc8fc20abb
2013-06-06 09:42:03 -05:00
Max Schenkelberg
d4b992ef52 Issue #1638 Moved python localization project out of common.base feature to keep it minimal.
Amend: Added to wrong edex feature

Change-Id: Ic1f3bf92a4559ba04eb6a05c39d5773393235330

Former-commit-id: 04256b7548 [formerly 6afefe027b] [formerly 0bfeed7240] [formerly 04256b7548 [formerly 6afefe027b] [formerly 0bfeed7240] [formerly 424ea84d6e [formerly 0bfeed7240 [formerly ac578db9a9809798c30d2c694bedb1d960395e77]]]]
Former-commit-id: 424ea84d6e
Former-commit-id: 0f72f90fa2 [formerly 1872fd5b67] [formerly f4bc575fd4f7424b96fd216a3ef955f3adc3b3f8 [formerly e80b104e15]]
Former-commit-id: b8642787fc6a5f25fa736546cf68951662d9b17f [formerly 6570c3042b]
Former-commit-id: fd9ab77cc6
2013-06-05 17:13:43 -05:00
David Gillingham
8c20759dbc Issue #2063: Improve performance of grid blanking in iscMosaic by only retrieving history data, not entire grid slices.
Change-Id: Icd25e7e54a391ca19445be866e411b35aed54b16

Former-commit-id: 5e53c3f0bd [formerly 51b317ac52] [formerly 9acf385f21] [formerly 5e53c3f0bd [formerly 51b317ac52] [formerly 9acf385f21] [formerly bad6a1fa40 [formerly 9acf385f21 [formerly 5570ee749c5797f8f2c9ab3f6f8392d2c5680d32]]]]
Former-commit-id: bad6a1fa40
Former-commit-id: 8ade43a3dc [formerly 5fe4739fc4] [formerly 71dde9577d001c57231eb1ddf6cca6a71e302a55 [formerly 070365714a]]
Former-commit-id: fadd22c5d4872ae77dc005477bc25d862c93c583 [formerly 8199019e54]
Former-commit-id: ce5c51d360
2013-06-05 16:26:04 -05:00
Ben Steffensmeier
9138c6c23f Issue #2041 Switch derived parameters to use concurrent python for threading.
Change-Id: I791eb2f4803b5d29928dd153bbcf157ae643534f

Former-commit-id: 528b5039f7 [formerly e73e50e8a8] [formerly 56f9b88ad5] [formerly 528b5039f7 [formerly e73e50e8a8] [formerly 56f9b88ad5] [formerly 76e4882b7c [formerly 56f9b88ad5 [formerly 11f346d4d7baae08f61966a91e4d5f579630c7de]]]]
Former-commit-id: 76e4882b7c
Former-commit-id: 0f1fbd7eee [formerly a1d0a7da5a] [formerly 2fd66320131edc6fff4cef9a6036cac49d0caac9 [formerly 7c0c8b02d8]]
Former-commit-id: f6a5c952ac2941ebaee28f5ac81c627057228831 [formerly eda82d0197]
Former-commit-id: e8d46644a1
2013-06-05 13:34:26 -05:00
Nate Jensen
07341d711b Merge "Issue #1869 Ensure RecordFactory throws NoPluginException when there is no plugin." into development
Former-commit-id: dd845bfb7a [formerly 9d27d25a0b] [formerly dc2a278ab5] [formerly dd845bfb7a [formerly 9d27d25a0b] [formerly dc2a278ab5] [formerly 0f7bf4dd6a [formerly dc2a278ab5 [formerly 38aa364a89d87896c2569026bc7e16a71babd308]]]]
Former-commit-id: 0f7bf4dd6a
Former-commit-id: c0ef1e9c10 [formerly 9ef714d7a3] [formerly b3d45da84582d6c6711f73f41968e26acb02b4ab [formerly 5f91361d7c]]
Former-commit-id: 9e111ed1d54224bbf9414b2284b8444ff704ff7a [formerly 417abbb4fc]
Former-commit-id: ffddb246c1
2013-06-05 13:26:12 -05:00
Dustin Johnson
53e41e9085 Merge "Issue #2064 - Add ability to subscribe to observational point data (MADIS)" into development
Former-commit-id: 7836105cff [formerly 6d589a3c79] [formerly 37791e95a1] [formerly 7836105cff [formerly 6d589a3c79] [formerly 37791e95a1] [formerly 022346b4b3 [formerly 37791e95a1 [formerly 0fe4193763117516c900f4a0236706fd1b08a781]]]]
Former-commit-id: 022346b4b3
Former-commit-id: 37f5475d46 [formerly 4722edba19] [formerly a11103f22a06ee773f069a81e288acdaf952851e [formerly 3554d85245]]
Former-commit-id: 399167c0b0da057899923c0252ebea376bc1ba8d [formerly 0b6ee64ce5]
Former-commit-id: 6af9819687
2013-06-05 13:24:54 -05:00
Richard Peter
c9a175204d Merge "Issue #2043 Fix Cape.py python imports." into development
Former-commit-id: 290f46d6d9 [formerly a6c207c2b8] [formerly ae1cde51ac] [formerly 290f46d6d9 [formerly a6c207c2b8] [formerly ae1cde51ac] [formerly ef2332ee1b [formerly ae1cde51ac [formerly 04399075a1c5a8204b77b374f0d7ae70594c89a4]]]]
Former-commit-id: ef2332ee1b
Former-commit-id: e61cc2e06c [formerly 24c47260f7] [formerly 6f8128b016c78c60019f278eec7c153e033d73eb [formerly 23ae300a3b]]
Former-commit-id: f01e8a8b0924f93e3090c4711419184557cf929b [formerly 49c77b336e]
Former-commit-id: 8560a240ab
2013-06-05 12:24:41 -05:00
Mike Duff
4fb549e9f2 Issue #2064 - Add ability to subscribe to observational point data (MADIS)
Change-Id: I298af2d50ec972ab4e728c7aa5d41c0a757d39fa

Former-commit-id: e6f8712306 [formerly 77611d7e9c] [formerly 321209adb8] [formerly e6f8712306 [formerly 77611d7e9c] [formerly 321209adb8] [formerly 12e5155edc [formerly 321209adb8 [formerly 9142ab024fb870b6c9fa18d42d42ae869c4ec58c]]]]
Former-commit-id: 12e5155edc
Former-commit-id: d9c8fa4f5c [formerly 41f817e755] [formerly ab2941e89c2d1b9a72ce27a9b74bec7f87fc7a12 [formerly 5e7ec92696]]
Former-commit-id: 3a4d38d0abfb2f40ce6aee4d0848c7c48a98cd78 [formerly 98d413f51b]
Former-commit-id: be7b0be127
2013-06-05 12:06:58 -05:00
Ron Anderson
5221344c01 Issue #2026 Improved alertviz error logging
Change-Id: Ia30086b9d830c6d950045ceab36bbe802d507ac8

Former-commit-id: 874c119d6c [formerly 6bab5a5935] [formerly 39e6673685] [formerly 874c119d6c [formerly 6bab5a5935] [formerly 39e6673685] [formerly 859b72a714 [formerly 39e6673685 [formerly d2418d309830a5063fcd90fd18a8d636574ddfbb]]]]
Former-commit-id: 859b72a714
Former-commit-id: 3e28a3a2c2 [formerly b3f48138a0] [formerly c6a1897c4014177d1042ea4f10536f366963f39e [formerly 94cfb2dddf]]
Former-commit-id: b4f880eb400c719ac320d30a1f5e3b6a146b50ba [formerly c0efa5b28f]
Former-commit-id: 764f1dbec6
2013-06-05 12:05:15 -05:00
Ben Steffensmeier
030d455eba Issue #2043 Fix Cape.py python imports.
Former-commit-id: 41d77c5ae6 [formerly 33cedf88d9] [formerly afebe38b8b] [formerly 41d77c5ae6 [formerly 33cedf88d9] [formerly afebe38b8b] [formerly bf7a64d328 [formerly afebe38b8b [formerly 9744c8883de4f3f739e517219f207ab850292c0f]]]]
Former-commit-id: bf7a64d328
Former-commit-id: 09ec95368a [formerly 9cad47b52f] [formerly 219e7b2204c20b30d9553d508d29d80a048dd7fc [formerly c49a80a04b]]
Former-commit-id: bdb1f6d00420a0b0011d7feac99837ab30cde010 [formerly 6c2e4fd402]
Former-commit-id: 1defdbc53b
2013-06-05 12:04:23 -05:00
Richard Peter
cfffff295a Merge "Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to." into development
Former-commit-id: a5de9a0b8f [formerly adfc741329] [formerly 27442499e6] [formerly a5de9a0b8f [formerly adfc741329] [formerly 27442499e6] [formerly e8c77bb251 [formerly 27442499e6 [formerly 5eb49ca9bf6a263af5059531b09cdb8a735ba9ac]]]]
Former-commit-id: e8c77bb251
Former-commit-id: 65b21b5776 [formerly 33b799fb50] [formerly 64f387a6c3302df000419d4af8e8bbba8f9b9c19 [formerly 42777a98a8]]
Former-commit-id: c81f02fc51612737d734ed8e888437172d9e6baa [formerly e130b14500]
Former-commit-id: b5a6bb343f
2013-06-05 11:48:09 -05:00
Ben Steffensmeier
7cb252192f Issue #1869 Ensure RecordFactory throws NoPluginException when there is no plugin.
Former-commit-id: f49bcb30a9 [formerly 5bb01374b9] [formerly 772ecd6e46] [formerly f49bcb30a9 [formerly 5bb01374b9] [formerly 772ecd6e46] [formerly 58b51b725c [formerly 772ecd6e46 [formerly 50da6ea32b6d876d70d8c4d7a4914f5bb17b4c62]]]]
Former-commit-id: 58b51b725c
Former-commit-id: 99f69f5b44 [formerly b65f1d4da0] [formerly fd2464a73f231b57a8dbc3163e7c274a17d5ebe4 [formerly 414b679b0a]]
Former-commit-id: 17fd11e416d0c7db55118dd85a26262a03539d21 [formerly 637c55af33]
Former-commit-id: 35a7d1eb33
2013-06-05 10:17:20 -05:00
Lee Venable
ebe31cd9fc Merge "Issue #1984 - Save images for table columns so they don't throw errors in Windows." into development
Former-commit-id: dfb9c5ecae [formerly 3c2ba8d3ec] [formerly 778baf331f] [formerly dfb9c5ecae [formerly 3c2ba8d3ec] [formerly 778baf331f] [formerly 6d0d8a3a8e [formerly 778baf331f [formerly a2fc3646e554018740153c78f2ecd3bc88abb691]]]]
Former-commit-id: 6d0d8a3a8e
Former-commit-id: 6f09a11696 [formerly 04788b06d9] [formerly b632204fcaa273d2105013dc1fb13aec46e1cc3d [formerly a0cd3823a3]]
Former-commit-id: e47dc5508ddaf6a5e2523a2525e7fd93287fe9c7 [formerly 48a57ac567]
Former-commit-id: d4d3655726
2013-06-05 08:45:39 -05:00
Nate Jensen
4d48f3c558 Merge "Issue #2041 Improve exception handling for concurrent python. Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47" into development
Former-commit-id: fb7e8c6070 [formerly 38b028b665] [formerly 725adab244] [formerly fb7e8c6070 [formerly 38b028b665] [formerly 725adab244] [formerly 4bfba7d6c6 [formerly 725adab244 [formerly 3d70e1866b618991ed0f8decb4925c794222c7ad]]]]
Former-commit-id: 4bfba7d6c6
Former-commit-id: c5ed0f981a [formerly 64ccc2c283] [formerly 6fc65338458aaa9265fae7cd81c3267e87afe0a1 [formerly 07b1854308]]
Former-commit-id: 7aebf2a60d28e6489a09c4231c774644ee1cb25c [formerly 27a4a99771]
Former-commit-id: e61ae7a5e1
2013-06-05 08:42:23 -05:00
Bryan Kowal
07edf607d8 Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to.
Former-commit-id: b7b51697b8 [formerly 3427534c29] [formerly 4b5c653363] [formerly b7b51697b8 [formerly 3427534c29] [formerly 4b5c653363] [formerly 2abb257d35 [formerly 4b5c653363 [formerly 289cd9fbe02da77b3c56729ec1ee4d3e89256a08]]]]
Former-commit-id: 2abb257d35
Former-commit-id: 6c368db5e0 [formerly b3b85069ea] [formerly 11d840385012f6641f89c0e54c9c442aed3c2d11 [formerly 98150aa493]]
Former-commit-id: 11b7a240d0024bcf99866d466385ac7d25b70731 [formerly 4f871084ec]
Former-commit-id: a4cf78cd95
2013-06-04 18:25:58 -05:00
Ben Steffensmeier
6090cbdde6 Issue #2031 move grib splitting cleanup into a finally block so less tmp files leak.
Former-commit-id: 2370b4305c [formerly a01c4eb02b] [formerly 2dc2e990cb] [formerly 2370b4305c [formerly a01c4eb02b] [formerly 2dc2e990cb] [formerly 19af45e525 [formerly 2dc2e990cb [formerly 327fe058b08967d18fa83ac9e6fc9c3356d68ff2]]]]
Former-commit-id: 19af45e525
Former-commit-id: 05874a2376 [formerly 016ed7211f] [formerly 7f1e69827c61f66c1292d7cb055f2116de1b2d8f [formerly d773bbf625]]
Former-commit-id: f0ba032b8faf66ab230082c83fd4d7e54fee0fd8 [formerly d9b9d4ed7c]
Former-commit-id: 6e18c7a6a8
2013-06-04 18:23:06 -05:00
Ben Steffensmeier
d75b99eb98 Issue #2041 Improve exception handing in grid resources.
Change-Id: I9edcb10da3ec9bfce16650cbf8c480af94dc6d39

Former-commit-id: ffcfe17e57 [formerly 956fd6e846] [formerly 5951b85ac6] [formerly ffcfe17e57 [formerly 956fd6e846] [formerly 5951b85ac6] [formerly 7259fdc3a8 [formerly 5951b85ac6 [formerly 17334720cd9f5705687b2030b1532b342e9a6fb8]]]]
Former-commit-id: 7259fdc3a8
Former-commit-id: 0dab882461 [formerly d79c15be5a] [formerly 58f9d2a4ed3c467b2b8107b3e0f8180a984f22b4 [formerly 8b3df5140c]]
Former-commit-id: f19444895879f05defc3e7a3fec5763162b14e71 [formerly 70fbbeb457]
Former-commit-id: 4fab8e711d
2013-06-04 17:38:56 -05:00
Ben Steffensmeier
e277655937 Issue #2041 Improve exception handling for concurrent python.
Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47

Former-commit-id: d9599eb3ae [formerly 5d5cd5e5f4] [formerly 8ce74c44df] [formerly d9599eb3ae [formerly 5d5cd5e5f4] [formerly 8ce74c44df] [formerly ef10b56e2b [formerly 8ce74c44df [formerly c605b0ce9b7437bfaa803b31c6f4b2f7dc17a6ea]]]]
Former-commit-id: ef10b56e2b
Former-commit-id: 4a98cb43a4 [formerly f78e0f18bf] [formerly 137f40ebc8428c8099afb92fc2a47d584a2c089d [formerly 0f70964bc9]]
Former-commit-id: 990432480823f66e862fc9a1dbba21d24cad808a [formerly 6109fde71d]
Former-commit-id: 580302942a
2013-06-04 17:03:05 -05:00
Bryan Kowal
2abad67407 Issue #2021 - do not track changes in directories generated by the build for tmcp; equivalent to ignoring the java bin directories and class files.
Change-Id: I72461155481aec1661ebb80a6230aeed1cb00dfb

Former-commit-id: 1dd640a72d [formerly ad2099d3e4] [formerly a77c77e7bc] [formerly 1dd640a72d [formerly ad2099d3e4] [formerly a77c77e7bc] [formerly ca9275ad16 [formerly a77c77e7bc [formerly 291ae689ebe66d24a9b0154180f9114a6486aa20]]]]
Former-commit-id: ca9275ad16
Former-commit-id: f6e015f82f [formerly 942e904172] [formerly 3e92d36855bfd498600d7049c59ab23514a60c28 [formerly 4d2abf761b]]
Former-commit-id: 414c3d60cf0d9fd475e99558f61c0266eee5633e [formerly c2737a8a6f]
Former-commit-id: 7bf9b0da2c
2013-06-04 15:49:58 -05:00
Lee Venable
796e23691d Issue #1984 - Save images for table columns so they don't throw errors in Windows.
Change-Id: I42bb4549664296abde66d5904b0ce1739ba6232c

Former-commit-id: 7c05dc6cc0 [formerly 86ff9a13a8] [formerly 187a4e9b17] [formerly 7c05dc6cc0 [formerly 86ff9a13a8] [formerly 187a4e9b17] [formerly 377c675436 [formerly 187a4e9b17 [formerly 3f26818dfeb006393598af41faf33cac6957d3e0]]]]
Former-commit-id: 377c675436
Former-commit-id: cd2bc6cb06 [formerly e809c6dfaf] [formerly 9b49b8b60af6b50b592dd8eaab2513a03b5bf29f [formerly d6274ac813]]
Former-commit-id: ddbd715ecebc75a1473cea49555b488a377736d0 [formerly 3759a4a914]
Former-commit-id: 253da4cf92
2013-06-04 15:48:40 -05:00
Greg Armendariz
4b1ffddf1c Merge "Issue #2021 - git ignore for build-generated hydro files; remove tmcp build-generated files" into development
Former-commit-id: 7409c24e4b [formerly 38e765397a] [formerly 2bb9f1ceec] [formerly 7409c24e4b [formerly 38e765397a] [formerly 2bb9f1ceec] [formerly 5b29c71d38 [formerly 2bb9f1ceec [formerly b88ac881c4963543a21566ae1361638ec40f8ac0]]]]
Former-commit-id: 5b29c71d38
Former-commit-id: 7b79540a57 [formerly 38c7865a12] [formerly 800a303d66f1897b74d520d00a685c51db55ad67 [formerly 9af992ed12]]
Former-commit-id: 7dbe62e2fccdb69266a813aa340982db4ccd9c3b [formerly 61594d9524]
Former-commit-id: 7b8c0cd36c
2013-06-04 15:29:10 -05:00
Richard Peter
1a31effed0 Merge "Issue #1965 Initial archive retention dialog work. updated archive creation, purge, and test cases after Roger's last checkin. added edex plugin for feature. added an abstract base archive dialog." into development
Former-commit-id: 96c8232006 [formerly 2281df8c5b] [formerly e513fdbc3e] [formerly 96c8232006 [formerly 2281df8c5b] [formerly e513fdbc3e] [formerly 220e817e15 [formerly e513fdbc3e [formerly 1b5ab5d85b4f634357d0f52551b800378349b363]]]]
Former-commit-id: 220e817e15
Former-commit-id: cbfbab7fb9 [formerly b5cccf449d] [formerly b87e95d2898e502766c05274499e1d042203b0c2 [formerly 6b75cad25f]]
Former-commit-id: f6fef22aee2325e1325aec4030039a6776b9a2aa [formerly c3bc837e61]
Former-commit-id: 1aa877a259
2013-06-04 15:08:09 -05:00
Richard Peter
31586d6e52 Merge "Issue #2043 switch capeFunc to java. Change-Id: I35db8657838d1e11180248ebfb5011181ea09659" into development
Former-commit-id: 4abe0f2e59 [formerly 03b2db312e] [formerly 82341a9fc1] [formerly 4abe0f2e59 [formerly 03b2db312e] [formerly 82341a9fc1] [formerly 3be654e028 [formerly 82341a9fc1 [formerly aa178f96c90b1c13ade6eb7db297583e5241601c]]]]
Former-commit-id: 3be654e028
Former-commit-id: c0bafd75dd [formerly 9ef5384cd3] [formerly 3368bc1fea10a6726f85b628d6d9cf0561a1b183 [formerly a765656f1d]]
Former-commit-id: 44d629a055583442037212aa5ad1fb19304fe305 [formerly 93010b6cb2]
Former-commit-id: 0751d58e02
2013-06-04 14:57:10 -05:00
Greg Armendariz
8d0abbcafd Merge "Issue #2021 - dist.native make update target will now deploy to files.native directory structure instead of producing a tar file." into development
Former-commit-id: 0119000284 [formerly 3c5c1b65e3] [formerly f1fbb33f31] [formerly 0119000284 [formerly 3c5c1b65e3] [formerly f1fbb33f31] [formerly dbdb343fad [formerly f1fbb33f31 [formerly 70379062d2943f045459a03c0de88ec09c1f0853]]]]
Former-commit-id: dbdb343fad
Former-commit-id: 052b511704 [formerly aa94d1e875] [formerly 308057f0728ab28ee2783a66c5517a744823908d [formerly af4fd585a2]]
Former-commit-id: d6c2ff15f8bbe9b54f19a2e9237d023e78d6b524 [formerly 9cc561d73a]
Former-commit-id: 0ee50d0fcd
2013-06-04 14:35:39 -05:00
Greg Armendariz
c1a192e419 Merge "Issue #2021 - add a .project file so files.native can be imported as an Eclipse project. Remove duplicate hydro filesystem in rary.ohd.filesystem - it used to be merged into the tar file." into development
Former-commit-id: 7f56d86586 [formerly 50db54dfeb] [formerly eeff0a13e1] [formerly 7f56d86586 [formerly 50db54dfeb] [formerly eeff0a13e1] [formerly ffa5962f52 [formerly eeff0a13e1 [formerly 92f888181ea2d4e4dbfb44623c58a2a547b7e1d8]]]]
Former-commit-id: ffa5962f52
Former-commit-id: 12eab962bf [formerly fb5f888ce1] [formerly e3e7d05f836bcaa14781703582e2093420cadfe7 [formerly a7d5daf5f9]]
Former-commit-id: 4090e5baf8f7115e4707a388a07527bc8906b516 [formerly 3ef9498bcb]
Former-commit-id: 4e11eb1528
2013-06-04 14:35:27 -05:00
Dustin Johnson
e7fcedbec9 Merge "Issue #2022 Modifications to subscription last run time and notificationservers" into development
Former-commit-id: c4446d26f1 [formerly a98b19c824] [formerly 3198277096] [formerly c4446d26f1 [formerly a98b19c824] [formerly 3198277096] [formerly 37b7e400ea [formerly 3198277096 [formerly 9a3f2121defaaaefd8f6268e289f87ecb2ee3e78]]]]
Former-commit-id: 37b7e400ea
Former-commit-id: 052d397cac [formerly 533fb7139a] [formerly 3c58657e60d5487cc0a3208db071bbf4465c4d6b [formerly b4a51bc24f]]
Former-commit-id: ce574b64d47c2c2151fb647417847c5bcffff967 [formerly bebc4fdbe5]
Former-commit-id: 2576da68e3
2013-06-04 14:22:59 -05:00
Bryan Kowal
bff32fc252 Issue #2021 - git ignore for build-generated hydro files; remove tmcp build-generated files
Change-Id: I1ae5a3c9a5d93822c6b5ce8190d1bed28e2b6198

Former-commit-id: ffc37683b3 [formerly be4f6b733f] [formerly 6e49c0d761] [formerly ffc37683b3 [formerly be4f6b733f] [formerly 6e49c0d761] [formerly 715d6f490f [formerly 6e49c0d761 [formerly 34bad0464e49f17004ce6b467559bbcdc9bacf59]]]]
Former-commit-id: 715d6f490f
Former-commit-id: 3542a15011 [formerly b485b6d152] [formerly e7df4bec83718c3470a8759de8408122c162440d [formerly 6e329bb0d5]]
Former-commit-id: 7339b7cba893ceaabf0d58d516a6e8ac2fe45821 [formerly 79407e64b2]
Former-commit-id: c32a9a4385
2013-06-04 14:21:15 -05:00
Benjamin Phillippe
4d43c0a1ff Issue #2022 Modifications to subscription last run time
and notificationservers

Change-Id: Ia11e639249ef7fd769e6e3baae2b09b966b3caea

Former-commit-id: 5b9eecc8b8 [formerly 0862f2b7d3] [formerly f00d8ae721] [formerly 5b9eecc8b8 [formerly 0862f2b7d3] [formerly f00d8ae721] [formerly 1cec0fab74 [formerly f00d8ae721 [formerly 4118d4e3888a5feb9bbc39036a8ceeb70d66e375]]]]
Former-commit-id: 1cec0fab74
Former-commit-id: 8d03dd6c75 [formerly 49ec0363c3] [formerly 3841592d2af8219265cb07e6457697758849bd51 [formerly 6e8314475e]]
Former-commit-id: 434342fc87b6ee05d1fcd27b36ac82d4029eafdd [formerly 585189abb1]
Former-commit-id: d108e2fa66
2013-06-04 14:19:09 -05:00
Richard Peter
ba88ac2d5c Merge branch 'omaha_13.4.1' (13.4.1-13) into development
Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
	tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java

Former-commit-id: c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly 9e3baaa87a [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: a8780f26b5 [formerly 9c3fe01efa] [formerly 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad]]
Former-commit-id: 21adb9c78d59896133d2b3efcbf7dcafb108064e [formerly 13f64a7da8]
Former-commit-id: 22f6319986
2013-06-04 14:06:53 -05:00
Steve Harris
0bf9bf7f39 Issue #1872 - Licensing for java jdk, jbzip2, postgresql, qpid
Change-Id: I09f958247c6342ff45da5f85a197ccb4c652c6db

Former-commit-id: f98d38a5e7 [formerly bf4d9824ef] [formerly a97ea3942d] [formerly f98d38a5e7 [formerly bf4d9824ef] [formerly a97ea3942d] [formerly aefacbcd9b [formerly a97ea3942d [formerly c9334ae14df169463a03d7c46fa3bbe8c5ac27c9]]]]
Former-commit-id: aefacbcd9b
Former-commit-id: efa574263b [formerly b1a3ff5b3f] [formerly e1914cbf0fcb4ad5791dcc28eb0fdd2ee0125df7 [formerly 7db966b23e]]
Former-commit-id: cd5203235535e2162124c621a19ce489d0b6d85b [formerly 173102dcfc]
Former-commit-id: 14845b87e4
2013-06-04 13:56:51 -05:00
Roger Ferrel
01fdaebda0 Issue #1965 Initial archive retention dialog work.
updated archive creation, purge, and test cases after Roger's last checkin.
added edex plugin for feature.
added an abstract base archive dialog.

Change-Id: I7c9ca3df40a7591815a1aae4fabf660217d44574

Former-commit-id: ef974b52f0 [formerly dcc56ad5d3] [formerly b952eee030] [formerly ef974b52f0 [formerly dcc56ad5d3] [formerly b952eee030] [formerly f53d6bf4ff [formerly b952eee030 [formerly 64b75031afaecd74649392a19cc0b10dcdb79a2b]]]]
Former-commit-id: f53d6bf4ff
Former-commit-id: 8820399134 [formerly 65d17722a9] [formerly 2833276d9329d4f1b9e5d852a18422d57355c145 [formerly 9aff5f2321]]
Former-commit-id: 437bc5403fa76566d08e9f5c3f08a082fb20cba3 [formerly 39cfbf038b]
Former-commit-id: 6f52e3d3f8
2013-06-04 13:08:05 -05:00
Bryan Kowal
604cf5f907 Issue #2021 - dist.native make update target will now deploy to files.native directory structure instead of producing a tar file.
Change-Id: Ie625a515e8dc30cacc002bb6d8e77365c1347a13

Former-commit-id: 0d2958f693 [formerly bc1ef2c5fe] [formerly 71b04e3147] [formerly 0d2958f693 [formerly bc1ef2c5fe] [formerly 71b04e3147] [formerly 33a5b6d42d [formerly 71b04e3147 [formerly 02af194872173d89f77e15a6a8caca1e5812dbe4]]]]
Former-commit-id: 33a5b6d42d
Former-commit-id: 398dfd5add [formerly dedddc5811] [formerly 4f0c9557cee74c0a1db544483c367421766de3d2 [formerly 9b896380be]]
Former-commit-id: 4c4a0ffa1c12189fa21e32b791fdf9841a58b135 [formerly 887e1eb88d]
Former-commit-id: 62440f27b3
2013-06-04 12:52:27 -05:00
Nate Jensen
b48efcb46a Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF

Former-commit-id: f4d0188254 [formerly 537b731f6e] [formerly 329d9d1c6a] [formerly f4d0188254 [formerly 537b731f6e] [formerly 329d9d1c6a] [formerly 5d1ecb3a5d [formerly 329d9d1c6a [formerly 6742f7dbcac39261d8bee4e055bb9e4eda66520d]]]]
Former-commit-id: 5d1ecb3a5d
Former-commit-id: e4158f9ece [formerly 412c21f516] [formerly 3ae61c25e5597f9a6be694c5608f437a8ff26eec [formerly 2d1405b9c4]]
Former-commit-id: eadb9a648fcb31ed1a068be92b49e326f53c79ae [formerly 5c2f0ab151]
Former-commit-id: b32e732341
2013-06-04 11:43:22 -05:00
Ben Steffensmeier
e4c8bd3233 Issue #2043 switch capeFunc to java.
Change-Id: I35db8657838d1e11180248ebfb5011181ea09659

Former-commit-id: 2f636b5309 [formerly f283171cb4] [formerly 098d209d5c] [formerly 2f636b5309 [formerly f283171cb4] [formerly 098d209d5c] [formerly 492b435626 [formerly 098d209d5c [formerly 5eaac7266a0f8d3b083703076a255c41d8bd1039]]]]
Former-commit-id: 492b435626
Former-commit-id: 01e46140cb [formerly 3fd810e0bf] [formerly 7651785a1e4de8202e12adb600233a932a8ec2e8 [formerly 6f9ea3f195]]
Former-commit-id: 932ba59540ac0b812791a35672cd6bc9d4485ccf [formerly 1354e0ceb0]
Former-commit-id: 6c6c593e91
2013-06-04 10:16:53 -05:00
Bryan Kowal
6f896001fe Issue #2021 - add a .project file so files.native can be imported as an Eclipse project. Remove duplicate hydro
filesystem in rary.ohd.filesystem - it used to be merged into the tar file.

Change-Id: Id3bdfd69d7bb51581dca8e8c0c64c833ec32f5cc

Former-commit-id: 2f5cbb6757 [formerly 5244c9563f] [formerly abd8ae931c] [formerly 2f5cbb6757 [formerly 5244c9563f] [formerly abd8ae931c] [formerly dc5a800b83 [formerly abd8ae931c [formerly 5080f2839a6f94c6152aeff231241935b570a3c3]]]]
Former-commit-id: dc5a800b83
Former-commit-id: 4df4ccae59 [formerly 96ae06c3a1] [formerly e4c7d77222a7a9b3cef69f5a27ecfe2376ffc717 [formerly 5e4a1576f0]]
Former-commit-id: 6b6eb70247efb5c60e9cd665cd5ce46b0f3f2dfb [formerly b09cce06f7]
Former-commit-id: a8f54dd2ba
2013-06-04 10:05:23 -05:00
Bryan Kowal
83a1fd41d0 Issue #1952 - remove the hydroapps dependency on awips2-edex-native.
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56

Former-commit-id: eb656f731c [formerly 7a1c08bb13] [formerly 46c9ba7c7b] [formerly eb656f731c [formerly 7a1c08bb13] [formerly 46c9ba7c7b] [formerly 67cd73c655 [formerly 46c9ba7c7b [formerly 69358da7b7cfa6b05d3b20bc7f27a1796bb2c86b]]]]
Former-commit-id: 67cd73c655
Former-commit-id: e49087b23f [formerly 86b88922da] [formerly 9df212446234478c6e77b29334b635f74a7591eb [formerly f8e2a2f4f2]]
Former-commit-id: a0a2edff60b79b0391b1c4924012a7097c13aeee [formerly 36aa500077]
Former-commit-id: 95a5349f85
2013-06-04 09:36:09 -05:00
Bryan Kowal
7fffda1117 Issue #2021 - native hydro code will now compile successfully
Change-Id: Ie58409a87690beb08808c4d53f6907cbe06cdd07

Former-commit-id: b222d55e5a [formerly 9ea421356a] [formerly cea990cbe3] [formerly b222d55e5a [formerly 9ea421356a] [formerly cea990cbe3] [formerly 032e26c7ba [formerly cea990cbe3 [formerly 152392137ad1a77c7bf0d8ec5a165ba5a20f0d9f]]]]
Former-commit-id: 032e26c7ba
Former-commit-id: 8633568ad4 [formerly f900d7c589] [formerly daf5a8ad8ba627b913cc4ebdc58cd4162ec55b62 [formerly 91a494bde0]]
Former-commit-id: 401d255106cf9fe14b27dd3de96b29916e909192 [formerly 10e5f4e413]
Former-commit-id: 7e30f452b0
2013-06-04 09:22:00 -05:00
Nate Jensen
5ce3f5ea79 Merge "Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable." into development
Former-commit-id: 1553b4d4d7 [formerly 2de1cec481] [formerly 3151ba277c] [formerly 1553b4d4d7 [formerly 2de1cec481] [formerly 3151ba277c] [formerly a7367c1e1a [formerly 3151ba277c [formerly b442e15efa533e64a2707878e15c52531cd79d5b]]]]
Former-commit-id: a7367c1e1a
Former-commit-id: c8e8c734ee [formerly c9056f278b] [formerly f8e32753a528ec9253f2ccf3b5eb7a14b0d1ec54 [formerly 877e78717b]]
Former-commit-id: aa6c00caa6197e2e5a96f86ac01768fd5ac5686c [formerly 199d9cd20c]
Former-commit-id: 725882e8fd
2013-06-04 09:13:56 -05:00
Max Schenkelberg
ae1104d980 Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable.
Change-Id: Ia0fe27113f7d3e1ce86bcce231812b2e0bbe0f75

Former-commit-id: 0df84a1b9a [formerly b28f451d17] [formerly 3379b100cb] [formerly 0df84a1b9a [formerly b28f451d17] [formerly 3379b100cb] [formerly 7f76bd3d98 [formerly 3379b100cb [formerly 483247738be16ae76bc2f9891f557960e7ade60e]]]]
Former-commit-id: 7f76bd3d98
Former-commit-id: 084f8cbc05 [formerly e4d27d5d99] [formerly 7f3bd173b51d3949c4a9f8672975f6254b9635b7 [formerly 86d8f1b294]]
Former-commit-id: 9265dbfea39fcf5bc4f77cd090d2dbb8d5f3f939 [formerly a6d84e24b7]
Former-commit-id: 3f67097105
2013-06-03 17:19:18 -05:00
Dustin Johnson
7fdf91ca93 Issue #2038 Change registry code to use GenericRegistry, use Spring 3 embedded DB feature in tests
Change-Id: Ie9e0a4fa4fb457f1d85326c6c2ddcfa16cdc5b63

Former-commit-id: 57b3706e5d [formerly d81592b575] [formerly d47da65262] [formerly 57b3706e5d [formerly d81592b575] [formerly d47da65262] [formerly bc830e67f0 [formerly d47da65262 [formerly 121d9a02acfe528c524788a062c2d2034f80afe5]]]]
Former-commit-id: bc830e67f0
Former-commit-id: efce5e19d5 [formerly cd1db53a35] [formerly ec9fba7ab73ee52c73b56514e1ac66a6a8b5586e [formerly 0b710bc166]]
Former-commit-id: fdc4ef6ee7911f95a849feb6d4d64feef2c9adcb [formerly bdccf71c8b]
Former-commit-id: 13e51bc99c
2013-06-03 14:54:53 -05:00
Nate Jensen
4740fffe4b Merge "Issue #1996 remove tear offs from GFE by adding a field to enable by perspective" into development
Former-commit-id: 682ac3f2be [formerly f55fa69ea2] [formerly 5d3b2b98bb] [formerly 682ac3f2be [formerly f55fa69ea2] [formerly 5d3b2b98bb] [formerly b9696149ad [formerly 5d3b2b98bb [formerly c97ca6775122d26f308558eb4e449fb56949b6ba]]]]
Former-commit-id: b9696149ad
Former-commit-id: 327f549f33 [formerly 718ea75857] [formerly 96bbef960bbaa3a9dcb3d3d02763c426f2216ddb [formerly f20b8b3b66]]
Former-commit-id: 1568b3634384e16481f2c927f76b8bb3b0f249c4 [formerly d595d9e84b]
Former-commit-id: dd8729effc
2013-06-03 13:32:21 -05:00
Bryan Kowal
466c50ebc4 Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities
Former-commit-id: 6719473eae [formerly e673c5c553] [formerly c407dd8623] [formerly 6719473eae [formerly e673c5c553] [formerly c407dd8623] [formerly 3d885c7a60 [formerly c407dd8623 [formerly 360e0f61f8580cfca1e8dd307e920e9e0150016d]]]]
Former-commit-id: 3d885c7a60
Former-commit-id: be8aab95e9 [formerly 5a4726bdc2] [formerly 282496ad9a90b4fff81f18018574383b257c142f [formerly 5f637cc57b]]
Former-commit-id: c13d5340a722273a6de1ef2e18e1ecdb0cadba46 [formerly 2050dec254]
Former-commit-id: 7edecdb7dd
2013-06-03 11:05:21 -05:00
Benjamin Phillippe
f9f44c0d18 Issue #1931 Fixed Repository Items REST Service
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97

Former-commit-id: 5450a58ca6 [formerly 2c147fe159] [formerly 1e413c68f6] [formerly 5450a58ca6 [formerly 2c147fe159] [formerly 1e413c68f6] [formerly a226f225fd [formerly 1e413c68f6 [formerly b2764126282aab128cc1465905c11686894ab1f7]]]]
Former-commit-id: a226f225fd
Former-commit-id: 396102ea5d [formerly 97a9a6279b] [formerly 747180ba600bf97794019a0d0a919d238456940e [formerly 3b3ae2add0]]
Former-commit-id: 6437394e0207ea10e1ae9b421cc9526b14344c70 [formerly 67d1818a64]
Former-commit-id: f482c88c7b
2013-06-03 10:26:36 -05:00
Matt Nash
854a63f7d0 Issue #1996 remove tear offs from GFE by adding a field to enable by perspective
Change-Id: I92d0138637b95c86a8326878756c720a97586fb1

Former-commit-id: aa13a1ed3a [formerly 7d61737d79] [formerly 7895dfa2e4] [formerly aa13a1ed3a [formerly 7d61737d79] [formerly 7895dfa2e4] [formerly cb59b82add [formerly 7895dfa2e4 [formerly 7666c93bd833f935c6b1635adeb385c2fa4e04cc]]]]
Former-commit-id: cb59b82add
Former-commit-id: efdb42ab54 [formerly c61b9d95e5] [formerly e32c05019af2175b9cb52b0d115b6de5640bce6f [formerly 5d492a4b10]]
Former-commit-id: 054ceaf89a593647c65a3915436f2882db3ed630 [formerly 0d06f59694]
Former-commit-id: 2b85258c26
2013-06-03 09:58:43 -05:00
Ron Anderson
a3e33d4211 Merge "Issue #1759: Add a more detailed comment in code for previous change." into omaha_13.4.1
Former-commit-id: 9e6969eccb [formerly d0897c31d8] [formerly fb5d432669] [formerly 9e6969eccb [formerly d0897c31d8] [formerly fb5d432669] [formerly 0ae8346cfb [formerly fb5d432669 [formerly b1c936f0dfb28dc543d7a83b6d0a0233866b98de]]]]
Former-commit-id: 0ae8346cfb
Former-commit-id: 9464771e25 [formerly e6d7b83df5] [formerly 4227600ec53435b3c39496f85e74622ae01b7d76 [formerly f65ce6e3e6]]
Former-commit-id: d45303b850db86b2c970e98ae8be0dd15f308265 [formerly d01a608015]
Former-commit-id: b0f7ac7f1a
2013-06-03 07:45:02 -05:00