Commit graph

1745 commits

Author SHA1 Message Date
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
Dave Hladky
4f536836cb Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets.
Change-Id: I6035ad79a31f9ada9910d599d6529ca91ff03173

Former-commit-id: 1c39b88ba4 [formerly 786afee256] [formerly 1c39b88ba4 [formerly 786afee256] [formerly 5d8851b214 [formerly 07d90ad640806abd237fb13e1476adc1fb8d35c0]]]
Former-commit-id: 5d8851b214
Former-commit-id: bd7e8a6968 [formerly c45822f09b]
Former-commit-id: 409508d3e2
2013-01-21 08:29:29 -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
Greg Armendariz
db31d16e61 Merge "Issue #1508: Improve capture to grab screen shots and multiple jstacks to track thread state over time" into 13.2.1_delivery
Former-commit-id: edda76ad75 [formerly 9d06f6ed6d] [formerly edda76ad75 [formerly 9d06f6ed6d] [formerly f7b046fa0d [formerly 0356abb43bea7c9bcf7fcfc9c43d46a2fa611389]]]
Former-commit-id: f7b046fa0d
Former-commit-id: 817162c467 [formerly dda78c073a]
Former-commit-id: 26c8921b73
2013-01-18 14:30:12 -06:00
Richard Peter
a08e7f9fae Issue #1508: Improve capture to grab screen shots and multiple jstacks to track thread state over time
Change-Id: I2d41e348d1cd4187887ec47c18f3b6d768ced8fd

Former-commit-id: b83e46a345 [formerly a1c58ab36d] [formerly b83e46a345 [formerly a1c58ab36d] [formerly af105bfe0f [formerly 8c232b02fbdd268f19e65676d68311b47469fcf3]]]
Former-commit-id: af105bfe0f
Former-commit-id: ee9adb9764 [formerly f5c8534098]
Former-commit-id: 4ebbe408a8
2013-01-18 13:55:56 -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
Richard Peter
670ee08715 Merge "Issue #1501 Use registry version of subscription when sending notification responses" into 13.2.1_delivery
Former-commit-id: f553d99665 [formerly 08e7ce3da9] [formerly f553d99665 [formerly 08e7ce3da9] [formerly f2ed67c841 [formerly 05dde10fa4bab4b93f7a2f25c368a2a99acae581]]]
Former-commit-id: f2ed67c841
Former-commit-id: a41c4056af [formerly 683fdaf376]
Former-commit-id: 876b7d9502
2013-01-17 17:06:52 -06:00
Nate Jensen
41f4599ba8 Issue #1497 ported python fillEditArea to Java to boost speed
Change-Id: Idbc2a027914e1a584d36551781df21ed9bf63c36

Former-commit-id: 449b3735f0 [formerly 278ea6d24e] [formerly 449b3735f0 [formerly 278ea6d24e] [formerly 15e1731ef3 [formerly 32cf1236638c64a3e047398ca829d79d3b7cb5ef]]]
Former-commit-id: 15e1731ef3
Former-commit-id: 492634b6f5 [formerly f70f8d1f4f]
Former-commit-id: ec5806fb58
2013-01-17 16:14:56 -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
Dustin Johnson
e3cf0246c7 Issue #1412 Check file last modified times each time role data is requested
Change-Id: Ieae84ad3106e3aa0cf4d253a10c27e8c9c60ecaa

Former-commit-id: b1ce19e41d [formerly 74d5a70c30] [formerly b1ce19e41d [formerly 74d5a70c30] [formerly 037dabb683 [formerly b7e577237df9e157fdb218af48c41f6209ff2bfb]]]
Former-commit-id: 037dabb683
Former-commit-id: fce3f8bec9 [formerly 6468029207]
Former-commit-id: 799cf85f82
2013-01-17 12:48:01 -06:00
Nate Jensen
525ce1e0ac Merge "Issue #1481 slight clean up of radar, make alphanumeric values empty for any products that do not matter" into 13.2.1_delivery
Former-commit-id: 40ebb52178 [formerly cd45e662fd] [formerly 40ebb52178 [formerly cd45e662fd] [formerly 391a179bdb [formerly 3824077f84deb52ee2d7adc7b19f5134e6788ddb]]]
Former-commit-id: 391a179bdb
Former-commit-id: aacdfed4a3 [formerly 8ee59505b6]
Former-commit-id: bd5a0da4cd
2013-01-17 09:27:52 -06:00
Brad Gonzales
379b354ffc Issue #1448 Added app context checks to ArealQpeGenSrv MpeLightningSrv. Uncommented run_report_alarm call in run_alarm_whfs. Moved internal methods to private in MpeRUCFreezingLevel.
Amend: removed log statments from run_alarm_whfs based on review comments.
       removed tab.

Change-Id: I05cd853814376bfb0ac61e3340210be928a35c57

Former-commit-id: 1a3e279226 [formerly 31c48be1c5] [formerly 1a3e279226 [formerly 31c48be1c5] [formerly 69eccc1d80 [formerly 86c094b2d301dbf6ead2d74bc64b3596cf2ef6d8]]]
Former-commit-id: 69eccc1d80
Former-commit-id: a90db41abd [formerly e1e5001736]
Former-commit-id: 6277097450
2013-01-16 15:23:53 -06:00
Richard Peter
8bc07b9c87 Merge "Issue #1420 - More Rules changes. Peer review comments" into 13.2.1_delivery
Former-commit-id: 6bc65147b3 [formerly f6749331c9] [formerly 6bc65147b3 [formerly f6749331c9] [formerly 86acbf5470 [formerly fc818294ba14c7b957cf6aedae153d3a18b5219b]]]
Former-commit-id: 86acbf5470
Former-commit-id: 15115e1ac0 [formerly 8d72673d7a]
Former-commit-id: a832f46f6b
2013-01-16 15:08:37 -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
Richard Peter
97cc1997ec Merge "Issue #1493 fix grib2 decoder to handle ensembles" into 13.2.1_delivery
Former-commit-id: 312b786d02 [formerly 276fee1b70] [formerly 312b786d02 [formerly 276fee1b70] [formerly b98ed1f8e7 [formerly 8b0a1178ecd824a3b7f399a187f5c152025aa58e]]]
Former-commit-id: b98ed1f8e7
Former-commit-id: e4651df11e [formerly 6d3159ea80]
Former-commit-id: 6f9c3c3074
2013-01-16 12:41:32 -06:00
Dustin Johnson
4ab214c5d7 Issue #1487 Use XML to store stats grouping information in the database
Amend:
  Increase length of grouping column to 1024.
  Add deltaScript to convert the grouping column to xml.
  Change regex to replace any pluginName fields with dashes, not just satellite-mcidas.

Change-Id: I0d5081645c5f11909e5778c8e555d5da3cf77e1a

Former-commit-id: c12b46027f [formerly b627dfc054] [formerly c12b46027f [formerly b627dfc054] [formerly 19d3a14d4f [formerly 38ecb1f36dce4717d0ba9066c8cd22116770d34b]]]
Former-commit-id: 19d3a14d4f
Former-commit-id: ecb1d5564a [formerly c750e27389]
Former-commit-id: 19558ae3fa
2013-01-16 12:21:11 -06:00
Ben Steffensmeier
46f252319e Issue #1493 fix grib2 decoder to handle ensembles
Former-commit-id: 02e0433afc [formerly 7d155653bc] [formerly 02e0433afc [formerly 7d155653bc] [formerly 4595797f5f [formerly c694df943bb70f2903fe495400061444a67d3357]]]
Former-commit-id: 4595797f5f
Former-commit-id: e7969ff457 [formerly fb237583e2]
Former-commit-id: e8255e320d
2013-01-15 18:08:19 -06:00
Richard Peter
90d7ef6fc3 Merge "Issue #1489 Harvester directories not created causing harvester to not start" into 13.2.1_delivery
Former-commit-id: e8a4939150 [formerly 09fb2d0919] [formerly e8a4939150 [formerly 09fb2d0919] [formerly 0e684515c6 [formerly 8388122d8273aca20a9c4292035049957a091a69]]]
Former-commit-id: 0e684515c6
Former-commit-id: cb3f43b17a [formerly 8258395d58]
Former-commit-id: 81bfd386a2
2013-01-15 16:11:35 -06:00
Matt Nash
68911edc7f Issue #1481 slight clean up of radar, make alphanumeric values empty for any products that do not matter
Change-Id: I88847a609e57e8057a480653add74f0c5c5b4934

Former-commit-id: 3f8cf19d71 [formerly 79e95d787c] [formerly 3f8cf19d71 [formerly 79e95d787c] [formerly db1dfd3001 [formerly 1ac8a6d7320254f4f69160f764c86e8bd4b35d66]]]
Former-commit-id: db1dfd3001
Former-commit-id: a78f914b92 [formerly 9f8cc4ec5d]
Former-commit-id: 47de98d4d7
2013-01-15 16:05:25 -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
Dave Hladky
50d1017f46 Issue #1489 Harvester directories not created causing harvester to not start
Change-Id: Id5caa14ebc33451f95e5d1e9d685c4094091ff63

Former-commit-id: 34577b50dd [formerly 9b75eaf869] [formerly 34577b50dd [formerly 9b75eaf869] [formerly b6bf73134e [formerly 08b944fa708ba12ac6df63b64501ff20f4738063]]]
Former-commit-id: b6bf73134e
Former-commit-id: fa9dc500a3 [formerly ccf832dd38]
Former-commit-id: d1c940cd8e
2013-01-15 12:41:15 -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
Steve Harris
846ac28155 Issue #1408 - Fix syntax errors in server config
Former-commit-id: 9a3be4460e [formerly aee6a65e4c] [formerly 9a3be4460e [formerly aee6a65e4c] [formerly a5eac8ec3c [formerly 29e1fc44a04dff56747b60d904e49d87cebf4f85]]]
Former-commit-id: a5eac8ec3c
Former-commit-id: e202452ace [formerly 31f190865e]
Former-commit-id: 72f3894768
2013-01-15 09:47:25 -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
c7f02b18c5 Merge "Issue #1477 Permissions broken for ingestDAT SQL querries." into development
Former-commit-id: a8495324f7 [formerly de7d7b07ef] [formerly a8495324f7 [formerly de7d7b07ef] [formerly 9ef997e3e8 [formerly 83ee4be25f2ad1e0a2f30f2695a2a65200abd787]]]
Former-commit-id: 9ef997e3e8
Former-commit-id: 997ab69bf0 [formerly 94eea3065b]
Former-commit-id: bdc637110a
2013-01-14 17:34:31 -06:00
Richard Peter
ad6bd4ace8 Merge "Issue #1482 ignore malformed gribModel files" into development
Former-commit-id: 5ec69e843e [formerly 89b08fdd2f] [formerly 5ec69e843e [formerly 89b08fdd2f] [formerly 8192515b06 [formerly fd8bd261b089b317e4ce66ca0e0aa6d5861a1b09]]]
Former-commit-id: 8192515b06
Former-commit-id: 9154383e5a [formerly 0b57b16cda]
Former-commit-id: a1517b8daa
2013-01-14 17:34:17 -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
Ben Steffensmeier
e65ba73968 Issue #1482 ignore malformed gribModel files
Former-commit-id: fadf4d58cf [formerly 685c09de47] [formerly fadf4d58cf [formerly 685c09de47] [formerly 9cfa09e507 [formerly 272da22e4ce82215aa4b00ce7624811f81327889]]]
Former-commit-id: 9cfa09e507
Former-commit-id: 80e307c96e [formerly 8fdfc14c29]
Former-commit-id: cc70fe7a41
2013-01-14 15:10:56 -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
Richard Peter
6825617baf Merge "Issue #1473: Fix Alarm Alert NPE" into development
Former-commit-id: 621a4cd147 [formerly 0f705ac355] [formerly 621a4cd147 [formerly 0f705ac355] [formerly e176fcbf06 [formerly edaf980163ff2f3770cb125b9a837a23ca1b16b2]]]
Former-commit-id: e176fcbf06
Former-commit-id: 521e7cf5af [formerly 157e75f7aa]
Former-commit-id: d446c490ba
2013-01-14 11:55:35 -06:00
Dave Hladky
64c293c460 Issue #1477 Permissions broken for ingestDAT SQL querries.
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b

Former-commit-id: 65cfb39ba5 [formerly 30733d3b25] [formerly 65cfb39ba5 [formerly 30733d3b25] [formerly c9160ac945 [formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]]
Former-commit-id: c9160ac945
Former-commit-id: e746688671 [formerly c5f71be70a]
Former-commit-id: 936d0f143d
2013-01-14 11:38:45 -06:00
Ben Steffensmeier
1ffcc3ada2 Issue #1464 fix saving of spatial subsets.
Former-commit-id: 0933461f40 [formerly bc5233748a] [formerly 0933461f40 [formerly bc5233748a] [formerly c8ef480815 [formerly 185311ebfda70bf29adb3898682f37ea55bca467]]]
Former-commit-id: c8ef480815
Former-commit-id: 053b673790 [formerly 4fd3d47385]
Former-commit-id: 244de069da
2013-01-14 10:49:14 -06:00
Richard Peter
bd03eaff5f Issue #1473: Fix Alarm Alert NPE
Change-Id: If9208dbed2b4b25c2dbedd4d7058b347028d9fff

Former-commit-id: 1d61d65a1e [formerly a4f3a2a174] [formerly 1d61d65a1e [formerly a4f3a2a174] [formerly e71db46db9 [formerly ed157e199cb95e5db44095b638332bb9563548d5]]]
Former-commit-id: e71db46db9
Former-commit-id: c68dcf4554 [formerly 8ea3bb4d17]
Former-commit-id: 58d09ab54b
2013-01-14 09:59:28 -06:00
Richard Peter
f0dcd53a2c Merge "Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state." into development
Former-commit-id: 854bd1d4e0 [formerly d2a1388b0e] [formerly 854bd1d4e0 [formerly d2a1388b0e] [formerly 061fa21537 [formerly 888b839152d86c536b249e795666c596a213da86]]]
Former-commit-id: 061fa21537
Former-commit-id: fdf83d8623 [formerly 6176588496]
Former-commit-id: a82f86b26b
2013-01-11 16:32:03 -06:00