Commit graph

750 commits

Author SHA1 Message Date
Ben Steffensmeier
e6fc131343 Issue #1614 Refactor data access framework to use single request.
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798

Former-commit-id: e771076275 [formerly 1393f3e3cf] [formerly e771076275 [formerly 1393f3e3cf] [formerly 0933a5f596 [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]]
Former-commit-id: 0933a5f596
Former-commit-id: 91bbdc3337 [formerly f0f3c71d50]
Former-commit-id: f868f66f76
2013-02-15 11:39:56 -06:00
Ron Anderson
80df624bb3 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: dc7c9edb87 [formerly a2a89fb4e7] [formerly dc7c9edb87 [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly dc9ac54903107224633b4e18d5caa345649d8266]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: d69d628450 [formerly e952a4f179]
Former-commit-id: 45627edcc7
2013-02-15 09:03:41 -06:00
Richard Peter
1b8a4b159d Merge "Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging." into development
Former-commit-id: dcd4761b54 [formerly eb00310ef9] [formerly dcd4761b54 [formerly eb00310ef9] [formerly b54ec2b59e [formerly b3c7458333b9a8d0f011614c0b4845397e074ce8]]]
Former-commit-id: b54ec2b59e
Former-commit-id: ad4110a73f [formerly 0bab06709b]
Former-commit-id: b82e1249bd
2013-02-15 08:44:02 -06:00
Richard Peter
424d5a62fd Merge "Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType." into development
Former-commit-id: bd91d2b8be [formerly 5a5a5ba855] [formerly bd91d2b8be [formerly 5a5a5ba855] [formerly d905313941 [formerly 7071c075ee2282b6048cafdefac6d6c83a344ca0]]]
Former-commit-id: d905313941
Former-commit-id: 015b51082d [formerly 2d8327e76f]
Former-commit-id: 8cac928d13
2013-02-15 08:31:33 -06:00
Dustin Johnson
12d4b055f6 Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41

Former-commit-id: 4be6c12ac6 [formerly 714ea1c8d8] [formerly 4be6c12ac6 [formerly 714ea1c8d8] [formerly 6e2f69939f [formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]]
Former-commit-id: 6e2f69939f
Former-commit-id: d0ecd69456 [formerly 1ef440f8ee]
Former-commit-id: f14bedec28
2013-02-15 08:13:11 -06:00
Brad Gonzales
3d92be6fc1 Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType.
Amend: Corrected comment in convertPluginNameToDataType.sh

Change-Id: I5e0084704cef599d368165058b8008bbb2bc8e18

Former-commit-id: 6a0e9c331b [formerly 03dd42463e] [formerly 6a0e9c331b [formerly 03dd42463e] [formerly dfef89ee64 [formerly a2391d76c91d3d2b86b8e74eed1e0754091650a0]]]
Former-commit-id: dfef89ee64
Former-commit-id: 936facbe86 [formerly e495a5f663]
Former-commit-id: 5e69b61418
2013-02-14 17:34:55 -06:00
Dustin Johnson
4466e63c84 Issue #1595 Fix expired subscription update retrieval time scheduling
Change-Id: I225bf887d03e43295f4b18eea677bb24c032b8a7

Former-commit-id: 54dd90afdd [formerly 656601f272] [formerly 54dd90afdd [formerly 656601f272] [formerly f6a286da2d [formerly 26dd90355f6ce2ed5c409a142622cf220754c2ab]]]
Former-commit-id: f6a286da2d
Former-commit-id: 158ce1fe5b [formerly 776581bc55]
Former-commit-id: 0614bd08f7
2013-02-14 15:33:06 -06:00
Nate Jensen
498c622823 Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development
Former-commit-id: 5526ee7e8d [formerly 1144f08e59] [formerly 5526ee7e8d [formerly 1144f08e59] [formerly a3e0bf09ab [formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]]
Former-commit-id: a3e0bf09ab
Former-commit-id: b4aea0385c [formerly 3f5b8b56ef]
Former-commit-id: 2422d17df3
2013-02-14 15:05:14 -06:00
Dave Hladky
3dd2314369 Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950

Former-commit-id: 2655952304 [formerly 7b3a310f67] [formerly 2655952304 [formerly 7b3a310f67] [formerly 381aec5976 [formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]]
Former-commit-id: 381aec5976
Former-commit-id: a17dee033a [formerly 5c66cbcd27]
Former-commit-id: 7dad108a93
2013-02-14 13:58:32 -06:00
Ben Steffensmeier
2bcf3749ce Issue #1614 allow locationNames for grid data access
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2

Former-commit-id: ef7addb005 [formerly ab319bd3a8] [formerly ef7addb005 [formerly ab319bd3a8] [formerly 9b4de367e3 [formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]]
Former-commit-id: 9b4de367e3
Former-commit-id: efaddb710c [formerly 0995024482]
Former-commit-id: aecc5a69e9
2013-02-14 10:07:01 -06:00
Dustin Johnson
1d80262cf9 Issue #1543 Serialize DODS response rather than plugin data objects directly
- Remove proxy classes for Spring transactions, use interfaces as Spring recommends.

Amend:
   Peer review comments.
   Set retrieval status to failed when payload is null.

Change-Id: I458b13856302c8faceeef985c1c41115644520b7

Former-commit-id: 25faaa2af0 [formerly dd8ca33fc4] [formerly 25faaa2af0 [formerly dd8ca33fc4] [formerly d143735ea8 [formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]]]
Former-commit-id: d143735ea8
Former-commit-id: 6f821ed8c9 [formerly 9783dc4d9f]
Former-commit-id: 922da948eb
2013-02-14 09:49:22 -06:00
Richard Peter
862619a1ba Merge "Issue #1615 Changed ProcessEvent pluginName to dataType. Refactored GribDecoder decode method to a Processor exchange method." into development
Former-commit-id: edcf52d9c1 [formerly e92c1fe346] [formerly edcf52d9c1 [formerly e92c1fe346] [formerly 671f961a99 [formerly 6574bb0978629fd9fac45b2f7eee1dc7a42d5156]]]
Former-commit-id: 671f961a99
Former-commit-id: ba2c69fb17 [formerly 351d52b311]
Former-commit-id: d4bcf0335e
2013-02-13 10:24:50 -06:00
Richard Peter
490f6ba46a Merge "Issue #1526 refactor for clarity and to stream responses from pypies" into development
Former-commit-id: 7438d87e58 [formerly e611aab017] [formerly 7438d87e58 [formerly e611aab017] [formerly dbcb8bd30e [formerly a8d1d7259bf914fac127361bde67d6513f775e8f]]]
Former-commit-id: dbcb8bd30e
Former-commit-id: 0804763d1a [formerly 6ec1990bd9]
Former-commit-id: 8984a46fe5
2013-02-13 10:18:24 -06:00
Nate Jensen
599d7c16b8 Issue #1526 refactor for clarity and to stream responses from pypies
Change-Id: Ia07aca01a528b51de4fd20571edaa90cc06631d7

Former-commit-id: 56112143c3 [formerly 96232ab0ab] [formerly 56112143c3 [formerly 96232ab0ab] [formerly 92076242fc [formerly 26ba8a930a723ccbecdc09d873cbcb917e8b453e]]]
Former-commit-id: 92076242fc
Former-commit-id: 54cea219cf [formerly cbca34e709]
Former-commit-id: 794f782624
2013-02-12 16:33:01 -06:00
Brad Gonzales
494696be28 Issue #1615 Changed ProcessEvent pluginName to dataType. Refactored GribDecoder decode method to a Processor exchange method.
Change-Id: Ib3eaf4c319d844c277dd7288d565bb9508fa46f8

Former-commit-id: 465764854a [formerly 9917cb9f46] [formerly 465764854a [formerly 9917cb9f46] [formerly 26f2374d54 [formerly 6eff40bb823594da5346022eeffc15910cdfb799]]]
Former-commit-id: 26f2374d54
Former-commit-id: 666c728476 [formerly ec6bfc0d5e]
Former-commit-id: 42f87af321
2013-02-12 13:49:18 -06:00
Matt Nash
a7c7b93d51 Issue #1570 add ability for synchronous operations in PythonJobCoordinator
Change-Id: Ida7d53c8675dee57ef37e3544500b8306ecb54c4

Former-commit-id: 3b2fa3eafe [formerly ba3a70d02c] [formerly 3b2fa3eafe [formerly ba3a70d02c] [formerly 85988ecfe6 [formerly f3f4604a64c797b998ffa7d4ccc574a0cc1dd633]]]
Former-commit-id: 85988ecfe6
Former-commit-id: e97b31bb7e [formerly c0ce67463f]
Former-commit-id: 1b3292d4c1
2013-02-12 13:39:44 -06:00
Nate Jensen
4cffc90376 Merge "Issue #1446 return None in Python if data is not available. Users will need to handle None, but it seems like this is better rather than return them an empty array and risk them searching through the empty array for values that are not there and getting more confused." into development
Former-commit-id: 2c516156f1 [formerly 207cca1edf] [formerly 2c516156f1 [formerly 207cca1edf] [formerly 4452a5d62f [formerly ec5a6b3d1ad551db73f3cd60eafe2b97267a6bdd]]]
Former-commit-id: 4452a5d62f
Former-commit-id: 9fb05f0a96 [formerly 4e0e1fe65e]
Former-commit-id: e175212305
2013-02-12 12:15:37 -06:00
Matt Nash
6f1596ab82 Issue #1446 return None in Python if data is not available. Users will need to handle None, but it seems like this is better rather than return them an empty array and risk them searching through the empty array for values that are not there and getting more confused.
Change-Id: I36d72ed9642752eb92ae0902892bd79810111c07

Former-commit-id: 2bed543d32 [formerly 1c504de33e] [formerly 2bed543d32 [formerly 1c504de33e] [formerly da21cf82e9 [formerly 4b56329756881b3291ad2856a5c166cdfc635bf9]]]
Former-commit-id: da21cf82e9
Former-commit-id: 39f3f70e1b [formerly d39f0938e8]
Former-commit-id: a64fd03896
2013-02-12 12:02:48 -06:00
Dustin Johnson
691e6d788e Issue #1543 Clean up test files after changing to Spring transactions
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680

Former-commit-id: 651c6d55c1 [formerly 4bcd75c091] [formerly 651c6d55c1 [formerly 4bcd75c091] [formerly 19fd95d2c8 [formerly e7e146c79b11d33ad6755acdeb11f58fa789b4c6]]]
Former-commit-id: 19fd95d2c8
Former-commit-id: 4a10957512 [formerly b4367903b0]
Former-commit-id: 084f5b7fdf
2013-02-12 11:59:45 -06:00
Dustin Johnson
fd01ca38af Merge "Issue #1554 fix XmlGenericMapAdapter to work with null maps." into development
Former-commit-id: ab7e404ffa [formerly 9004e0f57c] [formerly ab7e404ffa [formerly 9004e0f57c] [formerly 5c1c1ec582 [formerly 2d2dd4cc62a45794a3a912eb75c9d2745815dc4e]]]
Former-commit-id: 5c1c1ec582
Former-commit-id: e8f382e7c0 [formerly 12b6ac3d56]
Former-commit-id: ce740437b1
2013-02-12 07:59:24 -06:00
Dustin Johnson
f8758f456e Merge "Issue #1543 Add testing of current OpenDAP type retrievals. - Add test for current behavior of SBN-like retrievals. - Change session management to use a factory implementation. - Add service locator strategy to find jaxbables. - Tests cleanup. - Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality." into development
Former-commit-id: bc8fb2f4ea [formerly 2457359c0f] [formerly bc8fb2f4ea [formerly 2457359c0f] [formerly 6a4a11536e [formerly 4d055580ddea29eb35983dbe4e9e01a611f23ba1]]]
Former-commit-id: 6a4a11536e
Former-commit-id: ecbd1896dc [formerly da9072b0f1]
Former-commit-id: c0b42dd8dc
2013-02-12 07:58:39 -06:00
Ron Anderson
dcca4ce4af Merge "Issue #1554 initial implementation of GFE grid factory. Change-Id: Id2ae308c0c13822dd6e5dd0195f7920df82ff994" into development
Former-commit-id: dfe0723e65 [formerly 5bee722544] [formerly dfe0723e65 [formerly 5bee722544] [formerly 9713b42306 [formerly 7c4d695201e473de349f4f5a83a1a5283d6cb4f4]]]
Former-commit-id: 9713b42306
Former-commit-id: 1ec0410989 [formerly 184cd6d508]
Former-commit-id: dfdc2daf64
2013-02-11 17:20:21 -06:00
Ron Anderson
c26ca4f430 Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging.
Change-Id: I820a780dcbaa3e6ffefd56737bac7dbc13c2e485

Former-commit-id: 95d18f9283 [formerly 771296a845] [formerly 95d18f9283 [formerly 771296a845] [formerly b6a9b42094 [formerly 39282e6528aeb01a40a01df477f4579afab79ca3]]]
Former-commit-id: b6a9b42094
Former-commit-id: c862db5513 [formerly 12b0fbdab8]
Former-commit-id: 630ded93ff
2013-02-11 17:16:48 -06:00
Ben Steffensmeier
74a76c1acf Issue #1554 fix XmlGenericMapAdapter to work with null maps.
Former-commit-id: 4a7d94ecbd [formerly 60c435861a] [formerly 4a7d94ecbd [formerly 60c435861a] [formerly 7220c4c6cc [formerly 904e3387de59f534b6457c7a12e8f94d55974884]]]
Former-commit-id: 7220c4c6cc
Former-commit-id: ae0ac4e21c [formerly 21616e06ce]
Former-commit-id: 5c0d245613
2013-02-11 16:08:58 -06:00
Ben Steffensmeier
72b963d0c4 Issue #1554 initial implementation of GFE grid factory.
Change-Id: Id2ae308c0c13822dd6e5dd0195f7920df82ff994

Former-commit-id: b5fa5d45fb [formerly f34751122a] [formerly b5fa5d45fb [formerly f34751122a] [formerly ff13255ebe [formerly 0b350f62b26c9f2154a1d7bd6ba9d18475012495]]]
Former-commit-id: ff13255ebe
Former-commit-id: 92eb21f91c [formerly 1663a758b8]
Former-commit-id: aa2e48f4ab
2013-02-11 15:20:40 -06:00
Dustin Johnson
35b13ba973 Issue #1543 Add testing of current OpenDAP type retrievals.
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.

Amend:
  Peer review comments.
  Change to use Spring transactions.

Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366

Former-commit-id: 0d548bd66f [formerly 8307af022c] [formerly 0d548bd66f [formerly 8307af022c] [formerly ef32853dc1 [formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]]
Former-commit-id: ef32853dc1
Former-commit-id: 73a5667256 [formerly e504a474f9]
Former-commit-id: e48bf48821
2013-02-11 14:21:57 -06:00
Lee Venable
df57afc892 Merge "Issue #1580 - Implementation of Stats/Event framework." into development
Former-commit-id: 3fabb894fc [formerly 0f3bfe7fc1] [formerly 3fabb894fc [formerly 0f3bfe7fc1] [formerly 48bcf5dece [formerly f554b7144ffc8ff48f463a7d6ccf07edda1860d2]]]
Former-commit-id: 48bcf5dece
Former-commit-id: e978f5cf5a [formerly 73c8533cbb]
Former-commit-id: ba75f57195
2013-02-11 12:00:22 -06:00
Nate Jensen
f7374f5296 Merge "Issue #1553 minor fixes to radar grid access." into development
Former-commit-id: f938432a6f [formerly 8a141029ff] [formerly f938432a6f [formerly 8a141029ff] [formerly f0be76e8ee [formerly f113911f360b69d9a831b1fe7aed8ba29806316d]]]
Former-commit-id: f0be76e8ee
Former-commit-id: 55287447c9 [formerly bf0fc5ac32]
Former-commit-id: 3b154b5614
2013-02-11 09:53:51 -06:00
Nate Jensen
0f1248abbe Merge "Issue #1590 Change localization notification observer to send notification to listeners after unlocking file to avoid deadlock" into development
Former-commit-id: 139fbac574 [formerly ef0194872a] [formerly 139fbac574 [formerly ef0194872a] [formerly 1cf73c4426 [formerly 6eefd1de088b4b3e334a3c587c371a4028ee09dd]]]
Former-commit-id: 1cf73c4426
Former-commit-id: cefa4c3901 [formerly 69ebf80213]
Former-commit-id: f8734bbe6a
2013-02-11 09:48:42 -06:00
Steve Harris
c2b93e8b70 Merge branch '13.2.1_delivery' into development
Former-commit-id: 76b7586da8 [formerly 89581b175b] [formerly 76b7586da8 [formerly 89581b175b] [formerly ffc1f4c75c [formerly bc1132a73a78b9f8c1f92f6ded82335f77ebadf8]]]
Former-commit-id: ffc1f4c75c
Former-commit-id: 2d08f63ded [formerly 861983a573]
Former-commit-id: c96258b515
2013-02-08 16:14:17 -06:00
Steve Harris
3772f37cc3 Merge branch 'ss_builds' (13.2.1-6) into 13.2.1_delivery
Former-commit-id: 11fe18edec [formerly 51449a651e] [formerly 11fe18edec [formerly 51449a651e] [formerly 7b788f8e48 [formerly bdcffbb263cafbe7ee626b82dfa808a2e2ea58af]]]
Former-commit-id: 7b788f8e48
Former-commit-id: 9f3148073c [formerly a45d9231d6]
Former-commit-id: 62532d7ab5
2013-02-08 16:13:38 -06:00
Steve Harris
cad248b025 13.2.1-6 baseline
Former-commit-id: d6b32d9d1f [formerly 89a698bc02] [formerly d6b32d9d1f [formerly 89a698bc02] [formerly bd02b0b1b4 [formerly c5df294c580862d0ac52b44bc473d4512f77cf2e]]]
Former-commit-id: bd02b0b1b4
Former-commit-id: dd5d3741b0 [formerly efe8c4eae4]
Former-commit-id: 3c800ad07e
2013-02-08 15:59:40 -06:00
Ben Steffensmeier
ba133a6f07 Issue #1553 minor fixes to radar grid access.
Former-commit-id: 5f40a89ce3 [formerly 701c135510] [formerly 5f40a89ce3 [formerly 701c135510] [formerly a55a53ed66 [formerly 0d5997a70653c9a327501a868b5a243d40fb66fb]]]
Former-commit-id: a55a53ed66
Former-commit-id: 04c0603ed5 [formerly 38164f3eb9]
Former-commit-id: 5058a1fce0
2013-02-08 12:46:47 -06:00
Mike Duff
d11283fd41 Issue #1580 - Implementation of Stats/Event framework.
Change-Id: I45a5a855f81c975a8a13d73f18ab9de3ddecf7cd

Former-commit-id: 804f526206 [formerly def0464898] [formerly 804f526206 [formerly def0464898] [formerly b9f317bbd0 [formerly ca2f288876b80fe5e491f335fb6b22b20a468fca]]]
Former-commit-id: b9f317bbd0
Former-commit-id: 317b174c24 [formerly 15f96b75a5]
Former-commit-id: cd42422079
2013-02-08 10:23:45 -06:00
Max Schenkelberg
2f28c6a086 Issue #1590 Change localization notification observer to send notification to listeners after unlocking file to avoid deadlock
Change-Id: I2b5ffa08af98259bdd860feb4cd989be013a05be

Former-commit-id: 4ba75b9ece [formerly 232400965d] [formerly 4ba75b9ece [formerly 232400965d] [formerly 3f3359370d [formerly 1ebb6aa360c9f916f09a5da95e5d831a021508e1]]]
Former-commit-id: 3f3359370d
Former-commit-id: 9235c32f9e [formerly 9383d97579]
Former-commit-id: be6a2a47f1
2013-02-07 16:36:53 -06:00
Steve Harris
dc55ef579a 13.2.1-6 baseline
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]
Former-commit-id: a46e33f06e
Former-commit-id: bbe92e6824 [formerly 30d38334cc]
Former-commit-id: 0c128dd8f0
2013-02-07 16:00:39 -06:00
Steve Harris
46eee24352 13.2.1-6 baseline
Former-commit-id: cc48fa4fc6 [formerly b80782b081] [formerly cc48fa4fc6 [formerly b80782b081] [formerly 53adfb7345 [formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]]
Former-commit-id: 53adfb7345
Former-commit-id: 1f44caaedb [formerly dee1480773]
Former-commit-id: 16b7b742be
2013-02-07 16:38:44 -05:00
Matt Nash
ff1fbc33a6 Issue #1570 add concurrent python functionality, address some comments
Change-Id: I9d7f5491f0895e252d04979458004e64e39f6805

Former-commit-id: f785808ff9 [formerly 2b84120235] [formerly f785808ff9 [formerly 2b84120235] [formerly 53f58684a0 [formerly 02a6471f1407593fcf39a724eb19bb4a7bc22626]]]
Former-commit-id: 53f58684a0
Former-commit-id: a4b72307da [formerly e21ada775c]
Former-commit-id: d64842f8da
2013-02-07 12:01:42 -06:00
Max Schenkelberg
b085fddff2 Issue #1500 Sped up warngen text creation by calculating hatched polygon and area in Job when polygon or area changes, initializing velocity for template running when warngen starts, only requesting full warning records when they are requested for use from CurrentWarnings, and only requesting partial ActivateTableRecords for determining active watch info.
Change-Id: Ia120f2d20b99e4d152554727597b22af762413ac

Former-commit-id: f73d55e920 [formerly bb68c95589] [formerly f73d55e920 [formerly bb68c95589] [formerly fdc5759b53 [formerly 26af6badfffd930b8051af8e33ff6897d6c87073]]]
Former-commit-id: fdc5759b53
Former-commit-id: f186c355ac [formerly 014eaa1666]
Former-commit-id: e736a5d5b7
2013-02-06 17:21:13 -06:00
Bryan Kowal
eaccf2d09a Issue #1555 - initial generic geometry resource
- refactored viz data access resources
- updated hydro factory based on existing hydro code
- geometric lines and polygons are now both rendered using wireframe shapes and the same logic
- relocated the data used to render the geometries to the resource
- points are created instead of circles for geometric points
- do not store legend text as a static variable in the abstract data access resource
- addressed peer review comments

Change-Id: Ic7792aede9e24445af541f01631886645a8cf1f0

Former-commit-id: 442a2f8fa4 [formerly a86d2b5769] [formerly 442a2f8fa4 [formerly a86d2b5769] [formerly 1732e6b4ea [formerly 04179bd343c3ec976c601e2856a3949e4515b472]]]
Former-commit-id: 1732e6b4ea
Former-commit-id: 9c7d8ca3d3 [formerly c8a6b08394]
Former-commit-id: 3b2342193f
2013-02-06 12:03:40 -06:00
Steve Harris
a11c8dff6d Merge branch '13.2.1_delivery' into development
Former-commit-id: da43a7a8ca [formerly 4bc8e9ab5c] [formerly da43a7a8ca [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]
Former-commit-id: 5ee47e098d
Former-commit-id: b119d66cda [formerly 3ad515e28f]
Former-commit-id: d73efe8e86
2013-02-06 11:12:01 -06:00
Steve Harris
f997ecea38 Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 14f23d4227 [formerly a16ac7819c] [formerly 14f23d4227 [formerly a16ac7819c] [formerly 6c6b53679b [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]]
Former-commit-id: 6c6b53679b
Former-commit-id: 48a0ffda4d [formerly 28ddc9bad8]
Former-commit-id: f028c16f79
2013-02-06 11:08:53 -06:00
Steve Harris
f36867a520 13.2.1-5 baseline
Former-commit-id: a6b3cde1ff [formerly 232734091d] [formerly a6b3cde1ff [formerly 232734091d] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]
Former-commit-id: 146fcc6da8
Former-commit-id: 7497a15e22 [formerly 1c602ec3a7]
Former-commit-id: bb0759d5ad
2013-02-06 11:02:32 -06:00
Nate Jensen
5004f1a551 Merge "Issue #1553 initial implementation of radar factory Change-Id: I86375a74f96159a9ed32d20ffd38168d9308c574" into development
Former-commit-id: 3f2aa931db [formerly ad4d5d6816] [formerly 3f2aa931db [formerly ad4d5d6816] [formerly 86c14f8275 [formerly a2c55643fe41a58029089aec2689a4678e7f8f6d]]]
Former-commit-id: 86c14f8275
Former-commit-id: 36810f3daa [formerly 7304e763d6]
Former-commit-id: dbc0a5137b
2013-02-05 17:37:29 -06:00
Lee Venable
f82afa483c Merge "Issue #1550 - Add ability for MPE to preload maps on perspective open." into development
Former-commit-id: 6e7f552972 [formerly 42941bb2be] [formerly 6e7f552972 [formerly 42941bb2be] [formerly cc34190c18 [formerly 07a61258f12fe6cf793467af271d060882953adc]]]
Former-commit-id: cc34190c18
Former-commit-id: 3444c01cfa [formerly 0dd325ed88]
Former-commit-id: b807d9085e
2013-02-05 16:22:30 -06:00
Mike Duff
320c4c7683 Issue #1580 - Fix spring config
Former-commit-id: 3f3554a559 [formerly 6b51c66923] [formerly 3f3554a559 [formerly 6b51c66923] [formerly 65deb06061 [formerly 020c39ec162e786ebb8b5a9a2feac7ae415e5036]]]
Former-commit-id: 65deb06061
Former-commit-id: 1fc97f07fe [formerly 62e25af348]
Former-commit-id: cc384772b7
2013-02-05 15:49:22 -06:00
Mike Duff
28e854de25 Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a

Former-commit-id: 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 36909dd6c0 [formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]]
Former-commit-id: 36909dd6c0
Former-commit-id: cd52a94032 [formerly 4400265394]
Former-commit-id: 0cb979038b
2013-02-05 15:13:51 -06:00
Dustin Johnson
01bfa884e5 Merge "Issue #1543 Break apart the retrieval process to support SBN capabilities. Made interfaces for various aspects of retrieval that are Spring injectable. Created an initial SBN retrieval task that will watch the /awips2/crawl directory, for proof of concept." into development
Former-commit-id: 9da65d97bc [formerly 39cfcf40a8] [formerly 9da65d97bc [formerly 39cfcf40a8] [formerly 6f95400d1c [formerly b6c403f6c8e22397d1df178ffddc9b8951f7e683]]]
Former-commit-id: 6f95400d1c
Former-commit-id: 4fecb5f6a7 [formerly 2f900fb18f]
Former-commit-id: 0552073c4b
2013-02-05 14:36:12 -06:00
Bryan Kowal
2afa604676 Issue #1577 - deploy-install and AWIPS II ant task updates
- includegen will now fail if a plugin is included in two or more features
- includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates
- removed a plugin from the ncep feature that was also in the cots feature
- the includegen failure will cause deploy-install to fail
- peer review comments; excluding significant re-factoring

Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f

Former-commit-id: 81da18f851 [formerly 7815b651bb] [formerly 81da18f851 [formerly 7815b651bb] [formerly 5fea87f1dd [formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]]]
Former-commit-id: 5fea87f1dd
Former-commit-id: efe288c82c [formerly 99994d3151]
Former-commit-id: 2fafc6a34b
2013-02-05 13:25:15 -06:00
Dave Hladky
d8ce48e79d Issue #1478 FFMP cache file read/writes overloading NAS, more efficiency
Change-Id: Ib5f49d9c1551b72a3620629437386d52c12b0ecf

Former-commit-id: 7b49430e34 [formerly c0712160d7] [formerly 7b49430e34 [formerly c0712160d7] [formerly 7af5aab08a [formerly 9c7d813ee094864e0a7da60d54dee5424c50efba]]]
Former-commit-id: 7af5aab08a
Former-commit-id: b134741e4c [formerly f6bd4ea0fa]
Former-commit-id: 69477ec246
2013-02-05 12:23:56 -06:00