Nate Jensen
397fa4a07e
Omaha #4259 gfe changes for jep upgrade to 3.3
...
Change-Id: I5887537b7bcd05ea289fdd04851618264829987d
Former-commit-id: 83ba21f361e4c528115533ca72be8efd0109eb9d
2015-05-07 09:02:20 -05:00
Steve Harris
23cb520937
Merge tag 'OB_15.1.1-8' into omaha_16.1.1
...
15.1.1-7
Conflicts (these files were moved to AWIPS2_baseline):
rpms/awips2.core/Installer.java/build.sh
rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh
Former-commit-id: df806c9479cb29a5f47f1511ad70e140b2bbf8ec
2015-05-05 15:24:22 -05:00
Steve Harris
815a30871b
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
Former-commit-id: c6156764c2c4fb068f994cbb17d1f373d75f7070
2015-05-05 09:19:28 -05:00
Ron Anderson
095323cc32
Omaha #4027 Fixed hard coded active table mode in runFormatterScript
...
Change-Id: Ibf917114cff027fb0a24965dc4702dec62a780f8
Former-commit-id: be7645a58e3b8406727d7599e1f3ef5787705263
2015-04-30 15:29:01 -05:00
Ron Anderson
551d1bee91
Omaha #4027 More changes for Mixed Case
...
Change-Id: Id47f1c68877e8df0cbf84df09bdaa000a41a863e
Former-commit-id: 0e48bfe4de5c227ebf96b0b59f9c7a9c39415f2e
2015-04-29 13:18:27 -05:00
Fay.Liang
8ecc73d1f7
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Former-commit-id: 483383876bfe73eb58ec0eb314106288dab4d172
2015-04-27 14:08:47 -04:00
Shawn.Hooper
c03499c025
Merge branch 'master_15.1.1' into asm_15.1.1
...
Merges up to 15.1.1-7 back into the asm_15.1.1 branch.
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: Ica098ffb233837e4fcb718e9c75a78de443eb267
Former-commit-id: 78b3f7a15c5d2ab60235f40f5236bbbbe58d28ce
2015-04-24 15:44:14 -04:00
Rici.Yu
220331599f
ASM #17340 - Fix clipping zone selector map to domain issue
...
Change-Id: Ie59580f02a6f145a5c23cb431ce042f2e25ac5a5
Former-commit-id: 5d7d7e956ce69945c5226dccca18942ba2052a80
2015-04-23 10:46:26 -04:00
Ron Anderson
0edd237aa7
Omaha #4027 More GFE changes for Mixed Case WA
...
Change-Id: Ia1b65979d442246984b1e281c902c9f078fa4848
Former-commit-id: 0eef8697e269644ec36c1c7f7b09610778beb4a1
2015-04-20 17:17:08 -05:00
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
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
618781f10c
Merge tag 'OB_14.3.3-2' into master_14.4.1
...
14.3.3-2
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
Former-commit-id: f5fad51061f568aea4ea581a099ef8353758add6
2015-04-06 15:40:31 -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
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
Rici.Yu
0492e66d87
ASM #17194 - convert SerpConfig.py from smart tool to utility
...
Change-Id: I8007ca1676de148aa42c5b15c8e3366bbe8c8e5d
Former-commit-id: 6968986c535bbadee8436cca5cfcc329d47c606b
2015-04-02 10:48:25 -04:00
Steve Harris
f7af8ee606
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: cf70a7888a39667c54b344274c76d5106927fa30
2015-04-01 17:22:45 -05: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
Steve Harris
1c1844ad65
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Conflicts:
cave/build/p2-build.xml
Former-commit-id: 908fc24c43aab13856a375d8f79b4d0e576bea9a
2015-03-27 13:52:27 -05: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
ade9cbdf61
Omaha #4313 Updated Service Backup html help files for Multi-Site capability
...
Change-Id: I5d456a87ea651e377366c3826edacc29cfe38d5f
Former-commit-id: 2fb059379d95abe1762cde7258dd722319fc0165
2015-03-25 10:53:36 -05:00
Ron Anderson
fdfd52e26c
Omaha #4300 Minor updates to the Service Backup Dialogs
...
Change-Id: I409be11a06ff181f184d22dea311c6b0a7e96cca
Former-commit-id: 6833a9db5bc8c0187ce999d8a7f310bcd4892ad2
2015-03-25 10:46:36 -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
Fay.Liang
53bdc83ba4
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: dd741e026ef0599738bbbc82579a679b57feeef7
2015-03-19 17:18:52 -04: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
Paul Grell
f47e4fdcff
Merge "Revert "Revert "ASM #17217 - GFE: default to smart formatter types""" into asm_14.4.1
...
Former-commit-id: 60344f611d90d46fffcf2a05230670b72f303916
2015-03-19 16:05:49 -05:00
Paul Grell
3b71d36945
Revert "Revert "ASM #17217 - GFE: default to smart formatter types""
...
This reverts commit b1d84d2964
2015-03-19 16:02:22 -05: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
Steve Harris
c585001981
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 3e863af798cf64ae9bbde71649339aa99698e33b
2015-03-18 16:05:13 -05:00
Fay.Liang
475019fb61
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e
2015-03-18 15:12:56 -04:00
Paul Grell
4b1cec4b99
Merge "Revert "ASM #17217 - GFE: default to smart formatter types"" into asm_14.4.1
...
Former-commit-id: 4601ad77a9e49efaf34d4563baddcdf61dbd5804
2015-03-18 10:44:10 -05:00
Paul Grell
b1d84d2964
Revert "ASM #17217 - GFE: default to smart formatter types"
...
This reverts commit 70e5e24941
2015-03-18 09:36:12 -05:00
Rici.Yu
6a7fbec942
ASM #17217 - Add fullStationID entry for table products
...
Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847
Former-commit-id: a987fe4493e4e58618271fffb37a708185ed4139
2015-03-18 10:30:38 -04: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
Steve Harris
169b925507
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 04fa26ff310af7fd9574eeae98900d83e18ba276
2015-03-18 08:50:05 -05:00
Rici.Yu
70e5e24941
ASM #17217 - GFE: default to smart formatter types
...
Change-Id: Ib831998a7293e61a5b606d03ef19f47b09f2e0d5
Former-commit-id: 81aea3167f21670d7b41eec5458a1f7d36edb36a
2015-03-17 11:26:37 -04:00
Ron Anderson
6731ad4200
Omaha #4246 Changes to support VCModules at base, site, and user levels
...
Change-Id: I995ad5c185ec8c5f0056f28f7e2e1c5b5d7395fc
Former-commit-id: 33c2ab1111deb0ede6a3196d889475bc69dd63d4
2015-03-12 18:09:58 -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
Ron Anderson
370d0a0f70
Omaha #3955 Fix regression that brok ViewWCL
...
Change-Id: Ib1ff4137004cff22ef94e8029bbc62875992252e
Former-commit-id: 6af18dc2a364507481a119661f940aa420e379a9
2015-03-12 12:58:00 -05:00
Steve Harris
fdac40e9b1
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 28ce8ff8e28e73375a942d0d15700f1cbb06ec24
2015-03-09 21:41:36 -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
Shawn.Hooper
54d5553a93
ASM #17178 - Update TCMWindTool to remove option for background Wind field
...
Change-Id: Ia299900784b9fe05a68ca25a74528abdc68a3f1f
Former-commit-id: bc4ec070e81298f7ed7312692a7f43cbd2d854ec
2015-03-05 12:58:44 -05:00
Fay.Liang
1ed5d493fa
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: c91a37257cd2882047e79200f624acc1e0312cba
2015-03-03 14:44:31 -05:00
Fay.Liang
9a4751b60e
Merge branch 'master_14.3.1.1' into master_14.3.2
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 5aa2c444583d03b442768a8e9ea462877a25bb8d
2015-03-03 14:26:22 -05:00
David Gillingham
4499b0323a
Omaha #4203 : Make list of groups scrollable on save/delete weather element group dialog.
...
Change-Id: Iec5f5eae8fb862e92ea8db57fe8a0d54f9e0e72d
Former-commit-id: 38076c0efc699144d6f7815b23323c737289bfc9
2015-03-03 11:04:00 -06:00
Ana Rivera
5c19f14f0e
Merge "VLab Issue #6517 - TCMWindTool Fix; fixes #6517 " into tcv_14.3.2
...
Former-commit-id: 7746c8ce24f444d0d9b480e756d092b482e7428a
2015-03-02 22:19:14 +00:00
Bruce.Hundermark
fe162829de
ASM #13961 - GFE: ISC_Discrepancies tool creates unnecessary alarms
...
Change-Id: I7d4aec9d82a6f792bdf2a20d2b3fd271829d1edb
Former-commit-id: 19bd1d7d169521f322fbfb828ee27327515e0152
2015-03-02 18:22:55 +00:00
Ron Anderson
ce87addfe4
Omaha #4126 Ensure transmit is properly cancelled if dialog is closed
...
Change-Id: I259089abc4f4c9ce5cdfb80892273f7c0dd1ec65
Former-commit-id: 781b6d4f32ec8e9d34d746db72aebab4d4153c56
2015-02-27 12:29:22 -06:00
