xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1721 commits 31 branches 40 tags 3.8 GiB
Commit graph

574 commits

Author SHA1 Message Date
Mike Duff
4ab0eecfa0 Issue #1523 - Finalize registry and data delivery stats 
Former-commit-id: 4186b10583 [formerly cbfd355219] [formerly 9c033e6484] [formerly 561e83454f [formerly 9c033e6484 [formerly d691b22ff903b2231e2a04747a8b4f93174ec4e3]]]
Former-commit-id: 561e83454f
Former-commit-id: f8db6cdbac08b1f47e17566c905c303288aef176 [formerly 29939914a2]
Former-commit-id: 7e421afc03
 2013-01-23 14:40:23 -06:00
Mike Duff
aa26a4d5d2 Issue #1357 - Remaining stats items implemented. 
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: d54b3a3519 [formerly 712862d96f] [formerly ffca969560] [formerly 1bc6e7c2e4 [formerly ffca969560 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]]]
Former-commit-id: 1bc6e7c2e4
Former-commit-id: 1dd22669a9d4462243dd018526062181eb8a7d09 [formerly 4cd7deb608]
Former-commit-id: dfcce57a0a
 2013-01-23 11:17:36 -06:00
Dustin Johnson
70bce9d505 Issue #1519 Fix max latency calculations for adhoc queries 
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: 0f7b01795d [formerly 504268f0f3] [formerly 99533e7f4be78460bbd202f0f609a7357cffb683 [formerly 6c1818d544]] [formerly f730422834 [formerly 6c1818d544 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]]
Former-commit-id: f730422834
Former-commit-id: 76d8b5641220e657d9123f65878c0ce41da1c8f6 [formerly 516ac1ab9a]
Former-commit-id: 2e09d46fea
 2013-01-23 08:06:52 -06:00
Nate Jensen
998bbc254d 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: a2b66980dd [formerly ca7ecbb38a] [formerly 2059b9a962] [formerly 6e89f547e5 [formerly 2059b9a962 [formerly 302d33f6a13017905c5668fb12d710ecb29c4298]]]
Former-commit-id: 6e89f547e5
Former-commit-id: ee1703ba3eeb2bcd70c9bcd684bd2ba428f46711 [formerly ab30ace9ce]
Former-commit-id: 0ede688235
 2013-01-22 18:05:00 -06:00
Ron Anderson
a660c63e37 Merge "Issue #1504 Fix merge error" into 13.2.1_delivery 
Former-commit-id: d2a7bb20e6 [formerly abb36c3114] [formerly a1d7a1cbc9] [formerly b7abb8d4e4 [formerly a1d7a1cbc9 [formerly 3a231135b5686e0c26e7d43d74d742b29ce88b1b]]]
Former-commit-id: b7abb8d4e4
Former-commit-id: 796f7b8150dc43e27e559e8c5cea3a5559df55b4 [formerly 8fb70d5ddc]
Former-commit-id: e9855ab55a
 2013-01-22 17:50:40 -06:00
Ron Anderson
02ddcfecf9 Issue #1504 Fix merge error 
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6

Former-commit-id: 5e5d27a9a7 [formerly 5c6af0d0a1] [formerly c83667e9b5] [formerly 2f4badad98 [formerly c83667e9b5 [formerly f0e56aa95e2f06c04cd02f7c429736a6ba88feb5]]]
Former-commit-id: 2f4badad98
Former-commit-id: 813ef0be1d506471a55ae9362d82d11f346967aa [formerly 8e15531e08]
Former-commit-id: cb3e710d4c
 2013-01-22 16:54:04 -06:00
Lee Venable
96dcd20dc6 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: f5ac31bcde [formerly aecd00423a] [formerly 619349b140] [formerly b945ce9e6e [formerly 619349b140 [formerly ef3d4c5b19c6482ec2ac2d38f90d975b7df1e295]]]
Former-commit-id: b945ce9e6e
Former-commit-id: bc549afb6b1466a867632b29624f84bc92b91365 [formerly 511a7d9753]
Former-commit-id: bc10a17c9f
 2013-01-22 16:26:48 -06:00
Mike Duff
1a20fb912f Issue #1484 - Fix for half timestep changes for 3 hours or less duration. 
Peer Review comments.

Change-Id: Ia96c8857094ad14cf0db89b7642dfd46f333ec47

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

Former-commit-id: 6f980bd582 [formerly 74cb9aeb53] [formerly 62671efc2a] [formerly 20b0761048 [formerly 62671efc2a [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]]
Former-commit-id: 20b0761048
Former-commit-id: f07e79b0f531baa1e312a1c9871c441ba527ac16 [formerly 44807ba0d5]
Former-commit-id: 8e575db69c
 2013-01-22 14:47:37 -06:00
Dustin Johnson
02604beac9 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: 40ef4c5947 [formerly 3ec05a5a9c] [formerly 606083835faa9246ed4f7e98934f8bbc1be66266 [formerly 557de162b0]] [formerly 15c2c55ff9 [formerly 557de162b0 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 6bc759f6c2019b3fef1eb1a080cf002dc07697ce [formerly a3c99f86bb]
Former-commit-id: 756080321e
 2013-01-22 11:45:18 -06:00
Dustin Johnson
a619d03fe6 Issue #1501 Include subscription on activation/deactivation notification, remove race condition of table update. 
Change-Id: Ic3f8ff634136a9830cba42befc7f41c2554698aa

Former-commit-id: 491a095bed [formerly 94a0cd5733] [formerly 0281da10cc] [formerly 2eda48aa0d [formerly 0281da10cc [formerly dd07cad3e6b2471fc4371471918078498f05d01e]]]
Former-commit-id: 2eda48aa0d
Former-commit-id: 20226976bd8a1e9a6ac9b33833ffabcfa02b20ab [formerly c7189052e8]
Former-commit-id: 58b3edd7df
 2013-01-21 21:24:48 -06:00
Max Schenkelberg
004f5213e1 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: 1944f4f81d [formerly 8058260830] [formerly 5c51083f35] [formerly 6fd6b2e42d [formerly 5c51083f35 [formerly 3b5af8689a2fc2a7ee783d896c624fbc5581b58a]]]
Former-commit-id: 6fd6b2e42d
Former-commit-id: 79bd5d81a31d638d24e6343dd5e7a7bedd4ae7c3 [formerly 2c05f3c179]
Former-commit-id: 3d459dd57c
 2013-01-21 14:58:16 -06:00
Dustin Johnson
d1c07e450f Merge "Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets." into 13.2.1_delivery 
Former-commit-id: be213b454c [formerly 04398e0aa4] [formerly c1f03f7d81] [formerly 350becc94f [formerly c1f03f7d81 [formerly 2b3039f0f55655d484867701b4f28bfae12aece9]]]
Former-commit-id: 350becc94f
Former-commit-id: 03554cc48e06593184d75efb46c5490922947ac0 [formerly aa85e0c3ca]
Former-commit-id: 8aed30442e
 2013-01-21 12:23:08 -06:00
Dave Hladky
a2c43995ce Issue #1513 Updated the way level lookups are created 
Change-Id: Ie1120707af608910a88c407ca8af8cf19b964555

Former-commit-id: da08fa1186 [formerly d0ff35051e] [formerly 53ceda6a62] [formerly cf1c674c2e [formerly 53ceda6a62 [formerly a6b74b9bd1781ca61e364e24f61bb647602fcce6]]]
Former-commit-id: cf1c674c2e
Former-commit-id: 712cab376e7c48e00ea7d133e645e49a15eb434a [formerly e497d39d75]
Former-commit-id: 82cd0a1b58
 2013-01-21 11:19:00 -06:00
Dave Hladky
5568acd736 Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets. 
Change-Id: I6035ad79a31f9ada9910d599d6529ca91ff03173

Former-commit-id: 280a3e30c1 [formerly 1c39b88ba4] [formerly 786afee256] [formerly 5d8851b214 [formerly 786afee256 [formerly 07d90ad640806abd237fb13e1476adc1fb8d35c0]]]
Former-commit-id: 5d8851b214
Former-commit-id: 78c44449d6cffe22547976dbefb3b1a95a8fc2cb [formerly c45822f09b]
Former-commit-id: bd7e8a6968
 2013-01-21 08:29:29 -06:00
Richard Peter
1e35efe888 Merge "Issue #1495 add ensemble selection tab to subset dialog Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15" into 13.2.1_delivery 
Former-commit-id: 8c8a94d567 [formerly ac3b484474] [formerly 76f9e42fd3] [formerly 9feb73c161 [formerly 76f9e42fd3 [formerly 4eb1e71df46c7ceaa5bf523c02821228da42460e]]]
Former-commit-id: 9feb73c161
Former-commit-id: ef6aa2471937a8b955d7b017530ab4995d6df2b3 [formerly 5acc5996d3]
Former-commit-id: d421b7208a
 2013-01-18 15:43:16 -06:00
Ben Steffensmeier
42fe324c9b Issue #1495 add ensemble selection tab to subset dialog 
Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15

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

Former-commit-id: 2eaa5373a9 [formerly 928cb3b00f] [formerly eb821d7580] [formerly 94ba8511cb [formerly eb821d7580 [formerly ddaf9e6c69221600deedfbaf991a3936d0bb711e]]]
Former-commit-id: 94ba8511cb
Former-commit-id: b0014a9838aaba0f74cd6e57a56e57324e4301d1 [formerly 7e3b6d12f6]
Former-commit-id: 41a0a0e4e4
 2013-01-18 14:58:10 -06:00
Greg Armendariz
8a1911c392 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: 5c7bb26fb6 [formerly edda76ad75] [formerly 9d06f6ed6d] [formerly f7b046fa0d [formerly 9d06f6ed6d [formerly 0356abb43bea7c9bcf7fcfc9c43d46a2fa611389]]]
Former-commit-id: f7b046fa0d
Former-commit-id: ef490f989490503c10b7a1b4bb863400d1550c3c [formerly dda78c073a]
Former-commit-id: 817162c467
 2013-01-18 14:30:12 -06:00
Richard Peter
b2b2184700 Issue #1508: Improve capture to grab screen shots and multiple jstacks to track thread state over time 
Change-Id: I2d41e348d1cd4187887ec47c18f3b6d768ced8fd

Former-commit-id: 8269ba554b [formerly b83e46a345] [formerly a1c58ab36d] [formerly af105bfe0f [formerly a1c58ab36d [formerly 8c232b02fbdd268f19e65676d68311b47469fcf3]]]
Former-commit-id: af105bfe0f
Former-commit-id: 9404b257800521c9839b383dd2bea508dde12c1b [formerly f5c8534098]
Former-commit-id: ee9adb9764
 2013-01-18 13:55:56 -06:00
Nate Jensen
44606a58a4 Issue #1497 fix build 
Former-commit-id: bd08d7a537 [formerly 13b5619297] [formerly 6e0f0d330e] [formerly b52aa82213 [formerly 6e0f0d330e [formerly 3b30fcffe24d19c6c694d9519d1a515843248d32]]]
Former-commit-id: b52aa82213
Former-commit-id: da7e2f9e2766d8828401b92dfc04d9fa22173489 [formerly 98ec6fcc1c]
Former-commit-id: cc0725f0b7
 2013-01-17 18:42:38 -06:00
Richard Peter
8454b5b728 Merge "Issue #1501 Use registry version of subscription when sending notification responses" into 13.2.1_delivery 
Former-commit-id: be6d4cceeb [formerly f553d99665] [formerly 08e7ce3da9] [formerly f2ed67c841 [formerly 08e7ce3da9 [formerly 05dde10fa4bab4b93f7a2f25c368a2a99acae581]]]
Former-commit-id: f2ed67c841
Former-commit-id: 08d887ad7830cc5e32faea400a0f68d6bb840a00 [formerly 683fdaf376]
Former-commit-id: a41c4056af
 2013-01-17 17:06:52 -06:00
Nate Jensen
5cf2e3837f Issue #1497 ported python fillEditArea to Java to boost speed 
Change-Id: Idbc2a027914e1a584d36551781df21ed9bf63c36

Former-commit-id: bcd008737b [formerly 449b3735f0] [formerly 278ea6d24e] [formerly 15e1731ef3 [formerly 278ea6d24e [formerly 32cf1236638c64a3e047398ca829d79d3b7cb5ef]]]
Former-commit-id: 15e1731ef3
Former-commit-id: b89f2b5075327593e4173f85e19da25a0ce681cb [formerly f70f8d1f4f]
Former-commit-id: 492634b6f5
 2013-01-17 16:14:56 -06:00
Dustin Johnson
ceee5c6ad4 Issue #1501 Use registry version of subscription when sending notification responses 
Change-Id: I96622e8f1d2236ade47d4c5a11ad41b750bc7962

Former-commit-id: 5ce7601dfa [formerly 9f775d2dd7] [formerly d9064bdc98] [formerly 38036a0e8b [formerly d9064bdc98 [formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]]
Former-commit-id: 38036a0e8b
Former-commit-id: 0a9edd87c8a06f3382e4aca4205e470a2f005410 [formerly 13a75fabad]
Former-commit-id: 9681f57fac
 2013-01-17 14:53:36 -06:00
Dustin Johnson
837c1a0492 Issue #1412 Check file last modified times each time role data is requested 
Change-Id: Ieae84ad3106e3aa0cf4d253a10c27e8c9c60ecaa

Former-commit-id: 088b0d4c08 [formerly b1ce19e41d] [formerly 74d5a70c30] [formerly 037dabb683 [formerly 74d5a70c30 [formerly b7e577237df9e157fdb218af48c41f6209ff2bfb]]]
Former-commit-id: 037dabb683
Former-commit-id: 4c1037f281d91482cf2e0798dc7d242a1877cfba [formerly 6468029207]
Former-commit-id: fce3f8bec9
 2013-01-17 12:48:01 -06:00
Nate Jensen
c80803948a 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: c8a54dc15c [formerly 40ebb52178] [formerly cd45e662fd] [formerly 391a179bdb [formerly cd45e662fd [formerly 3824077f84deb52ee2d7adc7b19f5134e6788ddb]]]
Former-commit-id: 391a179bdb
Former-commit-id: d2d6d861e78931ace4c58dea0201a8b9d4573276 [formerly 8ee59505b6]
Former-commit-id: aacdfed4a3
 2013-01-17 09:27:52 -06:00
Brad Gonzales
2a12b30f0f 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: 4c2cf80f5d [formerly 1a3e279226] [formerly 31c48be1c5] [formerly 69eccc1d80 [formerly 31c48be1c5 [formerly 86c094b2d301dbf6ead2d74bc64b3596cf2ef6d8]]]
Former-commit-id: 69eccc1d80
Former-commit-id: 41d9b99c252bb6fc0475f979c7deaa852283a2e1 [formerly e1e5001736]
Former-commit-id: a90db41abd
 2013-01-16 15:23:53 -06:00
Richard Peter
6304173a89 Merge "Issue #1420 - More Rules changes. Peer review comments" into 13.2.1_delivery 
Former-commit-id: 7dab4209b8 [formerly 6bc65147b3] [formerly f6749331c9] [formerly 86acbf5470 [formerly f6749331c9 [formerly fc818294ba14c7b957cf6aedae153d3a18b5219b]]]
Former-commit-id: 86acbf5470
Former-commit-id: 02269f116e2eed587384fe28b971887e3fe440a1 [formerly 8d72673d7a]
Former-commit-id: 15115e1ac0
 2013-01-16 15:08:37 -06:00
Mike Duff
504dd2f5c0 Issue #1420 - More Rules changes. 
Peer review comments

Change-Id: I3ed89b332764bba2d995a248e361d20c1eec6edf

Former-commit-id: 5210083e95 [formerly 1df1b5a94d] [formerly 2a31447d6d] [formerly 8d0a79703f [formerly 2a31447d6d [formerly 84f2d0ed39e11059359558676c988a0bf1e989b9]]]
Former-commit-id: 8d0a79703f
Former-commit-id: dd2462fb0ac1bd87f0124290fd6e8c8a6b100b4b [formerly c6924b6920]
Former-commit-id: 72a70a6eaf
 2013-01-16 14:34:55 -06:00
Richard Peter
83045e0709 Merge "Issue #1493 fix grib2 decoder to handle ensembles" into 13.2.1_delivery 
Former-commit-id: 5b35bf0fca [formerly 312b786d02] [formerly 276fee1b70] [formerly b98ed1f8e7 [formerly 276fee1b70 [formerly 8b0a1178ecd824a3b7f399a187f5c152025aa58e]]]
Former-commit-id: b98ed1f8e7
Former-commit-id: b581b724a411f648bd7af6972b3d10792d2b037c [formerly 6d3159ea80]
Former-commit-id: e4651df11e
 2013-01-16 12:41:32 -06:00
Dustin Johnson
56b47ffbf1 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: 0397f990da [formerly c12b46027f] [formerly b627dfc054] [formerly 19d3a14d4f [formerly b627dfc054 [formerly 38ecb1f36dce4717d0ba9066c8cd22116770d34b]]]
Former-commit-id: 19d3a14d4f
Former-commit-id: a1d7a7e343770b91b36afc9c193dcdcee6b09ef3 [formerly c750e27389]
Former-commit-id: ecb1d5564a
 2013-01-16 12:21:11 -06:00
Ben Steffensmeier
3f92f1fcf2 Issue #1493 fix grib2 decoder to handle ensembles 
Former-commit-id: e2f2c05dbf [formerly 02e0433afc] [formerly 7d155653bc] [formerly 4595797f5f [formerly 7d155653bc [formerly c694df943bb70f2903fe495400061444a67d3357]]]
Former-commit-id: 4595797f5f
Former-commit-id: 1623e264547ed57e5cb9113a18651e8119bf31cb [formerly fb237583e2]
Former-commit-id: e7969ff457
 2013-01-15 18:08:19 -06:00
Richard Peter
c589e52e22 Merge "Issue #1489 Harvester directories not created causing harvester to not start" into 13.2.1_delivery 
Former-commit-id: 853f62e60d [formerly e8a4939150] [formerly 09fb2d0919] [formerly 0e684515c6 [formerly 09fb2d0919 [formerly 8388122d8273aca20a9c4292035049957a091a69]]]
Former-commit-id: 0e684515c6
Former-commit-id: dfce9cdbec9337e69a2347d574c754aa6bb72aca [formerly 8258395d58]
Former-commit-id: cb3f43b17a
 2013-01-15 16:11:35 -06:00
Matt Nash
2c5f244037 Issue #1481 slight clean up of radar, make alphanumeric values empty for any products that do not matter 
Change-Id: I88847a609e57e8057a480653add74f0c5c5b4934

Former-commit-id: 5d4a74d81d [formerly 3f8cf19d71] [formerly 79e95d787c] [formerly db1dfd3001 [formerly 79e95d787c [formerly 1ac8a6d7320254f4f69160f764c86e8bd4b35d66]]]
Former-commit-id: db1dfd3001
Former-commit-id: f983659ac6680126974420ce303cfcae2e104c80 [formerly 9f8cc4ec5d]
Former-commit-id: a78f914b92
 2013-01-15 16:05:25 -06:00
Dave Hladky
e45aff44f4 Issue #1489 Harvester directories not created causing harvester to not start 
Change-Id: Id5caa14ebc33451f95e5d1e9d685c4094091ff63

Former-commit-id: e5b4934da1 [formerly 34577b50dd] [formerly 9b75eaf869] [formerly b6bf73134e [formerly 9b75eaf869 [formerly 08b944fa708ba12ac6df63b64501ff20f4738063]]]
Former-commit-id: b6bf73134e
Former-commit-id: 3db6fe5b5d30defe833550d4242d81c1a27c008e [formerly ccf832dd38]
Former-commit-id: fa9dc500a3
 2013-01-15 12:41:15 -06:00
Dustin Johnson
b18fc5ff5e Issue #1286 Fix bugs found during 1286 testing 
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 50fa22f710 [formerly 99f8d40bed] [formerly 3d74a68e94] [formerly 2cf52d976b [formerly 3d74a68e94 [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]
Former-commit-id: 2cf52d976b
Former-commit-id: d2caf5c394290add805dceb28270a72f9b600765 [formerly aa7acedf0a]
Former-commit-id: 94e95f3e07
 2013-01-15 10:18:14 -06:00
Steve Harris
eedb2903b1 Issue #1408 - Fix syntax errors in server config 
Former-commit-id: 73c5d94310 [formerly 9a3be4460e] [formerly aee6a65e4c] [formerly a5eac8ec3c [formerly aee6a65e4c [formerly 29e1fc44a04dff56747b60d904e49d87cebf4f85]]]
Former-commit-id: a5eac8ec3c
Former-commit-id: b03470754f36ce50d19e7ef9072478e1b49ef2dd [formerly 31f190865e]
Former-commit-id: e202452ace
 2013-01-15 09:47:25 -06:00
Richard Peter
d880361e06 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: 6e42fa32d3 [formerly a966546e31] [formerly 20520c8f0152154419357d990f91f1ce998a888a [formerly 3fb7d96ec1]] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]
Former-commit-id: 79ef100838
 2013-01-14 18:07:17 -06:00
Richard Peter
dd346fa040 Merge "Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development" into development 
Former-commit-id: 4c82ddaa12 [formerly d2cc93281a] [formerly 59368e93e1] [formerly 4176d078a7 [formerly 59368e93e1 [formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]]
Former-commit-id: 4176d078a7
Former-commit-id: f0175e39c5b471bab4e4eaa25e855a6631e81662 [formerly 2049e40d87]
Former-commit-id: ea7d2eaff1
 2013-01-14 17:49:29 -06:00
Steve Harris
3d35fd52d5 13.2.1-1 baseline 
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]
Former-commit-id: e34695538d
 2013-01-14 18:42:21 -05:00
Richard Peter
9da3b7e2dd 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: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]
Former-commit-id: fa6247baf7
 2013-01-14 17:38:38 -06:00
Richard Peter
809c981306 Merge "Issue #1477 Permissions broken for ingestDAT SQL querries." into development 
Former-commit-id: d7beb14c67 [formerly a8495324f7] [formerly de7d7b07ef] [formerly 9ef997e3e8 [formerly de7d7b07ef [formerly 83ee4be25f2ad1e0a2f30f2695a2a65200abd787]]]
Former-commit-id: 9ef997e3e8
Former-commit-id: acf0de98c326adcb9c362eeee1f6403fbb971811 [formerly 94eea3065b]
Former-commit-id: 997ab69bf0
 2013-01-14 17:34:31 -06:00
Richard Peter
c056fd25cb Merge "Issue #1482 ignore malformed gribModel files" into development 
Former-commit-id: 85519760d6 [formerly 5ec69e843e] [formerly 00047e5aa78cabc9906a5db00d1b104a9d316528 [formerly 89b08fdd2f]] [formerly 8192515b06 [formerly 89b08fdd2f [formerly fd8bd261b089b317e4ce66ca0e0aa6d5861a1b09]]]
Former-commit-id: 8192515b06
Former-commit-id: e1968aa07abf36dd7677eb698b3949b4d6ce48c3 [formerly 0b57b16cda]
Former-commit-id: 9154383e5a
 2013-01-14 17:34:17 -06:00
Richard Peter
7af4fc10a8 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: 9cad9f0c54 [formerly 1a1a69d38c] [formerly 970216e4c9] [formerly 19d923f387 [formerly 970216e4c9 [formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]
Former-commit-id: 19d923f387
Former-commit-id: 8835cc0deb6ecb25ed3f4f23af4a1a62f0414be7 [formerly 8ccc791566]
Former-commit-id: f1262388ce
 2013-01-14 16:53:05 -06:00
Ben Steffensmeier
b2029cc48a Issue #1482 ignore malformed gribModel files 
Former-commit-id: beda2be0cb [formerly fadf4d58cf] [formerly 685c09de47] [formerly 9cfa09e507 [formerly 685c09de47 [formerly 272da22e4ce82215aa4b00ce7624811f81327889]]]
Former-commit-id: 9cfa09e507
Former-commit-id: 68d3db82e2a055144685ccadce3c90ec541556fb [formerly 8fdfc14c29]
Former-commit-id: 80e307c96e
 2013-01-14 15:10:56 -06:00
Dave Hladky
bd45e9af0f Issue #1477 Permissions broken for ingestDAT SQL querries. 
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b

Former-commit-id: e3ec930c36 [formerly 65cfb39ba5] [formerly 30733d3b25] [formerly c9160ac945 [formerly 30733d3b25 [formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]]
Former-commit-id: c9160ac945
Former-commit-id: ecd233941bfc185849d394ea786bc19f15301274 [formerly c5f71be70a]
Former-commit-id: e746688671
 2013-01-14 11:38:45 -06:00
Steve Harris
13be9f8987 13.1.2-8 baseline 
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]
Former-commit-id: 7d0109a349
 2013-01-11 16:19:07 -05:00
Steve Harris
4c8e604619 13.1.2-7 baseline 
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]
Former-commit-id: f1256f2a9e
 2013-01-11 16:12:09 -05:00
Richard Peter
cf8483486b Merge "Issue #1412 Move useradmin plugins out of datadelivery specific feature" into development 
Former-commit-id: 0c51e2e3aa [formerly 71d8907b6e] [formerly 8df96c2a14] [formerly 2cb7e1fe2c [formerly 8df96c2a14 [formerly f65462361c68b9757493f673463c731d0ded9dba]]]
Former-commit-id: 2cb7e1fe2c
Former-commit-id: bae6162eee72ec419f36031f9ab9e5c6edea709d [formerly 90ec121020]
Former-commit-id: 74092ae046
 2013-01-11 12:53:37 -06:00