Ben Steffensmeier
ad4ce67e85
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: c0b478eb979122b6da99c0b478eb979122b6da99865007473786500747375e4c35e93fd3043fda5aa1ac082c94
2014-03-07 18:15:32 -06:00
Steve Harris
ed7921643c
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 51b755a476873bd6b88951b755a476873bd6b889f60aba35d6f60aba35d6c24108e75b708485427e61af779433
2014-03-07 15:43:40 -06:00
Steve Harris
e29b96b6bd
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 068297b90a92232fa063068297b90a92232fa06340b543f9a840b543f9a84d1fbf8743f992a6b046ea01373320
2014-03-07 15:16:18 -06:00
Brian.Dyke
d9f1b98ce7
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 48cc3b6c553ac2a6121848cc3b6c553ac2a612181fe5504d4c1fe5504d4c48f1f544d60c4b9469b0795c5424cb
2014-03-07 11:50:06 -05:00
Steve Harris
2db5dcf6eb
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: 3ba28aabea069093884f3ba28aabea069093884fffcc34f8d4ffcc34f8d4587f15a95d96658d8ce036a0533f19
2014-03-06 08:39:43 -06:00
Steve Harris
86476b5064
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 1a666f9f71167ce61d6c1a666f9f71167ce61d6c4b01c57c0a4b01c57c0a12d8ff2fce6e361c0a57b00cecc2ab
2014-03-05 13:00:23 -06:00
Max Schenkelberg
c6cf08db73
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: 59434c8a60a01a6d68d059434c8a60a01a6d68d0cbf8b9249ccbf8b9249c39e1c4fa46654da3c0a2f509321134
2014-03-04 09:23:36 -06:00
Brian Clements
44fdea985e
Issue #2667 fixed bin lightning menus
...
the column name for the source of the lightning data was changed
Former-commit-id: 5d21675a9191936beadf5d21675a9191936beadf7a7d4768997a7d476899bf4c119278724bafd44fdc8667011b
2014-03-03 13:17:05 -06:00
Richard Peter
5fab51d41b
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: 7bd6a079130e25ae35c17bd6a079130e25ae35c11c150e6e8b1c150e6e8b50a1b270c5f13c86bc3e9b3f8f9649
2014-02-27 15:18:26 -06:00
Richard Peter
68eade49a2
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: c267c5a08f86d42ed603c267c5a08f86d42ed603862069dfd3862069dfd3237ada7b8bc0d495d9c39489565efb
2014-02-27 13:46:47 -06:00
Brian.Dyke
f86f9f8918
OB_14.1.1-19 baseline
...
Former-commit-id: 779553142ccfa4997978779553142ccfa499797810b723647b10b723647bc41dd22ff264044e7ce51b359c2564
2014-02-21 06:50:59 -05:00
Ron Anderson
e91fd1d683
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 663cb4cb625258aecf45663cb4cb625258aecf45419e9d0b8d419e9d0b8d908e43039e8a41723ba6b0a4b63689
2014-02-19 11:55:11 -06:00
Greg Armendariz
e47453df3b
Issue #2754 - Fix import
...
Former-commit-id: 5490e216bee611dbe9125490e216bee611dbe9122e796584172e79658417744c6fd9b123f17b3f63ac169b4f24
2014-02-03 14:45:47 -06:00
Stephen Gilbert
df9518ae2b
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: d849e051c8ba72d87f07d849e051c8ba72d87f073f6c7ef92c3f6c7ef92c838a8e4faa323eeb31c9e4c1561c19
2014-02-03 14:55:25 -05:00
Steve Harris
e6cab2a902
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml
Former-commit-id: ae2b8491577a156e297aae2b8491577a156e297a7b59bd41eb7b59bd41eb4a379aa6e5aa9b488963b9af02c0b3
2014-02-03 10:29:16 -06:00
Steve Harris
08700a77b1
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 131af8538eb2032880ac131af8538eb2032880aceb9d4319dceb9d4319dc6883c6474433aea09906d8989145ac
2014-02-03 10:26:11 -06:00
Brian.Dyke
a540be3064
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 89b824b8464e7b1b207f89b824b8464e7b1b207f40ce5ccc2a40ce5ccc2a3fd2ef82abdd183bc0e9df55ab5503
2014-01-31 08:28:09 -05:00
Stephen Gilbert
e60e1873c0
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: beaee1eaf0c9af367a72beaee1eaf0c9af367a720e96169b6f0e96169b6fe0e74ad5fd71e8735fdff5327455c3
2014-01-29 09:58:10 -05:00
Stephen Gilbert
39c149a747
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: e60635f47dac68b01bbce60635f47dac68b01bbcf21b0f5d82f21b0f5d8229ca14c4b7486096ada2fb46c34d1c
2014-01-28 14:52:46 -05:00
Stephen Gilbert
202f929a5f
Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 312a09983a64c2460028312a09983a64c24600281af8bfa1761af8bfa1767f3e8b5c21d62a9f3b0805655af06b
2014-01-27 14:23:02 -05:00
Stephen Gilbert
21dea78fde
Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: a7ce764b19a70450b064a7ce764b19a70450b064bf7fcc1952bf7fcc195248aeec0c173a3f8a7be0f39c9fdaa4
2014-01-27 14:22:17 -05:00
Stephen Gilbert
f7c1bee352
Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 53fa8822e06785474b1753fa8822e06785474b17b64adbed81b64adbed81511123b38cd947a0e7c14cd6847849
2014-01-27 14:20:47 -05:00
Stephen Gilbert
7a3a3de048
VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1
...
Many changes in NCEP Viz plugins for 14.2.1 enhancements and big fixes
for the National Centers Perspective and PGEN
Change-Id: I4fa707cf0844800a4c77961e110338daafbb0354
Former-commit-id: e1d16e1aeb14d218ddc5e1d16e1aeb14d218ddc5369d2592fe369d2592fe405cdee1ca6480693089f78b216bcd
2014-01-24 10:46:37 -05:00
Stephen Gilbert
436332a951
VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1
...
Updates to configuration files used by the National Centers Perspective
Change-Id: Ie2c8c4f8d0eb57031fb25acbe450b6e3ac56c109
Former-commit-id: 4b28ca1baf95bbc2f2b24b28ca1baf95bbc2f2b210a718853d10a718853df65b0ab7fe2432ca3a048018ae86f7
2014-01-24 10:33:14 -05:00
Stephen Gilbert
e75a572abf
VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1
...
Updates to GRIB decoder tables.
Changes to some decoder plugins to support data ingest through qpid.
Change-Id: Id42e993b1ac76040ad19c970c43036d3f852def0
Former-commit-id: 185f06495fa12b83ddfb185f06495fa12b83ddfb2bd1588ad42bd1588ad4081ef1a246cfa9fdb6cf6ef117ac7d
2014-01-24 10:14:17 -05:00
Stephen Gilbert
27e600f90b
Merge "VLab Issue #2841 - SWPC delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: e49e5d406fb9eefb97b4e49e5d406fb9eefb97b4bae1844e81bae1844e81a468328a3e935eebbb2acdeffde325
2014-01-23 17:12:28 -05:00
Stephen Gilbert
14b5ceaa17
VLab Issue #2841 - SWPC delivery for 14.2.1
...
Contains functionality for image calculations such
as differencing and ratios.
Also includes config files for displaying SWPC gridded terrestrial data.
Amending commit to address code-review concerns with some java classes.
Change-Id: I3e6e8dbd5015ef825386c1203c333091c6a24f25
Former-commit-id: 90a5cf53d3e02136a02690a5cf53d3e02136a026f0f1a832c7f0f1a832c70c053a145b25ad64175ca8426c759b
2014-01-23 11:58:55 -05:00
Nate Jensen
91396bb5a7
Merge "Issue #2312 Add ability to export gif and image export dialog. Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05" into development
...
Former-commit-id: 1f5a26dc30e2f9e866591f5a26dc30e2f9e86659738c70e8ea738c70e8ea96ad72aa9e10f9feddbadb7e3f7368
2014-01-22 09:36:33 -06:00
Ben Steffensmeier
9a87e95aac
Issue #2312 Add ability to export gif and image export dialog.
...
Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05
Former-commit-id: b70faf1f7dfc1c56f9cbb70faf1f7dfc1c56f9cb4ad4b4a8594ad4b4a859cd295e41728b2e5a06bc7d083a08c5
2014-01-21 18:09:13 -06:00
Steve Harris
69626ab704
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: a465718a0d24ab7cff49a465718a0d24ab7cff4969dc3d835b69dc3d835bb62efa9387252c7ee40a2a967fc9b5
2014-01-21 12:36:54 -06:00
Richard Peter
17cf9406ad
Issue #2724 : Fix Airep/Pirep Autoboxing NPE
...
Change-Id: Ieb2823dc220daf4d77a071ba8baaf3831957bd38
Former-commit-id: d831e8c692c6206fd6a8d831e8c692c6206fd6a857f609683357f6096833ee5fce8be6d372cf80f9593d58322c
2014-01-21 11:26:30 -06:00
Nate Jensen
283bcf652f
Issue #2359 fix ncep pirep decoding null pointer
...
Change-Id: Id255abcda2d8c661ce8d7d0b022addc69f7635ea
Former-commit-id: 7961052b417f7f05b8ba7961052b417f7f05b8ba5a860252ad5a860252ad4b570ada33c0d49c4b246809d67737
2014-01-20 13:11:36 -06:00
Steve Harris
ccd2f6cdaa
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
Former-commit-id: 5fcccbff1b454d5578845fcccbff1b454d5578849371eeeee09371eeeee07ea285c48b0ba307d616b5f7f35ccb
2014-01-20 10:17:44 -06:00
Nate Jensen
0e7647cdc6
Issue #2359 fix annoying ncep null pointer
...
Change-Id: I5d606f42bfe4060f8874d2cfaf01a48b548ce25e
Former-commit-id: f46b6e0a8fc7addfbdbff46b6e0a8fc7addfbdbffa79f2aa14fa79f2aa1409bc3382d6012ee681e5f00fb13946
2014-01-17 10:24:10 -06:00
Ron Anderson
77c132f706
Merge branch 'master_14.1.1' into solutions
...
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 0bde38cef3ba7a25a88f0bde38cef3ba7a25a88f62c445d87262c445d872dca7f21f7b624375267e5076217d8f
2014-01-13 17:45:20 -06:00
Nate Jensen
d9427f900f
Issue #2359 prevent obnoxious ncep decoder null pointer exceptions
...
Change-Id: I731614a8a6c9ec38bb6c1b29c4d9f6ca5a7c03d7
Former-commit-id: 52293fd1542c0e3f05ca52293fd1542c0e3f05cae509a2883fe509a2883fde5d7565e2488956a259bdf8ff8ad4
2014-01-07 12:38:49 -06:00
Max Schenkelberg
783391423f
Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
...
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index
Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5
Former-commit-id: b3aed9914216046a4ddeb3aed9914216046a4ddecc2080449ccc2080449c0ceaa43902f58795f460789a279475
2014-01-06 17:03:45 -06:00
Ben Steffensmeier
7303bd3b62
Issue #2537 Split modelsounding into common/edex plugins.
...
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8
Former-commit-id: f516a684d4f520a26fbdf516a684d4f520a26fbdd79f804d4ed79f804d4e9913e51429fac9fd296f4fef47c0a8
2014-01-06 16:02:59 -06:00
Steve Harris
1ca553385c
14.1.1-15 baseline
...
Former-commit-id: f88ff2bde98bbd803acef88ff2bde98bbd803aced8e5799328d8e5799328282d10fe6d35d8f5a281cd4a09623c
2014-01-06 14:08:08 -05:00
Steve Harris
5862555160
14.1.1-14 baseline
...
Former-commit-id: 6df7c67f95f2ad9da4eb6df7c67f95f2ad9da4eb9ef1c841b99ef1c841b90989c1771043cc501e0da2bdee5cc1
2014-01-06 14:02:30 -05:00
Max Schenkelberg
ede6c2fa1e
Issue #2620 Fixed viz base feature dependency issues.
...
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec
Former-commit-id: be451028149d846aa104be451028149d846aa104987d4b3a30987d4b3a30e86e477165eede01921e5c2da4c3e3
2013-12-09 15:14:01 -06:00
Richard Peter
611b721bbf
Issue #2551 : Update NCEP objects to extend PersistablePluginDataObject.
...
Amend: Remove IDecoderGettable.
Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b
Former-commit-id: 796293c03698117b4093796293c03698117b4093f8f3ebc6e9f8f3ebc6e900c44b3a081a554d96320932f3103b
2013-12-03 17:24:01 -06:00
Steve Harris
bfa9d638cc
14.1.1-11 baseline
...
Former-commit-id: 337b13820070a6f1936e337b13820070a6f1936e71ae71c85071ae71c8508bd818de095526a8999df88a635a58
2013-12-02 17:10:10 -05:00
Brian Clements
6b8a853240
Issue #2393 removed pypies interpolation
...
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code
Former-commit-id: d35fc591d2fe58826a1ed35fc591d2fe58826a1e0f40ae2b990f40ae2b9910e63616ffb762864f882e4dc2000e
2013-11-20 08:40:12 -06:00
Steve Harris
ea65181d19
14.1.1-10 baseline
...
Former-commit-id: 8251107646ca0f65bd9a8251107646ca0f65bd9a9248695a1f9248695a1fe35ec60f7eef6e0b030436d788890a
2013-11-19 16:40:25 -05:00
Nate Jensen
2e81364691
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 757ca42a5fdd99aa3f47757ca42a5fdd99aa3f4778b01f61c478b01f61c4d0d712ec6fd96cdbe761f2c777ff48
2013-11-14 17:41:24 -06:00
Bryan Kowal
97c0dff26a
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 178d95e59d86dd200844178d95e59d86dd2008440544b66f4e0544b66f4ea2b1211c5201735ca0c41a905e8a3c
2013-11-13 13:16:55 -06:00
Richard Peter
ef23a8f65b
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.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.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 7ba466f5a6306bd6fae17ba466f5a6306bd6fae1460a7b8b5d460a7b8b5d3f68fc6eed59671c1e7dc8ef435295
2013-11-12 11:11:36 -06:00
Nate Jensen
273eb805c0
Issue #2361 remove using SerializationUtil for processing XML colormaps
...
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7
Former-commit-id: 2c0c20f01eb52bdb1cec2c0c20f01eb52bdb1cec7a73c654307a73c654309bf83be7e95427e68fd280c38e1433
2013-11-12 10:37:54 -06:00
Bryan Kowal
f986662369
Issue #2297 - fix 14.2.1 merge
...
Former-commit-id: fee6a5dc9ce2a02ca247fee6a5dc9ce2a02ca247411e0fa7c4411e0fa7c4b1a6d2d828e937ba954b18bb3ef947
2013-11-11 13:04:21 -06:00
