Commit graph

564 commits

Author SHA1 Message Date
Steve Harris
5932df4786 Merge tag 'OB_15.1.1-6' into omaha_16.1.1
15.1.1-5

 Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF


Former-commit-id: 97efa605a593b2ce6c9a9a97192ecc5223511e88
2015-04-20 08:09:45 -05:00
Steve Harris
7ec7cdf232 Merge tag 'OB_15.1.1-4' into omaha_16.1.1
15.1.1-4


Former-commit-id: c9f9bc2c612dae6d355fb3c5de313aa7274adc8b
2015-04-13 12:22:22 -05:00
Fay.Liang
6cd66bff93 Merge tag 'OB_14.4.1-25' into master_15.1.1
This merge includes all changes in 14.4.1-22, -23, -24, and -25

Conflicts:
	cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt

Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
2015-04-13 13:02:24 -04: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
Fay.Liang
1579e023ea Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 6608975224ad22f454a243c919d498a5a2369e32
2015-04-08 12:24:58 -04:00
Steve Harris
19be21406f Merge branch 'omaha_15.1.1' into omaha_16.1.1
Former-commit-id: 2333d5fa9277d727aae1136df25eda1bf316393a
2015-04-06 11:11:59 -05: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
Ron Anderson
4132bbf6cf Merge "Omaha #4027 Convert all GFE text products to mixed case" into omaha_15.1.1
Former-commit-id: 67762d2b731cba6e8846ff04609454b354fa89a6
2015-04-02 17:05:47 -05:00
David Gillingham
5fddbf8ffe Omaha #4353: Remove log spam on Geometry validation errors.
Change-Id: I58f3c535e3fe582ea7402ad38d42a815823c099e

Former-commit-id: a8d6144ac52316c4e97c030c6b81cab20bbf7647
2015-04-02 16:34:22 -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
Bruce.Hundermark
7647f6bc67 ASM #17288 - GFE: Implement missing RTMA/URMA parameters
Change-Id: If7824ab1a777d21209750bedf2a6c9cf219eaaf5

Former-commit-id: b3a14027d7b87055b51c7bb8ea85c0a5412c5888
2015-04-01 16:08:41 +00: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
Ron Anderson
cbca87a1b7 Merge "Omaha #4103: Move svcbu.properties into the localization store." into omaha_15.1.1
Former-commit-id: 326344df5c72d2c77f30dd7e6d030e3f9e5aeef5
2015-03-30 16:24:57 -05:00
David Gillingham
806583afd9 Omaha #4103: Move svcbu.properties into the localization store.
Change-Id: I95001ee02f06594b15a451f938736bc7cb93d8be

Former-commit-id: 4b201b0a5cee53f2ffd8427d08252f6d0c83f47c
2015-03-30 16:05:57 -05: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
Steve Harris
7375074ed8 Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
15.1.1-2m

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
2015-03-30 11:07:52 -05: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
Ron Anderson
ea0b02bedd Omaha #4027 Convert all GFE text products to mixed case
Change-Id: I94275b65e8733d5bed1242f78503f1613b2e0aff

Former-commit-id: 07088e71d78d6302da23683894d96d72e4f69a96
2015-03-26 18:30:39 -05:00
Steve Harris
165971a4f6 Merge tag 'OB_14.4.1-20m' into omaha_15.1.1
14.4.1-20m

 Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
2015-03-26 09:57:17 -05:00
Ron Anderson
8c54ff2f61 Omaha #4300 Client-side changes for multi-site service backup
Change-Id: Ibcf05dfc67fa3824a5fe716e1d4038ad5aeb4034

Former-commit-id: 8daff8d5bb3e1bbf23a559671040cae4a03c9911
2015-03-23 16:08:31 -05:00
David Gillingham
a4d13dbabd Omaha #4103: Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status.
NOTE: Service Backup features are broken until DR 4300 lands on this branch.

Change-Id: Ic0184c10c553187c8d0515f639c5a33fd3abde1f

Former-commit-id: 732208b6600882a9ba9fcc0eefd7c8be0157beab
2015-03-19 16:13:56 -05:00
Fay.Liang
b23791cfbd Merge branch 'ops_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 5879ba157369936274e88800e4f178e67567de95
2015-03-19 12:45:22 -04:00
Fay.Liang
86a8041062 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/build.edex/edex/common.properties

Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04: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
Steve Harris
67b3a77c4f Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
2015-03-18 09:29:01 -05:00
Ron Anderson
429d904d3e Omaha #3955 Fix error in TopoDatabase when GFE domain is changed
Change-Id: I0afbffb8b4e0ece19281f62c593b270cb138048c

Former-commit-id: 1689d4433750ac388e9fe1f43b15545a7c398cbe
2015-03-17 16:32:42 -05:00
Ron Anderson
ec0ba7510a Omaha #3955 Fix null pointer in TopoDatabase when activating a new site
Change-Id: Ie1d558103a69eb6cb02629f3a3df961bf1955892

Former-commit-id: 1352570da1c69350a61b760ff0fe9829056dd5e1
2015-03-16 11:34:07 -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
Ron Anderson
7bbd4b6a25 Omaha #3955 Additional updates to try to make the procedures more bulletproof.
Change-Id: Ie4c9d02c880dd460ef3470db9c68f5a67c0e924c

Former-commit-id: 1ff0a8ab8715a780fdc14db7f81f1708567fdc78
2015-03-12 16:23:37 -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
Nate Jensen
e1536e8a6e Omaha #4234 initialize the main python interpreter on a different thread
than the sub-interpreters, or warn when that happens

Change-Id: Id4d2c2401c96f6d884e5c468419f2d5893f6eafd

Former-commit-id: 5386e7fabcfbac366bb5335f601bcd0719b4f32c
2015-03-10 15:41:32 -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
Matthew Howard
6bbcf0f6d0 Merge "ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly" into asm_15.1.1
Former-commit-id: 1d32e7e33c5d6fed4bc3c393cc25b31e528ba6a7
2015-03-10 11:26:52 -05:00
Steve Harris
85b687be0b Merge tag 'OB_14.4.1-16m' into omaha_15.1.1
14.4.1-16m


Former-commit-id: 468600e9d5144873e5af1529ae0d38673e81bb17
2015-03-09 18:54:39 -05: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
Bruce.Hundermark
3c532660b0 ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly
Change-Id: Ic8f63277a4b322e4908bbfe6fd32c28ffd3b1d24

Former-commit-id: 5c2d02a67bd5b4594c6d90afcbae4e8159e0edd1
2015-03-09 19:14:36 +00: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
Lee Venable
0268b22c0f Omaha #4169 - additional fixes found during testing
Former-commit-id: 567ee994f3529f03231ff014d4604938f75837e4
2015-03-06 09:38:08 -06: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
Lee Venable
261f55fdb2 Omaha #4169 - Fix error handling in getDatabase
Former-commit-id: e6cd36ecd1be2f80b82f92686cc18762c5e322a6
2015-03-05 11:46:27 -06: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
Steve Harris
7fb303eff1 Merge tag 'OB_14.4.1-15m' into omaha_15.1.1
Former-commit-id: 4fe28e2a0013f77c8a04a56789fc4e101039d77f
2015-03-04 21:06:10 -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