Commit graph

5075 commits

Author SHA1 Message Date
Sean.Webb
c061f7b1a0 ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b

Former-commit-id: 6ffb17540e [formerly b0b01694f7 [formerly 031c41d4f7801c8a5127cf007358856bf771593a]]
Former-commit-id: b0b01694f7
Former-commit-id: c90c45f303
2014-09-19 09:29:31 -04:00
Sean.Webb
90fbb6bf28 ASM #16761 - Added retrans code updates from ISG
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c

Former-commit-id: 51380a2363 [formerly 5c84cadaf6 [formerly 165b9a9b3481b3fa1d31b771eead03180430be59]]
Former-commit-id: 5c84cadaf6
Former-commit-id: 7f898635f9
2014-09-19 07:25:18 -04:00
Sean.Webb
57553e3c5a ASM #16761 - Updated ldm spec to add retrans
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229

Former-commit-id: 4c36280560 [formerly 35bfd8269c [formerly bb9d431a842511b0081660224f3ddefd947f76fd]]
Former-commit-id: 35bfd8269c
Former-commit-id: b959842361
2014-09-18 09:33:47 -04:00
Brian.Dyke
2d86fd1bf1 Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: a610fe6475 [formerly 7b7ef56b04 [formerly a77577595da1e2dcc8057c5a8b8643a612780339]]
Former-commit-id: 7b7ef56b04
Former-commit-id: 15381f5e9f
2014-09-04 15:59:00 -04:00
Brian.Dyke
8216b05646 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: e5227e90de [formerly e762271240 [formerly ad120a9357402fbdedb350cabe88d2becf5d7361]]
Former-commit-id: e762271240
Former-commit-id: c586c26447
2014-09-04 14:18:34 -04:00
Qinglu.Lin
efd54751a5 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110

Former-commit-id: 902b6c55bd [formerly 8c28597210 [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]
Former-commit-id: 8c28597210
Former-commit-id: 62bcefb9e1
2014-09-04 14:09:24 -04:00
Brian.Dyke
a05fabaeef Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 9e94c2c571 [formerly 72e2882496 [formerly 2c4c1a5babcfdcfadeb042a190bc79c7973e1a36]]
Former-commit-id: 72e2882496
Former-commit-id: 2b613a26fd
2014-09-04 14:01:26 -04:00
Nate Jensen
8cad8cb257 Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320

Former-commit-id: 87d507313b [formerly 2cfbfc1dc4 [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]]
Former-commit-id: 2cfbfc1dc4
Former-commit-id: a1bccdc57f
2014-09-04 10:10:37 -05:00
Brian.Dyke
9c9de8b351 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: d695dd0084 [formerly 043a95d35e [formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]]
Former-commit-id: 043a95d35e
Former-commit-id: fa6b302ab6
2014-09-03 21:14:27 -04:00
Brian.Dyke
08ec7d5802 ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: cfe03adff6 [formerly 121a2d100f [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]]
Former-commit-id: 121a2d100f
Former-commit-id: 3ddb5831a0
2014-09-03 21:10:16 -04:00
Brian.Dyke
a76150b1a7 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: b1dbaa0b50 [formerly 368f80f220 [formerly f9daf7d6e906904e96438fabc510e24ff66536d4]]
Former-commit-id: 368f80f220
Former-commit-id: 65f8fc89f0
2014-09-02 15:09:06 -04:00
Qinglu.Lin
dda32f85e9 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05

Former-commit-id: ae13ea419e [formerly 2374673f8d [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]
Former-commit-id: 2374673f8d
Former-commit-id: b32ea40289
2014-09-02 14:37:19 -04:00
Steve Harris
db74ef9c6d Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: 425e8243f2 [formerly db74dc031e [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]]
Former-commit-id: db74dc031e
Former-commit-id: 142f1bff66
2014-09-02 08:09:48 -05:00
Juliya Dynina
d911b87c7e Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: 58a3df78a8 [formerly 169dc0ba43 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]]
Former-commit-id: 169dc0ba43
Former-commit-id: 5f001b7ad7
2014-08-28 15:52:11 -05:00
David Friedman
16c903e2c5 ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa

Former-commit-id: d5c086a022 [formerly de6e79f9e3 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]
Former-commit-id: de6e79f9e3
Former-commit-id: 9c2545ed64
2014-08-28 18:08:23 +00:00
Daniel.Huffman
39f7795b7c ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e

Former-commit-id: ca2aa8811b [formerly c89a7169b0 [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]
Former-commit-id: c89a7169b0
Former-commit-id: c3731d5622
2014-08-28 17:20:30 +00:00
David Friedman
bb421fd3e4 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9

Former-commit-id: ea9230b37c [formerly a2dfe8e8f6 [formerly 6bfa1d6662b00925814be7126592bbe340651649]]
Former-commit-id: a2dfe8e8f6
Former-commit-id: ea1e9feb1d
2014-08-28 15:43:32 +00:00
Steve Harris
b551b21437 Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
Former-commit-id: d3b18900b3 [formerly 891019aadd [formerly 579781387325a36e27135b8384b2a8b14cb38317]]
Former-commit-id: 891019aadd
Former-commit-id: 080a50d28c
2014-08-27 11:34:06 -05:00
Daniel.Huffman
d7c82cf4be ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0

Former-commit-id: d1cd90b487 [formerly 8962a069be [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]]
Former-commit-id: 8962a069be
Former-commit-id: e2e132e7a5
2014-08-26 13:30:09 +00:00
Steve Harris
8a684bb351 Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
Former-commit-id: d850919303 [formerly a03b5201cb [formerly 67c81cedb7321baad8dcf5fb4cea21ac152d2dcd]]
Former-commit-id: a03b5201cb
Former-commit-id: 8aadfe944a
2014-08-25 08:19:50 -05:00
Brian.Dyke
d4d26aaf75 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: aaabfa6cd0 [formerly 14d21b336d [formerly 614b2bb59424f01d2608cd2db3a14dbcd77c90e6]]
Former-commit-id: 14d21b336d
Former-commit-id: f6748f1e28
2014-08-21 12:07:16 -04:00
Qinglu.Lin
bd03ec7a6f ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b

Former-commit-id: 2157a4aa3b [formerly fb92838427 [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]]
Former-commit-id: fb92838427
Former-commit-id: 3cc94603a2
2014-08-21 10:43:22 -04:00
David Friedman
280f4a4b64 ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f

Former-commit-id: 6a7638ddae [formerly 78ee5a56c5 [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]
Former-commit-id: 78ee5a56c5
Former-commit-id: b053e1e2ce
2014-08-20 14:13:32 +00:00
Steve Harris
7a8a23973c Merge branch 'master_14.2.2' (14.2.2-27,28) into omaha_14.2.2
Former-commit-id: 5dd1435a5e [formerly 0d6d3bd7f5 [formerly 8f436bd859a52374fe5788102465a6a20355fda2]]
Former-commit-id: 0d6d3bd7f5
Former-commit-id: c998370edd
2014-08-19 12:38:53 -05:00
Brian.Dyke
a16d1d02b2 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: ca564e58ea [formerly ef9ddd0f98 [formerly 3c1db35ef591bfe9c5124ad9c4c801d6acbdb8f8]]
Former-commit-id: ef9ddd0f98
Former-commit-id: 3bba82c371
2014-08-18 13:17:13 -04:00
Brian.Dyke
867b82ca10 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: d82d58d38e [formerly 9a212410b5 [formerly 5c9880c3179bf376798bb5658aec3666bddd7d3e]]
Former-commit-id: 9a212410b5
Former-commit-id: 2054d6f844
2014-08-18 11:47:38 -04:00
Brian.Dyke
367d7d8840 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 4d47e00887 [formerly 0bdacc25f6 [formerly 7a7e030bd70bb5bfee849750f1a8e1e4238ec0ee]]
Former-commit-id: 0bdacc25f6
Former-commit-id: f33e622e9d
2014-08-18 10:20:49 -04:00
Melissa Porricel
c05a460f4d ASM #15699 - Fix Grib decoder error
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511

Former-commit-id: 7e78946ee0 [formerly 67e44f145a [formerly e8c156d166cedc1553f9ffd8867633651443872d]]
Former-commit-id: 67e44f145a
Former-commit-id: 9f20c63f97
2014-08-15 13:41:53 -04:00
Brian.Dyke
a346d38358 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: d3888b16f3 [formerly 8b1b457310 [formerly bdfe1c263b8bcc0f6ebc8fd31c506e76271319ea]]
Former-commit-id: 8b1b457310
Former-commit-id: a73c8d4cda
2014-08-15 11:52:35 -04:00
Michael Gamazaychikov
d0c9d21538 ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805

Former-commit-id: c14a5287ac [formerly 9897417235 [formerly 126ec43423a864df597bd6dd745671ee0bf4fbfb]]
Former-commit-id: 9897417235
Former-commit-id: 2b450af136
2014-08-15 11:03:23 -04:00
Nate Jensen
4e99fa096a Issue #3524 ensure apache httpclient always sends credentials with https
requests

Change-Id: Ia3fef0d2236167c8b48c0107848f7e8a925acc1c

Former-commit-id: 9ddde59743 [formerly 5bcddf1af1 [formerly 843a3b51f2fd90275149d0d814f280ed64247a2c]]
Former-commit-id: 5bcddf1af1
Former-commit-id: 6907c5a1cf
2014-08-15 09:15:11 -05:00
Steve Harris
5c3f6ea126 Merge branch 'master_14.2.2' (14.2.2-26) into omaha_14.2.2
Former-commit-id: b4ac2e9c2c [formerly 1839d53d2c [formerly c5d804b092e56082337b80f717c6b2f3307fd9be]]
Former-commit-id: 1839d53d2c
Former-commit-id: f23139ba39
2014-08-13 14:50:49 -05:00
Ron Anderson
76d75f775d Issue #3517 Improved iscMosaic memory utilization and error handling when unzipping input file.
Change-Id: Idcce2dd53e39a8b483c2d5e244d4ec27bce94489

Former-commit-id: e4d1cfe9e5 [formerly 10a5053981 [formerly 36d33879425d32b4ff7de617d511d7a2c51b6a4e]]
Former-commit-id: 10a5053981
Former-commit-id: d39b184eea
2014-08-13 09:03:48 -05:00
Brian.Dyke
d023813321 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: aefe154e51 [formerly 59183249ed [formerly 84fc55492f7eccf55d3bf8e7e3227c882286a8fb]]
Former-commit-id: 59183249ed
Former-commit-id: 63f000f11d
2014-08-12 13:24:35 -04:00
Richard Peter
d63eb7e878 Issue #3458 Update ldm-6.11.5 queue size
Change-Id: I6e434d31c9f39c896630b685ee9d86e81cc32afb

Former-commit-id: 7317d99519 [formerly a9f8b72b6f [formerly c717d54c05cdae71b050eeee6afb06e6c71753a8]]
Former-commit-id: a9f8b72b6f
Former-commit-id: 635393cfb5
2014-08-11 11:54:59 -05:00
Brian.Dyke
19179c5e7b Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 54808cc027 [formerly d5177787c6 [formerly 6c54705000e153a9c17465631149a26aaf5f8c67]]
Former-commit-id: d5177787c6
Former-commit-id: c532d924ee
2014-08-08 11:31:24 -04:00
Bryan Kowal
632e493332 Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.

Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903

Former-commit-id: b568c25e10 [formerly a9b4b4124a [formerly d11649deb78aa356f27a22f33b38f7238513576c]]
Former-commit-id: a9b4b4124a
Former-commit-id: 09442217cd
2014-08-07 16:27:46 -05:00
Richard Peter
d3ba2f19bf Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: 96a1821753 [formerly 477119b739 [formerly e537db61848adeea0cef18e6a769597d746d6620]]
Former-commit-id: 477119b739
Former-commit-id: fc6aae3c3c
2014-08-07 14:01:54 -05:00
Richard Peter
56bf2c9b35 Merge "Issue #3493 Grouped common VTECs together" into omaha_14.2.2
Former-commit-id: 76b2d682ab [formerly cefae5e9bd [formerly 90a8191245d599077ea7d42de2ee80f074a7397a]]
Former-commit-id: cefae5e9bd
Former-commit-id: 83eae94f7b
2014-08-07 09:21:55 -05:00
Jonathan Sanchez
e9b5d0afe0 Issue #3493 Grouped common VTECs together
Change-Id: Ia72150a4782e95ea075f42979c489f7ef5d69fb9

Former-commit-id: 31c3135496 [formerly 0302efdc77 [formerly 47de8da4cadd899ae9aa0ffe6c89a109491966bc]]
Former-commit-id: 0302efdc77
Former-commit-id: 46c3625f0c
2014-08-06 17:40:44 -05:00
Bryan Kowal
51cf294761 Issue #3470 - finished TODO in yajsw ShellScript.java
Former-commit-id: 3b080e7c36 [formerly dd00d2fe38 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]]
Former-commit-id: dd00d2fe38
Former-commit-id: dd7ae1f7d3
2014-08-06 16:34:35 -05:00
Ron Anderson
94cf72add5 Merge "Issue #3498 Provide upgrade scripts for Topo file name in D2D procedures and saved displays" into omaha_14.2.2
Former-commit-id: a1ea3eb3bc [formerly 6e25166972 [formerly 1ed1ff3aabd3d3a4835591940fc70647147667f6]]
Former-commit-id: 6e25166972
Former-commit-id: d38ab4f344
2014-08-06 16:14:00 -05:00
Ron Anderson
b15013e959 Issue #3498 Provide upgrade scripts for Topo file name in D2D procedures and saved displays
Change-Id: I2b4577c972c884af08d59d7815017806928efa69

Former-commit-id: d3728fc462 [formerly cd72d75216 [formerly bb204013345db535d7cf9ca103cb033cf2507def]]
Former-commit-id: cd72d75216
Former-commit-id: 0654b75fb2
2014-08-06 14:00:47 -05:00
Ron Anderson
40e93f4626 Merge "Issue #3458 Increase ldm to edexBridge shared memory queue." into omaha_14.2.2
Former-commit-id: 214ec8cfa5 [formerly 5aa1d7b692 [formerly 1db29b26474545b85445ca4f0d5da75ff77f88c4]]
Former-commit-id: 5aa1d7b692
Former-commit-id: a93ba59bd1
2014-08-06 12:06:32 -05:00
Richard Peter
1e6502af95 Issue #3458 Increase ldm to edexBridge shared memory queue.
Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468

Former-commit-id: 8374869379 [formerly bd2d97dc46 [formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]]
Former-commit-id: bd2d97dc46
Former-commit-id: 01692edc6b
2014-08-06 10:57:31 -05:00
Jonathan Sanchez
290cd3eb49 Issue #3493 Allowed multiple watches to be displayed.
Change-Id: I8c69a07a5162868bc2a179960c7beb07d350cde9

Former-commit-id: 27d0e8eb52 [formerly 2946dc1904 [formerly e06ba2d33f9969ee3dc87491ac6bfa3e9ccb40b8]]
Former-commit-id: 2946dc1904
Former-commit-id: a07674c864
2014-08-05 12:23:16 -05:00
steve.naples
c8725135dd ASM #15671 Fix PostShef to allow ingest with token set load_shef_ingest and ingestfilter not populated.
Change-Id: I55d8718f9bc50c9b0ce070e8a11cf09b3b4ff0fb

Former-commit-id: 0bb82e215e [formerly 8185a7cd54 [formerly ed6769c047b8b21782da9a6040f2601465c150a2]]
Former-commit-id: 8185a7cd54
Former-commit-id: f5f348d681
2014-08-05 16:43:53 +00:00
Brian Clements
5a11e28b11 Issue #3488 added bin range check to bin lightning decoder
Change-Id: Ib445da1a33c84283bc8dd46521b6f7c3381a51f9

Former-commit-id: 432f43b567 [formerly 8d928ab3a2 [formerly 53b274aab9952d372221c686d886ac12e8eb2e6a]]
Former-commit-id: 8d928ab3a2
Former-commit-id: ba934c5411
2014-08-04 14:54:13 -05:00
Brian Clements
8b10703f28 Issue #3488 added sanity check for bin range in lightning viz resource
Change-Id: I23ec1614821dcbc18c06f58e3ef00371988fc30a

Former-commit-id: 30ca12aae7 [formerly 7b312ab6a7 [formerly 701b56ec37053654e64cfd6ea831aad4ea7b9d8a]]
Former-commit-id: 7b312ab6a7
Former-commit-id: dfc3545bf5
2014-08-04 11:22:12 -05:00
Juliya Dynina
33f17b1c7b Merge "ASM #15665 - Improve SatResource.java logging" into asm_14.2.2
Former-commit-id: 9e2124dd23 [formerly 072104e2d7 [formerly 98b85b738d099d8e2cc811aace8d6e6d913e45e9]]
Former-commit-id: 072104e2d7
Former-commit-id: 08c503140e
2014-07-31 13:59:38 -05:00