Nate Jensen
4285b8e813
Merge "Issue #2068 Unpack viz cots plugins." into development
...
Former-commit-id: f18adaf7fc
[formerly 58cc50e6f8
] [formerly 050f48c204
] [formerly 65af14d99c
[formerly 050f48c204
[formerly 4a60beb7ab6d44d30fd9d4c9c7486a95d5581cb2]]]
Former-commit-id: 65af14d99c
Former-commit-id: d5d2366b4d0adedde1e6ba3c2f9700042aec911f [formerly 248ce85b36
]
Former-commit-id: 5ff4dafed0
2013-06-06 14:11:53 -05:00
Nate Jensen
9f3f4343c4
Merge "Issue #2041 fix python job coordinator shutdown." into development
...
Former-commit-id: 56d5db0fcb
[formerly bcc8fcd81e
] [formerly 333af91ca3
] [formerly 855c2a4b58
[formerly 333af91ca3
[formerly 4d6418c7f32cdbd78fe52edc6f9e2784aeffd4e8]]]
Former-commit-id: 855c2a4b58
Former-commit-id: 2034490a7c9fb72494dce5949c9d130bce97b73a [formerly ea1e5f4cb1
]
Former-commit-id: 26dd286c55
2013-06-06 14:11:34 -05:00
Lee Venable
9758ff4d50
Merge "Issue #2071 - refactor data delivery help dialogs" into development
...
Former-commit-id: 0eef16bee8
[formerly a18a364f8e
] [formerly 791f9e93aa
] [formerly ac6df52b0d
[formerly 791f9e93aa
[formerly 14f9efda965a700d9e701e36a3ff2e56d78b1dba]]]
Former-commit-id: ac6df52b0d
Former-commit-id: d0f633c3e207549b406e98b988b0f25d546a8d98 [formerly a034c677d1
]
Former-commit-id: bc92d23e99
2013-06-06 14:06:53 -05:00
David Gillingham
3dca4cce4c
Issue #2023 : Pure python client implementation of Data Access Framework.
...
Change-Id: I801b88192aafb4b139b5a1b397b33620c0b9f427
Former-commit-id: 98b288f275
[formerly 2c0af328b6
] [formerly ae3e7a64b0
] [formerly 4bdf7178bd
[formerly ae3e7a64b0
[formerly edc77397fb74f07c66dd9f7b9ede5e8af81b4b18]]]
Former-commit-id: 4bdf7178bd
Former-commit-id: 9db7659ae79bb9f296e845275e0f20ae041ad376 [formerly 3f4b44fbbc
]
Former-commit-id: 242d3a5493
2013-06-06 13:47:31 -05:00
Ben Steffensmeier
7c89cdd96a
Issue #2072 Fix concurrency problems when init is called before time matching is done.
...
Former-commit-id: 3ca0145816
[formerly 14750f4724
] [formerly 0ed736513c
] [formerly 0842b9d292
[formerly 0ed736513c
[formerly 79bec984b094fc84bfb9da3e5c20796844e9bbbf]]]
Former-commit-id: 0842b9d292
Former-commit-id: 8ed3392eb5742d19e10b70a4320e645bbe6a92b6 [formerly 6b1a7700dd
]
Former-commit-id: b6c9b3d2c6
2013-06-06 13:23:29 -05:00
Ben Steffensmeier
68e003197c
Issue #2068 Unpack viz cots plugins.
...
Former-commit-id: 8744b432e2
[formerly 62c3bc9bbe
] [formerly a1a44cdc7a
] [formerly 073ad47a7d
[formerly a1a44cdc7a
[formerly 5a76cddc79705708969b37de530ad0bce2c26505]]]
Former-commit-id: 073ad47a7d
Former-commit-id: 587c0e8ab39d1a12b84ad0feb9eb72f3be035a36 [formerly 7f9cf6d46d
]
Former-commit-id: b117268b67
2013-06-06 13:17:50 -05:00
Ben Steffensmeier
460410a87f
Issue #2041 fix python job coordinator shutdown.
...
Former-commit-id: e27f1d20d6
[formerly 955468866e
] [formerly 4bf7b44234
] [formerly ab0bb800cb
[formerly 4bf7b44234
[formerly c749e5f77e06ede7fa39ece6846d957b8edfaed2]]]
Former-commit-id: ab0bb800cb
Former-commit-id: 810a58a6800b9e624f27b19c3a48e73c8947a22a [formerly 8111840673
]
Former-commit-id: b8cef5b733
2013-06-06 13:13:02 -05:00
Mike Duff
50fdffc7e4
Issue #2071 - refactor data delivery help dialogs
...
Change-Id: I4820f1847e0228f0fcd6166b8dd13e289623a3a0
Former-commit-id: 7ef6d90ae1
[formerly d218159b3b
] [formerly e579626dea
] [formerly 22132fbef8
[formerly e579626dea
[formerly 7734c4d8ef387c47f32930541a5fc5c09f3261fe]]]
Former-commit-id: 22132fbef8
Former-commit-id: 95115cca20ced730e5d7b754667b021a7deb9723 [formerly c37e75e0f7
]
Former-commit-id: f507b7afab
2013-06-06 12:33:45 -05:00
Roger Ferrel
a51c2add11
Issue #1966 Working case generation without compression. Changes to Retention to remove compile errors.
...
Change-Id: I6ecfe7d9a4b352318b718849ba7e62b24254385d
Former-commit-id: 7664a92ad8
[formerly 147a321455
] [formerly b645cd6079
] [formerly 0737075420
[formerly b645cd6079
[formerly 43a4ee08b063e1e2aba5035b964cf0b93462885b]]]
Former-commit-id: 0737075420
Former-commit-id: 783ee3decdd28da73264b556535021a75f7ffdfd [formerly 47b72d3a5a
]
Former-commit-id: f5756aa417
2013-06-06 12:27:38 -05:00
Lee Venable
2dff1c8507
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 ef425c9807
[formerly 2099f63370
[formerly 399a031eeb9e3eeabf60533cae11df7062446797]]]
Former-commit-id: ef425c9807
Former-commit-id: c649e169992723b0a871f5e28ab91cc2e5124356 [formerly 08b70b3bcb
]
Former-commit-id: cece058287
2013-06-06 12:04:33 -05:00
Nate Jensen
ba3ca161de
Merge "Issue #2069 populate the procedures list dialog asynchronously" into development
...
Former-commit-id: ed75a39665
[formerly ea9c792e1f
] [formerly 4d87b2fbc7
] [formerly 0d1b039ca5
[formerly 4d87b2fbc7
[formerly caecc0c54e223f87294a8a49d824576dbf9899e2]]]
Former-commit-id: 0d1b039ca5
Former-commit-id: 67c09922047050b831d312b0fac1d821830d22c4 [formerly 553e2412ca
]
Former-commit-id: b056cb499d
2013-06-06 10:40:21 -05:00
Nate Jensen
75d2a38ed6
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 a389d8541e
[formerly da536f4e31
[formerly 838f9848e888c852af567dc5a21009038f324348]]]
Former-commit-id: a389d8541e
Former-commit-id: 7c87d87ae96f8f95868d658d39803e2584614d5e [formerly b1dbc661c9
]
Former-commit-id: a84a66fd6d
2013-06-06 09:54:20 -05:00
Matt Nash
7b0b0c27a4
Issue #2069 populate the procedures list dialog asynchronously
...
Change-Id: I770f87a9de4d73084ca8c022038597405e594766
Former-commit-id: 798b51e6b3
[formerly a8b39e28c1
] [formerly 5c21ce0644
] [formerly 3b442729e4
[formerly 5c21ce0644
[formerly fe4d566519ff114d739777e0663d01b903a2c4ae]]]
Former-commit-id: 3b442729e4
Former-commit-id: 6a4a4b8317bb448bcb02d34ace2fab2bf069690e [formerly f87969c8cf
]
Former-commit-id: fed71d1d30
2013-06-06 09:44:46 -05:00
Richard Peter
877ec71d0f
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 24d7cbdf6c
[formerly f30c0f93ed
[formerly a82fb1b8dc3940c3a59c289ead9bdff3cefbd82a]]]
Former-commit-id: 24d7cbdf6c
Former-commit-id: 4a9d20946ab5546de0bacbbd868b658a9dd19c2f [formerly 9a23ebef30
]
Former-commit-id: b5f0306900
2013-06-06 09:43:22 -05:00
Richard Peter
4418e57f2d
Merge "Issue #2041 Improve exception handing in grid resources. Change-Id: I9edcb10da3ec9bfce16650cbf8c480af94dc6d39" into development
...
Former-commit-id: e3dcd577d0
[formerly dd7bfffe1c
] [formerly 6f277bd0b8
] [formerly 93c936373e
[formerly 6f277bd0b8
[formerly 07c9ee624f8e9271cd4d8ab53d4409a26378622f]]]
Former-commit-id: 93c936373e
Former-commit-id: 89f481349eee600da9e4c9f626e91640521fb3dd [formerly e3540e0330
]
Former-commit-id: 54dd8ec956
2013-06-06 09:42:03 -05:00
Max Schenkelberg
0f72f90fa2
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 424ea84d6e
[formerly 0bfeed7240
[formerly ac578db9a9809798c30d2c694bedb1d960395e77]]]
Former-commit-id: 424ea84d6e
Former-commit-id: f4bc575fd4f7424b96fd216a3ef955f3adc3b3f8 [formerly e80b104e15
]
Former-commit-id: 1872fd5b67
2013-06-05 17:13:43 -05:00
David Gillingham
8ade43a3dc
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 bad6a1fa40
[formerly 9acf385f21
[formerly 5570ee749c5797f8f2c9ab3f6f8392d2c5680d32]]]
Former-commit-id: bad6a1fa40
Former-commit-id: 71dde9577d001c57231eb1ddf6cca6a71e302a55 [formerly 070365714a
]
Former-commit-id: 5fe4739fc4
2013-06-05 16:26:04 -05:00
Ben Steffensmeier
0f1fbd7eee
Issue #2041 Switch derived parameters to use concurrent python for threading.
...
Change-Id: I791eb2f4803b5d29928dd153bbcf157ae643534f
Former-commit-id: 528b5039f7
[formerly e73e50e8a8
] [formerly 56f9b88ad5
] [formerly 76e4882b7c
[formerly 56f9b88ad5
[formerly 11f346d4d7baae08f61966a91e4d5f579630c7de]]]
Former-commit-id: 76e4882b7c
Former-commit-id: 2fd66320131edc6fff4cef9a6036cac49d0caac9 [formerly 7c0c8b02d8
]
Former-commit-id: a1d0a7da5a
2013-06-05 13:34:26 -05:00
Nate Jensen
c0ef1e9c10
Merge "Issue #1869 Ensure RecordFactory throws NoPluginException when there is no plugin." into development
...
Former-commit-id: dd845bfb7a
[formerly 9d27d25a0b
] [formerly dc2a278ab5
] [formerly 0f7bf4dd6a
[formerly dc2a278ab5
[formerly 38aa364a89d87896c2569026bc7e16a71babd308]]]
Former-commit-id: 0f7bf4dd6a
Former-commit-id: b3d45da84582d6c6711f73f41968e26acb02b4ab [formerly 5f91361d7c
]
Former-commit-id: 9ef714d7a3
2013-06-05 13:26:12 -05:00
Dustin Johnson
37f5475d46
Merge "Issue #2064 - Add ability to subscribe to observational point data (MADIS)" into development
...
Former-commit-id: 7836105cff
[formerly 6d589a3c79
] [formerly 37791e95a1
] [formerly 022346b4b3
[formerly 37791e95a1
[formerly 0fe4193763117516c900f4a0236706fd1b08a781]]]
Former-commit-id: 022346b4b3
Former-commit-id: a11103f22a06ee773f069a81e288acdaf952851e [formerly 3554d85245
]
Former-commit-id: 4722edba19
2013-06-05 13:24:54 -05:00
Richard Peter
e61cc2e06c
Merge "Issue #2043 Fix Cape.py python imports." into development
...
Former-commit-id: 290f46d6d9
[formerly a6c207c2b8
] [formerly ae1cde51ac
] [formerly ef2332ee1b
[formerly ae1cde51ac
[formerly 04399075a1c5a8204b77b374f0d7ae70594c89a4]]]
Former-commit-id: ef2332ee1b
Former-commit-id: 6f8128b016c78c60019f278eec7c153e033d73eb [formerly 23ae300a3b
]
Former-commit-id: 24c47260f7
2013-06-05 12:24:41 -05:00
Mike Duff
d9c8fa4f5c
Issue #2064 - Add ability to subscribe to observational point data (MADIS)
...
Change-Id: I298af2d50ec972ab4e728c7aa5d41c0a757d39fa
Former-commit-id: e6f8712306
[formerly 77611d7e9c
] [formerly 321209adb8
] [formerly 12e5155edc
[formerly 321209adb8
[formerly 9142ab024fb870b6c9fa18d42d42ae869c4ec58c]]]
Former-commit-id: 12e5155edc
Former-commit-id: ab2941e89c2d1b9a72ce27a9b74bec7f87fc7a12 [formerly 5e7ec92696
]
Former-commit-id: 41f817e755
2013-06-05 12:06:58 -05:00
Ron Anderson
3e28a3a2c2
Issue #2026 Improved alertviz error logging
...
Change-Id: Ia30086b9d830c6d950045ceab36bbe802d507ac8
Former-commit-id: 874c119d6c
[formerly 6bab5a5935
] [formerly 39e6673685
] [formerly 859b72a714
[formerly 39e6673685
[formerly d2418d309830a5063fcd90fd18a8d636574ddfbb]]]
Former-commit-id: 859b72a714
Former-commit-id: c6a1897c4014177d1042ea4f10536f366963f39e [formerly 94cfb2dddf
]
Former-commit-id: b3f48138a0
2013-06-05 12:05:15 -05:00
Ben Steffensmeier
09ec95368a
Issue #2043 Fix Cape.py python imports.
...
Former-commit-id: 41d77c5ae6
[formerly 33cedf88d9
] [formerly afebe38b8b
] [formerly bf7a64d328
[formerly afebe38b8b
[formerly 9744c8883de4f3f739e517219f207ab850292c0f]]]
Former-commit-id: bf7a64d328
Former-commit-id: 219e7b2204c20b30d9553d508d29d80a048dd7fc [formerly c49a80a04b
]
Former-commit-id: 9cad47b52f
2013-06-05 12:04:23 -05:00
Richard Peter
65b21b5776
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 e8c77bb251
[formerly 27442499e6
[formerly 5eb49ca9bf6a263af5059531b09cdb8a735ba9ac]]]
Former-commit-id: e8c77bb251
Former-commit-id: 64f387a6c3302df000419d4af8e8bbba8f9b9c19 [formerly 42777a98a8
]
Former-commit-id: 33b799fb50
2013-06-05 11:48:09 -05:00
Ben Steffensmeier
99f69f5b44
Issue #1869 Ensure RecordFactory throws NoPluginException when there is no plugin.
...
Former-commit-id: f49bcb30a9
[formerly 5bb01374b9
] [formerly 772ecd6e46
] [formerly 58b51b725c
[formerly 772ecd6e46
[formerly 50da6ea32b6d876d70d8c4d7a4914f5bb17b4c62]]]
Former-commit-id: 58b51b725c
Former-commit-id: fd2464a73f231b57a8dbc3163e7c274a17d5ebe4 [formerly 414b679b0a
]
Former-commit-id: b65f1d4da0
2013-06-05 10:17:20 -05:00
Lee Venable
6f09a11696
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 6d0d8a3a8e
[formerly 778baf331f
[formerly a2fc3646e554018740153c78f2ecd3bc88abb691]]]
Former-commit-id: 6d0d8a3a8e
Former-commit-id: b632204fcaa273d2105013dc1fb13aec46e1cc3d [formerly a0cd3823a3
]
Former-commit-id: 04788b06d9
2013-06-05 08:45:39 -05:00
Nate Jensen
c5ed0f981a
Merge "Issue #2041 Improve exception handling for concurrent python. Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47" into development
...
Former-commit-id: fb7e8c6070
[formerly 38b028b665
] [formerly 725adab244
] [formerly 4bfba7d6c6
[formerly 725adab244
[formerly 3d70e1866b618991ed0f8decb4925c794222c7ad]]]
Former-commit-id: 4bfba7d6c6
Former-commit-id: 6fc65338458aaa9265fae7cd81c3267e87afe0a1 [formerly 07b1854308
]
Former-commit-id: 64ccc2c283
2013-06-05 08:42:23 -05:00
Bryan Kowal
6c368db5e0
Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to.
...
Former-commit-id: b7b51697b8
[formerly 3427534c29
] [formerly 4b5c653363
] [formerly 2abb257d35
[formerly 4b5c653363
[formerly 289cd9fbe02da77b3c56729ec1ee4d3e89256a08]]]
Former-commit-id: 2abb257d35
Former-commit-id: 11d840385012f6641f89c0e54c9c442aed3c2d11 [formerly 98150aa493
]
Former-commit-id: b3b85069ea
2013-06-04 18:25:58 -05:00
Ben Steffensmeier
05874a2376
Issue #2031 move grib splitting cleanup into a finally block so less tmp files leak.
...
Former-commit-id: 2370b4305c
[formerly a01c4eb02b
] [formerly 2dc2e990cb
] [formerly 19af45e525
[formerly 2dc2e990cb
[formerly 327fe058b08967d18fa83ac9e6fc9c3356d68ff2]]]
Former-commit-id: 19af45e525
Former-commit-id: 7f1e69827c61f66c1292d7cb055f2116de1b2d8f [formerly d773bbf625
]
Former-commit-id: 016ed7211f
2013-06-04 18:23:06 -05:00
Ben Steffensmeier
0dab882461
Issue #2041 Improve exception handing in grid resources.
...
Change-Id: I9edcb10da3ec9bfce16650cbf8c480af94dc6d39
Former-commit-id: ffcfe17e57
[formerly 956fd6e846
] [formerly 5951b85ac6
] [formerly 7259fdc3a8
[formerly 5951b85ac6
[formerly 17334720cd9f5705687b2030b1532b342e9a6fb8]]]
Former-commit-id: 7259fdc3a8
Former-commit-id: 58f9d2a4ed3c467b2b8107b3e0f8180a984f22b4 [formerly 8b3df5140c
]
Former-commit-id: d79c15be5a
2013-06-04 17:38:56 -05:00
Ben Steffensmeier
4a98cb43a4
Issue #2041 Improve exception handling for concurrent python.
...
Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47
Former-commit-id: d9599eb3ae
[formerly 5d5cd5e5f4
] [formerly 8ce74c44df
] [formerly ef10b56e2b
[formerly 8ce74c44df
[formerly c605b0ce9b7437bfaa803b31c6f4b2f7dc17a6ea]]]
Former-commit-id: ef10b56e2b
Former-commit-id: 137f40ebc8428c8099afb92fc2a47d584a2c089d [formerly 0f70964bc9
]
Former-commit-id: f78e0f18bf
2013-06-04 17:03:05 -05:00
Bryan Kowal
f6e015f82f
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 ca9275ad16
[formerly a77c77e7bc
[formerly 291ae689ebe66d24a9b0154180f9114a6486aa20]]]
Former-commit-id: ca9275ad16
Former-commit-id: 3e92d36855bfd498600d7049c59ab23514a60c28 [formerly 4d2abf761b
]
Former-commit-id: 942e904172
2013-06-04 15:49:58 -05:00
Lee Venable
cd2bc6cb06
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 377c675436
[formerly 187a4e9b17
[formerly 3f26818dfeb006393598af41faf33cac6957d3e0]]]
Former-commit-id: 377c675436
Former-commit-id: 9b49b8b60af6b50b592dd8eaab2513a03b5bf29f [formerly d6274ac813
]
Former-commit-id: e809c6dfaf
2013-06-04 15:48:40 -05:00
Greg Armendariz
7b79540a57
Merge "Issue #2021 - git ignore for build-generated hydro files; remove tmcp build-generated files" into development
...
Former-commit-id: 7409c24e4b
[formerly 38e765397a
] [formerly 1b0b29205a69fc55a9c10d5d8b14d02b10bfa071 [formerly 2bb9f1ceec
]] [formerly 5b29c71d38
[formerly 2bb9f1ceec
[formerly b88ac881c4963543a21566ae1361638ec40f8ac0]]]
Former-commit-id: 5b29c71d38
Former-commit-id: 800a303d66f1897b74d520d00a685c51db55ad67 [formerly 9af992ed12
]
Former-commit-id: 38c7865a12
2013-06-04 15:29:10 -05:00
Richard Peter
cbfbab7fb9
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 220e817e15
[formerly e513fdbc3e
[formerly 1b5ab5d85b4f634357d0f52551b800378349b363]]]
Former-commit-id: 220e817e15
Former-commit-id: b87e95d2898e502766c05274499e1d042203b0c2 [formerly 6b75cad25f
]
Former-commit-id: b5cccf449d
2013-06-04 15:08:09 -05:00
Richard Peter
c0bafd75dd
Merge "Issue #2043 switch capeFunc to java. Change-Id: I35db8657838d1e11180248ebfb5011181ea09659" into development
...
Former-commit-id: 4abe0f2e59
[formerly 03b2db312e
] [formerly 82341a9fc1
] [formerly 3be654e028
[formerly 82341a9fc1
[formerly aa178f96c90b1c13ade6eb7db297583e5241601c]]]
Former-commit-id: 3be654e028
Former-commit-id: 3368bc1fea10a6726f85b628d6d9cf0561a1b183 [formerly a765656f1d
]
Former-commit-id: 9ef5384cd3
2013-06-04 14:57:10 -05:00
Greg Armendariz
052b511704
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 dbdb343fad
[formerly f1fbb33f31
[formerly 70379062d2943f045459a03c0de88ec09c1f0853]]]
Former-commit-id: dbdb343fad
Former-commit-id: 308057f0728ab28ee2783a66c5517a744823908d [formerly af4fd585a2
]
Former-commit-id: aa94d1e875
2013-06-04 14:35:39 -05:00
Greg Armendariz
12eab962bf
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 ffa5962f52
[formerly eeff0a13e1
[formerly 92f888181ea2d4e4dbfb44623c58a2a547b7e1d8]]]
Former-commit-id: ffa5962f52
Former-commit-id: e3e7d05f836bcaa14781703582e2093420cadfe7 [formerly a7d5daf5f9
]
Former-commit-id: fb5f888ce1
2013-06-04 14:35:27 -05:00
Dustin Johnson
052d397cac
Merge "Issue #2022 Modifications to subscription last run time and notificationservers" into development
...
Former-commit-id: c4446d26f1
[formerly a98b19c824
] [formerly 3198277096
] [formerly 37b7e400ea
[formerly 3198277096
[formerly 9a3f2121defaaaefd8f6268e289f87ecb2ee3e78]]]
Former-commit-id: 37b7e400ea
Former-commit-id: 3c58657e60d5487cc0a3208db071bbf4465c4d6b [formerly b4a51bc24f
]
Former-commit-id: 533fb7139a
2013-06-04 14:22:59 -05:00
Bryan Kowal
3542a15011
Issue #2021 - git ignore for build-generated hydro files; remove tmcp build-generated files
...
Change-Id: I1ae5a3c9a5d93822c6b5ce8190d1bed28e2b6198
Former-commit-id: ffc37683b3
[formerly be4f6b733f
] [formerly f452515ce77edf341d97d4fc2bdd9a349ef16520 [formerly 6e49c0d761
]] [formerly 715d6f490f
[formerly 6e49c0d761
[formerly 34bad0464e49f17004ce6b467559bbcdc9bacf59]]]
Former-commit-id: 715d6f490f
Former-commit-id: e7df4bec83718c3470a8759de8408122c162440d [formerly 6e329bb0d5
]
Former-commit-id: b485b6d152
2013-06-04 14:21:15 -05:00
Benjamin Phillippe
8d03dd6c75
Issue #2022 Modifications to subscription last run time
...
and notificationservers
Change-Id: Ia11e639249ef7fd769e6e3baae2b09b966b3caea
Former-commit-id: 5b9eecc8b8
[formerly 0862f2b7d3
] [formerly f00d8ae721
] [formerly 1cec0fab74
[formerly f00d8ae721
[formerly 4118d4e3888a5feb9bbc39036a8ceeb70d66e375]]]
Former-commit-id: 1cec0fab74
Former-commit-id: 3841592d2af8219265cb07e6457697758849bd51 [formerly 6e8314475e
]
Former-commit-id: 49ec0363c3
2013-06-04 14:19:09 -05:00
Richard Peter
a8780f26b5
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 9e3baaa87a
[formerly 192e5b9be8
[formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad
]
Former-commit-id: 9c3fe01efa
2013-06-04 14:06:53 -05:00
Steve Harris
efa574263b
Issue #1872 - Licensing for java jdk, jbzip2, postgresql, qpid
...
Change-Id: I09f958247c6342ff45da5f85a197ccb4c652c6db
Former-commit-id: f98d38a5e7
[formerly bf4d9824ef
] [formerly a97ea3942d
] [formerly aefacbcd9b
[formerly a97ea3942d
[formerly c9334ae14df169463a03d7c46fa3bbe8c5ac27c9]]]
Former-commit-id: aefacbcd9b
Former-commit-id: e1914cbf0fcb4ad5791dcc28eb0fdd2ee0125df7 [formerly 7db966b23e
]
Former-commit-id: b1a3ff5b3f
2013-06-04 13:56:51 -05:00
Roger Ferrel
8820399134
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 f53d6bf4ff
[formerly b952eee030
[formerly 64b75031afaecd74649392a19cc0b10dcdb79a2b]]]
Former-commit-id: f53d6bf4ff
Former-commit-id: 2833276d9329d4f1b9e5d852a18422d57355c145 [formerly 9aff5f2321
]
Former-commit-id: 65d17722a9
2013-06-04 13:08:05 -05:00
Bryan Kowal
398dfd5add
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 33a5b6d42d
[formerly 71b04e3147
[formerly 02af194872173d89f77e15a6a8caca1e5812dbe4]]]
Former-commit-id: 33a5b6d42d
Former-commit-id: 4f0c9557cee74c0a1db544483c367421766de3d2 [formerly 9b896380be
]
Former-commit-id: dedddc5811
2013-06-04 12:52:27 -05:00
Nate Jensen
e4158f9ece
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 5d1ecb3a5d
[formerly 329d9d1c6a
[formerly 6742f7dbcac39261d8bee4e055bb9e4eda66520d]]]
Former-commit-id: 5d1ecb3a5d
Former-commit-id: 3ae61c25e5597f9a6be694c5608f437a8ff26eec [formerly 2d1405b9c4
]
Former-commit-id: 412c21f516
2013-06-04 11:43:22 -05:00
Ben Steffensmeier
01e46140cb
Issue #2043 switch capeFunc to java.
...
Change-Id: I35db8657838d1e11180248ebfb5011181ea09659
Former-commit-id: 2f636b5309
[formerly f283171cb4
] [formerly 098d209d5c
] [formerly 492b435626
[formerly 098d209d5c
[formerly 5eaac7266a0f8d3b083703076a255c41d8bd1039]]]
Former-commit-id: 492b435626
Former-commit-id: 7651785a1e4de8202e12adb600233a932a8ec2e8 [formerly 6f9ea3f195
]
Former-commit-id: 3fd810e0bf
2013-06-04 10:16:53 -05:00
Bryan Kowal
4df4ccae59
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 dc5a800b83
[formerly abd8ae931c
[formerly 5080f2839a6f94c6152aeff231241935b570a3c3]]]
Former-commit-id: dc5a800b83
Former-commit-id: e4c7d77222a7a9b3cef69f5a27ecfe2376ffc717 [formerly 5e4a1576f0
]
Former-commit-id: 96ae06c3a1
2013-06-04 10:05:23 -05:00
Bryan Kowal
e49087b23f
Issue #1952 - remove the hydroapps dependency on awips2-edex-native.
...
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56
Former-commit-id: eb656f731c
[formerly 7a1c08bb13
] [formerly 46c9ba7c7b
] [formerly 67cd73c655
[formerly 46c9ba7c7b
[formerly 69358da7b7cfa6b05d3b20bc7f27a1796bb2c86b]]]
Former-commit-id: 67cd73c655
Former-commit-id: 9df212446234478c6e77b29334b635f74a7591eb [formerly f8e2a2f4f2
]
Former-commit-id: 86b88922da
2013-06-04 09:36:09 -05:00