Commit graph

350 commits

Author SHA1 Message Date
Brian Clements
472d08d2ad Issue #2667 fixed bin lightning menus
the column name for the source of the lightning data was changed


Former-commit-id: dedd9e80ed [formerly 5d21675a91] [formerly 91936beadf] [formerly 7a7d476899 [formerly 91936beadf [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]]
Former-commit-id: 7a7d476899
Former-commit-id: dbc2261d04afbbeaa80308981a4752188bec6977 [formerly 724bafd44f]
Former-commit-id: bf4c119278
2014-03-03 13:17:05 -06:00
Richard Peter
1d6e9816e0 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: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]
Former-commit-id: 50a1b270c5
2014-02-27 15:18:26 -06:00
Richard Peter
9f43d8e4b2 Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: 63da19f472 [formerly c267c5a08f] [formerly 86d42ed603] [formerly 862069dfd3 [formerly 86d42ed603 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]
Former-commit-id: 862069dfd3
Former-commit-id: 2ae63270ca0112aca619a0c7564fa8a1154ef4f9 [formerly c0d495d9c3]
Former-commit-id: 237ada7b8b
2014-02-27 13:46:47 -06:00
Ron Anderson
84bea14340 Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 5f3248574f [formerly 663cb4cb62] [formerly 5258aecf45] [formerly 419e9d0b8d [formerly 5258aecf45 [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: ba993f1f22c77f61f4ea6ed8c28039e69d6a34b2 [formerly 8a41723ba6]
Former-commit-id: 908e43039e
2014-02-19 11:55:11 -06:00
Greg Armendariz
4cc403c2e7 Issue #2754 - Fix import
Former-commit-id: 11db377bf8 [formerly 5490e216be] [formerly e611dbe912] [formerly 2e79658417 [formerly e611dbe912 [formerly 1c9160bd5fe0e8c08ead5a67d9da426834a7669c]]]
Former-commit-id: 2e79658417
Former-commit-id: 7f15c3386a71f2f598d58c1cb6cc6594a4e6792d [formerly 23f17b3f63]
Former-commit-id: 744c6fd9b1
2014-02-03 14:45:47 -06:00
Steve Harris
116d836ab3 Merge branch 'omaha_14.2.1' into development
Conflicts:
	ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml

Former-commit-id: f1a9ec2d1e [formerly ae2b849157] [formerly f59a8466de6460c73da06c85dae5790c93c14949 [formerly 7a156e297a]] [formerly 7b59bd41eb [formerly 7a156e297a [formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]]]
Former-commit-id: 7b59bd41eb
Former-commit-id: 675dc12528eb749e423c405fa15dbe8b66201362 [formerly aa9b488963]
Former-commit-id: 4a379aa6e5
2014-02-03 10:29:16 -06:00
Steve Harris
ae4332665e Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: ab0609007c [formerly 131af8538e] [formerly b2032880ac] [formerly eb9d4319dc [formerly b2032880ac [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]
Former-commit-id: eb9d4319dc
Former-commit-id: 66f652cd9d2fbc7c64872d432745217d602f2015 [formerly 33aea09906]
Former-commit-id: 6883c64744
2014-02-03 10:26:11 -06:00
Stephen Gilbert
bad69bc7e1 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: 17598bc377 [formerly beaee1eaf0] [formerly c9af367a72] [formerly 0e96169b6f [formerly c9af367a72 [formerly 0fa8b0ae9f21df9a1d773edd7e997151c6db9c8f]]]
Former-commit-id: 0e96169b6f
Former-commit-id: b1f331f4a7e0b7dacbc9abc9350a207b7d9b3eac [formerly 71e8735fdf]
Former-commit-id: e0e74ad5fd
2014-01-29 09:58:10 -05:00
Stephen Gilbert
cbf5fd5372 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: d19279fbab [formerly e60635f47d] [formerly ac68b01bbc] [formerly f21b0f5d82 [formerly ac68b01bbc [formerly 61c5dce6e5ee16d776bcac2740ddf4e860fbb40f]]]
Former-commit-id: f21b0f5d82
Former-commit-id: e88492cf6e3b7e15e084b09596f70de340b6008e [formerly 486096ada2]
Former-commit-id: 29ca14c4b7
2014-01-28 14:52:46 -05:00
Stephen Gilbert
7607cd015b Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: 90917307fb [formerly 312a09983a] [formerly 64c2460028] [formerly 1af8bfa176 [formerly 64c2460028 [formerly b928cda17148473922bcd3ad11e33cc93c1e37c3]]]
Former-commit-id: 1af8bfa176
Former-commit-id: 4713e121a372bd9e590289df0e094c3f4646818c [formerly d62a9f3b08]
Former-commit-id: 7f3e8b5c21
2014-01-27 14:23:02 -05:00
Stephen Gilbert
7ae8c668c6 Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: ef9b4279bc [formerly a7ce764b19] [formerly a70450b064] [formerly bf7fcc1952 [formerly a70450b064 [formerly 2989403fe879801729b1233a54cd5ea314bb2dae]]]
Former-commit-id: bf7fcc1952
Former-commit-id: beb85c45aff9872eb3c656babb7195987348c330 [formerly 3a3f8a7be0]
Former-commit-id: 48aeec0c17
2014-01-27 14:22:17 -05:00
Stephen Gilbert
023ac1960f Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: 7383aa8502 [formerly 53fa8822e0] [formerly 6785474b17] [formerly b64adbed81 [formerly 6785474b17 [formerly 57ce64e6119d2bf540da80c1161b88b04474d53c]]]
Former-commit-id: b64adbed81
Former-commit-id: 9726e54239f843bd384b3ad71761a58541ba9389 [formerly d947a0e7c1]
Former-commit-id: 511123b38c
2014-01-27 14:20:47 -05:00
Stephen Gilbert
1bb9e4c3e4 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: 01f013e2d0 [formerly e1d16e1aeb] [formerly 14d218ddc5] [formerly 369d2592fe [formerly 14d218ddc5 [formerly e3a35c9c3eb2184818b21ba1b23aac988a0148ee]]]
Former-commit-id: 369d2592fe
Former-commit-id: cbeb097387af8cc564bfd909a4840579c3c07c47 [formerly 6480693089]
Former-commit-id: 405cdee1ca
2014-01-24 10:46:37 -05:00
Stephen Gilbert
445c082c6a 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: 688690ea97 [formerly 4b28ca1baf] [formerly 95bbc2f2b2] [formerly 10a718853d [formerly 95bbc2f2b2 [formerly 12d9868db2939c53ed49b1cf3092f7d638189696]]]
Former-commit-id: 10a718853d
Former-commit-id: 534ee8af4b6cac013a0164544170fe9a9cdf1bec [formerly 2432ca3a04]
Former-commit-id: f65b0ab7fe
2014-01-24 10:33:14 -05:00
Stephen Gilbert
2e2034bb1d 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: e64020e271 [formerly 185f06495f] [formerly a12b83ddfb] [formerly 2bd1588ad4 [formerly a12b83ddfb [formerly f64ce96da2871e55b40b6fe4ba0e77eaed266103]]]
Former-commit-id: 2bd1588ad4
Former-commit-id: ed33756c50a2ab718a474d22ed268e2af3dd027b [formerly cfa9fdb6cf]
Former-commit-id: 081ef1a246
2014-01-24 10:14:17 -05:00
Stephen Gilbert
d30d723cc3 Merge "VLab Issue #2841 - SWPC delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: ca2016cb72 [formerly e49e5d406f] [formerly b9eefb97b4] [formerly bae1844e81 [formerly b9eefb97b4 [formerly 015664232a6214feb624262196e45aadc8ee4636]]]
Former-commit-id: bae1844e81
Former-commit-id: e100d8460661b67f275541169a79b8fa253a1a9b [formerly 935eebbb2a]
Former-commit-id: a468328a3e
2014-01-23 17:12:28 -05:00
Stephen Gilbert
3d70db144f 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: f841786213 [formerly 90a5cf53d3] [formerly e02136a026] [formerly f0f1a832c7 [formerly e02136a026 [formerly 5823fba56ae3036682814548004afd076174bb06]]]
Former-commit-id: f0f1a832c7
Former-commit-id: 94129f483f09e5269c4bcaed7df0cc11fee8fd8f [formerly 25ad64175c]
Former-commit-id: 0c053a145b
2014-01-23 11:58:55 -05:00
Nate Jensen
438afc8ddf Merge "Issue #2312 Add ability to export gif and image export dialog. Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05" into development
Former-commit-id: b8fd9afeca [formerly 1f5a26dc30] [formerly e2f9e86659] [formerly 738c70e8ea [formerly e2f9e86659 [formerly 8c8215778f5e37dfa4ec2df000db90f1193107ac]]]
Former-commit-id: 738c70e8ea
Former-commit-id: f1d07570e73e9dfb9bf87e2e898ca0f0586aadff [formerly 10f9feddba]
Former-commit-id: 96ad72aa9e
2014-01-22 09:36:33 -06:00
Ben Steffensmeier
b7cdcc757c Issue #2312 Add ability to export gif and image export dialog.
Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05

Former-commit-id: 7a8c934c5c [formerly b70faf1f7d] [formerly fc1c56f9cb] [formerly 4ad4b4a859 [formerly fc1c56f9cb [formerly e2159c422ca93aa76c6ba7a30a09234e8f9da4ce]]]
Former-commit-id: 4ad4b4a859
Former-commit-id: e898590f6488b3cb1f76a669ff09fbe8f3b22604 [formerly 8b2e5a06bc]
Former-commit-id: cd295e4172
2014-01-21 18:09:13 -06:00
Steve Harris
6cb92b1f57 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: 56f5ae9f48 [formerly a465718a0d] [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a]
Former-commit-id: b62efa9387
2014-01-21 12:36:54 -06:00
Richard Peter
f759bef6c7 Issue #2724: Fix Airep/Pirep Autoboxing NPE
Change-Id: Ieb2823dc220daf4d77a071ba8baaf3831957bd38

Former-commit-id: 1377205d2a [formerly d831e8c692] [formerly c6206fd6a8] [formerly 57f6096833 [formerly c6206fd6a8 [formerly cbdaaf4d6e28d7001df205ffb7d8d2d56bacd35f]]]
Former-commit-id: 57f6096833
Former-commit-id: 475cd6c235c1c72aec40bf5bd60d2e54fb7720f5 [formerly d372cf80f9]
Former-commit-id: ee5fce8be6
2014-01-21 11:26:30 -06:00
Nate Jensen
d2b3488271 Issue #2359 fix ncep pirep decoding null pointer
Change-Id: Id255abcda2d8c661ce8d7d0b022addc69f7635ea

Former-commit-id: 104f88b3ea [formerly 7961052b41] [formerly 7f7f05b8ba] [formerly 5a860252ad [formerly 7f7f05b8ba [formerly 5f554ec21fcedc7f8ef5b3b00fc951527bb424bb]]]
Former-commit-id: 5a860252ad
Former-commit-id: f33cec7c56fa3bc29a69437e8a4601464274ccd0 [formerly c0d49c4b24]
Former-commit-id: 4b570ada33
2014-01-20 13:11:36 -06:00
Steve Harris
9843517cb3 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: 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]
Former-commit-id: 7ea285c48b
2014-01-20 10:17:44 -06:00
Nate Jensen
270b3afecd Issue #2359 fix annoying ncep null pointer
Change-Id: I5d606f42bfe4060f8874d2cfaf01a48b548ce25e

Former-commit-id: 9d7eb95eac [formerly f46b6e0a8f] [formerly c7addfbdbf] [formerly fa79f2aa14 [formerly c7addfbdbf [formerly 0cb0975786aa578e93fe06227c666feb759e0433]]]
Former-commit-id: fa79f2aa14
Former-commit-id: 4cdae6e45ee095c11e9c313188a44bdfc245a4a2 [formerly 012ee681e5]
Former-commit-id: 09bc3382d6
2014-01-17 10:24:10 -06:00
Ron Anderson
46735c9afe 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: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e]
Former-commit-id: dca7f21f7b
2014-01-13 17:45:20 -06:00
Nate Jensen
7371990c29 Issue #2359 prevent obnoxious ncep decoder null pointer exceptions
Change-Id: I731614a8a6c9ec38bb6c1b29c4d9f6ca5a7c03d7

Former-commit-id: 79e387fc94 [formerly 52293fd154] [formerly 2c0e3f05ca] [formerly e509a2883f [formerly 2c0e3f05ca [formerly 514d0cfecd3eb8c81a6d2120406225856d964c9e]]]
Former-commit-id: e509a2883f
Former-commit-id: d150fe75866671138e7bd888dc3ce56b60f9a3c4 [formerly 488956a259]
Former-commit-id: de5d7565e2
2014-01-07 12:38:49 -06:00
Max Schenkelberg
257553461b 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: 30059d255c [formerly b3aed99142] [formerly 16046a4dde] [formerly cc2080449c [formerly 16046a4dde [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]
Former-commit-id: cc2080449c
Former-commit-id: d612c358920d902e7385e86659fc1d050de57dd4 [formerly f58795f460]
Former-commit-id: 0ceaa43902
2014-01-06 17:03:45 -06:00
Ben Steffensmeier
4b43971a78 Issue #2537 Split modelsounding into common/edex plugins.
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8

Former-commit-id: 08c9b54e49 [formerly f516a684d4] [formerly f520a26fbd] [formerly d79f804d4e [formerly f520a26fbd [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]]
Former-commit-id: d79f804d4e
Former-commit-id: b2807282541cba1b6dadcac12cda1996f7292656 [formerly fac9fd296f]
Former-commit-id: 9913e51429
2014-01-06 16:02:59 -06:00
Steve Harris
188b12a1b0 14.1.1-15 baseline
Former-commit-id: c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly d8e5799328 [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]
Former-commit-id: d8e5799328
Former-commit-id: 390c383ede3823f4b855f6230e3fad20d31e0e07 [formerly 35d8f5a281]
Former-commit-id: 282d10fe6d
2014-01-06 14:08:08 -05:00
Steve Harris
4a516444b6 14.1.1-14 baseline
Former-commit-id: 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d]
Former-commit-id: 0989c17710
2014-01-06 14:02:30 -05:00
Max Schenkelberg
774859fcb9 Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 9d846aa104 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]
Former-commit-id: 987d4b3a30
Former-commit-id: f76ae5c39c57683f77097753d76cab458fd9e037 [formerly eede01921e]
Former-commit-id: e86e477165
2013-12-09 15:14:01 -06:00
Richard Peter
73ead1f113 Issue #2551: Update NCEP objects to extend PersistablePluginDataObject.
Amend: Remove IDecoderGettable.

Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b

Former-commit-id: 7a6363a221 [formerly 796293c036] [formerly 98117b4093] [formerly f8f3ebc6e9 [formerly 98117b4093 [formerly 0778a7f0123dd150894458fef6958fcdd9da39b6]]]
Former-commit-id: f8f3ebc6e9
Former-commit-id: 44511bfc2e531ad41861e79e71e290ead558ef3f [formerly 1a554d9632]
Former-commit-id: 00c44b3a08
2013-12-03 17:24:01 -06:00
Steve Harris
41a54a5ca6 14.1.1-11 baseline
Former-commit-id: 401ee156b8 [formerly 337b138200] [formerly bcc2fb56db7acfd2f7ecd928f118488dc7beb36e [formerly 70a6f1936e]] [formerly 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 2a75dd3165e6ee0eb548ce9cbb694967018bb4bf [formerly 5526a8999d]
Former-commit-id: 8bd818de09
2013-12-02 17:10:10 -05:00
Brian Clements
6c28068d21 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: 42f7214967 [formerly d35fc591d2] [formerly fe58826a1e] [formerly 0f40ae2b99 [formerly fe58826a1e [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 2a623a799e9a08a389ada1365b70ef555ee0c5d1 [formerly b762864f88]
Former-commit-id: 10e63616ff
2013-11-20 08:40:12 -06:00
Steve Harris
2c49ed51ac 14.1.1-10 baseline
Former-commit-id: 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304]
Former-commit-id: e35ec60f7e
2013-11-19 16:40:25 -05:00
Nate Jensen
d8f4ecc2d7 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 462878bf86 [formerly 757ca42a5f] [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly dd99aa3f47 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]
Former-commit-id: 78b01f61c4
Former-commit-id: dc8aea52f7c970fb95e7d9d99a858f44faa15501 [formerly d96cdbe761]
Former-commit-id: d0d712ec6f
2013-11-14 17:41:24 -06:00
Bryan Kowal
ce40d40304 Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 1d519f9778 [formerly 178d95e59d] [formerly 86dd200844] [formerly 0544b66f4e [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]
Former-commit-id: 0544b66f4e
Former-commit-id: 9fef8ee66c8d7456504fc2bc5dcebeba0b756974 [formerly 01735ca0c4]
Former-commit-id: a2b1211c52
2013-11-13 13:16:55 -06:00
Richard Peter
112816a54c 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: 061fa07147 [formerly 7ba466f5a6] [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 617c9d2d122683ab3ac05ff74694962b33afa16d [formerly 59671c1e7d]
Former-commit-id: 3f68fc6eed
2013-11-12 11:11:36 -06:00
Nate Jensen
f91ac1953e Issue #2361 remove using SerializationUtil for processing XML colormaps
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: 1174d22160 [formerly 2c0c20f01e] [formerly b52bdb1cec] [formerly 7a73c65430 [formerly b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]
Former-commit-id: 7a73c65430
Former-commit-id: 760e4eea3b71bfcf5ae883d95ff74e375ec4bfc6 [formerly 5427e68fd2]
Former-commit-id: 9bf83be7e9
2013-11-12 10:37:54 -06:00
Bryan Kowal
608f00417e Issue #2297 - fix 14.2.1 merge
Former-commit-id: 8d412d7aa0 [formerly fee6a5dc9c] [formerly 8a38becc7d39cde10626cf74c95abd25e5000f8c [formerly e2a02ca247]] [formerly 411e0fa7c4 [formerly e2a02ca247 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]]]
Former-commit-id: 411e0fa7c4
Former-commit-id: 9608fdc09cce1ba5077a173bab8ffc316408830f [formerly e937ba954b]
Former-commit-id: b1a6d2d828
2013-11-11 13:04:21 -06:00
Bryan Kowal
b2fb3cc71b 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: f6b8d99e70 [formerly 3b8ce3fd34] [formerly c3eb4e9af9] [formerly f1cd2f2e5a [formerly c3eb4e9af9 [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: 9832b7353c98edff371d73697564b1585403dd75 [formerly 1909193f0c]
Former-commit-id: 464a8d1001
2013-11-08 14:51:47 -06:00
Richard Peter
aec254aac0 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: 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 93c776022a [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4 [formerly 520dd57f02]
Former-commit-id: c97efbf656
2013-11-07 14:25:45 -06:00
Steve Harris
93e9333a2e 14.1.1-7 baseline (addendum 1)
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml


Former-commit-id: 824866bca8 [formerly abbecba957] [formerly 2d36bc2c1f] [formerly b835dad501 [formerly 2d36bc2c1f [formerly 07f7c24804028aed71fc29cdf6f163a9e9d15623]]]
Former-commit-id: b835dad501
Former-commit-id: 9b114a2ed684d2ac0bd0e804a8a6594626e1cb9e [formerly 155bc487ff]
Former-commit-id: a72bb1669f
2013-11-07 12:09:23 -05:00
Steve Harris
4d2f53ebc6 14.1.1-7 baseline
Former-commit-id: 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653]
Former-commit-id: b694612fe0
2013-11-06 14:16:14 -05:00
Steve Harris
2a5f4c26d6 14.1.1-6 baseline
Former-commit-id: f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly 6067af4252 [formerly 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]
Former-commit-id: 6067af4252
Former-commit-id: 70967acd51143f4f43cec1322c400d567f95c3ce [formerly 26da1ce793]
Former-commit-id: e86a0aa489
2013-11-06 14:08:33 -05:00
Bryan Kowal
b85c53c8b0 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: 7f9f20c8a8 [formerly d73aaf9753] [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4bad21e6cd [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]
Former-commit-id: 3255bf3861
Former-commit-id: fda65eb7f8713472578cb95e718895ab10e4b197 [formerly 76726372e5]
Former-commit-id: 400b4a1328
2013-11-05 19:03:22 -06:00
Ben Steffensmeier
41a54ad666 Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64

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

Former-commit-id: fd5a5096de [formerly 04bcd7e6dc] [formerly 49422aea62] [formerly d08a652e23 [formerly 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]
Former-commit-id: d08a652e23
Former-commit-id: 2f7241bd44af27a962760419963b91198396fa99 [formerly adb62df96a]
Former-commit-id: d53ec9c750
2013-10-31 15:43:29 -05:00
Bryan Kowal
d3062ea58f Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]
Former-commit-id: f02d4b7a0b
2013-10-31 15:34:46 -05:00
Steve Harris
23a1f33d89 Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 056b2fa457 [formerly 7768ee1c36] [formerly 2257eb5ddd] [formerly 855b444073 [formerly 2257eb5ddd [formerly ec141b61f8f0558ff18d1d67492a066c837f20b7]]]
Former-commit-id: 855b444073
Former-commit-id: 2c8c708ed1c375e99805b56ce3ded641d901d6ca [formerly 83dc6d8e2a]
Former-commit-id: c953a6574d
2013-10-31 11:58:04 -05:00