xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4698 commits 31 branches 40 tags 3.8 GiB
Commit graph

352 commits

Author SHA1 Message Date
Brian.Dyke
26e19974d1 Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: 24785068be [formerly d710aec521] [formerly 24785068be [formerly d710aec521] [formerly fda6ab1344 [formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]]
Former-commit-id: fda6ab1344
Former-commit-id: c5502af3fa [formerly 0aff5875b0]
Former-commit-id: dcade6e18a
 2014-03-10 15:14:59 -04:00
Stephen Gilbert
aaa14d1b1d VLab Issue #3224 - NSHARP: Fix erroneous mixing heights 
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2

Former-commit-id: 200c7e60da [formerly 65dd8b4c3c] [formerly 200c7e60da [formerly 65dd8b4c3c] [formerly f203a4c035 [formerly 459cd2e6772efa05a683073798a1d4424aa2facf]]]
Former-commit-id: f203a4c035
Former-commit-id: 00c1f40997 [formerly 46ebeb9969]
Former-commit-id: abb11feb16
 2014-03-07 19:10:08 -05:00
Stephen Gilbert
08b8f4c679 VLab Issue #3223 - NSHARP: Improve selection operation 
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d

Former-commit-id: 5fcb45a629 [formerly 9a457213bb] [formerly 5fcb45a629 [formerly 9a457213bb] [formerly e3aedaa1d6 [formerly 16fcc171c65d79d5698feeb3ff0ace49c31d976f]]]
Former-commit-id: e3aedaa1d6
Former-commit-id: c4b73eb02e [formerly b1e1d9178a]
Former-commit-id: 05328b9103
 2014-03-07 19:07:28 -05:00
Stephen Gilbert
5eea989db5 VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP 
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57

Former-commit-id: a7fd09a409 [formerly 1632166902] [formerly a7fd09a409 [formerly 1632166902] [formerly 49a6d6ec7e [formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]]]
Former-commit-id: 49a6d6ec7e
Former-commit-id: 6d40a42c39 [formerly de6e50d8e6]
Former-commit-id: 40a62c63cd
 2014-03-07 18:49:21 -05:00
Stephen Gilbert
e0f2f91b21 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: cce06bfbe3 [formerly 625fcb0064] [formerly cce06bfbe3 [formerly 625fcb0064] [formerly 6dd6ae8d36 [formerly 4f58998c899e28521658bf17dee852592c534713]]]
Former-commit-id: 6dd6ae8d36
Former-commit-id: ce73240c40 [formerly 204d047289]
Former-commit-id: ebafac1725
 2014-03-07 18:36:42 -05:00
Steve Harris
e29b96b6bd Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 068297b90a [formerly 92232fa063] [formerly 068297b90a [formerly 92232fa063] [formerly 40b543f9a8 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: 4d1fbf8743 [formerly f992a6b046]
Former-commit-id: ea01373320
 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: 48cc3b6c55 [formerly 3ac2a61218] [formerly 48cc3b6c55 [formerly 3ac2a61218] [formerly 1fe5504d4c [formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]]
Former-commit-id: 1fe5504d4c
Former-commit-id: 48f1f544d6 [formerly 0c4b9469b0]
Former-commit-id: 795c5424cb
 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: 3ba28aabea [formerly 069093884f] [formerly 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 587f15a95d [formerly 96658d8ce0]
Former-commit-id: 36a0533f19
 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: 1a666f9f71 [formerly 167ce61d6c] [formerly 1a666f9f71 [formerly 167ce61d6c] [formerly 4b01c57c0a [formerly 505bcf7b47aac1344bb46bac690ce83591b8e554]]]
Former-commit-id: 4b01c57c0a
Former-commit-id: 12d8ff2fce [formerly 6e361c0a57]
Former-commit-id: b00cecc2ab
 2014-03-05 13:00:23 -06:00
Richard Peter
68eade49a2 Issue #2509: Fix Merge of 13.5.2-4 ncep resources 
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: c267c5a08f [formerly 86d42ed603] [formerly c267c5a08f [formerly 86d42ed603] [formerly 862069dfd3 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]
Former-commit-id: 862069dfd3
Former-commit-id: 237ada7b8b [formerly c0d495d9c3]
Former-commit-id: 9489565efb
 2014-02-27 13:46:47 -06:00
Brian.Dyke
f86f9f8918 OB_14.1.1-19 baseline 
Former-commit-id: 779553142c [formerly cfa4997978] [formerly 779553142c [formerly cfa4997978] [formerly 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: c41dd22ff2 [formerly 64044e7ce5]
Former-commit-id: 1b359c2564
 2014-02-21 06:50:59 -05: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: d849e051c8 [formerly ba72d87f07] [formerly d849e051c8 [formerly ba72d87f07] [formerly 3f6c7ef92c [formerly 0ff12f2c322d9cbed696f9ee4f2049d9efed7863]]]
Former-commit-id: 3f6c7ef92c
Former-commit-id: 838a8e4faa [formerly 323eeb31c9]
Former-commit-id: e4c1561c19
 2014-02-03 14:55:25 -05:00
Steve Harris
08700a77b1 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 131af8538e [formerly b2032880ac] [formerly 131af8538e [formerly b2032880ac] [formerly eb9d4319dc [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]
Former-commit-id: eb9d4319dc
Former-commit-id: 6883c64744 [formerly 33aea09906]
Former-commit-id: d8989145ac
 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: 89b824b846 [formerly 4e7b1b207f] [formerly 89b824b846 [formerly 4e7b1b207f] [formerly 40ce5ccc2a [formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]]
Former-commit-id: 40ce5ccc2a
Former-commit-id: 3fd2ef82ab [formerly dd183bc0e9]
Former-commit-id: df55ab5503
 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: beaee1eaf0 [formerly c9af367a72] [formerly beaee1eaf0 [formerly c9af367a72] [formerly 0e96169b6f [formerly 0fa8b0ae9f21df9a1d773edd7e997151c6db9c8f]]]
Former-commit-id: 0e96169b6f
Former-commit-id: e0e74ad5fd [formerly 71e8735fdf]
Former-commit-id: f5327455c3
 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: e60635f47d [formerly ac68b01bbc] [formerly e60635f47d [formerly ac68b01bbc] [formerly f21b0f5d82 [formerly 61c5dce6e5ee16d776bcac2740ddf4e860fbb40f]]]
Former-commit-id: f21b0f5d82
Former-commit-id: 29ca14c4b7 [formerly 486096ada2]
Former-commit-id: fb46c34d1c
 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: 312a09983a [formerly 64c2460028] [formerly 312a09983a [formerly 64c2460028] [formerly 1af8bfa176 [formerly b928cda17148473922bcd3ad11e33cc93c1e37c3]]]
Former-commit-id: 1af8bfa176
Former-commit-id: 7f3e8b5c21 [formerly d62a9f3b08]
Former-commit-id: 05655af06b
 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: a7ce764b19 [formerly a70450b064] [formerly a7ce764b19 [formerly a70450b064] [formerly bf7fcc1952 [formerly 2989403fe879801729b1233a54cd5ea314bb2dae]]]
Former-commit-id: bf7fcc1952
Former-commit-id: 48aeec0c17 [formerly 3a3f8a7be0]
Former-commit-id: f39c9fdaa4
 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: 53fa8822e0 [formerly 6785474b17] [formerly 53fa8822e0 [formerly 6785474b17] [formerly b64adbed81 [formerly 57ce64e6119d2bf540da80c1161b88b04474d53c]]]
Former-commit-id: b64adbed81
Former-commit-id: 511123b38c [formerly d947a0e7c1]
Former-commit-id: 4cd6847849
 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: e1d16e1aeb [formerly 14d218ddc5] [formerly e1d16e1aeb [formerly 14d218ddc5] [formerly 369d2592fe [formerly e3a35c9c3eb2184818b21ba1b23aac988a0148ee]]]
Former-commit-id: 369d2592fe
Former-commit-id: 405cdee1ca [formerly 6480693089]
Former-commit-id: f78b216bcd
 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: 4b28ca1baf [formerly 95bbc2f2b2] [formerly 4b28ca1baf [formerly 95bbc2f2b2] [formerly 10a718853d [formerly 12d9868db2939c53ed49b1cf3092f7d638189696]]]
Former-commit-id: 10a718853d
Former-commit-id: f65b0ab7fe [formerly 2432ca3a04]
Former-commit-id: 8018ae86f7
 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: 185f06495f [formerly a12b83ddfb] [formerly 185f06495f [formerly a12b83ddfb] [formerly 2bd1588ad4 [formerly f64ce96da2871e55b40b6fe4ba0e77eaed266103]]]
Former-commit-id: 2bd1588ad4
Former-commit-id: 081ef1a246 [formerly cfa9fdb6cf]
Former-commit-id: 6ef117ac7d
 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: e49e5d406f [formerly b9eefb97b4] [formerly e49e5d406f [formerly b9eefb97b4] [formerly bae1844e81 [formerly 015664232a6214feb624262196e45aadc8ee4636]]]
Former-commit-id: bae1844e81
Former-commit-id: a468328a3e [formerly 935eebbb2a]
Former-commit-id: cdeffde325
 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: 90a5cf53d3 [formerly e02136a026] [formerly 90a5cf53d3 [formerly e02136a026] [formerly f0f1a832c7 [formerly 5823fba56ae3036682814548004afd076174bb06]]]
Former-commit-id: f0f1a832c7
Former-commit-id: 0c053a145b [formerly 25ad64175c]
Former-commit-id: a8426c759b
 2014-01-23 11:58:55 -05:00
Richard Peter
17cf9406ad Issue #2724: Fix Airep/Pirep Autoboxing NPE 
Change-Id: Ieb2823dc220daf4d77a071ba8baaf3831957bd38

Former-commit-id: d831e8c692 [formerly c6206fd6a8] [formerly d831e8c692 [formerly c6206fd6a8] [formerly 57f6096833 [formerly cbdaaf4d6e28d7001df205ffb7d8d2d56bacd35f]]]
Former-commit-id: 57f6096833
Former-commit-id: ee5fce8be6 [formerly d372cf80f9]
Former-commit-id: 593d58322c
 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: 7961052b41 [formerly 7f7f05b8ba] [formerly 7961052b41 [formerly 7f7f05b8ba] [formerly 5a860252ad [formerly 5f554ec21fcedc7f8ef5b3b00fc951527bb424bb]]]
Former-commit-id: 5a860252ad
Former-commit-id: 4b570ada33 [formerly c0d49c4b24]
Former-commit-id: 6809d67737
 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: 5fcccbff1b [formerly 454d557884] [formerly 5fcccbff1b [formerly 454d557884] [formerly 9371eeeee0 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 7ea285c48b [formerly 0ba307d616]
Former-commit-id: b5f7f35ccb
 2014-01-20 10:17:44 -06:00
Nate Jensen
0e7647cdc6 Issue #2359 fix annoying ncep null pointer 
Change-Id: I5d606f42bfe4060f8874d2cfaf01a48b548ce25e

Former-commit-id: f46b6e0a8f [formerly c7addfbdbf] [formerly f46b6e0a8f [formerly c7addfbdbf] [formerly fa79f2aa14 [formerly 0cb0975786aa578e93fe06227c666feb759e0433]]]
Former-commit-id: fa79f2aa14
Former-commit-id: 09bc3382d6 [formerly 012ee681e5]
Former-commit-id: f00fb13946
 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: 0bde38cef3 [formerly ba7a25a88f] [formerly 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: dca7f21f7b [formerly 624375267e]
Former-commit-id: 5076217d8f
 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: 52293fd154 [formerly 2c0e3f05ca] [formerly 52293fd154 [formerly 2c0e3f05ca] [formerly e509a2883f [formerly 514d0cfecd3eb8c81a6d2120406225856d964c9e]]]
Former-commit-id: e509a2883f
Former-commit-id: de5d7565e2 [formerly 488956a259]
Former-commit-id: bdf8ff8ad4
 2014-01-07 12:38:49 -06:00
Ben Steffensmeier
7303bd3b62 Issue #2537 Split modelsounding into common/edex plugins. 
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8

Former-commit-id: f516a684d4 [formerly f520a26fbd] [formerly f516a684d4 [formerly f520a26fbd] [formerly d79f804d4e [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]]
Former-commit-id: d79f804d4e
Former-commit-id: 9913e51429 [formerly fac9fd296f]
Former-commit-id: 4fef47c0a8
 2014-01-06 16:02:59 -06:00
Steve Harris
1ca553385c 14.1.1-15 baseline 
Former-commit-id: f88ff2bde9 [formerly 8bbd803ace] [formerly f88ff2bde9 [formerly 8bbd803ace] [formerly d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]
Former-commit-id: d8e5799328
Former-commit-id: 282d10fe6d [formerly 35d8f5a281]
Former-commit-id: cd4a09623c
 2014-01-06 14:08:08 -05:00
Steve Harris
5862555160 14.1.1-14 baseline 
Former-commit-id: 6df7c67f95 [formerly f2ad9da4eb] [formerly 6df7c67f95 [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 0989c17710 [formerly 43cc501e0d]
Former-commit-id: a2bdee5cc1
 2014-01-06 14:02:30 -05:00
Richard Peter
611b721bbf Issue #2551: Update NCEP objects to extend PersistablePluginDataObject. 
Amend: Remove IDecoderGettable.

Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b

Former-commit-id: 796293c036 [formerly 98117b4093] [formerly 796293c036 [formerly 98117b4093] [formerly f8f3ebc6e9 [formerly 0778a7f0123dd150894458fef6958fcdd9da39b6]]]
Former-commit-id: f8f3ebc6e9
Former-commit-id: 00c44b3a08 [formerly 1a554d9632]
Former-commit-id: 0932f3103b
 2013-12-03 17:24:01 -06:00
Steve Harris
bfa9d638cc 14.1.1-11 baseline 
Former-commit-id: 337b138200 [formerly 70a6f1936e] [formerly 337b138200 [formerly 70a6f1936e] [formerly 71ae71c850 [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 8bd818de09 [formerly 5526a8999d]
Former-commit-id: f88a635a58
 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: d35fc591d2 [formerly fe58826a1e] [formerly d35fc591d2 [formerly fe58826a1e] [formerly 0f40ae2b99 [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 10e63616ff [formerly b762864f88]
Former-commit-id: 2e4dc2000e
 2013-11-20 08:40:12 -06:00
Steve Harris
ea65181d19 14.1.1-10 baseline 
Former-commit-id: 8251107646 [formerly ca0f65bd9a] [formerly 8251107646 [formerly ca0f65bd9a] [formerly 9248695a1f [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: e35ec60f7e [formerly ef6e0b0304]
Former-commit-id: 36d788890a
 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: 757ca42a5f [formerly dd99aa3f47] [formerly 757ca42a5f [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]
Former-commit-id: 78b01f61c4
Former-commit-id: d0d712ec6f [formerly d96cdbe761]
Former-commit-id: f2c777ff48
 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: 178d95e59d [formerly 86dd200844] [formerly 178d95e59d [formerly 86dd200844] [formerly 0544b66f4e [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]
Former-commit-id: 0544b66f4e
Former-commit-id: a2b1211c52 [formerly 01735ca0c4]
Former-commit-id: 1a905e8a3c
 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: 7ba466f5a6 [formerly 306bd6fae1] [formerly 7ba466f5a6 [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 3f68fc6eed [formerly 59671c1e7d]
Former-commit-id: c8ef435295
 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: 2c0c20f01e [formerly b52bdb1cec] [formerly 2c0c20f01e [formerly b52bdb1cec] [formerly 7a73c65430 [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]
Former-commit-id: 7a73c65430
Former-commit-id: 9bf83be7e9 [formerly 5427e68fd2]
Former-commit-id: 80c38e1433
 2013-11-12 10:37:54 -06:00
Bryan Kowal
f986662369 Issue #2297 - fix 14.2.1 merge 
Former-commit-id: fee6a5dc9c [formerly e2a02ca247] [formerly fee6a5dc9c [formerly e2a02ca247] [formerly 411e0fa7c4 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]]]
Former-commit-id: 411e0fa7c4
Former-commit-id: b1a6d2d828 [formerly e937ba954b]
Former-commit-id: 18bb3ef947
 2013-11-11 13:04:21 -06:00
Bryan Kowal
9f749f3079 Merge branch 'omaha_14.1.1' into development_on_RHEL6 
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	cots/edu.uci.ics.crawler4j/.classpath
	cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
	cots/edu.uci.ics.crawler4j/build.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
	edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.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/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GridToGribConverter.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/CPCoutlookGribPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/Nam80PostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/SixHrPrecipGridProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/ThreeHrPrecipGridProcessor.java
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
	edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.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/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/MESOWestDecoder.java
	edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java
	edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoder.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/src/gov/noaa/nws/ncep/edex/plugin/ncccfp/decoder/NcccfpDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgridAssembler.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
	rpms/awips2.ade/Installer.eclipse/component.spec.3.6.1

Former-commit-id: 3b8ce3fd34 [formerly c3eb4e9af9] [formerly 3b8ce3fd34 [formerly c3eb4e9af9] [formerly f1cd2f2e5a [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: 464a8d1001 [formerly 1909193f0c]
Former-commit-id: dfba50bf2e
 2013-11-08 14:51:47 -06:00
Richard Peter
94e0faa6c6 Merge branch 'omaha_13.5.3' (13.5.3-5) into development 
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	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/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java

Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9

Former-commit-id: 25df870b67 [formerly fa7d77ae97] [formerly 25df870b67 [formerly fa7d77ae97] [formerly 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: c97efbf656 [formerly 520dd57f02]
Former-commit-id: 910464ea6a
 2013-11-07 14:25:45 -06:00
Steve Harris
43b93250c0 14.1.1-7 baseline (addendum 1) 
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml


Former-commit-id: abbecba957 [formerly 2d36bc2c1f] [formerly abbecba957 [formerly 2d36bc2c1f] [formerly b835dad501 [formerly 07f7c24804028aed71fc29cdf6f163a9e9d15623]]]
Former-commit-id: b835dad501
Former-commit-id: a72bb1669f [formerly 155bc487ff]
Former-commit-id: fdad37d271
 2013-11-07 12:09:23 -05:00
Steve Harris
cfb3194426 14.1.1-7 baseline 
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d] [formerly 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: b694612fe0 [formerly 48df058653]
Former-commit-id: 647b908fed
 2013-11-06 14:16:14 -05:00
Steve Harris
0aa90a7855 14.1.1-6 baseline 
Former-commit-id: 946a9be17e [formerly 0cb2978c13] [formerly 946a9be17e [formerly 0cb2978c13] [formerly 6067af4252 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]
Former-commit-id: 6067af4252
Former-commit-id: e86a0aa489 [formerly 26da1ce793]
Former-commit-id: 270c5f1a2d
 2013-11-06 14:08:33 -05:00
Bryan Kowal
2c31c6f4ab Merge branch 'development' into development_on_RHEL6 
Conflicts:
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
	rpms/awips2.core/Installer.tools/component.spec
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh

Former-commit-id: d73aaf9753 [formerly 4bad21e6cd] [formerly d73aaf9753 [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]
Former-commit-id: 3255bf3861
Former-commit-id: 400b4a1328 [formerly 76726372e5]
Former-commit-id: 748ab480fb
 2013-11-05 19:03:22 -06:00
Ben Steffensmeier
5cf9a6ed01 Issue #2485 Remove ncccfp 
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64

Former-commit-id: 4639cd69f4 [formerly 5b53cb4c98] [formerly 4639cd69f4 [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]
Former-commit-id: 1d35086e8d
Former-commit-id: b64221f27b [formerly 8aefe5ff02]
Former-commit-id: a97ec9b8e5
 2013-11-05 17:33:41 -06:00
Bryan Kowal
0d8ab84604 Merge branch 'development' into development_on_RHEL6 
Conflicts:
	cots/org.jep.linux64/libjep.so

Former-commit-id: 04bcd7e6dc [formerly 49422aea62] [formerly 04bcd7e6dc [formerly 49422aea62] [formerly d08a652e23 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]
Former-commit-id: d08a652e23
Former-commit-id: d53ec9c750 [formerly adb62df96a]
Former-commit-id: 70d4374ce8
 2013-10-31 15:43:29 -05:00