Commit graph

213 commits

Author SHA1 Message Date
mjames-upc
2e3f856355 UKMET-Global replacing UKMET-NorthernHemisphere
Former-commit-id: 8f4fc1001f
2016-03-09 14:18:05 -07:00
mjames-upc
c8b157eb46 grid naming updates
Former-commit-id: ee4d47a486
2016-03-09 12:26:50 -07:00
mjames-upc
f436e5ed47 ecmwf global grid composite support
Former-commit-id: 8093d54403
2016-01-24 17:33:43 -07:00
mjames-upc
739226d2f8 further model menu reorg / additions
Former-commit-id: 8d7f86057a
2016-01-17 15:04:52 -06:00
mjames-upc
d104afcb24 viz/topo sat bundle
Former-commit-id: 167f5fd50b
2016-01-16 16:22:44 -06:00
mjames-upc
5f0fe205b9 major VB reorg / colormaps / bundles
Former-commit-id: 7f23ad29d2
2016-01-16 13:35:40 -06:00
mjames-upc
3a59fefb09 cleaning up unidata_15.1.1 enough to launch in eclipse
Former-commit-id: 0b01029e68
2015-12-29 20:15:31 -07:00
mjames-upc
fbd05a3a10 aliasing and naming updates, primarily for nam
Former-commit-id: 3192ec189c
Former-commit-id: b2e14c3f30
2015-12-24 14:21:40 -07:00
Fay.Liang
fc4955ec2b Merge tag 'OB_14.4.1-47' into int_15.1.1
14.4.1-47

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 31496dac17 [formerly 602505383d4a1ec8a2cea08f94b7350cabae39b7]
Former-commit-id: 3a354bf7fb
2015-05-29 15:42:40 -04:00
David Gillingham
0fec0afca6 Omaha #4384 (and 4385): Fix volume browser menus for NWPS models, display vector arrows for all mag values greater than 1.0.
Change-Id: Ib3b5a7fcf060364c09fadf57bd5b7151a4f6828e

Former-commit-id: 6754cf45a4 [formerly 81fd8d7391 [formerly 96f3b85b57] [formerly 6754cf45a4 [formerly bc3abb1effa93ff76c8287f59b64dd73017f3ad8]]]
Former-commit-id: 81fd8d7391 [formerly 96f3b85b57]
Former-commit-id: 81fd8d7391
Former-commit-id: aa6ab9bc74
2015-05-11 14:57:00 -05:00
David Gillingham
81fd8d7391 Omaha #4384 (and 4385): Fix volume browser menus for NWPS models, display vector arrows for all mag values greater than 1.0.
Change-Id: Ib3b5a7fcf060364c09fadf57bd5b7151a4f6828e

Former-commit-id: 6754cf45a4 [formerly bc3abb1effa93ff76c8287f59b64dd73017f3ad8]
Former-commit-id: 96f3b85b57
2015-05-11 14:57:00 -05:00
Shawn.Hooper
7f3aa70c58 ASM #17024 - Fix bad XML merge for d2dContourStyleRules.xml and gridImageryStyleRules.xml
Change-Id: I600498d43bdc146ddb873f457f73e054c6497e5e

Former-commit-id: 1b217fc5a8 [formerly 098391a703022ae7d0e85f6cfab11ab3d8dcdfdf]
Former-commit-id: ec10118b39
2015-04-24 16:05:57 -04:00
Ana Rivera
ff6f986a4c Merge branch 'master_15.1.1' into field_15.1.1
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml was removed.
"Visibility Anl Uncertainty" entry in .../fields/planview-timeseries/other.xml was added to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/aviation.xml

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/misc.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml

Change-Id: I4cac5e1ee29119569cb19c235ec5d1664eb08b8c

Former-commit-id: 0f2e031c70 [formerly 4dad0cb77e2101fc8ec2d46924b6c64dcc0d12cb]
Former-commit-id: da79c8cca4
2015-04-20 19:14:43 +00:00
Fay.Liang
f9d33d9a7d 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: 6cd66bff93 [formerly 857d0d89ae214ccf53713f74ef6778ba80c637fe]
Former-commit-id: c31d3f0910
2015-04-13 13:02:24 -04:00
Matthew Foster
ab812f4433 VLab Issue #7570 - Remove duplicate derived parameter definitions from dataplugin.grid project; fixes #7570
Change-Id: Id1849c0482b3b170c7fe0a247146b239e6c84cf2

Former-commit-id: c3793908cf [formerly be185a7b314348400b9b275eff4d8550ae0e6b91]
Former-commit-id: f6b7993fe1
2015-04-13 13:08:51 +00:00
David Gillingham
1b278bcf12 Omaha #4385: add nwpsCG1 model to Volume Browser.
Change-Id: Id069d07c5dfffaf1952042611f35a2221d8d639b

Former-commit-id: 1d2fb3c135 [formerly acb5b4f1af [formerly 3594451824] [formerly 1d2fb3c135 [formerly 20d76ae4ed226d19ea6ddbb408224ace8519787b]]]
Former-commit-id: acb5b4f1af [formerly 3594451824]
Former-commit-id: acb5b4f1af
Former-commit-id: c454610ff7
2015-04-09 15:13:48 -05:00
David Gillingham
acb5b4f1af Omaha #4385: add nwpsCG1 model to Volume Browser.
Change-Id: Id069d07c5dfffaf1952042611f35a2221d8d639b

Former-commit-id: 1d2fb3c135 [formerly 20d76ae4ed226d19ea6ddbb408224ace8519787b]
Former-commit-id: 3594451824
2015-04-09 15:13:48 -05:00
Matthew Foster
75ad4890ae VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688
Change-Id: Iea8f52d8ba1cf78848dc95bf0792f0f220d4dd08

Former-commit-id: 8d56aabf36 [formerly 382e01a6b5b93697efa2016a21cc2cdd1ececc5f]
Former-commit-id: 2f53fba60a
2015-04-09 13:53:58 -05:00
David Gillingham
9a7074dade Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser.
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6

Former-commit-id: c01694607f [formerly 2e3b98f02f [formerly b13f8c7794] [formerly c01694607f [formerly 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb]]]
Former-commit-id: 2e3b98f02f [formerly b13f8c7794]
Former-commit-id: 2e3b98f02f
Former-commit-id: 7fe1a980ba
2015-04-09 13:26:52 -05:00
David Gillingham
2e3b98f02f Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser.
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6

Former-commit-id: c01694607f [formerly 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb]
Former-commit-id: b13f8c7794
2015-04-09 13:26:52 -05:00
Ana Rivera
580b3c81d1 Merge branch 'master_15.1.1'(master_15.1.1-2m) into field_15.1.1
Change-Id: If8fdc78136ac00065a7c1f9a3b45e814a58c815e

Former-commit-id: 388e4a3d8c [formerly 87043a26d3e1aa32f693ff0f48d4357ac416e6d9]
Former-commit-id: 42e1d12ccf
2015-04-09 15:13:54 +00:00
Fay.Liang
020a0fbe3a Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: a204a6210e [formerly 5e481a056337b7f502921886725382258c6e29d1]
Former-commit-id: 8ce086e41a
2015-04-01 13:04:48 -04:00
Fay.Liang
8f8f86f60c Merge tag 'OB_14.4.1-20m' into master_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
	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: 133a603566 [formerly 1d282a64da2998d91040a7c97f2e81beea0a8da4]
Former-commit-id: 3bd4d76143
2015-03-30 14:28:30 -04:00
Melissa Porricel
152bdd241d ASM #16905 - Implement missing RTMA/URMA parameters
Change-Id: I4ec616b80b6c8f85bafec46f0c840c3c43a9c527

Former-commit-id: 9a2a726fb9 [formerly d68078b665787d91bfd92440345d41f9fcc98b3d]
Former-commit-id: d96bbe4799
2015-03-26 09:58:45 -04:00
Fay.Liang
6796af2399 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: 86a8041062 [formerly ba576b948587ea7b1c077ebad7113bc4e7504c00]
Former-commit-id: 2eb8777058
2015-03-19 12:35:31 -04:00
Steve Harris
31a6aa8107 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: 67b3a77c4f [formerly 41217304fa68101d17e003b2fa6992d0e15b083c]
Former-commit-id: 2fd5ba420f
2015-03-18 09:29:01 -05:00
Melissa Porricel
f24e8de19e ASM #7951 - Add Capabilities for CONUS RTMA at 2.5km
Change-Id: Iab79fc17b3b648ffa39c8385c581392e3cf58f9c

Former-commit-id: fcdcb81963 [formerly 9c7d466213eaac3a46fddf416967d00e3446bfee]
Former-commit-id: 7db813d59c
2015-03-16 17:14:56 -04:00
Steve Harris
2ce988ce9f Merge tag 'OB_14.4.1-16m' into omaha_15.1.1
14.4.1-16m


Former-commit-id: 85b687be0b [formerly 468600e9d5144873e5af1529ae0d38673e81bb17]
Former-commit-id: 379163b888
2015-03-09 18:54:39 -05:00
Fay.Liang
a9945f1981 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: 0e475cb704 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]
Former-commit-id: 059eb032b1
2015-03-09 16:11:13 -04:00
Fay.Liang
55e0d315e7 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: 0e475cb704 [formerly a9945f1981 [formerly 059eb032b1] [formerly 0e475cb704 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]]]
Former-commit-id: a9945f1981 [formerly 059eb032b1]
Former-commit-id: a9945f1981
Former-commit-id: 1138f48ee9
2015-03-09 16:11:13 -04:00
Richard Peter
fc68d9b30d Omaha #3959 - Make subgridding grid based.
Change-Id: If1970961641536655fd1a951c0e433dbaca0687c

Former-commit-id: e0ff8b49c1 [formerly c3b5f78811d231009dad7533fd650a68634e3e29]
Former-commit-id: 9df7d7e987
2015-03-05 16:13:41 -06:00
Joshua Watson
845e1557e5 VLab Issue #6684 - Fixed parameter abbrev in derived parameter CONVP2hr.xml and fixed grib table entry in grib/tables/7/14/4.2.0.19.table; fixes #6684
Change-Id: Ibcfe705b56cc4112da732c46eb17d52f9a4a6df7

Former-commit-id: ac92410d39 [formerly 5a0b0653e28f31a080eec2123386359691c4b1fd]
Former-commit-id: 7fc4a6f2ae
2015-03-02 12:10:07 -05:00
Joshua Watson
7bfd79f928 VLab Issue #6684 - Fixed parameter abbrev in derived parameter CONVP2hr.xml and fixed grib table entry in grib/tables/7/14/4.2.0.19.table; fixes #6684
Change-Id: Ibcfe705b56cc4112da732c46eb17d52f9a4a6df7

Former-commit-id: ac92410d39 [formerly 845e1557e5 [formerly 7fc4a6f2ae] [formerly ac92410d39 [formerly 5a0b0653e28f31a080eec2123386359691c4b1fd]]]
Former-commit-id: 845e1557e5 [formerly 7fc4a6f2ae]
Former-commit-id: 845e1557e5
Former-commit-id: 3d500422e1
2015-03-02 12:10:07 -05:00
Steve Harris
614966a758 Merge tag 'OB_14.4.1-14m' into omaha_15.1.1
14.4.1-14


Former-commit-id: ead97f053e [formerly cdca3c5b9eb65bed9d773019917245d1000d78dd]
Former-commit-id: 07363394a1
2015-03-02 10:58:40 -06:00
Mark Peters
fca568d5b2 Omaha #4179 Abstract out getAvailableValues()
Change-Id: I6cceaf0e91db04eda2be76e687015d02cd91f0db

Former-commit-id: 7c5662a198 [formerly 1a0b9f20a89fcaca55e9af51c6f0996a99b65af5]
Former-commit-id: 82ddd6a608
2015-02-27 14:24:46 -06:00
Ben Steffensmeier
cf0688cba0 Omaha #4016 Implement getGeometryData on Grid data access factory.
Former-commit-id: 2c1f39447a [formerly 3e2a4dd96326f9a972addb138655cff0c3fedb52]
Former-commit-id: b34a00df51
2015-02-24 12:16:13 -06:00
Joshua Watson
d7f5da46c3 VLab Issue #6495 - Fixed parameter abbrev in derived parameter CLGTN2hr.xml; fixes #6495
Change-Id: I48f5c7a8c73a156d578c801c90b57364d8f5af1e

Former-commit-id: e958013148 [formerly b8a493859cf272d116cc05c6121c2c84791962d9]
Former-commit-id: 7e1d77fc7d
2015-02-18 16:23:05 -05:00
Joshua Watson
59045bd3e6 VLab Issue #6495 - Fixed parameter abbrev in derived parameter CLGTN2hr.xml; fixes #6495
Change-Id: I48f5c7a8c73a156d578c801c90b57364d8f5af1e

Former-commit-id: e958013148 [formerly d7f5da46c3 [formerly 7e1d77fc7d] [formerly e958013148 [formerly b8a493859cf272d116cc05c6121c2c84791962d9]]]
Former-commit-id: d7f5da46c3 [formerly 7e1d77fc7d]
Former-commit-id: d7f5da46c3
Former-commit-id: 51e006c656
2015-02-18 16:23:05 -05:00
Mark Peters
9d02da183a Omaha #4124 Implement getAvailableParameters() for satellite retrieval through DAF
Change-Id: I532640b7305ad0f5e7423a35e37abce22866ebad

Former-commit-id: abc34feab3 [formerly 51466d91a9327b0bcfdeae9d1eadcd06df622da1]
Former-commit-id: e383afe23f
2015-02-17 17:06:45 -06:00
Kiran.Shrestha
8389938a6a ASM #17085 - lifted index issue reporting in units of Kelvin but labeled as Celsius
Change-Id: I004f3bab00aa82130ea21d888a1307f76ec58849

Former-commit-id: 89b18b15d7 [formerly 391a2576ade26ad7031e037db5e9695915212cd5]
Former-commit-id: a4f63f4147
2015-02-09 21:06:36 +00:00
Kiran.Shrestha
1ed10375a3 ASM #17085 - lifted index issue reporting in units of Kelvin but labeled as Celsius
Change-Id: I004f3bab00aa82130ea21d888a1307f76ec58849

Former-commit-id: 89b18b15d7 [formerly 8389938a6a [formerly a4f63f4147] [formerly 89b18b15d7 [formerly 391a2576ade26ad7031e037db5e9695915212cd5]]]
Former-commit-id: 8389938a6a [formerly a4f63f4147]
Former-commit-id: 8389938a6a
Former-commit-id: c0d137e30c
2015-02-09 21:06:36 +00: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
Ana Rivera
2a3bb0c580 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 4071b58b85 [formerly 8bfa7c4087] [formerly 20ad0a65f3 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]]
Former-commit-id: 4071b58b85 [formerly 8bfa7c4087]
Former-commit-id: 4071b58b85
Former-commit-id: ed61c52ee3
2015-01-27 22:05:59 +00: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
6b58d62fe3 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 62094315d2 [formerly 7c5fc26537] [formerly 327945af8b [formerly 889608360567b829f81ed6392c64c669798f34a9]]]
Former-commit-id: 62094315d2 [formerly 7c5fc26537]
Former-commit-id: 62094315d2
Former-commit-id: dd232580d0
2015-01-27 16:28:42 +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
Nate Jensen
ad8dc7fb2a Omaha #3993 ensure important dataplugin utility folders are included in
viz builds

Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747

Former-commit-id: b434ae1343 [formerly f88f62191f [formerly 05307be9d0] [formerly b434ae1343 [formerly 9f30c7195d6a62206bae05d6e17df4a8e068255e]]]
Former-commit-id: f88f62191f [formerly 05307be9d0]
Former-commit-id: f88f62191f
Former-commit-id: 88e656a34d
2015-01-13 16:47:04 -06: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
Joshua Watson
d86ee989aa VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667

Former-commit-id: 5aa4748569 [formerly 0c375981e7 [formerly 3f2f7f2f3a] [formerly 5aa4748569 [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]]
Former-commit-id: 0c375981e7 [formerly 3f2f7f2f3a]
Former-commit-id: 0c375981e7
Former-commit-id: cf1882cc44
2014-12-17 08:38:27 -05: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