Commit graph

525 commits

Author SHA1 Message Date
Fay.Liang
6dd4acc2c2 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 03e663afae6eb0998892e2921566652f42196e1f
2015-04-16 23:06:25 -04:00
Yun.Teng
dd5fd66fa5 ASM #17383 - Fixed error that time constraint being off
Change-Id: I7b00a4b0d1bd7822cd3f751264badfa62afc3bcb

Former-commit-id: d0e8d057f765d95c65ef121e784152d05bd1187c
2015-04-16 17:57:45 +01:00
Fay.Liang
8b31206de4 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: ff79e4fdaf62c76f39b0e1948d33e0b84df77011
2015-04-09 10:18:40 -04:00
David Gillingham
2f5d67f093 Omaha #4367: Revert baseline time constraints for WindGust back to 1 hr.
Change-Id: I8ed3b075b4097d37926d67c616a451fee38b4358

Former-commit-id: b6660c446ee92a6bf82b935920ee1c6def7f7699
2015-04-03 12:00:45 -05:00
Fay.Liang
60fd384f94 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: a8eb3c2346609e0ca351c494c5bdfa2090423019
2015-04-02 11:33:37 -04:00
Fay.Liang
08b89e7978 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 4a76f9bb72ade29ca23a158c0cb2ef038905fd07
2015-03-31 15:02:33 -04:00
Ana Rivera
9172a3bdd4 VLab Issue #7280 - NWPS:Add missing smartinit file (nwpsTrkngCG0.py) and remove extra parenthesis in nwpsCG1.py
Change-Id: I4dd0e31e936720c07b40a905017958d3f4def649

Former-commit-id: e3b0aef8afd48c54a3d947e5bbbe67c238f1fdd2
2015-03-30 20:51:57 +00:00
Yun.Teng
db554cf9ce ASM #17206 - Change some parametes that are not rate parameters
Change-Id: I8420e3d3b85e32420c5c91b802f7cdccc035bc2f

Former-commit-id: 23927a6c91076fedc6d53eb5ba2882166814134a
2015-03-30 16:39:34 +01:00
Fay.Liang
3233640aa2 Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 42d435f739134ec29a021415ed96b6c3406fc021
2015-03-18 14:54:46 -04:00
Steve Harris
9b749e134d Merge tag 'OB_14.4.1-18m' into omaha_14.4.1
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java


Former-commit-id: 390c7ec5c261717f6e0b2053761e12e1fcb68215
2015-03-18 13:09:03 -05:00
Fay.Liang
e4269dfba4 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: ff4a350eca07ea0f158ca0c3082890faa5bda368
2015-03-13 15:58:28 -04:00
Richard Peter
ca6249346d Merge "Omaha #4128: Refactor ISC and active table sharing code so that their beans perform cluster failover together." into omaha_14.4.1
Former-commit-id: 99f2b2f693e2e30903399ffc94a7f4d6a84e0fed
2015-03-12 20:03:41 -05:00
David Gillingham
e713928f7c Omaha #4128: Refactor ISC and active table sharing code so that their beans perform cluster failover together.
Change-Id: Ib97d20bdd26b413648727101da26fee8449cb7ba

Former-commit-id: d242c9cc22d53dca873e62787f6ab3234dd2b7df
2015-03-12 10:17:01 -05:00
Ron Anderson
bf2ff2d80f Omaha #4129 Fix server selection logic used by requestAT, requestTCV, and sendTCV
Change-Id: I1b31a05844e8a760d01bac57e2897bed28df198c

Former-commit-id: fb32cc53c476d64368e1a9b607e8b2a8e21dfb2c
2015-03-12 09:47:36 -05:00
Michael Gamazaychikov
12304947c6 ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: I7b0f6b3974e8a8e4072fa530dce7443a9d85244a

Former-commit-id: a437417c6a07fc069e194cd08d515c6984d15616
2015-03-10 13:18:09 -04:00
Fay.Liang
0e475cb704 Merge tag 'OB_14.3.2-19m' into master_14.4.1
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
2015-03-09 16:11:13 -04:00
Steve Harris
62527097b4 Merge tag 'OB_14.4.1-16m' into omaha_14.4.1
14.4.1-16m


Former-commit-id: ed67f8932f910a858b32b503fc8009e39dac03ab
2015-03-09 11:39:50 -05:00
Ron Anderson
8a51d088bc Merge "Omaha #4128: Fix NullPointerException in FetchActiveTableSrv.preStop()." into omaha_14.4.1
Former-commit-id: 4100c8f8d3f05a47676f2a5a7ee0bcf4d0151733
2015-03-05 11:52:13 -06:00
Fay.Liang
51cce67ca8 Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
Former-commit-id: cbed951a6854af1afe4e4e1d14bedfda1534b21f
2015-03-05 12:48:18 -05:00
David Gillingham
154e56e186 Omaha #4128: Fix NullPointerException in FetchActiveTableSrv.preStop().
Change-Id: I52f7181d2e6585f4e1b84e949212324d308529cc

Former-commit-id: 92b8782bb0c874e78e00d848c71c8140ff71e6ac
2015-03-05 10:08:14 -06:00
Fay.Liang
211d9bb8eb Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 10b981ac5353585985f450b849006bd6514fe057
2015-03-05 10:39:44 -05:00
Ron Anderson
893de08048 Omaha #4129 Fix exception handling on subprocess calls in IrtServer.py
Change-Id: Id0923f0ee4ae61f45df6f336fc856e8d27897990

Former-commit-id: 30bfaf9432481328ed9d23ef56568a857cf775c7
2015-03-05 08:56:48 -06:00
Ron Anderson
e08d469768 Merge "Omaha #4129 Log active table changes from ingestAT" into omaha_14.4.1
Former-commit-id: eaecbaa0b66153b43bfe59f96c43a1876b9e235f
2015-03-04 16:06:41 -06:00
Ron Anderson
1b2258ed00 Omaha #4129 Log active table changes from ingestAT
Change-Id: I19dee195785363bba0008419fbf156b2d74cf6dc

Former-commit-id: 009e56509930c8fdf2eacd250903260a13a6f3ca
2015-03-04 15:37:22 -06:00
Shawn.Hooper
08f7a7ef1c ASM #16946 - Update typo from dateFile to dataFile
Change-Id: I1e18426806b0a6e1cb2ef1bbf5c003e5a8a8e1c2

Former-commit-id: 13fbcbd0a2cb70228a47d63839640c7612caaa2a
2015-03-04 14:07:01 -05:00
David Gillingham
46e371f7e6 Omaha #4128: Ensure active table sharing is configured before enabling it.
Change-Id: Ib42a251f5d9c134da7ba484582ce60d653a06937

Former-commit-id: 3ebb60db47fc74a77eea56ae7738b5f7b405fb19
2015-03-03 16:46:39 -06:00
Michael Gamazaychikov
9db91abd8a ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: I5772661758a26c47019c3939ceff73ca0eb6f50e

Former-commit-id: ab0f7f0f627ab3926a219940f1267dc460e74e14
2015-03-03 09:38:34 -05:00
David Gillingham
63139c2f38 Omaha #4128: Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service.
Change-Id: I99132eb075f3ccf4dd8b679d61c992e7029e1a31

Former-commit-id: 5d962bf6cf7a3e40ee152bc98817daf116633f60
2015-02-26 15:57:47 -06:00
Steve Harris
0de5743e1f Merge tag 'OB_14.4.1-13m' into omaha_14.4.1
14.4.1-13


Former-commit-id: c75f0f600cc312a83275b767165471b458da18b7
2015-02-20 09:57:49 -06:00
Richard Peter
f9fa25b783 Omaha #4125 - Fix jaxb performance issue
Change-Id: I7b306098a96b86fb5a9c1262b2fb92f5f24ba0b1

Former-commit-id: 9f81dd0ec5e00827f5a9a98376f15c5139908ce1
2015-02-19 14:25:12 -06:00
Fay.Liang
608e249e84 Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 2a6f8f560b6fb3825e4127fcd5b15b6c5b215ae7
2015-02-19 11:09:01 -05:00
Ron Anderson
3d100c7bd6 Omaha #4139 Fix handling of pre-epoch dates in ISC
Change-Id: I116f35c34544319bf9875aaeea82d24751b2cca2

Former-commit-id: 2718eab540d66cac4ac88f01b840bdf23bc0562b
2015-02-18 11:28:34 -06:00
Sarah Pontius
e4a1aa13f5 VLab Issue #6386 - HLS/TCV Beta Testing Changes; fixes #6386
Change-Id: Ica6e803b85c34e6d65fd268b844eaac06417909e

Former-commit-id: 5fbb83dd042795e308ca8b6aa370e4f9b0fb3291
2015-02-13 10:12:53 -07:00
Ana Rivera
6191c93a9c Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java

Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209

Former-commit-id: f6b3765fc1670db2b9ceef75be7422a07b2badcf
2015-02-11 22:00:40 +00:00
Steve Harris
9311e6f440 Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10


Former-commit-id: 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2
2015-02-11 15:53:38 -06:00
Joshua Watson
f612e85eed VLab Issue #6421 - Source in GFSLAMPGrid.py smart init changed to GFSLAMPGrid. Visibility calculation streamlined; fixes #6421
Change-Id: Ic63cb16c30aff1705d9753017a43ba9c59b02d51

Former-commit-id: c570ea9f982665f3cb560c665cea6357c11841ce
2015-02-11 09:04:44 -05:00
Ana Rivera
c2f02ff4b2 Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f

Former-commit-id: c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265
2015-02-10 14:41:19 +00:00
Fay.Liang
43c7161dcf Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
	edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
	rpms/awips2.core/Installer.java/1.7/component.spec

Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
2015-02-09 17:19:41 -05:00
Joshua Watson
f6cf02c893 VLab Issue #6363 - Fixed malformed xml in GFSLAMPGridded.xml, changed ClgHgt to CigHgt in serverConfig.py and GFSLAMPGrid.py smart init; fixes #6363
Change-Id: Ibee986bdef73cdb6883fdd50e725d28d3838c848

Former-commit-id: 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff
2015-02-06 16:06:37 -05:00
Fay.Liang
98fc313530 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 85751935d73a6c64fd041c791ddb09f081831e20
2015-02-04 16:20:31 -05:00
Joshua Watson
4c574676d7 VLab Issue #5238 - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS. Changed serverConfig.Vis to Vis on that same line; fixes #5238
Change-Id: I1724074899bad140a60c7f4da37622178ddba3c0

Former-commit-id: b32bdbe92d1db52997c9e79ece82df19f91357f3
2015-02-03 17:43:17 -05:00
Fay.Liang
de502a310b Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 8f839ec64da04492e6cf109fdf47b95f08db5388
2015-02-03 16:04:56 -05:00
Steve Harris
b684848820 Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
14.4.1-6


Former-commit-id: 6873606777f0c7c18928b0b0814050742c256dc2
2015-02-03 11:24:39 -06:00
Fay.Liang
15f28c0245 Merge branch 'master_14.3.1' into master_14.3.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/doConfig.py

Former-commit-id: 307e986b8e9ce89ad1eb7b28f88afe82c2596f30
2015-02-02 10:06:58 -05:00
Zhidong.Hao
6ab746f74a ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
Change-Id: I64fe04fb736e9dae2158d0dc1401af5795d2ddeb

Former-commit-id: 86cf0fa14af93c1bf35f57e566e19ad45fb34b34
2015-01-30 11:31:36 -05:00
Steve Harris
bc3f196d48 Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
14.4.1-5


Former-commit-id: 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021
2015-01-28 12:57:55 -06:00
Ana Rivera
20ad0a65f3 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: 291d66c66af4f1f4d298185412d5930714ffb2c5
2015-01-27 22:05:59 +00:00
Ana Rivera
327945af8b 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: 889608360567b829f81ed6392c64c669798f34a9
2015-01-27 16:28:42 +00:00
Ron Anderson
29930e52b3 Omaha #4033 Fix logging in configureTextProducts
Change-Id: I1d2de04b532a3d543418d42c76e499cde2c04030

Former-commit-id: 1c1fefe7cc5cf26abf7c60254132ddeb22585b26
2015-01-26 17:50:28 -06:00
Ana Rivera
7c25945fd9 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: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
2015-01-26 18:45:26 +00:00