Steve Harris
79c2727251
Merge branch 'master_14.2.2' (14.2.2-21) into omaha_14.2.2
...
Former-commit-id: 35130cb3f5
[formerly eaa4456fa7
[formerly 2c17b02a196584edbaa2cef33d8e9adc91567f8e]]
Former-commit-id: eaa4456fa7
Former-commit-id: 619ed933ac
2014-07-23 13:07:11 -05:00
Matthew Howard
92dfe3cb38
Merge "ASM #15649 - these 5 files are rolled back to 14.1.3" into asm_14.2.2
...
Former-commit-id: 621be56dbc
[formerly b84f1255f0
[formerly 75a9fd67f7093fe2f8eb21cec6762210a3014351]]
Former-commit-id: b84f1255f0
Former-commit-id: 4cf9cc1178
2014-07-23 11:17:38 -05:00
Ying-Lian.Shi
a258d2fe22
ASM #15649 - these 5 files are rolled back to 14.1.3
...
Change-Id: Ifc52168f1faf3984f2a2d72947273686c5a00fd9
Former-commit-id: 1f6d24a076
[formerly 22d46f2658
[formerly ab5a6807a591605e230d4180f1dcf3c2eaa8657f]]
Former-commit-id: 22d46f2658
Former-commit-id: 9dbfbbe0c3
2014-07-23 12:24:22 +00:00
Nathan Bowler
5211975c0c
Omaha #3392 Adding unmodified, existing a2acars scripts in order to maintain history.
...
Change-Id: Ifd853cec4a97d7008e58e6beee40a90731d16e12
Former-commit-id: 97d38c86cf
[formerly 43d9e401af
[formerly 86d82d1942f6c8c85eda7ba5fb16b75740a2d972]]
Former-commit-id: 43d9e401af
Former-commit-id: 22f8746715
2014-07-23 08:23:45 -04:00
Nate Jensen
dbf12d7973
Omaha #3185 harden using DAF through jep, implement new DAF methods for
...
JepRouter
Change-Id: Id923a9267eee1242ef826414c037c1391f2effd6
Former-commit-id: b9caab11c9
[formerly 94ad041a46
[formerly de69306f1d3804b5c4cb09736aec3fa9a889646c]]
Former-commit-id: 94ad041a46
Former-commit-id: a85f1054f3
2014-07-22 17:37:20 -05:00
Jonathan Sanchez
c479178882
Issue #3419 Refactored watches to use the county table.
...
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: b991838494
[formerly 86a8ca4a30
[formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]
Former-commit-id: 86a8ca4a30
Former-commit-id: 997485dd22
2014-07-22 15:32:12 -05:00
Shawn.Hooper
11196e7275
ASM #15630 - Check-in fix for GFE: Missing ISC Wind Grids on behalf of Ron Anderson
...
Change-Id: I9053182b6c02d6c77e10e23b017b94bcff4da58b
Former-commit-id: ae272328a3
[formerly 2a32d5945c
[formerly 4bca3ffd258a6869150154e93abb652a1f22bc4d]]
Former-commit-id: 2a32d5945c
Former-commit-id: a70786ff22
2014-07-22 15:59:22 -04:00
Mark Peters
38a41fa367
Omaha #3422 Move HydroPointResource and HydroPointResourceData to MPE plugin
...
Change-Id: I222f99b0b952d9cef91208eb27f6adca43e13669
Former-commit-id: 29bc0fae50
[formerly 92b1e9a9cf
[formerly 7929e5b809d83a0f682e9f1c6953c9a090ed7310]]
Former-commit-id: 92b1e9a9cf
Former-commit-id: 85bf675f6a
2014-07-22 14:57:35 -05:00
Nate Jensen
ff80bfe0b8
Merge "Omaha #3422 Replace drawFilledCircle and drawArc calls" into omaha_14.4.1
...
Former-commit-id: 415c9e73fd
[formerly 87ec4fed2c
[formerly eac41695224c18aa566e4b1fdcbaf48647d93fdf]]
Former-commit-id: 87ec4fed2c
Former-commit-id: d419c9b8ca
2014-07-22 14:21:27 -05:00
Nate Jensen
5751c78426
Merge "Omaha #3214 fixed typos in LightningFrameRetriever" into omaha_14.4.1
...
Former-commit-id: 3128374080
[formerly 464e252e96
[formerly 5a2968189edd1abe58560404fc01dcea82957b5f]]
Former-commit-id: 464e252e96
Former-commit-id: fd997ad030
2014-07-22 14:01:08 -05:00
Mark Peters
c87a74bd05
Omaha #3422 Replace drawFilledCircle and drawArc calls
...
Change-Id: I2ecd1e2fd9614317addc248130bfc8ececc3d80e
Former-commit-id: b0e9c73eaf
[formerly 9532289be3
[formerly f0575e788549a1728c6d6fff7b99e3764c3739d8]]
Former-commit-id: 9532289be3
Former-commit-id: f1b1aa1b5d
2014-07-22 13:50:39 -05:00
Brian Clements
6e61d1b0bb
Omaha #3333 grid lightning ignores strikes outside of map
...
Change-Id: I188aac28b50b7ac8a107d785b52471c1d7fe6d14
Former-commit-id: 62dcdda0bc
[formerly a9284b35ff
[formerly bb55bde76765d330f782524965fe79d5373b6e9f]]
Former-commit-id: a9284b35ff
Former-commit-id: 0bd9bb7c21
2014-07-22 13:42:18 -05:00
Brian Clements
7949037995
Omaha #3214 fixed typos in LightningFrameRetriever
...
Change-Id: I1616b5f64c3d6c99f034c7f7c526a453e0f5578c
Former-commit-id: 3f82ead0b5
[formerly 45d52c2298
[formerly 7f5868947a0c7bee586908f832f3bb9030c3e84e]]
Former-commit-id: 45d52c2298
Former-commit-id: 319cbe37b3
2014-07-22 13:33:26 -05:00
Nathan Bowler
46b40bd411
Omaha #3392 Change Doubles to Float in ACARS and ACARSSoundingLayer
...
Change-Id: I6c07c51a3118d6317418a22be56b7899734e5917
Former-commit-id: 4f3a729894
[formerly 06b9d253f3
[formerly 9ac070996c42b004f3683d7ee253feb54f05264c]]
Former-commit-id: 06b9d253f3
Former-commit-id: 7d352f77a3
2014-07-22 14:05:16 -04:00
Nate Jensen
fdc6456e35
Omaha #3185 python newDataRequest() now supports
...
optional/default/keyword args
Change-Id: Iaab83d9915899d96114c078fb82c99be3b59e0dc
Former-commit-id: e1291395b0
[formerly 88aa123a5a
[formerly 66804918e06afc9616fcfe0f0a12afd75a8143e1]]
Former-commit-id: 88aa123a5a
Former-commit-id: bab319cf15
2014-07-22 11:57:53 -05:00
Steve Harris
51f80b4c58
Merge branch 'master_14.2.2' into omaha_14.2.2
...
Former-commit-id: 8a7ea92c2b
[formerly bce7039508
[formerly c0033681d38af55bff79efbceec119606fcc5c2f]]
Former-commit-id: bce7039508
Former-commit-id: 7b0b043c67
2014-07-22 10:26:33 -05:00
Shawn Hooper
3555c2504b
Merge "Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"" into asm_14.2.2
...
Former-commit-id: 1e2324481b
[formerly 1a57a9adea
[formerly 553333f8542d272d5412d9a8b1804e096c8031ff]]
Former-commit-id: 1a57a9adea
Former-commit-id: be7b6c166f
2014-07-22 10:19:27 -05:00
Shawn Hooper
c3c267fbdc
Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"
...
This reverts commit 4c06eca38e
[formerly 212fcd9eb4
] [formerly a5791db7cb
] [formerly 8de6be5219
[formerly a5791db7cb
[formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]]].
Change-Id: Ib5d03f81b35c0371e063a89739b823b8264c439f
Former-commit-id: 65802e34fd
[formerly 425bcea65d
[formerly 7dcfb55353ba7ec9d0619737da37781b0b186e5d]]
Former-commit-id: 425bcea65d
Former-commit-id: faf934a05a
2014-07-22 10:15:46 -05:00
Brian.Dyke
dc0fcade07
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: 6811770438
[formerly 6c121acf63
[formerly 184da085244822b37575bf90e7f798c2abb842e9]]
Former-commit-id: 6c121acf63
Former-commit-id: 1fdf03034a
2014-07-22 07:08:34 -04:00
Nate Jensen
a2fc6f9c22
Merge "Omaha #3373 fixed jaxb pooling performance issues" into omaha_14.4.1
...
Former-commit-id: ee5fca16ff
[formerly 9c1e1974ce
[formerly e59c0863348b800dc6ea990df1b4848b12a314fe]]
Former-commit-id: 9c1e1974ce
Former-commit-id: 55421c88dd
2014-07-21 17:49:20 -05:00
Nate Jensen
f8ef711068
Merge "Omaha #3412 Replace drawCircle calls" into omaha_14.4.1
...
Former-commit-id: 25c79387ca
[formerly c47892bf95
[formerly 61846ea9ec93ae255bdc4be7332a63252012aa9f]]
Former-commit-id: c47892bf95
Former-commit-id: 4633cc855f
2014-07-21 17:47:24 -05:00
Mark Peters
d04f7dd252
Omaha #3412 Replace drawCircle calls
...
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca
Former-commit-id: e4c455f5c0
[formerly e638d2f41b
[formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]
Former-commit-id: e638d2f41b
Former-commit-id: b5a25e7372
2014-07-21 17:07:02 -05:00
Brian Clements
f346fb1d71
Omaha #3373 fixed jaxb pooling performance issues
...
Change-Id: Icf7949e956f2b21ba156f4f0a19a2c41d0037681
Former-commit-id: a20345bf50
[formerly 37d97b9e48
[formerly 2ec52d8956b77aad30d46d7b4b2202c868b38a4d]]
Former-commit-id: 37d97b9e48
Former-commit-id: 6d2204c33e
2014-07-21 17:05:29 -05:00
Nate Jensen
0b67b02c61
Merge "Omaha #2768 removed workaround for edex localization notifications" into omaha_14.4.1
...
Former-commit-id: 3b23caee5d
[formerly 4e94590075
[formerly 7f3040fd6aefbae1af344a3177bf2fd7f7ad48fb]]
Former-commit-id: 4e94590075
Former-commit-id: acba540802
2014-07-21 13:02:56 -05:00
Ron Anderson
e0bfbb796b
Issue #3415 Fixed d2dGridDataPurged to not purge NetCDF databases.
...
Change-Id: Ie52a5b8c46d58cb39acde27f0ebdde0c42fdfa67
Former-commit-id: 6ea726136b
[formerly f3a6393b96
[formerly a2362b68b103c9013d615815924514ebe44be147]]
Former-commit-id: f3a6393b96
Former-commit-id: 7903a20dbc
2014-07-21 12:47:12 -05:00
Greg Armendariz
0afcd724ec
Merge branch 'omaha_15.1.1' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java
Former-commit-id: 8773e17083
[formerly f12b1a1098
[formerly 111178b736cc4e894f59bc7127ec2bddda96264c]]
Former-commit-id: f12b1a1098
Former-commit-id: e5919e105b
2014-07-21 12:12:32 -05:00
Fay.Liang
4c06eca38e
ASM #15630 -- GFE: Missing ISC Wind Grids
...
Change-Id: I289f1fafac8e034faa38dcddf639d5744fabe901
Former-commit-id: 8de6be5219
[formerly a5791db7cb
[formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]]
Former-commit-id: a5791db7cb
Former-commit-id: 212fcd9eb4
2014-07-21 12:57:21 -04:00
Brian.Dyke
c16617e7f7
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: c26e0cd548
[formerly e55b892fc3
[formerly 499b825592fdbdf150c918e5f3abacc4f37ddd70]]
Former-commit-id: e55b892fc3
Former-commit-id: 9ef7783251
2014-07-21 11:18:25 -04:00
Brian Clements
b45b3203be
Omaha #2768 removed workaround for edex localization notifications
...
Change-Id: I34bc85f1d7331f2a6da8d14410836634f6239a17
Former-commit-id: e5f5fb76cf
[formerly 9693094664
[formerly c142ac8f463951ed58d68bed24fb966adc289c2b]]
Former-commit-id: 9693094664
Former-commit-id: 4b9c886ab4
2014-07-21 09:53:34 -05:00
David Friedman
59de9e6c91
ASM #15049 - LAPS time matching problem
...
Change-Id: I52eee87defb407b741208e183b9829558bfa6733
Former-commit-id: 188e25d2e7
[formerly ec25c44fe7
[formerly 624c3a4225910863d5cc0b795493a39c0422a3e3]]
Former-commit-id: ec25c44fe7
Former-commit-id: 6aebd3a19b
2014-07-18 17:06:05 +00:00
Greg Armendariz
22ede9935d
Omaha #2914 - Remove calls to PropertiesFactory
...
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be
Former-commit-id: 09f6bd471c
[formerly b34486973e
[formerly b59ebac85404fba5657e9041b6f2be7a1959fd9c]]
Former-commit-id: b34486973e
Former-commit-id: e3f927e52c
2014-07-17 15:41:38 -05:00
Nate Jensen
9aa3ba110f
Issue #2954 actually log when the scalesInfo.xml cannot be parsed before
...
falling back to the base version
Change-Id: I2df669504061160c6ace76560f07845f99a80912
Former-commit-id: 2a01b1ebcd
[formerly da731be2f7
[formerly 894e6ac1db5b34e6466c68aefa5877b9405bfd59]]
Former-commit-id: da731be2f7
Former-commit-id: 82bef00378
2014-07-17 13:27:48 -05:00
Steve Harris
3439348ffa
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Former-commit-id: a5491e2d9f
[formerly 6b19a1ccb5
[formerly 3dceeec9d010a590353f6ab3327743781cd014f1]]
Former-commit-id: 6b19a1ccb5
Former-commit-id: 933355b964
2014-07-17 10:40:27 -05:00
Nate Jensen
40806f74b6
Merge "Omaha #3350 Fix build...again" into omaha_14.4.1
...
Former-commit-id: 006642adfb
[formerly 1bc55915ac
[formerly 5645cbc048baa63287c6599c0774949cf363edc9]]
Former-commit-id: 1bc55915ac
Former-commit-id: b72ef26e13
2014-07-17 08:59:05 -05:00
Benjamin Phillippe
90f0d70867
Omaha #3350 Fix build...again
...
Former-commit-id: e99a59d8fb
[formerly ad6b7cb8f3
[formerly 4ca53671a23ea0b232d17453aee12c72d8f80bce]]
Former-commit-id: ad6b7cb8f3
Former-commit-id: 8c060c7854
2014-07-17 08:53:40 -05:00
Richard Peter
4acf2dfb23
Merge "Omaha #3350 Fix Build" into omaha_14.4.1
...
Former-commit-id: 6054cb4b6e
[formerly 4675d335f4
[formerly 362aa326ca9792cfc5507f3324d37dac74cfb106]]
Former-commit-id: 4675d335f4
Former-commit-id: 9e8c84a1c3
2014-07-16 17:03:58 -05:00
Benjamin Phillippe
6a2648c84e
Omaha #3350 Fix Build
...
Former-commit-id: b203666598
[formerly 31e2999556
[formerly 71268a5d54542628d36f7e7ea6665761b9d4342f]]
Former-commit-id: 31e2999556
Former-commit-id: 09a62bb1cc
2014-07-16 16:54:45 -05:00
Greg Armendariz
585f28b5e6
Merge "Omaha #3300 moving 15.1.1 deltascript back into 14.4.1" into omaha_14.4.1
...
Former-commit-id: d410f5b2fd
[formerly b787ba53db
[formerly 8d25cc0eb9bc92d29fa2e4832b8fa974953a5609]]
Former-commit-id: b787ba53db
Former-commit-id: 5c8e4250a3
2014-07-16 15:26:25 -05:00
Richard Peter
20a0fd5643
Merge "Omaha #3389 : Add ability for deploy-install.xml to run WA-specific deploy script for standalone components." into omaha_14.4.1
...
Former-commit-id: 74b806cbb7
[formerly 4d9c25c63e
[formerly eb2dbad6c50eb770a57dcbb59ceb7a08e88b059f]]
Former-commit-id: 4d9c25c63e
Former-commit-id: 37151ec879
2014-07-16 15:05:45 -05:00
Steve Harris
5272683878
Omaha #3300 moving 15.1.1 deltascript back into 14.4.1
...
Former-commit-id: 74fff3659f
[formerly b9a02bf34a
[formerly 33cde5250c39fda59bbb08d7b8075cb5645c028f]]
Former-commit-id: b9a02bf34a
Former-commit-id: 17ec38ef34
2014-07-16 14:53:18 -05:00
Steve Harris
005d453875
Merge branch 'omaha_15.1.1' into omaha_14.4.1
...
Former-commit-id: 5e04680687
[formerly 308246ac7b
[formerly 7605f77e2027026c83c0cc4c1e27ba617efbe70f]]
Former-commit-id: 308246ac7b
Former-commit-id: 76d548cdc4
2014-07-16 13:21:53 -05:00
Benjamin Phillippe
c74f855d31
Omaha #3350 Added user/role authentication. Added XACML authorization
...
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df
Former-commit-id: 6cb73e63a1
[formerly cebfbebea6
[formerly 81d0249971d4004067b6aef672e00417ddb83b36]]
Former-commit-id: cebfbebea6
Former-commit-id: d4997f5a90
2014-07-16 10:49:24 -05:00
Brian Clements
a3f91f92cc
Omaha #3373 jaxb manager refactor
...
api changes
reworked ogc jaxb manager to use parent class
Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48
Former-commit-id: e428f257cb
[formerly e4c85f7cd5
[formerly 125c31f035057676d8c97a9b6c7a1d7b1b7f5bcb]]
Former-commit-id: e4c85f7cd5
Former-commit-id: 33684f3c97
2014-07-16 09:00:59 -05:00
Nate Jensen
ef72e8e222
Issue #2954 fall back to existing map scales if map scale is missing
...
Change-Id: I75083325edec689c38f2fe7661c635ddf3e0f527
Former-commit-id: ed9bee5533
[formerly 6e21526fd2
[formerly c7167ad2f59ba02edc842f321d12cd36cd6da8bb]]
Former-commit-id: 6e21526fd2
Former-commit-id: c07802a208
2014-07-15 18:27:09 -05:00
David Gillingham
96f97f6b54
Omaha #3389 : Add ability for deploy-install.xml to run WA-specific deploy script for standalone components.
...
Change-Id: I39fe60ae80c8a62b9ed6052e353e314783bba999
Former-commit-id: afc28adc7a
[formerly fc715e98a5
[formerly 334cfcf418b0659b496088d7ac2b2f111cf8bc72]]
Former-commit-id: fc715e98a5
Former-commit-id: f9ca189dfc
2014-07-15 16:00:46 -05:00
Fay.Liang
e571f735bb
ASM #15468 Shefdecode failed to ingest RVF product at OUN
...
Change-Id: I6238c25f867c0e6e491831e9c2b1c47e22484620
Former-commit-id: a00be8447d
[formerly 87d50e7296
[formerly 3637d6387396f88811ec3964bd61d10ce0ee38eb]]
Former-commit-id: 87d50e7296
Former-commit-id: 7cbd90018e
2014-07-15 10:22:09 -04:00
Richard Peter
35b7c07625
Merge "Omaha #3184 throw incompatible request exceptions when trying to get levels on FFMP or IHFS" into omaha_15.1.1
...
Former-commit-id: 0a24d7452f
[formerly 58628db2c5
[formerly 95816d39509fa3499494b369ad09fb026c07108d]]
Former-commit-id: 58628db2c5
Former-commit-id: 6eb299d022
2014-07-14 17:05:22 -05:00
Richard Peter
935b0c20e0
Issue #3146 Fix alert viz log statement.
...
Change-Id: Id55d73a77b7f408e02ea6fe6d528650839e535d0
Former-commit-id: 216d3ba749
[formerly e484749e1c
[formerly deef73c921f9ba90b3db0f5793355f05ae861ffa]]
Former-commit-id: e484749e1c
Former-commit-id: 148bbebd42
2014-07-14 17:01:53 -05:00
Roger Ferrel
d989718a09
Omaha #3344 Updated import for GRID_FILL_VALUE.
...
Former-commit-id: 88aa28c46b
[formerly 3ce6447418
[formerly d490bc82905d37ad284485d30a493c1fd7e3ed6f]]
Former-commit-id: 3ce6447418
Former-commit-id: 8fdfb4b6e2
2014-07-14 17:01:32 -05:00
Nate Jensen
355f388653
Omaha #3184 throw incompatible request exceptions when trying to get
...
levels on FFMP or IHFS
Change-Id: I599799cc95835708fdb48b6ce8a8e977daceff26
Former-commit-id: a1dadba524
[formerly 9c1e33521e
[formerly 2fdb210c8fe8e6763b6a6422b5710c35ee7e48a8]]
Former-commit-id: 9c1e33521e
Former-commit-id: 8cc62dae6b
2014-07-14 14:25:51 -05:00