Commit graph

5909 commits

Author SHA1 Message Date
Nate Jensen
2baedbf6b8 Issue #3337 disable logback packaging data in cave
Former-commit-id: 939fde1575 [formerly c003d70168 [formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]
Former-commit-id: c003d70168
Former-commit-id: 56363ffc4a
2014-07-02 09:24:15 -05:00
Steve Harris
070e025fb4 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: fcecd75dfd [formerly 483a69c58d [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]
Former-commit-id: 483a69c58d
Former-commit-id: 4882158177
2014-07-01 18:05:43 -05:00
Brian.Dyke
505d2d7938 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: f8759e2317 [formerly 3ed9e07c44 [formerly 625eefb5f53e292d947233c1cd0aa031e61ca9ea]]
Former-commit-id: 3ed9e07c44
Former-commit-id: 7b205d97ca
2014-07-01 15:41:10 -04:00
Steve Harris
6a7aeb3557 Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 30cdbff7f8 [formerly 1c8dc56d49 [formerly 382c772c196711d230395f34a04559c188880622]]
Former-commit-id: 1c8dc56d49
Former-commit-id: f68e051938
2014-07-01 13:38:18 -05:00
Ron Anderson
319819d3a7 Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)

Former-commit-id: 4123073c4e [formerly 2c5f910f90 [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]
Former-commit-id: 2c5f910f90
Former-commit-id: c7a74ab5b1
2014-07-01 13:56:41 -04:00
Ron Anderson
1f056e7ab9 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: 487c7ee30a [formerly beee08c32b [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]
Former-commit-id: beee08c32b
Former-commit-id: 9818d9b485
2014-07-01 13:56:05 -04:00
Steve Harris
741dc31fcb Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]
Former-commit-id: d4dc1723c1
Former-commit-id: 2f2958df37
2014-07-01 11:08:46 -04:00
Juliya Dynina
9fc999e435 Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 102da2d0f7 [formerly b5e4bc1fdc [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]
Former-commit-id: b5e4bc1fdc
Former-commit-id: bf765525b7
2014-07-01 10:05:57 -05:00
Juliya Dynina
0959178a06 Merge "ASM #660 - WarnGen can generate polygons that do not match hatched area" into asm_14.2.2
Former-commit-id: 3aeceabb7a [formerly 0fe04515ad [formerly 2260a05df61ec1dc21cc6619fcb48713368e3a46]]
Former-commit-id: 0fe04515ad
Former-commit-id: 3ee22b685d
2014-07-01 09:01:55 -05:00
Sean.Webb
4aa35df7c7 ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03

Former-commit-id: 0b29e66772 [formerly c24c2f1e3e [formerly add5d004eca457782f957a95262e880b91dfeeb1]]
Former-commit-id: c24c2f1e3e
Former-commit-id: 5288764393
2014-06-30 16:06:25 -04:00
Qinglu.Lin
660d1c9ff2 ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81

Former-commit-id: 1d52d020eb [formerly 1200633cd2 [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]
Former-commit-id: 1200633cd2
Former-commit-id: 1180b31875
2014-06-30 13:09:15 -04:00
David Friedman
5c62d368ea ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652

Former-commit-id: dc25040a25 [formerly 18b3b61afc [formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]]
Former-commit-id: 18b3b61afc
Former-commit-id: c4967a96fb
2014-06-27 19:17:55 +00:00
Mike Duff
0de6d3b92a Issue #3321 - Fix ingest switch checks
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12

Former-commit-id: d62c925baa [formerly f17c93bb19 [formerly 5df0ac7f96d1280c1c50f39982693f9503b56f14]]
Former-commit-id: f17c93bb19
Former-commit-id: 1d3aeb881b
2014-06-26 16:23:02 -05:00
Brian.Dyke
5b88408af1 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 3df14b5a94 [formerly a5ae302690 [formerly 632577244e843dd122c00b745e973730c7920246]]
Former-commit-id: a5ae302690
Former-commit-id: a48268a1d6
2014-06-26 10:39:49 -04:00
Ron Anderson
8c0311507b Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9

Former-commit-id: a6956a8ccd [formerly ead09dd683 [formerly 04805a8957ef14754225f85f4722d8302cde8df3]]
Former-commit-id: ead09dd683
Former-commit-id: 5dd7a035ac
2014-06-25 19:12:51 +00:00
Ron Anderson
cdef6bd26c Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46

Former-commit-id: 2ac9cd84ec [formerly 898b30fadb [formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]]
Former-commit-id: 898b30fadb
Former-commit-id: f76a2d3700
2014-06-25 13:21:32 -05:00
Steve Harris
7f040f069c Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: ddc6f2092a [formerly 89606076ec [formerly 174fe6d66525229f328846a1f4564300d7603c10]]
Former-commit-id: 89606076ec
Former-commit-id: 3f2058a1ab
2014-06-24 10:57:56 -05:00
Ben Steffensmeier
886e738c6f Issue #2661 Fix grid time series errors when there is no data.
Former-commit-id: 46b8688597 [formerly aaa146b2d0 [formerly 2fdb5867131b54f5d74ef3edd8c621c8807d4d99]]
Former-commit-id: aaa146b2d0
Former-commit-id: 2c1988017e
2014-06-24 10:57:02 -05:00
steve.naples
e994aa9482 ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9

Former-commit-id: 90ed511478 [formerly efe877d82b [formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]
Former-commit-id: efe877d82b
Former-commit-id: 2a49bbda2f
2014-06-24 15:52:23 +00:00
Nate Jensen
ef9e4c2439 Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor

Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit e39ecf5473 [formerly 4558fe5862] [formerly 845483346f] [formerly 65eb76ff66 [formerly 845483346f [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]])

Former-commit-id: 65619399a0 [formerly ca27873204 [formerly f0ad63d2ccf347e92274701f9890e120b9e70140]]
Former-commit-id: a160f9e2840f0ab223e8e22743c49a053da45545 [formerly ca27873204]
Former-commit-id: 333f8317bb
2014-06-23 11:59:26 -05:00
Nate Jensen
cfd3efcfe2 Issue #3307 fix xml serialization of looping field
Former-commit-id: 97ef9fc343 [formerly 51da67dd3f [formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]]
Former-commit-id: 51da67dd3f
Former-commit-id: c7c0d9cb4b
2014-06-23 09:54:11 -05:00
Steve Harris
869235c02a 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: 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]
Former-commit-id: b84dda5930
Former-commit-id: 16f5ff0979
2014-06-20 14:01:55 -04:00
Nate Jensen
e39ecf5473 Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor

Change-Id: I210ac789322c975cb93584facb3eec417f5097f2

Former-commit-id: 65eb76ff66 [formerly 845483346f [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]
Former-commit-id: 845483346f
Former-commit-id: 4558fe5862
2014-06-19 10:02:34 -05:00
Brian.Dyke
e3dc97e246 CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 8ecdd9a192 [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]
Former-commit-id: 399c06820a
Former-commit-id: be589ceb9b
2014-06-18 08:55:49 -04:00
Brian Clements
ccac7c3d47 Issue #2903 prevent shared display crash from missing point style enum value
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173

Former-commit-id: 5d03048fff [formerly 9946f78241 [formerly 5d298b39786d37aa365ccfe2c337214d1e46f1a9]]
Former-commit-id: 9946f78241
Former-commit-id: b8a0a60df6
2014-06-17 17:01:23 -05:00
Nate Jensen
8ce9a5e5b8 Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
Former-commit-id: ed36453f09 [formerly c2aa87470d [formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]]
Former-commit-id: c2aa87470d
Former-commit-id: eddc8f373a
2014-06-16 08:31:30 -05:00
Steve Harris
e67900933d Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
Former-commit-id: 6c82cc5c3d [formerly 1d2b8aeb7b [formerly 4041e8afbb4bf1c0c416624140d74d27e963f9c8]]
Former-commit-id: 1d2b8aeb7b
Former-commit-id: 0c3dcb77d5
2014-06-16 07:49:58 -05:00
Brian.Dyke
232d538288 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: 482f915b42 [formerly 30d8644fa5 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]
Former-commit-id: 30d8644fa5
Former-commit-id: 06c565d74f
2014-06-13 14:05:49 -04:00
Brian.Dyke
4766b3f49f CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 81832d97e5 [formerly 346bf852cd [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]
Former-commit-id: 346bf852cd
Former-commit-id: 5064d24e26
2014-06-13 13:21:19 -04:00
Brian Clements
89a5679714 Issue #2903 changed collaboration jaxb xml to be base64 encoded
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c

Former-commit-id: ef0ecfd1d4 [formerly 5424eb0258 [formerly afcfdf1ed08cd64deb085b909f0965e4ab68d92d]]
Former-commit-id: 5424eb0258
Former-commit-id: 909561d871
2014-06-12 13:40:33 -05:00
Brian.Dyke
c4ecd90117 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 6fcc2604e0 [formerly a011c0b6bb [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]
Former-commit-id: a011c0b6bb
Former-commit-id: e802508e98
2014-06-12 07:07:17 -04:00
Steve Harris
61cb3f45b4 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: 9510608b74 [formerly ad6e9fa5ee [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]
Former-commit-id: ad6e9fa5ee
Former-commit-id: 3a3277c469
2014-06-11 12:55:44 -05:00
Ana Rivera
c1e504cdfa VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e

Former-commit-id: 9da58db461 [formerly 65e90953c2 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]]
Former-commit-id: 65e90953c2
Former-commit-id: 4b515bfd0a
2014-06-11 17:35:55 +00:00
David Friedman
350566a514 ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e

Former-commit-id: 1c84c31e30 [formerly b8542c1332 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]
Former-commit-id: b8542c1332
Former-commit-id: 6d0d3f5ba5
2014-06-11 13:37:16 +00:00
dmsys
ca9a4ac6fb Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 1f0a6112c7 [formerly b7cfb9e752 [formerly 161ffe72d115c7846697afa8be559d2f5fd199da]]
Former-commit-id: b7cfb9e752
Former-commit-id: fc77941b88
2014-06-10 17:17:26 -04:00
Ben Steffensmeier
6f21122f93 Issue #2661 Fix vector derived parameter.
Former-commit-id: 0a66c47341 [formerly cd60dc028a [formerly 238043b8c4286e398176d4d6c78e585e33faa5da]]
Former-commit-id: cd60dc028a
Former-commit-id: 1f270a6059
2014-06-10 15:44:33 -05:00
Brian.Dyke
7056d79f70 Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 9ab17ddecb [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]
Former-commit-id: f72380ad60
Former-commit-id: 0f07e14bf1
2014-06-10 13:56:03 -04:00
Brian.Dyke
64a10ce12d CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: 8874d41872 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]
Former-commit-id: c1b3f9d180
Former-commit-id: ef5c74dece
2014-06-10 12:52:59 -04:00
Steve Harris
483d61f414 Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: bd98f04cde [formerly 14370245fd [formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]]
Former-commit-id: 14370245fd
Former-commit-id: 6e09bce335
2014-06-09 15:20:03 -05:00
Mike Duff
b2162559fe ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1

Former-commit-id: 39173c380c [formerly 81ab64d7ff [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]
Former-commit-id: 81ab64d7ff
Former-commit-id: b876d9755a
2014-06-06 16:03:14 -04:00
Xuezhi.Wei
ba05b6f16a ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2

Former-commit-id: 33b235a0a4 [formerly bdbeec662c [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]
Former-commit-id: bdbeec662c
Former-commit-id: 81ec03e291
2014-06-06 17:40:09 +00:00
Juliya Dynina
1b61a32634 Merge "ASM #114 - Problem with Distance Speed Tool." into asm_14.2.2
Former-commit-id: 87216a87de [formerly 80a83bd44c [formerly 1e1c7cbcee94e782338d440d585a3217ad606725]]
Former-commit-id: 80a83bd44c
Former-commit-id: 21cd415434
2014-06-06 09:50:36 -05:00
Sean Webb
52283357c8 Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: cb43d21243 [formerly 016648ffaf [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]
Former-commit-id: 016648ffaf
Former-commit-id: e0f9eabb45
2014-06-05 15:03:11 -05:00
Fay.Liang
46926b679d ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7

Former-commit-id: c5e6daa943 [formerly d1aa160aa7 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]
Former-commit-id: d1aa160aa7
Former-commit-id: fa2cdbfac1
2014-06-05 15:49:27 -04:00
Chip Gobs
12f78bef75 VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse.
Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d

Former-commit-id: 036d1c4d31 [formerly 83ac596f9e [formerly 6944361d04e7462f768bb74f00780dc8b8a51225]]
Former-commit-id: 83ac596f9e
Former-commit-id: a5c4402f34
2014-06-05 13:37:02 -04:00
Stephen Gilbert
bb2323b792 VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b

Former-commit-id: d49482965e [formerly b7d93ed06d [formerly c681ba369a486f3ff3c7a324837a78e9c5594b4b]]
Former-commit-id: b7d93ed06d
Former-commit-id: 11cf39ce44
2014-06-05 12:06:35 -04:00
Mike Duff
3a3928cde3 Issue #3222 - Fix for SHEF posting times
Former-commit-id: f5f101d416 [formerly 8a5acd085d [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]
Former-commit-id: 8a5acd085d
Former-commit-id: 28a42f3f10
2014-06-05 09:35:07 -05:00
Michael Gamazaychikov
efd0fb50b8 ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75

Former-commit-id: 50ab77046b [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]
Former-commit-id: c07bcacbf8
Former-commit-id: e5a9fa0827
2014-06-05 13:43:04 +01:00
Brian.Dyke
67cef121bf ASM #557 - Removed rh6 dependency from wxgtk rpm requirements...modified spec file
Former-commit-id: 7db87d6ccb [formerly d708eeb7d8 [formerly f671db68bfab4b9c17eb25050468e5b6306e6359]]
Former-commit-id: d708eeb7d8
Former-commit-id: de6a06bc8c
2014-06-04 11:52:00 -04:00
Brian.Dyke
a91c426ee7 Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: 3919c9ec2f [formerly 61b206be0b [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]
Former-commit-id: 61b206be0b
Former-commit-id: feb26ee9b7
2014-06-04 07:46:16 -04:00