Commit graph

5003 commits

Author SHA1 Message Date
Steve Harris
a14b996684 Merge branch 'master_14.2.2' (14.2.2-22) into omaha_14.2.2
Former-commit-id: 6a7f00f07d1ee3e9f39b299306083228eb5adb18
2014-07-24 11:35:24 -05:00
Brian.Dyke
ff4e52fc75 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: df900c3156da1ed48c512fe4b1356c4b4301ad5f
2014-07-23 16:46:09 -04:00
Steve Harris
eaa4456fa7 Merge branch 'master_14.2.2' (14.2.2-21) into omaha_14.2.2
Former-commit-id: 2c17b02a196584edbaa2cef33d8e9adc91567f8e
2014-07-23 13:07:11 -05:00
Jonathan Sanchez
86a8ca4a30 Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1

Former-commit-id: 135d7ffa84af58d7b3c9575e654fa1298b76b2e2
2014-07-22 15:32:12 -05:00
Steve Harris
bce7039508 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: c0033681d38af55bff79efbceec119606fcc5c2f
2014-07-22 10:26:33 -05:00
Ron Anderson
f3a6393b96 Issue #3415 Fixed d2dGridDataPurged to not purge NetCDF databases.
Change-Id: Ie52a5b8c46d58cb39acde27f0ebdde0c42fdfa67

Former-commit-id: a2362b68b103c9013d615815924514ebe44be147
2014-07-21 12:47:12 -05:00
Brian.Dyke
e55b892fc3 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 499b825592fdbdf150c918e5f3abacc4f37ddd70
2014-07-21 11:18:25 -04:00
David Friedman
ec25c44fe7 ASM #15049 - LAPS time matching problem
Change-Id: I52eee87defb407b741208e183b9829558bfa6733

Former-commit-id: 624c3a4225910863d5cc0b795493a39c0422a3e3
2014-07-18 17:06:05 +00:00
Nate Jensen
da731be2f7 Issue #2954 actually log when the scalesInfo.xml cannot be parsed before
falling back to the base version

Change-Id: I2df669504061160c6ace76560f07845f99a80912

Former-commit-id: 894e6ac1db5b34e6466c68aefa5877b9405bfd59
2014-07-17 13:27:48 -05:00
Nate Jensen
6e21526fd2 Issue #2954 fall back to existing map scales if map scale is missing
Change-Id: I75083325edec689c38f2fe7661c635ddf3e0f527

Former-commit-id: c7167ad2f59ba02edc842f321d12cd36cd6da8bb
2014-07-15 18:27:09 -05:00
Fay.Liang
87d50e7296 ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: I6238c25f867c0e6e491831e9c2b1c47e22484620

Former-commit-id: 3637d6387396f88811ec3964bd61d10ce0ee38eb
2014-07-15 10:22:09 -04:00
Nate Jensen
47bf21d7b5 Issue #3372 make LocalizationStreamHandler thread safe
Change-Id: I208b66fbd2b0bfcd225c3df98f96bcdcf5cb9a88

Former-commit-id: 87d5faa03ea63759a6805ed063174fb09ca4800a
2014-07-14 09:18:16 -05:00
Fay.Liang
400561ac9c ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: Ie345c88c4a3a0ff995c4d33772f90e863bed7ee5

Former-commit-id: f78783d2ea194539414294abff46d4f2acda65d1
2014-07-11 15:19:08 -04:00
Juliya Dynina
ac39f9cb43 Merge "ASM #15557 - Restore ability to display HPCGuide2.5" into asm_14.2.2
Former-commit-id: 9826716e2a5f59826e8a3789ca8d2d8f8dc58cce
2014-07-11 08:37:30 -05:00
Mike Duff
a35529bba4 Issue #3370 - Revert "Issue #3370 - Fix for mulitple shef types in same file."
This reverts commit b5b61650d3 [formerly 0c0b14929f74f2262559a4919171623870139313].


Former-commit-id: 43cbf77bb90ba12a6ee11bc35b18c226f9490a88
2014-07-10 16:01:56 -05:00
Melissa Porricel
d3c29b834d ASM #15557 - Restore ability to display HPCGuide2.5
Change-Id: Ibdcdd0aa95e406b5cd886dc8f51e74a3cde54d17

Change-Id: I5594c2151026247d48e657a30c7b4f94b14f036f

Former-commit-id: 5998e7ad9690e3b87805c75dcb711d299e8f1427
2014-07-10 16:15:12 -04:00
Mike Duff
b5b61650d3 Issue #3370 - Fix for mulitple shef types in same file.
Change-Id: I23110d7887b68ff073afdf61815d7dced9c4a3ad

Former-commit-id: 0c0b14929f74f2262559a4919171623870139313
2014-07-10 10:05:05 -05:00
steve.naples
339fcbc18a ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88

Former-commit-id: 24b9a6e0801cc653062a71d86090df3836aa86a4
2014-07-09 15:42:51 +00:00
Ron Anderson
111b04296c Issue #3332 Fixed race condition which could cause GFE grid saving to hang
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652

Former-commit-id: b01b72b896b894568acce6a8dc4d45328a06067a
2014-07-09 08:56:06 -05:00
steve.naples
75969ceec2 ASM #253 Update RadarBiasTableDialog fix issue of not saving.
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673

Former-commit-id: 9021eca6b32dd2b3859cd928c14a0e40a4907c13
2014-07-08 16:32:08 +00:00
Brian.Dyke
2ef4767652 Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
Former-commit-id: 845aebda9d8af143e3a6828c066b291e0343a020
2014-07-07 13:33:35 -04:00
David Friedman
a45fe1dad0 ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1

Former-commit-id: f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20
2014-07-03 13:58:24 +00:00
Juliya Dynina
244b2f5f3a Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: d6ae0d12f104de38b8fa770e4576b96a32da360c
2014-07-02 14:17:11 -05:00
Steve Harris
136af3f7e2 Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: c88d3136dbadab41df5fbf37b4b7c821dfcd07d9
2014-07-02 13:38:08 -05:00
Brian.Dyke
d56843d0e8 Merge branch 'm1413_m1422_merge' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2 CM-MERGE:14.1.3-4 into 14.2.2
Former-commit-id: 142e61e538fb094633933e5a2e1244441fc0106b
2014-07-02 13:18:10 -04:00
steve.naples
66c3241bc4 ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f

Former-commit-id: b9f868e0ced53987accf675bfe2ce1a1f4f34da1
2014-07-02 15:30:48 +00:00
Nate Jensen
c003d70168 Issue #3337 disable logback packaging data in cave
Former-commit-id: db10ba5a37dbe219110f4f902bf9257f2f220b3d
2014-07-02 09:24:15 -05:00
Steve Harris
483a69c58d Merge branch 'master_14.1.3' into master_14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: f947df2bf87c0df3e461be5c6dd72e13a0743f61
2014-07-01 18:05:43 -05:00
Brian.Dyke
3ed9e07c44 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 625eefb5f53e292d947233c1cd0aa031e61ca9ea
2014-07-01 15:41:10 -04:00
Ron Anderson
2c5f910f90 Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)

Former-commit-id: a0384ccfb30a877f14893c6cfa62d92117c0bb87
2014-07-01 13:56:41 -04:00
Ron Anderson
beee08c32b Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript.
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)

Former-commit-id: 49638ba1e9561dea7b318b7adc0f1ab9571170f5
2014-07-01 13:56:05 -04:00
Juliya Dynina
b5e4bc1fdc Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb
2014-07-01 10:05:57 -05:00
Juliya Dynina
0fe04515ad Merge "ASM #660 - WarnGen can generate polygons that do not match hatched area" into asm_14.2.2
Former-commit-id: 2260a05df61ec1dc21cc6619fcb48713368e3a46
2014-07-01 09:01:55 -05:00
Sean.Webb
c24c2f1e3e ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03

Former-commit-id: add5d004eca457782f957a95262e880b91dfeeb1
2014-06-30 16:06:25 -04:00
Qinglu.Lin
1200633cd2 ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81

Former-commit-id: 4d50beaed59d785d923e357f8ce036f6625ce4b4
2014-06-30 13:09:15 -04:00
David Friedman
18b3b61afc ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652

Former-commit-id: 993663cbee3f794981fc7f4cc97f96e3b86c47f8
2014-06-27 19:17:55 +00:00
Mike Duff
f17c93bb19 Issue #3321 - Fix ingest switch checks
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12

Former-commit-id: 5df0ac7f96d1280c1c50f39982693f9503b56f14
2014-06-26 16:23:02 -05:00
Brian.Dyke
a5ae302690 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 632577244e843dd122c00b745e973730c7920246
2014-06-26 10:39:49 -04:00
Ron Anderson
ead09dd683 Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9

Former-commit-id: 04805a8957ef14754225f85f4722d8302cde8df3
2014-06-25 19:12:51 +00:00
Ron Anderson
898b30fadb Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46

Former-commit-id: 2a84ea1af7bb767e9e85387de1fd90c662f9f91d
2014-06-25 13:21:32 -05:00
Steve Harris
89606076ec Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 174fe6d66525229f328846a1f4564300d7603c10
2014-06-24 10:57:56 -05:00
steve.naples
efe877d82b ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9

Former-commit-id: fcd20d35abf3617701cc797baf9ba2b3984379c8
2014-06-24 15:52:23 +00:00
Nate Jensen
ca27873204 Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor

Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit 845483346f [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716])

Former-commit-id: f0ad63d2ccf347e92274701f9890e120b9e70140
2014-06-23 11:59:26 -05:00
Nate Jensen
51da67dd3f Issue #3307 fix xml serialization of looping field
Former-commit-id: c6ce72840a4ee0f44eacff46015b5382d86dd47f
2014-06-23 09:54:11 -05:00
Steve Harris
b84dda5930 CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java

Former-commit-id: ce5767f2bbf5c9627bd43e766c6193c261c48af3
2014-06-20 14:01:55 -04:00
Brian.Dyke
399c06820a CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 86dc406cd227362abc5274f4cd64813ceb91d00d
2014-06-18 08:55:49 -04:00
Brian.Dyke
30d8644fa5 CM-MERGE:OB13.5.6-3 into 14.1.3
Merge branch 'master_14.1.3_merge' into master_14.1.3


Former-commit-id: 4b317062ce5c35823210cbbf023c0f0fc8051ef3
2014-06-13 14:05:49 -04:00
Brian.Dyke
346bf852cd CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: df99fcb0a4be27d5f2d22935847fb55b8bfbbb58
2014-06-13 13:21:19 -04:00
Steve Harris
ad6e9fa5ee Merge branch 'master_14.2.2' (14.2.2-13) into omaha_14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: If5dae78936eddf1bc4ee63f35beb96a0cb9defb9

Former-commit-id: cf56d49dc5a197fa114fa6c468860d63621a9cdc
2014-06-11 12:55:44 -05:00
David Friedman
b8542c1332 ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e

Former-commit-id: a3f4fd6537f3847011e199e0f043968d9f595937
2014-06-11 13:37:16 +00:00