Ron Anderson
38e4a75c49
Merge "Issue #1504 Fix merge error" into 13.2.1_delivery
...
Former-commit-id: abb36c3114
[formerly a1d7a1cbc9
] [formerly abb36c3114
[formerly a1d7a1cbc9
] [formerly b7abb8d4e4
[formerly 3a231135b5686e0c26e7d43d74d742b29ce88b1b]]]
Former-commit-id: b7abb8d4e4
Former-commit-id: e9855ab55a
[formerly 8fb70d5ddc
]
Former-commit-id: 05de6bdf6b
2013-01-22 17:50:40 -06:00
Ron Anderson
cb3ccc4533
Issue #1504 Fix merge error
...
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6
Former-commit-id: 5c6af0d0a1
[formerly c83667e9b5
] [formerly 5c6af0d0a1
[formerly c83667e9b5
] [formerly 2f4badad98
[formerly f0e56aa95e2f06c04cd02f7c429736a6ba88feb5]]]
Former-commit-id: 2f4badad98
Former-commit-id: cb3e710d4c
[formerly 8e15531e08
]
Former-commit-id: 6b2815a40c
2013-01-22 16:54:04 -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
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
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
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
Dustin Johnson
ce68428901
Merge "Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets." into 13.2.1_delivery
...
Former-commit-id: 04398e0aa4
[formerly c1f03f7d81
] [formerly 04398e0aa4
[formerly c1f03f7d81
] [formerly 350becc94f
[formerly 2b3039f0f55655d484867701b4f28bfae12aece9]]]
Former-commit-id: 350becc94f
Former-commit-id: 8aed30442e
[formerly aa85e0c3ca
]
Former-commit-id: 51a9a32485
2013-01-21 12:23:08 -06:00
Dave Hladky
220296333b
Issue #1513 Updated the way level lookups are created
...
Change-Id: Ie1120707af608910a88c407ca8af8cf19b964555
Former-commit-id: d0ff35051e
[formerly 53ceda6a62
] [formerly d0ff35051e
[formerly 53ceda6a62
] [formerly cf1c674c2e
[formerly a6b74b9bd1781ca61e364e24f61bb647602fcce6]]]
Former-commit-id: cf1c674c2e
Former-commit-id: 82cd0a1b58
[formerly e497d39d75
]
Former-commit-id: 037353dda2
2013-01-21 11:19:00 -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
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
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
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
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
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
Steve Harris
92f1e9416c
13.1.2-8 baseline
...
Former-commit-id: b864fdc303
[formerly e6217a17de
] [formerly b864fdc303
[formerly e6217a17de
] [formerly 06b8eb8db0
[formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 7d0109a349
[formerly 3caf592e83
]
Former-commit-id: 066c14dcd2
2013-01-11 16:19:07 -05:00
Steve Harris
1ef10eaf2c
13.1.2-7 baseline
...
Former-commit-id: a8d90da9c0
[formerly 4f86b07eb0
] [formerly a8d90da9c0
[formerly 4f86b07eb0
] [formerly 42189b5f88
[formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: f1256f2a9e
[formerly b7f1dbe72b
]
Former-commit-id: 775a338b90
2013-01-11 16:12:09 -05:00
Richard Peter
d72901c86c
Merge "Issue #1412 Move useradmin plugins out of datadelivery specific feature" into development
...
Former-commit-id: 71d8907b6e
[formerly 8df96c2a14
] [formerly 71d8907b6e
[formerly 8df96c2a14
] [formerly 2cb7e1fe2c
[formerly f65462361c68b9757493f673463c731d0ded9dba]]]
Former-commit-id: 2cb7e1fe2c
Former-commit-id: 74092ae046
[formerly 90ec121020
]
Former-commit-id: da60306633
2013-01-11 12:53:37 -06:00
Dustin Johnson
b462fe0286
Issue #1412 Move useradmin plugins out of datadelivery specific feature
...
Change-Id: Ide1f64a373d2d65b02fb92afd8e8b484cc620451
Former-commit-id: 08911772bf
[formerly 7d10c7fac5
] [formerly 08911772bf
[formerly 7d10c7fac5
] [formerly f44a2f6ea9
[formerly b4908a75e84a6df2ed97e517ac096a7d6693ba2e]]]
Former-commit-id: f44a2f6ea9
Former-commit-id: 5e4a1b7bd9
[formerly bd8dbc39e7
]
Former-commit-id: 69c42d3e72
2013-01-11 12:39:00 -06:00
Richard Peter
87b4521a69
Merge "Issue #1453 Fix handling of active period across year boundary" into development
...
Former-commit-id: 58242a600c
[formerly 32e5d79e7a
] [formerly 58242a600c
[formerly 32e5d79e7a
] [formerly a2c3db2ee7
[formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: cf815a4c72
[formerly d3df89181f
]
Former-commit-id: a9f01d5846
2013-01-11 12:37:05 -06:00
Dustin Johnson
ef31fc45a9
Issue #1453 Fix handling of active period across year boundary
...
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272
Former-commit-id: 3e1878c5f9
[formerly 7716f1baa9
] [formerly 3e1878c5f9
[formerly 7716f1baa9
] [formerly c4068d27bf
[formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]]
Former-commit-id: c4068d27bf
Former-commit-id: a4414d409a
[formerly 0b3f803f6c
]
Former-commit-id: 9b3cf3308f
2013-01-11 12:23:15 -06:00
Dave Hladky
b5ea7aaff8
Issue #1466 Updated parsing for NCOM, revamped MetaDataParser to make more efficient, unit updates, tests, params
...
Change-Id: I5177209c25cb08c0ffe74104ceb6e16874ce3208
Former-commit-id: 440de708df
[formerly 5cf3eee426
] [formerly 440de708df
[formerly 5cf3eee426
] [formerly 002ac2eb41
[formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]]
Former-commit-id: 002ac2eb41
Former-commit-id: fe486b4889
[formerly 5312e82b4b
]
Former-commit-id: a51f8f449b
2013-01-11 11:59:36 -06:00
Dustin Johnson
f269969791
Issue #1441 Cleaned up editing/deleting groups and handling of user permissions
...
Amend:
Split creation and edit group dialogs.
Add some javadoc and remove sysouts.
Add missing test data causing broken tests.
Rebased.
Change-Id: I00d48f2a97bf8398b74bf8ed568cb19126d2c185
Former-commit-id: 8473eb60fb
[formerly 4ae1a9645c
] [formerly 8473eb60fb
[formerly 4ae1a9645c
] [formerly 446f65776e
[formerly 797f570e28086b43b5d851275fba457c5920f57e]]]
Former-commit-id: 446f65776e
Former-commit-id: 7bf029eb7e
[formerly 64ececeda1
]
Former-commit-id: 6fb6bc8f87
2013-01-11 11:53:02 -06:00