Commit graph

201 commits

Author SHA1 Message Date
Mark Peters
94364ab115 Omaha #3644 Remove dataURI from ccfp plugin
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27

Former-commit-id: 6bb4f5dbdf [formerly cf1bff0d02 [formerly 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea]]
Former-commit-id: cf1bff0d02
Former-commit-id: c20d19a2d3
2014-10-09 15:30:23 -05:00
Richard Peter
1038af1901 Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: 1bc24c3be2 [formerly 1adac05f5a [formerly 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5]]
Former-commit-id: 1adac05f5a
Former-commit-id: ee86734625
2014-10-07 15:13:11 -05:00
Ben Steffensmeier
d5888d403c Omaha #3702 register database plugin to fxa database.
Former-commit-id: 997bfd689d [formerly 6a2b2efb1a [formerly 7fa6925c27330262dd0a70afcb77c589718cf1f7]]
Former-commit-id: 6a2b2efb1a
Former-commit-id: 3e0a99aed2
2014-10-06 20:00:19 -05:00
Steve Harris
53dc9657e2 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 39c5e9c314
Former-commit-id: 06a27b2d3c
2014-10-06 13:57:59 -05:00
Steve Harris
6900bb61c1 Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 90e08b96e1
Former-commit-id: 3598e9b5b6
2014-09-29 12:58:56 -05:00
Ben Steffensmeier
a0d9cbede4 Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 5b10ac2f36 [formerly f92d021e96 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]
Former-commit-id: f92d021e96
Former-commit-id: 6090625040
2014-09-29 10:49:14 -05:00
Slav Korolev
87c7787cb2 Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
Former-commit-id: ce2ef5019b [formerly 7b1a4c6774 [formerly d7a921d6206f5b09e7a6784c7e86b9167b74685f]]
Former-commit-id: 7b1a4c6774
Former-commit-id: 1120f9a440
2014-09-25 09:02:27 -04:00
Ying-Lian.Shi
e70e111d73 ASM #16693 updated dictionary cleanup script
Change-Id: I431226edf9afdf2f85811e36a631926a37398203

Former-commit-id: b6ed9507e5 [formerly 87911e9c4a [formerly bd9b2c16e78147a0d7929922ad31cd9c57979efb]]
Former-commit-id: 87911e9c4a
Former-commit-id: 8533354024
2014-09-24 12:30:40 +00:00
Brian.Dyke
ccc9f4a8f3 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 7996916e36 [formerly 5d0347f589 [formerly 414a695e6423fa291936d15a999113f4a518b097]]
Former-commit-id: 5d0347f589
Former-commit-id: a1dd6b20ab
2014-09-22 16:51:47 -04:00
Brian.Dyke
32d63dff6f Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8d665b93b5 [formerly 4db67c581c [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]]
Former-commit-id: 4db67c581c
Former-commit-id: 75f3bb31d5
2014-09-19 16:56:50 -04:00
Brian Clements
9f4315eb5c Omaha #2707 LSR rework
removed dataURI column from DB
removed eventType from hdf5
eventType in DB now string
unknown event types now render direct

Change-Id: I24f5041f761758371dcef1fd1157be0bcf329e73

Former-commit-id: 6fd51c01fe [formerly 423421175f [formerly 9950454fbe4158bcfcb9d3ce25abafad4d012556]]
Former-commit-id: 423421175f
Former-commit-id: 84f85d1436
2014-09-17 10:57:07 -05:00
Ying-Lian.Shi
86c761c8a4 ASM #16693 - Fix spelling checker suggests swear words
Change-Id: Ie9e5bc5c26b16655185b81cf4b4cf2f758693566

Former-commit-id: 6e88d5f39c [formerly 11b40e167c [formerly 094cb9dba5d6e0da22b32b85dcc5049fd629fe5e]]
Former-commit-id: 11b40e167c
Former-commit-id: 83536a6b09
2014-09-15 14:56:32 +00:00
Stephen Gilbert
d98c1adc91 Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
	cave/build/cave/customTargets.xml
	edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
	ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
	ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
	ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
	ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
	ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties

Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6

Former-commit-id: 662436c2d5 [formerly 561b751e58 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]
Former-commit-id: 561b751e58
Former-commit-id: 2406f0786f
2014-09-11 11:14:33 -04:00
Steve Harris
3619a11a8a Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]
Former-commit-id: 793064063b
Former-commit-id: bddf9c0f27
2014-08-29 10:17:52 -05:00
Brian.Dyke
0a5ddf7457 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]
Former-commit-id: e654318431
Former-commit-id: a08db8d73d
2014-08-27 11:19:19 -04:00
Bryan Kowal
9787e4f1d8 Omaha #3049 - entire data directory cannot be removed because it is mounted
The script does still verify that the variable reference to the data directory is set. Thus, the root
directory could only be removed as a result of malicious intent. A user could intentionally not
set the data directory and remove the verification check or the user could intentionally set the
data directory to the root location.


Former-commit-id: 604c5a4d10 [formerly 6a5deba786 [formerly efe867dc134027eb7cdf393473476fcc4ec0f6f8]]
Former-commit-id: 6a5deba786
Former-commit-id: 429aec5855
2014-08-13 16:59:26 -05:00
Bryan Kowal
b805f1db0d Omaha #3475 - PostgreSQL Upgrade.
amend: vacuum databases after upgrade due to: http://www.postgresql.org/docs/9.3/static/release-9-3-2.html E.4.2 VACUUM tests
amend: update viz xdat to use the newer PostgreSQL jdbc driver
amend: fix formatting

Change-Id: Icda3348eea3e5edd879acb3a897bc530e73fb7f3

Former-commit-id: a2be914331 [formerly f6bc96829e [formerly 426a8c8863ea6be7d6795ace387c214ce3b36790]]
Former-commit-id: f6bc96829e
Former-commit-id: 3d68ae0c78
2014-08-12 15:10:39 -05:00
Ron Anderson
b15013e959 Issue #3498 Provide upgrade scripts for Topo file name in D2D procedures and saved displays
Change-Id: I2b4577c972c884af08d59d7815017806928efa69

Former-commit-id: d3728fc462 [formerly cd72d75216 [formerly bb204013345db535d7cf9ca103cb033cf2507def]]
Former-commit-id: cd72d75216
Former-commit-id: 0654b75fb2
2014-08-06 14:00:47 -05:00
Roger Ferrel
ba4f30e9c5 Omaha #3318 split deltascript one for dx1 the other for dx2.
Change-Id: If230b4c1bb24b4d2d9b73b357019275534803691

Former-commit-id: 44029681c8 [formerly 8ea817f6d0 [formerly abbaca59ff431f420bc700ad11de3cda89f82277]]
Former-commit-id: 8ea817f6d0
Former-commit-id: 7208fc1f29
2014-08-01 14:13:25 -05:00
Brian Clements
5df226066b Omaha #3410 added data uri reformatting to lon lat precision change delta script
Change-Id: I3335e3d0f62b702845f26fe4ed408600debc20d6

Former-commit-id: edb0244e9f [formerly aa84d39ec5 [formerly e3c680ad83d542beed195d3b1f983e122e6f21ec]]
Former-commit-id: aa84d39ec5
Former-commit-id: d5a0586bf4
2014-07-31 14:14:17 -05:00
Brian Clements
26ade7cae8 Omaha #3410 changed lon/lat fields to floats in sfc and air obs location
Change-Id: I4c8d47b9f9e598e69309f1aa99bc30c022cae7af

Former-commit-id: 74a6c3dd20 [formerly aa991c9223 [formerly cdb0a72fcb2345564f2b944fdecd7869fd498767]]
Former-commit-id: aa991c9223
Former-commit-id: a7d17bd490
2014-07-24 13:45:58 -05:00
Stephen Gilbert
8e79558516 VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
NcText decoder updates and other ingest config changes

Change-Id: I1dca245ff36c565c924a494eae3f1a2b834f43ac

Former-commit-id: f94a3aadf4 [formerly c16e83f25a [formerly 9e47362ce407ea03c0ede8884baa7e8129d2d646]]
Former-commit-id: c16e83f25a
Former-commit-id: 22649088f1
2014-07-23 15:51:27 -04:00
Nathan Bowler
46b40bd411 Omaha #3392 Change Doubles to Float in ACARS and ACARSSoundingLayer
Change-Id: I6c07c51a3118d6317418a22be56b7899734e5917

Former-commit-id: 4f3a729894 [formerly 06b9d253f3 [formerly 9ac070996c42b004f3683d7ee253feb54f05264c]]
Former-commit-id: 06b9d253f3
Former-commit-id: 7d352f77a3
2014-07-22 14:05:16 -04:00
Steve Harris
5272683878 Omaha #3300 moving 15.1.1 deltascript back into 14.4.1
Former-commit-id: 74fff3659f [formerly b9a02bf34a [formerly 33cde5250c39fda59bbb08d7b8075cb5645c028f]]
Former-commit-id: b9a02bf34a
Former-commit-id: 17ec38ef34
2014-07-16 14:53:18 -05:00
Steve Harris
a46c22c588 Merge branch 'omaha_14.4.1' into omaha_15.1.1
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java

Former-commit-id: a43ffbe052 [formerly 05de3fbe54 [formerly 6d1d1a86cfb70e9ca096f59d9aadf8219efdaeb3]]
Former-commit-id: 05de3fbe54
Former-commit-id: a893b9b08a
2014-07-14 12:08:09 -05:00
Brian Clements
481e503df9 Omaha #2587 update script to set reftime as non null in db
Change-Id: Ibcfb61b607645fcbb91e793f2088c8fb7432ecf4

Former-commit-id: faa29355b0 [formerly 2a5af8ce1f [formerly dfafe89ab5cb4589d2408564b82a03adc9fc1143]]
Former-commit-id: 2a5af8ce1f
Former-commit-id: fbf4111d6c
2014-07-14 08:40:37 -05:00
Roger Ferrel
c9601b1194 Omaha #3318 Delta script for GEFS h5 file updates
Former-commit-id: 9eaeb01624 [formerly d007725e9a [formerly 2e6eeaeac3018a34bf5a471f4ebcae58e608fbca]]
Former-commit-id: d007725e9a
Former-commit-id: 577790589f
2014-07-10 16:30:03 -05:00
Steve Harris
4d724b6474 Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: e1c8ad2611 [formerly 9213369739 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]
Former-commit-id: 9213369739
Former-commit-id: 97843cf58e
2014-06-16 08:19:12 -05:00
Ben Steffensmeier
baec34d0ab Omaha #2061 Remove dataURI from acars.
Former-commit-id: 35ad2f2b8d [formerly f66725a515 [formerly e8b5ea58ca12878922be01c815a354703f5f4387]]
Former-commit-id: f66725a515
Former-commit-id: 0a6e99e9d1
2014-06-12 13:59:45 -05:00
Roger Ferrel
0c2d66c29a Omaha #2715 Script to move stats data to new location.
Former-commit-id: b2b00bb763 [formerly 29db287a6c [formerly 74f1e03a7d4458447fad552051af969d2ea71b5e]]
Former-commit-id: 29db287a6c
Former-commit-id: 7714c7c3ac
2014-06-11 08:58:12 -05:00
Brian Clements
eb782b8201 Omaha #3226 added total lightning decoder
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning

Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3

Former-commit-id: f39896b2d1 [formerly c278000764 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]
Former-commit-id: c278000764
Former-commit-id: 2e445986e2
2014-06-06 14:39:57 -05:00
Chip Gobs
12f78bef75 VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse.
Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d

Former-commit-id: 036d1c4d31 [formerly 83ac596f9e [formerly 6944361d04e7462f768bb74f00780dc8b8a51225]]
Former-commit-id: 83ac596f9e
Former-commit-id: a5c4402f34
2014-06-05 13:37:02 -04:00
Steve Harris
2b95865dec Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so

Former-commit-id: 455eb8b39d [formerly 7fec0d039c [formerly 45250149681f057cf168f4d3cb27276279f62c05]]
Former-commit-id: 7fec0d039c
Former-commit-id: 647cd97e29
2014-06-02 11:21:46 -05:00
Brian.Dyke
5524d6b38d Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: 3f1e12effc [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]
Former-commit-id: a8737e18f0
Former-commit-id: a0a879be7d
2014-05-30 10:46:25 -04:00
Nate Jensen
9fa1b78e76 Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
Former-commit-id: c43a2bf217 [formerly 5cfbcb7e98 [formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]
Former-commit-id: 5cfbcb7e98
Former-commit-id: a709601e2f
2014-05-29 13:51:09 -05:00
Brian Clements
de85e00fde Omaha #2536 merge autobldsrv into text plugins
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52

Former-commit-id: 542d36f107 [formerly 5d0eaf02ab [formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]
Former-commit-id: 5d0eaf02ab
Former-commit-id: 4aade4bf2e
2014-05-29 08:19:47 -05:00
Steve Harris
4469d87a8f Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
	edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java

Former-commit-id: dc74953978 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]
Former-commit-id: be80bd01f3
Former-commit-id: 718c78d984
2014-05-28 09:01:00 -05:00
Steve Harris
08308cd279 Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 99bc6f990c
Former-commit-id: 3de24b7b07
2014-05-27 14:48:24 -04:00
Richard Peter
48236cfcee Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1
Former-commit-id: 87da8bd952 [formerly 40b7623c87 [formerly 1f786fd25cab2956c2cc3318a7adbabf6e8c306d]]
Former-commit-id: 40b7623c87
Former-commit-id: 80a5f2fc1b
2014-05-19 16:07:51 -05:00
Richard Peter
bbdd7c01a7 Issue #2060: Consolidate grid indexes.
Change-Id: Ibc77133cd1b016ef85bae61e47e373a30e6e4d23

Former-commit-id: 6143d43329 [formerly 62e215eb89 [formerly 892c0f28a13d53118141efe14762deebe169d7ba]]
Former-commit-id: 62e215eb89
Former-commit-id: 50fb33488c
2014-05-12 16:59:34 -05:00
Roger Ferrel
487b66ffc4 Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.
Change-Id: Ibcd4c5389ba081b19a3134989c507b88b2d882b8

Former-commit-id: c226ef3596 [formerly 039f4826ea [formerly 909a3f42bdb9d8149013056f9956bf0c38b764c5]]
Former-commit-id: 039f4826ea
Former-commit-id: 6bfacf85ab
2014-05-09 09:34:49 -05:00
David Gillingham
39266d563f Issue #3142: Improve error-handling and logging in CleanupGfeHDF5Storage delta script.
Change-Id: I5c75cfb44654781a53f4588236f5d5d562432615

Former-commit-id: 29072aa824 [formerly 9ebbf783df [formerly 920999bda9dda329e71359ab46872130f45d298c]]
Former-commit-id: 9ebbf783df
Former-commit-id: 720993104c
2014-05-08 16:51:41 -05:00
Mike Duff
f4062cd277 Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13

Former-commit-id: 6a67638a94 [formerly 8498235fd8 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]
Former-commit-id: 8498235fd8
Former-commit-id: 0456fd0597
2014-05-08 14:36:54 -05:00
Chip Gobs
a95de2211a VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: e42bef2a33 [formerly 65d2135ac2 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]
Former-commit-id: 65d2135ac2
Former-commit-id: 4e4d00792d
2014-05-06 10:48:35 -04:00
Nate Jensen
b911f3e9b5 Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1
Former-commit-id: bcb82bedc6 [formerly 7fbdb9ff83 [formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]
Former-commit-id: 7fbdb9ff83
Former-commit-id: 1d157a16e3
2014-05-01 12:06:13 -05:00
Dave Hladky
f844c98853 Issue #2992 Missed perl script
Former-commit-id: 904a608495 [formerly 23433f628d [formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]
Former-commit-id: 23433f628d
Former-commit-id: 9a43ac36e6
2014-05-01 08:48:38 -05:00
Dave Hladky
a14cb8c45f Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: 3b00ae03cc [formerly c352643c79 [formerly a34955102d1316135c4151210daba0e5807ff6c9]]
Former-commit-id: c352643c79
Former-commit-id: e2a4bb6755
2014-04-30 17:38:28 -05:00
Richard Peter
46a94c88cd Issue #2854: Reorganize deltaScripts
Former-commit-id: c8e373c098 [formerly 56745c942e [formerly 469c2c597b80fd725f474e0d645656e4054fd69a]]
Former-commit-id: 56745c942e
Former-commit-id: 09f41a6b31
2014-04-30 13:03:44 -05:00
Richard Peter
8b1a177110 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 44b1782461
Former-commit-id: 67683dd891
2014-04-28 16:27:40 -05:00
Brian Clements
9d0b557dec Issue #3079 update to lightning name will continue if it encounters invalid xml
Former-commit-id: 98adf15cda [formerly 3305aee692 [formerly 07e7a0eaa6973a705d5fff1beb8ebcb553c172d0]]
Former-commit-id: 3305aee692
Former-commit-id: afdae7c2e1
2014-04-25 11:04:00 -05:00