Commit graph

1259 commits

Author SHA1 Message Date
Mike Duff
45b5ce4fd6 Issue #1523 - Fix for count unit label.
Change-Id: Icc705a4bff143734b61fd11b8edc4d6337647015

Former-commit-id: ea5d953e80 [formerly 2772f83fc7] [formerly ea5d953e80 [formerly 2772f83fc7] [formerly 5cab77afb3 [formerly 5a3facb0b4cb6c15a458a44f97fe4ffece505523]]]
Former-commit-id: 5cab77afb3
Former-commit-id: 26768cd96d [formerly 9ff30b4934]
Former-commit-id: 18ac9ff2d3
2013-01-29 13:12:40 -06:00
Dustin Johnson
64c335478a Issue #1530 Do not allow partial scheduling of subscriptions in BandwidthManager
Amend:
  Rebase to 13.2.1

Change-Id: Ied72baede3691957cf1155e1986428d1bfd16e81

Former-commit-id: c8302eb9f8 [formerly b0125d6d7e] [formerly c8302eb9f8 [formerly b0125d6d7e] [formerly 4e9ecdf166 [formerly 902feab2b1bdf0ffdadce76847ee76b9a8c7061e]]]
Former-commit-id: 4e9ecdf166
Former-commit-id: a463f7ef2b [formerly 150c5275ca]
Former-commit-id: 6b46be5bc6
2013-01-29 10:10:54 -06:00
Dustin Johnson
b15abf8279 Issue #1529 Disable menu items when no subscriptions selected
Amend:
  Rebase to 13.2.1

Change-Id: I5265c1036bc31a87a8bacadfd7b3a9219922f073

Former-commit-id: 572733ff56 [formerly fc332a8b9a] [formerly 572733ff56 [formerly fc332a8b9a] [formerly e9ae4c62c1 [formerly 50a157e679cc16cc47653314d538738355aada49]]]
Former-commit-id: e9ae4c62c1
Former-commit-id: a5ecfa14a9 [formerly f6dfeb1823]
Former-commit-id: 2756a184f1
2013-01-29 10:05:52 -06:00
Lee Venable
68d5562118 Merge "Issue #1533 Update the calculated dataset size after loading subset xml" into 13.2.1_delivery
Former-commit-id: d5a0674873 [formerly 98f25434a9] [formerly d5a0674873 [formerly 98f25434a9] [formerly 21059af185 [formerly 4043ba3c71a85148bbd262fd5cd371c290b5bfd8]]]
Former-commit-id: 21059af185
Former-commit-id: 30ab7d00ff [formerly 18b96d33c6]
Former-commit-id: 66f7449b9c
2013-01-29 10:00:37 -06:00
Lee Venable
39a081b349 Merge "Issue #1528 Fix subscription priorities to be the same from domain object to GUI Fix incorrect use of enum ordinal value mappings to priorities. Fix broken bandwidth priority scheduling." into 13.2.1_delivery
Former-commit-id: ef51b388d7 [formerly 06900ccbb7] [formerly ef51b388d7 [formerly 06900ccbb7] [formerly f98e5b35e1 [formerly 19229d6f4fc871d462e8460c02bfb69975e7dada]]]
Former-commit-id: f98e5b35e1
Former-commit-id: df5bcf64de [formerly fb942ec7c2]
Former-commit-id: b2cd64020d
2013-01-29 09:59:59 -06:00
Lee Venable
ee66eb1671 Merge "Issue #1516 Changes to get point information into the proper DataSelection mapping (Planes)." into development
Former-commit-id: 73e44d87fa [formerly 1c61671766] [formerly 73e44d87fa [formerly 1c61671766] [formerly 078cc84047 [formerly 9e32ad8949af4f1e1a4d163056d510c2572f0aec]]]
Former-commit-id: 078cc84047
Former-commit-id: 65fc68e586 [formerly 0ee108f806]
Former-commit-id: 6b415ceab0
2013-01-29 09:19:56 -06:00
Ron Anderson
96acf099c8 Issue #1535 Fix GFE saving last block of grids twice
Change-Id: I3411e27c96b5f0dd79c24e7ba75361582cb6652c

Former-commit-id: ed7784818a [formerly aa2c0ffb60] [formerly ed7784818a [formerly aa2c0ffb60] [formerly 5738910b71 [formerly 16eedd6d46196d08d02abc674c81ed95c403457c]]]
Former-commit-id: 5738910b71
Former-commit-id: 670f23e1c2 [formerly d61a24410a]
Former-commit-id: 3d1159c81f
2013-01-28 19:23:23 -06:00
Richard Peter
7a41e41ca9 Merge "Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed" into development
Former-commit-id: 59ef7758f1 [formerly 6eb11703e4] [formerly 59ef7758f1 [formerly 6eb11703e4] [formerly 2946e97294 [formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]]
Former-commit-id: 2946e97294
Former-commit-id: 7c9b9b0237 [formerly 878cbe1695]
Former-commit-id: 4f61e88c6f
2013-01-28 15:27:23 -06:00
Max Schenkelberg
21d7fb592c Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon.
Change-Id: I74312305d80762e55f64a5ca70fc454063f2f01d

Former-commit-id: 796522b6d0 [formerly 95ccc76272] [formerly 796522b6d0 [formerly 95ccc76272] [formerly 1dbeeb84fb [formerly 493ac37a227259db4c1ea01afa3bd7a9b77095f7]]]
Former-commit-id: 1dbeeb84fb
Former-commit-id: 0019b43582 [formerly 99c8a97f8c]
Former-commit-id: cfcffa3b2e
2013-01-28 14:30:53 -06:00
Dustin Johnson
4afc6cf363 Issue #1533 Update the calculated dataset size after loading subset xml
Change-Id: I9fd94485bed113c68663484fb19daadcbe962a8d

Former-commit-id: 7dae10b701 [formerly 2c068589aa] [formerly 7dae10b701 [formerly 2c068589aa] [formerly 9f7e9692c2 [formerly 747395cffd90554eea099c05affe75487ec304a3]]]
Former-commit-id: 9f7e9692c2
Former-commit-id: 8a2ac02862 [formerly 0fe2711273]
Former-commit-id: ee324a8a28
2013-01-28 12:47:45 -06:00
Roger Ferrel
9fc3f7151f Issue #1516 Changes to get point information into the proper DataSelection mapping (Planes).
Change-Id: Icce03032714b09c67bbb4ec23a426ad1dcdd244b

Former-commit-id: 3bc828f839 [formerly 5a23770931] [formerly 3bc828f839 [formerly 5a23770931] [formerly dd41c60e3f [formerly fcf6a52f2b172c2450f3f417e4256c04f5eefbcd]]]
Former-commit-id: dd41c60e3f
Former-commit-id: d4667e3909 [formerly e6ff72765a]
Former-commit-id: 6a870cbd8d
2013-01-28 08:39:36 -06:00
Bryan Kowal
01ba5e0b5c Issue #1522 - disable Spring during installs and uninstalls
Former-commit-id: 1f7f5932dd [formerly 2046255ef0] [formerly 1f7f5932dd [formerly 2046255ef0] [formerly 7e7b47d934 [formerly b65827ab53309433a66c3c5146bdfb6c41eec2f8]]]
Former-commit-id: 7e7b47d934
Former-commit-id: 0695fbbc8c [formerly fc6feb2329]
Former-commit-id: 3e9d683a7f
2013-01-25 16:19:54 -06:00
Steve Harris
687b789b6b Merge "Issue #1522 - disable Spring during installs and uninstalls" into development
Former-commit-id: 282acc3b41 [formerly ffb536cd46] [formerly 282acc3b41 [formerly ffb536cd46] [formerly e8e8106d42 [formerly de2829de069a3f3280b25fd8a8b7b831377aaebc]]]
Former-commit-id: e8e8106d42
Former-commit-id: fe4b27913c [formerly bac3f97ab6]
Former-commit-id: fe2ddb8fde
2013-01-25 16:02:47 -06:00
Dustin Johnson
7d73d0bd64 Issue #1528 Fix subscription priorities to be the same from domain object to GUI
Fix incorrect use of enum ordinal value mappings to priorities.
Fix broken bandwidth priority scheduling.

Change-Id: Ic9e220966c20e95fcc3f81f0c647ffcdb2fcbca5

Former-commit-id: 50bfcd3fbf [formerly 41c0ff85ff] [formerly 50bfcd3fbf [formerly 41c0ff85ff] [formerly f88a5c1b95 [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]]
Former-commit-id: f88a5c1b95
Former-commit-id: 4ab288ae75 [formerly 4465094fe9]
Former-commit-id: b78257ab11
2013-01-25 14:30:04 -06:00
Steve Harris
a7d7847b06 Merge branch '13.2.1_delivery' into development
Former-commit-id: 618cf868c5 [formerly f673583915] [formerly 618cf868c5 [formerly f673583915] [formerly 827611474f [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]
Former-commit-id: 827611474f
Former-commit-id: a85c81289e [formerly 25fecb8b4f]
Former-commit-id: 895b25bac4
2013-01-25 10:54:51 -06:00
Steve Harris
eafa141b90 13.2.1-2 baseline
Former-commit-id: 0006a2b6cb [formerly 7a7f7c45ca] [formerly 0006a2b6cb [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 251a9c0195 [formerly 1153d80c5b]
Former-commit-id: 27706b8dcb
2013-01-25 09:07:12 -06:00
Lee Venable
4a9d05e1f0 Merge "Issue #1523 - Fix problem with legend keys." into 13.2.1_delivery
Former-commit-id: 0767f1a50b [formerly 9756c431fd] [formerly 0767f1a50b [formerly 9756c431fd] [formerly e4142b63c9 [formerly 2dcf981656f547cc07f8124eadc32ca0204b4b46]]]
Former-commit-id: e4142b63c9
Former-commit-id: 4bf28dd204 [formerly 063ffa26eb]
Former-commit-id: 18f8246019
2013-01-24 16:52:17 -06:00
Nate Jensen
ddf1360954 Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed
Change-Id: I9156f9b29f3e57a668791da28b692420a27dfa96

Former-commit-id: c7172e87a3 [formerly 705bfb0755] [formerly c7172e87a3 [formerly 705bfb0755] [formerly 2dc3abb847 [formerly 505fa329c6700063aec6b62e4fef623b539ad801]]]
Former-commit-id: 2dc3abb847
Former-commit-id: 04a397866a [formerly fa27552c9b]
Former-commit-id: 8726a77052
2013-01-24 16:41:02 -06:00
Bryan Kowal
9c8071e3a1 Issue #1522 - disable Spring during installs and uninstalls
Former-commit-id: ab7f75ad73 [formerly 09735415c5] [formerly ab7f75ad73 [formerly 09735415c5] [formerly 117028c632 [formerly 293dd0c762884f285e455d94708b6e9fcc82023f]]]
Former-commit-id: 117028c632
Former-commit-id: 473368e0c8 [formerly a90266a49f]
Former-commit-id: 1154a1187e
2013-01-24 15:50:09 -06:00
Steve Harris
db11a51d8c Merge "Issue #1496 Changes to move what may be long queries off the UI thread. Changed based on comments in patch set 2." into development
Former-commit-id: 88734ab106 [formerly ca23ba06e5] [formerly 88734ab106 [formerly ca23ba06e5] [formerly 267d860cd1 [formerly 64f9216a13fbad67733c5babde8a8f507bbe399f]]]
Former-commit-id: 267d860cd1
Former-commit-id: bd1393541a [formerly 9b3713763d]
Former-commit-id: ec2aaf2005
2013-01-24 15:02:36 -06:00
Mike Duff
0752ecb4f1 Issue #1523 - Fix problem with legend keys.
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931

Former-commit-id: 478ec72102 [formerly ba5014b162] [formerly 478ec72102 [formerly ba5014b162] [formerly c06ed9f9dc [formerly c625174317778f673a8f3b5062e1bd7832b70ed4]]]
Former-commit-id: c06ed9f9dc
Former-commit-id: 05e9b88566 [formerly fbf92a6d06]
Former-commit-id: f9b7cae879
2013-01-24 12:39:12 -06:00
Mike Duff
2b936f62dc Issue #1357 - fix for data plotting in the x direction.
Former-commit-id: d4d80b0206 [formerly da22ae4a5f] [formerly d4d80b0206 [formerly da22ae4a5f] [formerly b283362a2f [formerly 862ca86596fb59ce5c0b6cbcce320303f6cda3b3]]]
Former-commit-id: b283362a2f
Former-commit-id: 4e30dc629a [formerly da2c03f0ae]
Former-commit-id: eb6789534e
2013-01-24 11:37:23 -06:00
Max Schenkelberg
8bfa47f929 Issue #1474 Fixed MetarPrecipResourceData and LightningResourceData so updates do not required requery. Made an AutoUpdater per plugin so they process independently of each other.
Amend: Only register product alerts in thin client if JMS is not disabled

Change-Id: Ic46daf57ef3ede3aad2a2f067e9764f85f7df9a2

Former-commit-id: a8dc166a1f [formerly 9655d64069] [formerly a8dc166a1f [formerly 9655d64069] [formerly b6a29c38a5 [formerly 115dc26748e0779b4c67cc74fe08c5bf17542632]]]
Former-commit-id: b6a29c38a5
Former-commit-id: ecce9be8ce [formerly 11c8dd6fff]
Former-commit-id: 12318158c2
2013-01-23 16:50:17 -06:00
Ron Anderson
f24c9b9456 Merge "Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads." into development
Former-commit-id: d8878cfd97 [formerly 237b728039] [formerly d8878cfd97 [formerly 237b728039] [formerly ed1e096a11 [formerly 1f809b6b94e9a0d3d96542bea9781cbc6397572d]]]
Former-commit-id: ed1e096a11
Former-commit-id: dd437f3df4 [formerly ee4c0568bf]
Former-commit-id: 86c52667ae
2013-01-23 16:46:42 -06:00
Ron Anderson
259871dfd8 Issue #1524 Fix discrete color bar.
Former-commit-id: 3d838584ed [formerly 718f1da85b] [formerly 3d838584ed [formerly 718f1da85b] [formerly 358c8bdf07 [formerly 7edd57ef71e8a22aa25870477844ba063da0b9d3]]]
Former-commit-id: 358c8bdf07
Former-commit-id: 6f7fa3e4e5 [formerly 3ccfdbc4bb]
Former-commit-id: 01f80e2ff2
2013-01-23 16:37:56 -06:00
Ben Steffensmeier
2c863705f7 Issue #1479 fix mod families
Former-commit-id: 735add55ba [formerly 13fd813660] [formerly 735add55ba [formerly 13fd813660] [formerly a7989d4638 [formerly 76b5a4fcf313e2a028662a1e07871fff2e328d48]]]
Former-commit-id: a7989d4638
Former-commit-id: 3dfe43caac [formerly fbd614258f]
Former-commit-id: d5e0e015b3
2013-01-23 15:47:30 -06:00
Mike Duff
3fa52f2d43 Issue #1523 - Fix for count
Former-commit-id: adbabb6765 [formerly 229a0c77fa] [formerly adbabb6765 [formerly 229a0c77fa] [formerly 3c20aab166 [formerly 35fbd9ce448a17d761bd4f745fd2f1339d82537b]]]
Former-commit-id: 3c20aab166
Former-commit-id: 028fe6cea9 [formerly cb268b76e4]
Former-commit-id: 646282d82f
2013-01-23 15:15:08 -06:00
Mike Duff
006f964dbe Issue #1386 - Remove Save Stats Graph Menu Item.
Former-commit-id: c52ed8a476 [formerly 8c2789a1a7] [formerly c52ed8a476 [formerly 8c2789a1a7] [formerly dc46923886 [formerly a201a22bb4271c94b1fda7f4eaa1f1b74b9d1859]]]
Former-commit-id: dc46923886
Former-commit-id: a7dfd070fd [formerly 2b4ec75a2c]
Former-commit-id: 28658f155b
2013-01-23 15:02:36 -06:00
Roger Ferrel
067198ca1f Issue #1496 Changes to move what may be long queries off the UI thread.
Changed based on comments in patch set 2.

Change-Id: I867f716aac39562f9b8bfaddf187bc80cb5a71ce

Former-commit-id: 3abb6f1026 [formerly ff09ee32ab] [formerly 3abb6f1026 [formerly ff09ee32ab] [formerly 470abe2495 [formerly e54cc8fa001f3c6584bc40a74f461d7021ef77bb]]]
Former-commit-id: 470abe2495
Former-commit-id: 3daf0c7b37 [formerly 58e3bbbe97]
Former-commit-id: e0c01d6c04
2013-01-23 14:08:46 -06:00
Ben Steffensmeier
20a08fcc2c Issue #1521 create grid data access factory and refactor satellite to share common functionality.
Change-Id: I54de0b41b60ccd058124eb79e6f032cb2ea9a3cf

Former-commit-id: bd32a947c7 [formerly a19b51cf2e] [formerly bd32a947c7 [formerly a19b51cf2e] [formerly 3032dc2189 [formerly 2133adac87eaa53977c26700ef656c304e81ee1b]]]
Former-commit-id: 3032dc2189
Former-commit-id: e59bb3c914 [formerly 2e907f4a0e]
Former-commit-id: fc7b0393c5
2013-01-23 11:39:52 -06:00
Mike Duff
df41fe4395 Issue #1357 - Remaining stats items implemented.
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: 712862d96f [formerly ffca969560] [formerly 712862d96f [formerly ffca969560] [formerly 1bc6e7c2e4 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]]]
Former-commit-id: 1bc6e7c2e4
Former-commit-id: dfcce57a0a [formerly 4cd7deb608]
Former-commit-id: ac9f95d1d0
2013-01-23 11:17:36 -06:00
David Gillingham
a4db386f6e Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads.
Change-Id: I1c3c46dde051802fb79b7ead6fb63d766d1d00a6

Former-commit-id: eab83c0f63 [formerly bf6230441f] [formerly eab83c0f63 [formerly bf6230441f] [formerly 88e518725e [formerly 9cd87997f7ae7b51608ac56fcdf4d282339526aa]]]
Former-commit-id: 88e518725e
Former-commit-id: faedefb85d [formerly a1fd2bd32f]
Former-commit-id: 5e6d400e79
2013-01-23 10:09:39 -06:00
Mike Duff
a14438b10a Issue #1520 - Change delete notifications to hide.
Remove accelerators

Change-Id: I2954c1324cbdf1bc4e5577925dbcd10e5faa6156

Former-commit-id: bbc998d372 [formerly ddcd0f8222] [formerly bbc998d372 [formerly ddcd0f8222] [formerly 8efd37da79 [formerly 0378ff80cc3592379ec3d49efc895adafa05109a]]]
Former-commit-id: 8efd37da79
Former-commit-id: 14bfeb0732 [formerly 243c1e15e9]
Former-commit-id: ad1c7c604d
2013-01-23 09:14:48 -06:00
Dustin Johnson
4cec3d4356 Issue #1519 Fix max latency calculations for adhoc queries
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: 504268f0f3 [formerly 6c1818d544] [formerly 504268f0f3 [formerly 6c1818d544] [formerly f730422834 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]]
Former-commit-id: f730422834
Former-commit-id: 2e09d46fea [formerly 516ac1ab9a]
Former-commit-id: 7918b009ff
2013-01-23 08:06:52 -06:00
Steve Harris
7063a0c8d2 Merge branch '13.2.1_delivery' into development
Former-commit-id: cbffccc58e [formerly 1718a19f2d] [formerly cbffccc58e [formerly 1718a19f2d] [formerly 9b6cc68601 [formerly 382363c3418b73ecd4f0ead96315a50fe859f779]]]
Former-commit-id: 9b6cc68601
Former-commit-id: 764efdb8b8 [formerly c7148da94d]
Former-commit-id: 6964c16be7
2013-01-22 21:47:09 -06:00
Nate Jensen
d61e8b9cdb Merge "Issue #1485 fixed bug in CAVE localization where a save() operation would appear to work when it actually failed due to user not being authorized." into 13.2.1_delivery
Former-commit-id: ca7ecbb38a [formerly 2059b9a962] [formerly ca7ecbb38a [formerly 2059b9a962] [formerly 6e89f547e5 [formerly 302d33f6a13017905c5668fb12d710ecb29c4298]]]
Former-commit-id: 6e89f547e5
Former-commit-id: 0ede688235 [formerly ab30ace9ce]
Former-commit-id: 9494e5b520
2013-01-22 18:05:00 -06:00
Steve Harris
c60051d5df Merge branch '13.2.1_delivery' into development
Former-commit-id: cf384edfbb [formerly 11b9bfc187] [formerly cf384edfbb [formerly 11b9bfc187] [formerly 1af055a04b [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]
Former-commit-id: 1af055a04b
Former-commit-id: 8b578c10dc [formerly 29b9077291]
Former-commit-id: b03d5ce450
2013-01-22 16:45:48 -06:00
Lee Venable
fdd9368038 Merge "Issue #1484 - Fix for half timestep changes for 3 hours or less duration. Peer Review comments." into 13.2.1_delivery
Former-commit-id: aecd00423a [formerly 619349b140] [formerly aecd00423a [formerly 619349b140] [formerly b945ce9e6e [formerly ef3d4c5b19c6482ec2ac2d38f90d975b7df1e295]]]
Former-commit-id: b945ce9e6e
Former-commit-id: bc10a17c9f [formerly 511a7d9753]
Former-commit-id: 1dd4ad4b00
2013-01-22 16:26:48 -06:00
Ron Anderson
d0d1b62ab7 Issue #1518 Fixed unloading of D2D model parameters from Grid Manager and related issues with HashMaps with Parms as keys in GFELegendResource.
Change-Id: I483bbe92210ceb3015632d6a25d97ac35d7021a6

Former-commit-id: 9a432a1153 [formerly ce3d102cf9] [formerly 9a432a1153 [formerly ce3d102cf9] [formerly 3682a0e7f4 [formerly 4f7a660ae3fba41240e032220b6599e652ae6750]]]
Former-commit-id: 3682a0e7f4
Former-commit-id: 1062e54d2f [formerly 953f86348e]
Former-commit-id: 48099589c0
2013-01-22 16:12:16 -06:00
Mike Duff
3f25b13a11 Issue #1484 - Fix for half timestep changes for 3 hours or less duration.
Peer Review comments.

Change-Id: Ia96c8857094ad14cf0db89b7642dfd46f333ec47

Former-commit-id: e5e7bc1047 [formerly fc4a6264f6] [formerly e5e7bc1047 [formerly fc4a6264f6] [formerly 96e2192585 [formerly f7d8b074bc95b61e6d6e8dbe47442e944092618f]]]
Former-commit-id: 96e2192585
Former-commit-id: 0ffc71147e [formerly d62088cb0c]
Former-commit-id: 8f388537eb
2013-01-22 14:57:23 -06:00
Ron Anderson
64d4baf536 Issue #1504 GFE: Model data not always appearing automatically without CAVE restart
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58

Former-commit-id: 74cb9aeb53 [formerly 62671efc2a] [formerly 74cb9aeb53 [formerly 62671efc2a] [formerly 20b0761048 [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]]
Former-commit-id: 20b0761048
Former-commit-id: 8e575db69c [formerly 44807ba0d5]
Former-commit-id: cb23960f0e
2013-01-22 14:47:37 -06:00
Ben Steffensmeier
c770b2bd32 Issue #1495 update Product Browser to load all ensemble members
Former-commit-id: cea067868c [formerly 3c62be59c8] [formerly cea067868c [formerly 3c62be59c8] [formerly 1569f5af5d [formerly 2c3ced7beb526f534083ff7b292b7523c76534a9]]]
Former-commit-id: 1569f5af5d
Former-commit-id: ad1ca2feb5 [formerly 1057580201]
Former-commit-id: 18296e08da
2013-01-22 12:12:18 -06:00
Dustin Johnson
87a442717b Merge "Issue #1501 Route notification requests to datadelivery." into 13.2.1_delivery
Former-commit-id: 77923b1cef [formerly 84b6f0217f] [formerly 77923b1cef [formerly 84b6f0217f] [formerly 26e72198b7 [formerly 9fb35681ebe6d17679cd26cc86a53aeb357bcd3b]]]
Former-commit-id: 26e72198b7
Former-commit-id: a83bc7ce7f [formerly 821572355e]
Former-commit-id: c3cfb16075
2013-01-22 11:47:03 -06:00
Dustin Johnson
7da688f138 Issue #1441 Create new datadelivery services plugin
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.

Amend:
  Rebase to HEAD of 13.2.1.

Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa

Former-commit-id: 3ec05a5a9c [formerly 557de162b0] [formerly 3ec05a5a9c [formerly 557de162b0] [formerly 15c2c55ff9 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 756080321e [formerly a3c99f86bb]
Former-commit-id: 2168713505
2013-01-22 11:45:18 -06:00
Bryan Kowal
91e8aa2419 Fix the merge.
Former-commit-id: 0858dfdfe4 [formerly fd7c132266] [formerly 0858dfdfe4 [formerly fd7c132266] [formerly a66024e35b [formerly 9f9da21517569f703c9e732016350b64ef14b98a]]]
Former-commit-id: a66024e35b
Former-commit-id: 1e2a4b7801 [formerly 358132c3c4]
Former-commit-id: 61349238a4
2013-01-22 10:48:04 -06:00
Dustin Johnson
cb174e731d Issue #1501 Route notification requests to datadelivery.
Change-Id: Icde52bafb67e199caeb74ed0078c879ab514836b

Former-commit-id: cda7f4d592 [formerly d956891360] [formerly cda7f4d592 [formerly d956891360] [formerly 500f6050be [formerly 9550a861fab635a8f61c485152e27ec90ebb9cb2]]]
Former-commit-id: 500f6050be
Former-commit-id: a372963fb7 [formerly b4bb2ee454]
Former-commit-id: 2ab171b9ef
2013-01-22 10:19:09 -06:00
Steve Harris
cae136ee16 Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureJob.java

Former-commit-id: 340d2009f7 [formerly df9ac3685e] [formerly 340d2009f7 [formerly df9ac3685e] [formerly 3a772f41cf [formerly a0bcc2276fb95097cfc10869f0aa1ee48189fc3a]]]
Former-commit-id: 3a772f41cf
Former-commit-id: 5b516ebb6f [formerly 111d5afb3a]
Former-commit-id: 922d0493fb
2013-01-22 09:40:50 -06:00
Dustin Johnson
6314e94764 Issue #1501 Include subscription on activation/deactivation notification, remove race condition of table update.
Change-Id: Ic3f8ff634136a9830cba42befc7f41c2554698aa

Former-commit-id: 94a0cd5733 [formerly 0281da10cc] [formerly 94a0cd5733 [formerly 0281da10cc] [formerly 2eda48aa0d [formerly dd07cad3e6b2471fc4371471918078498f05d01e]]]
Former-commit-id: 2eda48aa0d
Former-commit-id: 58b3edd7df [formerly c7189052e8]
Former-commit-id: 2df1cb5d53
2013-01-21 21:24:48 -06:00
Max Schenkelberg
babef87edb Issue #1485 fixed bug in CAVE localization where a save() operation would appear to work when it actually failed due to user not being authorized.
Change-Id: Ib37e5be2163d750ac24827c2868162b06c290390

Former-commit-id: 8058260830 [formerly 5c51083f35] [formerly 8058260830 [formerly 5c51083f35] [formerly 6fd6b2e42d [formerly 3b5af8689a2fc2a7ee783d896c624fbc5581b58a]]]
Former-commit-id: 6fd6b2e42d
Former-commit-id: 3d459dd57c [formerly 2c05f3c179]
Former-commit-id: 75135bf8f6
2013-01-21 14:58:16 -06:00
Nate Jensen
977cf22051 Merge "Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it." into development
Former-commit-id: d725a23922 [formerly 36fc48eb53] [formerly d725a23922 [formerly 36fc48eb53] [formerly d45d793d36 [formerly 73d470a83799446554b4dd86eb20638c0d5fc48f]]]
Former-commit-id: d45d793d36
Former-commit-id: e0452a81c7 [formerly e969a8c438]
Former-commit-id: 6400ecbe98
2013-01-21 11:42:37 -06:00