Commit graph

1161 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
152a94adf4 Issue #1509 garbage collect after each procedure run
Change-Id: I7792d8bc186d6cef0fea38eccb657af040746fd7

Former-commit-id: c5d725bc7e [formerly bd9123fb3a] [formerly c5d725bc7e [formerly bd9123fb3a] [formerly add161ae2f [formerly fa239d3e7413c7441ba4440f0fe10f9e373de3df]]]
Former-commit-id: add161ae2f
Former-commit-id: 414004fabf [formerly 633af5e497]
Former-commit-id: 1a1eb9bf3b
2013-01-21 09:26:43 -06:00
Richard Peter
006dbb78cf Merge "Issue #1495 add ensemble selection tab to subset dialog Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15" into 13.2.1_delivery
Former-commit-id: ac3b484474 [formerly 76f9e42fd3] [formerly ac3b484474 [formerly 76f9e42fd3] [formerly 9feb73c161 [formerly 4eb1e71df46c7ceaa5bf523c02821228da42460e]]]
Former-commit-id: 9feb73c161
Former-commit-id: d421b7208a [formerly 5acc5996d3]
Former-commit-id: 06d25c6c95
2013-01-18 15:43:16 -06:00
Ben Steffensmeier
c659ffb227 Issue #1495 add ensemble selection tab to subset dialog
Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15

Former-commit-id: d06ef00715 [formerly f0d1c1a737] [formerly d06ef00715 [formerly f0d1c1a737] [formerly 14f3c3b3bf [formerly e884c8e79f05af8fb3252fa7a492d232ba090715]]]
Former-commit-id: 14f3c3b3bf
Former-commit-id: 0ec9848c96 [formerly a28d09edbf]
Former-commit-id: 88dd263c34
2013-01-18 15:42:08 -06:00
Richard Peter
f891a71692 Merge "Issue #1495 enable ensemble subset requests in opendap. Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a" into 13.2.1_delivery
Former-commit-id: 7cc497c663 [formerly 9f9020db61] [formerly 7cc497c663 [formerly 9f9020db61] [formerly bf18ba9214 [formerly b940fe556d1421d3709ff6c798ee0a39ae09af10]]]
Former-commit-id: bf18ba9214
Former-commit-id: 0f208693ec [formerly 2e5883c56e]
Former-commit-id: 0e6209822e
2013-01-18 15:35:56 -06:00
Ben Steffensmeier
cc33f33872 Issue #1495 enable ensemble subset requests in opendap.
Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a

Former-commit-id: 928cb3b00f [formerly eb821d7580] [formerly 928cb3b00f [formerly eb821d7580] [formerly 94ba8511cb [formerly ddaf9e6c69221600deedfbaf991a3936d0bb711e]]]
Former-commit-id: 94ba8511cb
Former-commit-id: 41a0a0e4e4 [formerly 7e3b6d12f6]
Former-commit-id: 0232b77e85
2013-01-18 14:58:10 -06:00
Ben Steffensmeier
c67345f95a Issue #1502 fix grid sampling unit null pointer.
Former-commit-id: f814fd22a3 [formerly b6fb3706bb] [formerly f814fd22a3 [formerly b6fb3706bb] [formerly 5a07b36fa4 [formerly db0a4825b8360afaada2a8f8363108464e61f474]]]
Former-commit-id: 5a07b36fa4
Former-commit-id: 0b672c9c8c [formerly 57ef4597e8]
Former-commit-id: 77d8f4ec1d
2013-01-18 11:19:15 -06:00
Ben Steffensmeier
8d6d821ac0 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: a9654f859a [formerly f0af056d97] [formerly a9654f859a [formerly f0af056d97] [formerly ec199ad7d1 [formerly deeff9eae06f096612b65832a344e5d05a36db07]]]
Former-commit-id: ec199ad7d1
Former-commit-id: 50d1561165 [formerly 3bfba5b771]
Former-commit-id: ca6ab4a945
2013-01-18 10:59:43 -06:00
Mike Duff
4119d2bb88 Issue #1386 - Change menu text to read Save Graph Image.
Former-commit-id: 754fbf637e [formerly 5b6ec484c0] [formerly 754fbf637e [formerly 5b6ec484c0] [formerly 592b2d9088 [formerly c8e849b1636d9429215a36ba85febf805cdd4fc6]]]
Former-commit-id: 592b2d9088
Former-commit-id: b3c1a39a24 [formerly d0d05f975d]
Former-commit-id: 2f8c734d8e
2013-01-18 09:28:43 -06:00
Nate Jensen
c71320d922 Issue #1497 fix build
Former-commit-id: 13b5619297 [formerly 6e0f0d330e] [formerly 13b5619297 [formerly 6e0f0d330e] [formerly b52aa82213 [formerly 3b30fcffe24d19c6c694d9519d1a515843248d32]]]
Former-commit-id: b52aa82213
Former-commit-id: cc0725f0b7 [formerly 98ec6fcc1c]
Former-commit-id: d269e1953b
2013-01-17 18:42:38 -06:00
Dustin Johnson
1e4df6722c Issue #1501 Use registry version of subscription when sending notification responses
Change-Id: I96622e8f1d2236ade47d4c5a11ad41b750bc7962

Former-commit-id: 9f775d2dd7 [formerly d9064bdc98] [formerly 9f775d2dd7 [formerly d9064bdc98] [formerly 38036a0e8b [formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]]
Former-commit-id: 38036a0e8b
Former-commit-id: 9681f57fac [formerly 13a75fabad]
Former-commit-id: 6266e3e44c
2013-01-17 14:53:36 -06:00
Mike Duff
fc87600adb Issue #1420 - More Rules changes.
Peer review comments

Change-Id: I3ed89b332764bba2d995a248e361d20c1eec6edf

Former-commit-id: 1df1b5a94d [formerly 2a31447d6d] [formerly 1df1b5a94d [formerly 2a31447d6d] [formerly 8d0a79703f [formerly 84f2d0ed39e11059359558676c988a0bf1e989b9]]]
Former-commit-id: 8d0a79703f
Former-commit-id: 72a70a6eaf [formerly c6924b6920]
Former-commit-id: 7a750e72e3
2013-01-16 14:34:55 -06:00
Brad Gonzales
beed5ad195 Issue #1452 Clear current filters when creating a new filter configuration.
Change-Id: I7562e05f404b7b3bc746a168d72601520d3a8500

Former-commit-id: 5fd396acaf [formerly 026c98298b] [formerly 5fd396acaf [formerly 026c98298b] [formerly e7ecc52e25 [formerly c4f47262403a56a0e6fe28bb1b5ac523fb91e43f]]]
Former-commit-id: e7ecc52e25
Former-commit-id: 382a21f3a2 [formerly 253ac8f1d3]
Former-commit-id: 5693e82505
2013-01-15 15:50:43 -06:00
Dave Hladky
4fd7346b03 Issue #1475 QPF standalonoe displays appear slow
Change-Id: I352de7f76ade5d3d981b3c6206086955c2243f6a

Former-commit-id: ffd3faa84b [formerly 0f7a64798d] [formerly ffd3faa84b [formerly 0f7a64798d] [formerly 6822591e1a [formerly 6e7c86aba7103c445823ac2a11a2241939e4b6c2]]]
Former-commit-id: 6822591e1a
Former-commit-id: 9d935baf22 [formerly 81c9f8e21e]
Former-commit-id: 5b9f40661a
2013-01-15 15:50:27 -06:00
Richard Peter
84e0f2cf1f Merge "Issue #1286 Fix bugs found during 1286 testing" into 13.2.1_delivery
Former-commit-id: d30a607764 [formerly c8d963d541] [formerly d30a607764 [formerly c8d963d541] [formerly dc6ee0b9e1 [formerly e2516f60d0748830d5849f42819e2dcc66b67bb6]]]
Former-commit-id: dc6ee0b9e1
Former-commit-id: fe2c8b320e [formerly b456405145]
Former-commit-id: aef2f39a62
2013-01-15 15:37:42 -06:00
Max Schenkelberg
5d6421259b Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously.
Amend: Switched to proper ticket

Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9

Former-commit-id: 9aac1d2871 [formerly 02e7c79de9] [formerly 9aac1d2871 [formerly 02e7c79de9] [formerly aa88b83859 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]]
Former-commit-id: aa88b83859
Former-commit-id: 410abb1144 [formerly c6b6823228]
Former-commit-id: f35d30e675
2013-01-15 14:13:36 -06:00
Dustin Johnson
1070de3f2d Issue #1286 Fix bugs found during 1286 testing
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 99f8d40bed [formerly 3d74a68e94] [formerly 99f8d40bed [formerly 3d74a68e94] [formerly 2cf52d976b [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]
Former-commit-id: 2cf52d976b
Former-commit-id: 94e95f3e07 [formerly aa7acedf0a]
Former-commit-id: 5cd31fc0b7
2013-01-15 10:18:14 -06:00
Richard Peter
e838f2db25 Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a966546e31 [formerly 3fb7d96ec1] [formerly a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 79ef100838 [formerly 345dfd2ca9]
Former-commit-id: cd2014bf8d
2013-01-14 18:07:17 -06:00
Richard Peter
ff672cac47 Merge "Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development" into development
Former-commit-id: d2cc93281a [formerly 59368e93e1] [formerly d2cc93281a [formerly 59368e93e1] [formerly 4176d078a7 [formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]]
Former-commit-id: 4176d078a7
Former-commit-id: ea7d2eaff1 [formerly 2049e40d87]
Former-commit-id: 57e68e7872
2013-01-14 17:49:29 -06:00
Lee Venable
6101a97ad0 Merge "Issue #1480 guarantee that framesInfo returned from descriptor is always valid." into development
Former-commit-id: c3dec53498 [formerly 7009876544] [formerly c3dec53498 [formerly 7009876544] [formerly a3a7dc44c9 [formerly 2069b8265416fae4c8fbeb37b4686b85428eca7f]]]
Former-commit-id: a3a7dc44c9
Former-commit-id: baa5496a72 [formerly 4e2b009db0]
Former-commit-id: 4c2353f110
2013-01-14 17:47:59 -06:00
Steve Harris
b4556ea28f 13.2.1-1 baseline
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d [formerly 8713dfc5ca]
Former-commit-id: ebff2a6275
2013-01-14 18:42:21 -05:00
Richard Peter
ef2dc06b69 Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: ae3ea75cbf [formerly 1318f53902] [formerly ae3ea75cbf [formerly 1318f53902] [formerly b8e42dabc0 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: fa6247baf7 [formerly aa9e16b038]
Former-commit-id: 096134d917
2013-01-14 17:38:38 -06:00
Richard Peter
9cf234df1e Merge "Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository." into development
Former-commit-id: 461a503837 [formerly 32d4bc3d9f] [formerly 461a503837 [formerly 32d4bc3d9f] [formerly 69c6cfd196 [formerly c8cf77295c7f53dbd2821271298391ba136e034c]]]
Former-commit-id: 69c6cfd196
Former-commit-id: ab38a1f89b [formerly a634690867]
Former-commit-id: 2f507e1245
2013-01-14 17:33:22 -06:00
Richard Peter
e59ea72456 Issue #1408: Merge branch 'ss_builds' (13.1.2-6) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.core/res/spring/viz.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/auth/UserController.java
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/OrLevelNode.java
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogMonitorAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeSeasAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsUserManager.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourSupport.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/CoverageUtils.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/HydroDisplayManager.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/AwipsCalendar.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualListConfig.java
	cave/ohd.hseb.common/externaljars/jdom.jar
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/bin/setup.env
	edexOsgi/build.edex/esb/bin/wrapper.conf
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/build.edex/esb/etc/registry.sh
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyMessage.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyQueue.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticDataGenerator.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribParamInfoLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridModel.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/alias/grib.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid104.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_ECMWF-98.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_FSL-59.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NOAA-161.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NWSTG-8.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RSMC-54.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_UKMET-74.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/grid/IGridData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/mapping/DatasetIdMapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.level/src/com/raytheon/uf/common/dataplugin/level/mapping/LevelMapper.java
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/subgrid/SubGrid.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/lookup/ParameterLookup.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/mapping/ParameterMapper.java
	edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ConvertUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/AliasNamespace.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/Mapper.java
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteServerRequestRouter.java
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
	edexOsgi/com.raytheon.uf.edex.gridcoverage/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
	edexOsgi/com.raytheon.uf.edex.gridcoverage/src/com/raytheon/uf/edex/gridcoverage/GetGridCoverageHandler.java
	edexOsgi/com.raytheon.uf.edex.ohd/resources/com.raytheon.uf.edex.ohd.properties
	edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridInfoCache.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-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/handler/GraphDataHandler.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: I80504ec890827bb512be138f319380d04bdfc402

Former-commit-id: 1a1a69d38c [formerly 970216e4c9] [formerly 1a1a69d38c [formerly 970216e4c9] [formerly 19d923f387 [formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]
Former-commit-id: 19d923f387
Former-commit-id: f1262388ce [formerly 8ccc791566]
Former-commit-id: 2575e4e4ea
2013-01-14 16:53:05 -06:00
Brad Gonzales
7be1cf3631 Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository.
Change-Id: I49b715f4b9f998e933948d3803194aa41deec979

Former-commit-id: 1644eee264 [formerly 5bbe5d5dbf] [formerly 1644eee264 [formerly 5bbe5d5dbf] [formerly 72cb336592 [formerly 9341aa5fe927e38db949be280a323300cd9fc62d]]]
Former-commit-id: 72cb336592
Former-commit-id: bd8eaa6dc8 [formerly 881cc10e84]
Former-commit-id: 063551fb18
2013-01-14 14:47:51 -06:00
Ben Steffensmeier
08311ccdf5 Issue #1480 guarantee that framesInfo returned from descriptor is always valid.
Former-commit-id: e00348a124 [formerly cf8a9e3f64] [formerly e00348a124 [formerly cf8a9e3f64] [formerly ac9ba67919 [formerly c2b715458167c4438d2c2c35b3b0cb54c2a9cc9c]]]
Former-commit-id: ac9ba67919
Former-commit-id: c1ae999c81 [formerly 147a379a81]
Former-commit-id: 6b95c98e8e
2013-01-14 14:30:17 -06:00
Richard Peter
e2207bce78 Merge "Issue #1464 fix saving of spatial subsets." into development
Former-commit-id: fe28e371a6 [formerly 65715d4154] [formerly fe28e371a6 [formerly 65715d4154] [formerly e180a2ff86 [formerly 7a5c93c668bb409857ff0d50a9506c67cae7a081]]]
Former-commit-id: e180a2ff86
Former-commit-id: 62d3bd6837 [formerly 712fb1cb05]
Former-commit-id: f298a42853
2013-01-14 11:56:33 -06:00