Stephen Gilbert
e07ae7a2f2
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
...
Removed dependency on persistCamelRegistered from ncgrib spring config
Change-Id: I84e7b6fc6e50f9d1795e887a9fb30f9cdda3a7f8
Former-commit-id: 3b8233dd88
[formerly a7140f38a54a577dd2d62cc551ab182b561f6fc0]
Former-commit-id: 4299e7c72c
2014-05-22 14:35:49 -04:00
Stephen Gilbert
7aaf3f44bc
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0
Former-commit-id: 91d469eb90
[formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]
Former-commit-id: 7992a6b15b
2014-05-22 12:39:09 -04:00
Stephen Gilbert
66295d65c5
VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
...
Updates to various resource plugins such as ncgrid, plotdata, ncscat,
and ntrans
Change-Id: Ie04200519fad583d2b252ea161cb5c72eb90732c
Former-commit-id: 57cf6c4bd7
[formerly 0832f7cdc3c6f020f5fe97dde01ed17cf98eebb2]
Former-commit-id: e1b0c5f102
2014-05-15 18:31:17 -04:00
Stephen Gilbert
c0e6cd6c50
VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
...
PGEN Bug Fixes
Change-Id: Ie50d8f829e0dfb00fab254945a46592553cdb59c
Former-commit-id: e71b522740
[formerly 2f93fd7bdbcf1fa4698dfc2dd51c377db6d809b6]
Former-commit-id: d6f370db60
2014-05-15 17:40:04 -04:00
Stephen Gilbert
6f18460949
VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
...
Localization/configuration file updates
Change-Id: I489d8228f17534234cd8ea20e10a137a17bad054
Former-commit-id: 60b9ec665b
[formerly c55835291b5d2bbe24c4398851e23a5c28d5e582]
Former-commit-id: 4f2a631e66
2014-05-15 17:25:39 -04:00
Stephen Gilbert
c3b1cda7c5
VLab Issue #3722 - SWPC delivery for 14.3.1
...
Upgrades to Geomag and solar image processing
Change-Id: Ibe33d00843419e34998274a87734f3f29d2b63dc
Former-commit-id: 5da74a455d
[formerly c9bcc3d15adcea014696e5cd68b9688506ee07d9]
Former-commit-id: 4d2154d2de
2014-05-15 17:24:13 -04:00
Stephen Gilbert
4e5968d7b6
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
...
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins
Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68
Former-commit-id: bd2dad11b5
[formerly 3c904361e7176592cc873a3414c18ad5107aea54]
Former-commit-id: ca9b7c8dfc
2014-05-15 17:20:52 -04:00
Brad Gonzales
40f9f6e788
Issue #2873 Revert the deletion of the ncep nsharp win32 project.
...
Amend: added the gov.noaa.nws.ncep.ui.nsharp.win32 plugin dependency back to the com.raytheon.uf.viz.ncep.nsharp.feature/feature.xml.
Change-Id: Ic801fbfd81c691298751d0bafbc4d96ba1457776
Former-commit-id: b341c10bb4
[formerly 8209ff5c53bb117b8a18b2923952b289e3021762]
Former-commit-id: 9c86a55171
2014-05-12 16:59:16 -05:00
Bryan Kowal
c1e9154e89
Issue #3108 - update bignsharp for Windows 64-bit compatibility. Upgrade JNA.
...
Amend: updated and/or added change revision history comments
Amend: fixed Java requirement in JNA classpath
Amend: fixed Java requirement in JNA MANIFEST
Change-Id: I5033f05c48a271fe08d3ec2ac01fe79481564371
Former-commit-id: 1e1f46e68b
[formerly fb12234836a3562156a30531e6961c0a064588bd]
Former-commit-id: 9c29e6739c
2014-05-08 17:30:22 -05:00
Ben Steffensmeier
119ced4a01
Issue #2947 Redo satellite derived parameters to use an inventory to determine availability.
...
Former-commit-id: 709e3411c4
[formerly 1a041cb3be1141f4af116335e5b9540beda817cb]
Former-commit-id: a8bb2c0dfd
2014-04-16 14:54:59 -05:00
Nate Jensen
56e7b21e35
Issue #2984 remove dead ncep purge util plugin and web page
...
Change-Id: Ifca01d858586ce3bf968f4b1203eb9853be97829
Former-commit-id: e081847225
[formerly 9f01e8a242ba44dec510fdc5ca75be566f8fa008]
Former-commit-id: 7726f144ed
2014-04-15 11:16:24 -05:00
Nate Jensen
d435258fce
Issue #2984 remove unnecessary plugins from features
...
remove unnecessary uengine dependencies from manifests
Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d
Former-commit-id: 6e2d68e102
[formerly c59a5d99ce31464bacd7c266543f10f523719a07]
Former-commit-id: 57f2357f10
2014-04-14 16:50:54 -05:00
Richard Peter
8b279966d1
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: dbba727f3d
[formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]
Former-commit-id: 17196b5dcd
2014-04-14 13:10:11 -05:00
Richard Peter
a7ec0bcf66
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
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
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 3575d6586f
[formerly bd13bc332bcdd87723bec8669885f4594ad483b9]
Former-commit-id: 21ae3b5fcd
2014-04-11 16:23:09 -05:00
Nate Jensen
92f0182d3f
Merge "Issue #2950 Support dynamic color counts for color map editing." into development
...
Former-commit-id: 5129002e91
[formerly b196bf0463ea59d55dec4e70373ca731152123f9]
Former-commit-id: 5bad21f3e6
2014-04-09 11:20:04 -05:00
Everett Kladstrup
260d0beddc
Issue #2725 Move derived parameters logic to common
...
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
to the common hierarchy
* Move data cube classes that don't depend on derived parameters
to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
viz.core to viz.datacube
Former-commit-id: 06d6961c0f
[formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]
Former-commit-id: 0699041518
2014-04-09 09:31:12 -05:00
Ben Steffensmeier
16446101a4
Issue #2950 Support dynamic color counts for color map editing.
...
Former-commit-id: c5a48642eb
[formerly 85528bf2bbdbbaacc9631b76ef710e9fd0210110]
Former-commit-id: c805a5fed7
2014-04-08 15:27:57 -05:00
Ben Steffensmeier
ab8293c6a1
Issue #2874 Initial implementation of RTOFS data.
...
Former-commit-id: 55046a8e1e
[formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]
Former-commit-id: 12ed72b0c0
2014-03-24 11:10:18 -05:00
Brad Gonzales
d303662a51
Issue #2873 Removed 32 bit native libraries and references.
...
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f
Former-commit-id: 08dde4824f
[formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]
Former-commit-id: 189234f162
2014-03-20 13:27:39 -05:00
Nate Jensen
24eadadffd
Issue #2919 fix windows error due to gempak library missing
...
Former-commit-id: 747ac58166
[formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]
Former-commit-id: 82ee3e7104
2014-03-20 09:38:07 -05:00
Steve Harris
b5a2d2237f
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
...
Former-commit-id: d0aeb854f5
[formerly a2318f04eea89a258400dea526daa4fe67b69271]
Former-commit-id: 0c2c5ad4bd
2014-03-17 15:55:41 -05:00
Nate Jensen
d8edb8e91b
Merge "Issue #2718 Update to GeoTools 10.5 Undo reformatting of ncep code Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util" into development
...
Former-commit-id: 540d0f2e1d
[formerly ee5c599bf4822f73e488e42240c5794189e2d70f]
Former-commit-id: 27625eb93a
2014-03-13 11:16:00 -05:00
Ron Anderson
4b2a388628
Issue #2718 Update to GeoTools 10.5
...
Undo reformatting of ncep code
Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util
Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a
Former-commit-id: 1c727465ee
[formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]
Former-commit-id: bcfaf40ebf
2014-03-13 11:11:53 -05:00
Bryan Kowal
9ec8e864a7
Issue #2851 - initial 64-bit build of the bignsharp DLL
...
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll: PE32 executable for MS Windows (DLL) (console) Intel 80386 32-bit
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll: PE32+ executable for MS Windows (DLL) (console) Mono/.Net assembly
Amend: update Java version and Plugin version
Change-Id: I377e8b51eb9d7fd9964092040d1bcde3f9bcfd27
Former-commit-id: cac6709da8
[formerly 3189f870d55219372438213441fd1359a6bb5cc4]
Former-commit-id: 438e594868
2014-03-11 16:47:11 -05:00
Brian.Dyke
0aff5875b0
Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: d710aec521
[formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]
Former-commit-id: fda6ab1344
2014-03-10 15:14:59 -04:00
Ben Steffensmeier
d3043fda5a
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: 9122b6da99
[formerly ba5ff870337c7ac66d633077d84de867e5df967c]
Former-commit-id: 8650074737
2014-03-07 18:15:32 -06:00
Stephen Gilbert
46ebeb9969
VLab Issue #3224 - NSHARP: Fix erroneous mixing heights
...
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2
Former-commit-id: 65dd8b4c3c
[formerly 459cd2e6772efa05a683073798a1d4424aa2facf]
Former-commit-id: f203a4c035
2014-03-07 19:10:08 -05:00
Stephen Gilbert
b1e1d9178a
VLab Issue #3223 - NSHARP: Improve selection operation
...
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d
Former-commit-id: 9a457213bb
[formerly 16fcc171c65d79d5698feeb3ff0ace49c31d976f]
Former-commit-id: e3aedaa1d6
2014-03-07 19:07:28 -05:00
Stephen Gilbert
de6e50d8e6
VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
...
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57
Former-commit-id: 1632166902
[formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]
Former-commit-id: 49a6d6ec7e
2014-03-07 18:49:21 -05:00
Stephen Gilbert
204d047289
VLab Issue #3221 - Fix XML serialization problems
...
A few problems reading/writing XML files were noticed after upgrading to
14.2.1. This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.
Change-Id: I8aad4197029c70f72612299a25329687892884af
Former-commit-id: 625fcb0064
[formerly 4f58998c899e28521658bf17dee852592c534713]
Former-commit-id: 6dd6ae8d36
2014-03-07 18:36:42 -05:00
Steve Harris
708485427e
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 873bd6b889
[formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]
Former-commit-id: f60aba35d6
2014-03-07 15:43:40 -06:00
Steve Harris
f992a6b046
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 92232fa063
[formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]
Former-commit-id: 40b543f9a8
2014-03-07 15:16:18 -06:00
Brian.Dyke
0c4b9469b0
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 3ac2a61218
[formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]
Former-commit-id: 1fe5504d4c
2014-03-07 11:50:06 -05:00
Steve Harris
96658d8ce0
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
...
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 069093884f
[formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]
Former-commit-id: ffcc34f8d4
2014-03-06 08:39:43 -06:00
Steve Harris
6e361c0a57
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 167ce61d6c
[formerly 505bcf7b47aac1344bb46bac690ce83591b8e554]
Former-commit-id: 4b01c57c0a
2014-03-05 13:00:23 -06:00
Max Schenkelberg
654da3c0a2
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
...
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: a01a6d68d0
[formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]
Former-commit-id: cbf8b9249c
2014-03-04 09:23:36 -06:00
Brian Clements
724bafd44f
Issue #2667 fixed bin lightning menus
...
the column name for the source of the lightning data was changed
Former-commit-id: 91936beadf
[formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]
Former-commit-id: 7a7d476899
2014-03-03 13:17:05 -06:00
Richard Peter
f13c86bc3e
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 0e25ae35c1
[formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]
Former-commit-id: 1c150e6e8b
2014-02-27 15:18:26 -06:00
Richard Peter
c0d495d9c3
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 86d42ed603
[formerly 08990cfd910707cbf1731a8f271a52ff922a6345]
Former-commit-id: 862069dfd3
2014-02-27 13:46:47 -06:00
Brian.Dyke
64044e7ce5
OB_14.1.1-19 baseline
...
Former-commit-id: cfa4997978
[formerly db2a591456383d8f980d33757e8c161bdcc01d3a]
Former-commit-id: 10b723647b
2014-02-21 06:50:59 -05:00
Ron Anderson
8a41723ba6
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 5258aecf45
[formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]
Former-commit-id: 419e9d0b8d
2014-02-19 11:55:11 -06:00
Greg Armendariz
23f17b3f63
Issue #2754 - Fix import
...
Former-commit-id: e611dbe912
[formerly 1c9160bd5fe0e8c08ead5a67d9da426834a7669c]
Former-commit-id: 2e79658417
2014-02-03 14:45:47 -06:00
Stephen Gilbert
323eeb31c9
VLab Issue #2916 - NSHARP Errors Swapping into main pane
...
Fixed some widget management errors in the Show Text dialog's close
method. Ensure Text Dislog's close method is called when swapping
Nsharp display.
Change-Id: I6e645aa552980b49e552a2830f9f148d95f27f3b
Former-commit-id: ba72d87f07
[formerly 0ff12f2c322d9cbed696f9ee4f2049d9efed7863]
Former-commit-id: 3f6c7ef92c
2014-02-03 14:55:25 -05:00
Steve Harris
aa9b488963
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml
Former-commit-id: 7a156e297a
[formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]
Former-commit-id: 7b59bd41eb
2014-02-03 10:29:16 -06:00
Steve Harris
33aea09906
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: b2032880ac
[formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]
Former-commit-id: eb9d4319dc
2014-02-03 10:26:11 -06:00
Brian.Dyke
dd183bc0e9
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 4e7b1b207f
[formerly 0409f7045a797c8c051a353d69de1991b8c8b681]
Former-commit-id: 40ce5ccc2a
2014-01-31 08:28:09 -05:00
Stephen Gilbert
71e8735fdf
VLab Issue #2867 - Remove dependency on Mcidas dataplugin
...
Removed the dependency for mcidas dataplugin. The ncep feature
dependencies don't allow for that causing an error in the build scripts.
Change-Id: I9cccc6d93158465f54cb0d9db0e57b16604e1d09
Former-commit-id: c9af367a72
[formerly 0fa8b0ae9f21df9a1d773edd7e997151c6db9c8f]
Former-commit-id: 0e96169b6f
2014-01-29 09:58:10 -05:00
Stephen Gilbert
486096ada2
VLab Issue #2867 - Add dependency for Mcidas dataplugin
...
Don't like it, but added a dependency for mcidas dataplugin to the
gov.noaa.nws.ncep.vix.common plugin.
Change-Id: Ie8aff1c3ae1733191cb74b7dc0c4593bb37ca28b
Former-commit-id: ac68b01bbc
[formerly 61c5dce6e5ee16d776bcac2740ddf4e860fbb40f]
Former-commit-id: f21b0f5d82
2014-01-28 14:52:46 -05:00
Stephen Gilbert
d62a9f3b08
Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 64c2460028
[formerly b928cda17148473922bcd3ad11e33cc93c1e37c3]
Former-commit-id: 1af8bfa176
2014-01-27 14:23:02 -05:00
Stephen Gilbert
3a3f8a7be0
Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: a70450b064
[formerly 2989403fe879801729b1233a54cd5ea314bb2dae]
Former-commit-id: bf7fcc1952
2014-01-27 14:22:17 -05:00