Commit graph

3525 commits

Author SHA1 Message Date
Fay.Liang
3aa9f17455 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: de502a310b [formerly 8f839ec64da04492e6cf109fdf47b95f08db5388]
Former-commit-id: 07c742044d
2015-02-03 16:04:56 -05:00
Fay.Liang
5550322f62 Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: f1c34884a5 [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]
Former-commit-id: ae85ade54d
2015-02-03 11:24:57 -05:00
Matthew Howard
9c2ab1517f Merge "ASM #17055 - fix activeTableChange logging" into asm_14.4.1
Former-commit-id: 5bdaf8cd94 [formerly e14672d6e2b075792600c4d4d709044049e21d04]
Former-commit-id: a1c925be94
2015-01-30 14:29:49 -05:00
Ana Rivera
ccd0a40621 Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5

Former-commit-id: 070f0136ec [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]
Former-commit-id: ea92049aac
2015-01-30 19:29:29 +00:00
Rici.Yu
2fd2028490 ASM #17055 - fix activeTableChange logging
Change-Id: I863a43005685b5b73eb96d80f0ffa46d12ecfcbc

Former-commit-id: e9349a6701 [formerly 777729392f9cdbbcfe3bbdd7ac4c19c714dfb31a]
Former-commit-id: 969e5ca72b
2015-01-30 13:19:40 -05:00
Zhidong.Hao
60fbbed390 ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
Change-Id: I64fe04fb736e9dae2158d0dc1401af5795d2ddeb

Former-commit-id: 6ab746f74a [formerly 86cf0fa14af93c1bf35f57e566e19ad45fb34b34]
Former-commit-id: caa2ebde5e
2015-01-30 11:31:36 -05:00
Fay.Liang
4c69a4bc24 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: e8b40ad087 [formerly 8c72e62260026a2d1d2fb41839f1e79535b09b7f]
Former-commit-id: 8aa0a2a200
2015-01-28 14:31:02 -05:00
Ana Rivera
4071b58b85 Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40

Former-commit-id: 20ad0a65f3 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]
Former-commit-id: 8bfa7c4087
2015-01-27 22:05:59 +00:00
Fay.Liang
65d91d9113 Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 7bc10075e5 [formerly 6ad30059fa7249aba100a39c7c39215212a929cc]
Former-commit-id: d29d86ad05
2015-01-27 12:08:28 -05:00
Ana Rivera
62094315d2 Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18

Former-commit-id: 327945af8b [formerly 889608360567b829f81ed6392c64c669798f34a9]
Former-commit-id: 7c5fc26537
2015-01-27 16:28:42 +00:00
Ana Rivera
654d08a588 Merge branch 'master_14.4.1' into emc_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1

Former-commit-id: 7c25945fd9 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]
Former-commit-id: 98ac97e397
2015-01-26 18:45:26 +00:00
Shawn.Hooper
e6c4f29036 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: e84a037b2e [formerly 95cdc2d817eac840017fc14746c2ada498f1a716]
Former-commit-id: 568b7c801a
2015-01-26 11:22:49 -05:00
Steve Harris
8cd9e2e92f Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec

Former-commit-id: 0f05c53a53 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]
Former-commit-id: 158fa16376
2015-01-23 09:08:06 -06:00
Daniel.Huffman
f4ac238888 ASM #17057 RadarDecoder::AlertMessageSanityCheck
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c

Former-commit-id: a25fa81a0f [formerly 498f55c757f20f70b11a921a2e5948c3c7c49c90]
Former-commit-id: 845998cbfa
2015-01-22 21:13:04 +00:00
Shawn.Hooper
7839dab5e6 Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: a757b55446 [formerly d53c809149da23fcae51138cc45c57aecd641794]
Former-commit-id: 0bc501bd4c
2015-01-22 16:05:41 -05:00
Dave Hladky
5fd928ec4c Omaha #3918 Central registry web interface broken by DPA fix.
Former-commit-id: a15e67385a [formerly 5aa305adb5fd16c72ce557309cab28fd287379d9]
Former-commit-id: c1127b066f
2015-01-22 13:22:18 -06:00
Ana Rivera
4f8900fd23 VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f

Former-commit-id: 18b9d5d163 [formerly 8a66266d3ffa236343f14089d7e7b32c1060f9ea]
Former-commit-id: 7b47ffe362
2015-01-22 16:11:44 +00:00
Nate Jensen
f88f62191f Omaha #3993 ensure important dataplugin utility folders are included in
viz builds

Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747

Former-commit-id: b434ae1343 [formerly 9f30c7195d6a62206bae05d6e17df4a8e068255e]
Former-commit-id: 05307be9d0
2015-01-13 16:47:04 -06:00
Fay.Liang
1934dedd2d ASM #15311 - Merge changes from asm_14.4.1 into master_14.4.1
Merge branch 'asm_14.4.1' into master_14.4.1

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java

Former-commit-id: a09a27a963 [formerly 67315d8c5f28f5ed5e0870f65de30a9c2c2bd290]
Former-commit-id: 13fb781066
2015-01-13 14:35:30 -05:00
Slav Korolev
f08d184cfc Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
Former-commit-id: b8ab18d3e1 [formerly 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e]
Former-commit-id: 9c57dab437
2015-01-12 14:32:31 -05:00
Fay.Liang
6b77894bd0 ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: eed6737801 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]
Former-commit-id: c6bd5d7675
2015-01-12 13:03:31 -05:00
Nate Jensen
c37ffcde90 Merge "Omaha #3918 Fix for standalone clients not starting due to central registry non-existance. Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292" into omaha_14.4.1
Former-commit-id: 06054344dd [formerly 5fc926b7e735f2c92b16a85a7ba5f663a443ea53]
Former-commit-id: 44f0f7aafc
2015-01-12 09:22:30 -06:00
Michael Gamazaychikov
1aa98e754a ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: Ife5ecb2c5823d4d34c1b4af6dc53fa360074b7bb

Former-commit-id: e007fac30f [formerly 38eabd6196df1576970019f2b0255d3f39a825a9]
Former-commit-id: bae8d9ea3f
2015-01-09 15:07:29 -05:00
Ying-Lian.Shi
4109770c59 ASM #15035 - Add SFMG WNJ GFE Domain definition to baseline serverConfig, double quote to sigle quote
Change-Id: I9c652fdc3440d8c15a0c443a6b80a8a10877693e

Former-commit-id: c99e199a69 [formerly af67fa0f955b35c7b9b141fef507a5db805eaa27]
Former-commit-id: 3e1d1aa814
2015-01-08 15:28:54 +00:00
Juliya Dynina
206a985f23 Merge "ASM #632 -Filter erroneous RPG alert messages." into asm_14.4.1
Former-commit-id: 2efa96316e [formerly 503e8a59c9608c3094d817e3e2d5e07250c0e0e5]
Former-commit-id: d0072cd181
2015-01-07 09:02:32 -05:00
Daniel.Huffman
22f923eaf5 ASM #632 -Filter erroneous RPG alert messages.
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e

Former-commit-id: 7a563dd505 [formerly d7d3bc55053f16da410d3ebe1ef055e93d198790]
Former-commit-id: 9db291b296
2015-01-07 00:41:35 +00:00
Dave Hladky
c6aca09cf3 Omaha #3918 Fix for standalone clients not starting due to central registry non-existance.
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292

Former-commit-id: 36ab95205f [formerly d8a52577bbe13f53f9afbbae354e8bc58e11a0ed]
Former-commit-id: 66aa4b2fbf
2015-01-06 14:37:01 -06:00
Brian Clements
111c81d35c Omaha #2707 replaced LSR officeId constraint with stationId
Change-Id: I05fef0c56801fa907e45da3400437e71ce0e38dd

Former-commit-id: ac952bc760 [formerly e0cd69f020d351f0aaefd5b35ffb369e44a04e48]
Former-commit-id: acc9e8630d
2015-01-06 12:33:06 -06:00
Rici.Yu
4d10daca1f ASM #16942 - GFE: VTEC Active Tables not getting purged
Change-Id: Ia00f0c5d9f0a9f8abadde271f3608fd4e786a60b

Former-commit-id: 483d0216da [formerly a98e1f924bf0b99657dd56241c02f529c5e48ce7]
Former-commit-id: 97c7681e01
2014-12-30 13:56:02 -05:00
Nathan Bowler
f7acda4f6a Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance.
Change-Id: I168bd135ae3ddd386761bb87b9160eb97f718642

Former-commit-id: a674630b92 [formerly 6f9709b43d307494dfa702030b961964ec8d2170]
Former-commit-id: 863ac95fef
2014-12-19 12:56:43 -05:00
Ana Rivera
3686a4e170 VLab Issue #5704 - Update NWPS: runManualNWPS_OutsideAWIPS.sh; fixes #5704
Change-Id: I32484682f1eb2bccd286673a1ea15cebd8df9320

Former-commit-id: 77d66167f0 [formerly b016c3bcb587c04b4d0e5d21ecce6f5e6bb3e75d]
Former-commit-id: 57d8d5794d
2014-12-18 14:13:24 +00:00
Kiran.Shrestha
897ca1de81 ASM #622 Total Precipitable Water (TPW) satellite field should be displayed in inches
Change-Id: Ia7aba807682f559f11522491f7d64280eef9eac0

Former-commit-id: 991f4c22c8 [formerly 039ccf8cf811b9e4f868138da8074df3ea4a862a]
Former-commit-id: 8216ea6b6b
2014-12-17 21:20:57 +00:00
Juliya Dynina
e9d9b1c7bd Merge "ASM #14638 trigger compare fixed." into asm_14.4.1
Former-commit-id: 9b4ae6de7e [formerly 61e8a1bf2cd87ac9ee16cb8969ba3d74ba4dd514]
Former-commit-id: aaf04680c4
2014-12-17 10:05:42 -05:00
Joshua Watson
0c375981e7 VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667

Former-commit-id: 5aa4748569 [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]
Former-commit-id: 3f2f7f2f3a
2014-12-17 08:38:27 -05:00
Daniel.Huffman
f520ff9d71 ASM #14638 trigger compare fixed.
Change-Id: I5dc06e8a509a9eeb2afa0c41b84a64b502f5e012

Former-commit-id: a91ea93823 [formerly ba6ed158aa84958ad791f2b83e5f95b0cb302f20]
Former-commit-id: 9484ea870e
2014-12-17 06:20:52 +00:00
Ana Rivera
214be0a93b Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895

Former-commit-id: 1823ed3596 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]
Former-commit-id: 043bc3a8b7
2014-12-16 23:39:02 +00:00
Ana Rivera
15f81a3bc7 VLab Issue #4365 Decode Ensemble Kernel Density MOS (EKDMOS); fixes 4365
Change-Id: I1272721f43ee78b310fcf74227317cf27e8d6b28

Former-commit-id: dcf5dc2173 [formerly cb236c208fe6489f88144adab3178dccd4a826db]
Former-commit-id: 2eec9d9557
2014-12-16 16:39:22 +00:00
Zhidong.Hao
9ab6bab9cf ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
Change-Id: I656058629e2982a20312fca7f7024db82a8ad2fb

Former-commit-id: c3b623cb6d [formerly 133d3f229145c8ac84f31a8a6becc98688d189ae]
Former-commit-id: e443ced7f1
2014-12-16 10:16:35 -05:00
Juliya Dynina
b67ff1b062 Merge "ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer." into asm_14.4.1
Former-commit-id: 88fbcaa849 [formerly 45ad574592e05ba3f9a0f27b2afd2c9a0e5d19a2]
Former-commit-id: 6b93d792f0
2014-12-15 12:25:14 -05:00
Michael Gamazaychikov
a2dfa180f3 ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer.
Change-Id: I74ff5b0abb7df0434bb7f66db080447a9d644266

Former-commit-id: ce2c685da4 [formerly 5c31d213c84dfa701eda80712ad5014bf4a012aa]
Former-commit-id: 4fbd55ebc0
2014-12-15 08:40:22 -05:00
Jordan Gerth
4003c09e47 VLab Issue #5345 - Ingest, Load, Display severe probability for a storm cell
Change-Id: I032b0db29ed8947df3fe630336bb01083dbfecd0

Former-commit-id: e0fd068337 [formerly fe7454aac732eae6bd0024be122b819e909f98fa]
Former-commit-id: 784c43ee33
2014-12-14 15:40:19 -06:00
Richard Peter
23eafaba3d Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: 8de1ebcb65 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]
Former-commit-id: 2457d0e6f7
2014-12-12 10:36:04 -06:00
Ana Rivera
b9fe58ea8b Merge "VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129" into field_14.4.1
Former-commit-id: 062d78a6e8 [formerly 3934ea2d8dc5507899ee6942e327c7c5d8eb28cf]
Former-commit-id: 41c487a291
2014-12-12 15:42:39 +00:00
Joshua Watson
0c8b629c96 VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840

Former-commit-id: bca4b40eed [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]
Former-commit-id: a8f5bb480b
2014-12-11 11:39:00 -05:00
Ana Rivera
0cfdd055bf Merge "VLab Issue #5240 - Baseline LMA; fixes #5240 Made changes suggested by Ben S. Made other changes suggested by Ben S. Made changes suggested by Richard Peter. Made change from Ben S. Change-Id: Ic7eb146c30d8024b34782187318e79882fc963bd" into field_14.4.1
Former-commit-id: d441204ed5 [formerly 3bf75dd1a19473014b39b7c50dc3936e6fb2b891]
Former-commit-id: 9c63026bfe
2014-12-11 16:38:06 +00:00
Jingtao Deng
a5041af702 VLab Issue #5062 - DR17605 Hydro Alert/Alarm mismatched report format between A1 and A2; fixes #5062
Change-Id: Ie5d29a5f2d375d473fe79b990019f757b20ad0bc

Former-commit-id: 831dbd1db6 [formerly ae2c45f9cd0ee5ecb8278ec99cb145525b2ce3a3]
Former-commit-id: fdd49db3c5
2014-12-11 11:14:52 -05:00
Juliya Dynina
95a028c971 Merge "ASM #16859 - Text decoder processes collectives inefficiently" into asm_14.4.1
Former-commit-id: bcb7eb353c [formerly ab502407cff717bb5cb86f79544c0665dd8a41f9]
Former-commit-id: 3b710ebee1
2014-12-09 12:22:39 -05:00
David Gillingham
02af20bcd9 Omaha #3885: Fix purging of practice VTECproducts when submitted in simulated time.
Change-Id: I5c4afa6ab0faf975388a25916d6616ce9eb05098

Former-commit-id: ae5a0f55d1 [formerly 35ae2af301ec8b66a65e1564c17f6e3f8d7623d2]
Former-commit-id: a41cc32a40
2014-12-09 11:21:29 -06:00
Jason Burks
7457631795 VLab Issue #5240 - Baseline LMA; fixes #5240
Made changes suggested by Ben S.
Made other changes suggested by Ben S.
Made changes suggested by Richard Peter.
Made change from Ben S.
Change-Id: Ic7eb146c30d8024b34782187318e79882fc963bd

Former-commit-id: 325f31f6ef [formerly a941dd68c3c5b42671ad78900d6d8f8231d70810]
Former-commit-id: 044b18a356
2014-12-08 21:01:19 +00:00
Zihou Wang
a94ea04543 VLab Issue #5571 - DR_17356 Remove extra sails tag; fixes #5571
Change-Id: Ic77c8413d7909fbd86bf6dbdcb58055be564a3f3

Former-commit-id: 42018056d9 [formerly 5737eb25c9ac5ca56229c2379246051521c4a343]
Former-commit-id: 0a4f817d28
2014-12-08 18:07:39 +00:00