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

169 commits

Author SHA1 Message Date
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
Brian.Dyke
362d882b40 Merge branch 'master_14.2.2' into master_14.3.1 
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: fb1f5aa593
Former-commit-id: f0b8ea5822
 2014-04-25 11:06:11 -04:00
Nate Jensen
8cd709c01d Issue #2060 fix delta script to only drop dataURI if the constraint 
alterations work

Change-Id: I5ad70fd87b72ebb3566aa99d7c603b2b122be5e8

Former-commit-id: 0b4df56454 [formerly 43b44d911a [formerly 6f8459f03a5af0816f93b0a20e861aafe5a9a779]]
Former-commit-id: 43b44d911a
Former-commit-id: d276d5f39b
 2014-04-23 12:05:20 -05:00
Nate Jensen
03451ab6b2 Issue #2060 dropping grid dataURI column 
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e

Former-commit-id: 5dfb652775 [formerly a37a2afe18 [formerly 1aab87d9572089a09351ebdfb8fbcef884866feb]]
Former-commit-id: a37a2afe18
Former-commit-id: 263611f905
 2014-04-21 17:34:39 -05:00
Nate Jensen
452145016b Merge "Issue #2725 Adding user/site derivparam migrate script" into development 
Former-commit-id: 9ad6b06ac9 [formerly fc4d9a79ce [formerly ea7a0b963bf90c657c574fb40e67e54c1f33c203]]
Former-commit-id: fc4d9a79ce
Former-commit-id: a2db252625
 2014-04-14 08:59:21 -05:00
Mike Duff
3404a4beb4 Issue #2864 - Change how saved subset files are stored. 
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c

Former-commit-id: 890faf2d73 [formerly 82cf444d6f [formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]]
Former-commit-id: 82cf444d6f
Former-commit-id: a58f279b54
 2014-04-11 08:27:42 -05:00
Everett Kladstrup
e88ca6c56f Issue #2725 Adding user/site derivparam migrate script 
Former-commit-id: a0edd808b0 [formerly b4e353332b [formerly 8c37f0716051384e6364ffa30a6dd0a4649fb96b]]
Former-commit-id: b4e353332b
Former-commit-id: 0f9228c686
 2014-04-10 17:15:44 -05:00
Dave Hladky
daa2f2ba43 Issue #2949 Updated scripts 
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80

Former-commit-id: ede510dd91 [formerly 3d6ebf498e [formerly afcfc72329522c2d731a4afe9353632effb9cb23]]
Former-commit-id: 3d6ebf498e
Former-commit-id: 41e43a169b
 2014-04-01 12:33:48 -05:00
Brian Clements
93c743267d Issue #2667 delta scripts for lightning source name change in xml files 
handles stored procedures/bundles in localization


Former-commit-id: ddcb1011bb [formerly 0811b0580f [formerly 8e3e3be372d5db6dfc5897407074bc250fbef294]]
Former-commit-id: 0811b0580f
Former-commit-id: cc50637346
 2014-03-03 16:30:45 -06:00
Steve Harris
f1a9ec2d1e Merge branch 'omaha_14.2.1' into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml

Former-commit-id: 7b59bd41eb [formerly 7a156e297a [formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]]
Former-commit-id: 7a156e297a
Former-commit-id: ae2b849157
 2014-02-03 10:29:16 -06:00
Nate Jensen
9ff86044a2 Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN 
events while in there

Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619

Former-commit-id: 906c679b4e [formerly 327c588c9e [formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]
Former-commit-id: 327c588c9e
Former-commit-id: c18e66cc45
 2014-01-30 12:02:42 -06:00
Brian Clements
fffb6aaf9a Issue #2701 removed local groups from collaboration 
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group


Former-commit-id: 26ac549096 [formerly f615f2226f [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]
Former-commit-id: f615f2226f
Former-commit-id: b86ad8ca6f
 2014-01-27 10:14:10 -06:00
Brian Clements
ff97757a38 Issue #2667 added bin lightning data access factory 
renamed lightning record's lightSource field to source
added delta script for db column change
added attribute method comments for IData and DefaultGeometryData


Former-commit-id: bd9fbc5f38 [formerly 402bef9c5b [formerly b6c50729919ea8a9b29ca963e18f68268c3a0b7f]]
Former-commit-id: 402bef9c5b
Former-commit-id: 54516275f1
 2014-01-23 09:32:18 -06:00
Nate Jensen
16d01f1ca7 Issue #2581 fix local storm report delta script and unique constraint 
Change-Id: I421aed1572c10c80a592381c849d85eac8d1e809

Former-commit-id: 059e057cdb [formerly e6feb413f7 [formerly 88918268a6d72d35dd2f19be09fbb429851fe46b]]
Former-commit-id: e6feb413f7
Former-commit-id: 562e85e45b
 2014-01-15 09:50:35 -06:00
Ben Steffensmeier
08c9b54e49 Issue #2537 Split modelsounding into common/edex plugins. 
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8

Former-commit-id: d79f804d4e [formerly f520a26fbd [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]
Former-commit-id: f520a26fbd
Former-commit-id: f516a684d4
 2014-01-06 16:02:59 -06:00
Richard Peter
ce63ee408b Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1 
Former-commit-id: 6f57e14406 [formerly 63bd2b26eb [formerly 3d887a288459b786718a59d0c4a368408c3419f0]]
Former-commit-id: 63bd2b26eb
Former-commit-id: f278dad7cc
 2013-12-11 16:19:02 -06:00
Mike Duff
fa87393135 Issue #2616 - Set overwrite allowed flag on madis records when decoded 
Added delta script for table MADIS with the hibernate generated key name

Change-Id: Id8cfee5bfba68aa686b9d998bdbf85e5de5c7519

Former-commit-id: 5a42580c2b [formerly 9a02ae7d68 [formerly b3a18fd5270f2ce109b0560fba6e11e76e721bc9]]
Former-commit-id: 9a02ae7d68
Former-commit-id: 1a0893d70e
 2013-12-11 14:12:05 -06:00
Nate Jensen
1d91d67a5b Issue #2581 remove LSR dataURI column 
Change-Id: I9d5ddc8346e6b9ac0ec56d09d50b6b19a5bc682f

Former-commit-id: e037c179fe [formerly fa674baf89 [formerly 88124207249673c3bf29915b6f6318bd2397ecd5]]
Former-commit-id: fa674baf89
Former-commit-id: 6188356e72
 2013-12-10 18:27:33 -06:00
Richard Peter
2a2473f3bb Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development 
Former-commit-id: 0281447166 [formerly ea7dac5993 [formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]
Former-commit-id: ea7dac5993
Former-commit-id: ff44393e90
 2013-12-04 12:00:40 -06:00
Dave Hladky
bce11dec14 Issue #1736 Add registry bandwidth tracking 
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: 593f24023d [formerly 483ec5d22f [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]
Former-commit-id: 483ec5d22f
Former-commit-id: 6607e5fe30
 2013-12-04 11:58:49 -06:00
Nate Jensen
77c23c6d0e Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup 
VAA and remove dataURI

Change-Id: I984173a6e85eb7dc269fb98964af4915a9b5105e

Former-commit-id: 72c322c667 [formerly 6bf1fd8d3c [formerly 148e7113abefd684dcacb5ccc28bb77192ff45c8]]
Former-commit-id: 6bf1fd8d3c
Former-commit-id: 9b3f871c21
 2013-12-02 16:10:26 -06:00
Richard Peter
9bebb21be8 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: c42f931118 [formerly 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]]
Former-commit-id: 8fb79e7b73
Former-commit-id: 800effdc5a
 2013-11-14 14:56:59 -06:00
Brian Clements
3204a2f7b5 Issue #2505 removed recco from deployment 
added update script to drop recco from db


Former-commit-id: 8cbe2c06a8 [formerly 95f1621d3e [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]
Former-commit-id: 95f1621d3e
Former-commit-id: 3551b731e0
 2013-11-13 13:45:44 -06:00
Steve Harris
626b91c9c7 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 1b3d4c8f67 [formerly 108a4d908d [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]
Former-commit-id: 108a4d908d
Former-commit-id: 2a8e926976
 2013-11-06 18:31:05 -06:00
Ben Steffensmeier
c40ec16df3 Issue #2493 remove mesowest. 
Former-commit-id: 36916fedcd [formerly d0b7966458 [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]
Former-commit-id: d0b7966458
Former-commit-id: f761c701cf
 2013-11-06 13:42:38 -06:00
Bryan Kowal
7f9f20c8a8 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: 3255bf3861 [formerly 4bad21e6cd [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]
Former-commit-id: 4bad21e6cd
Former-commit-id: d73aaf9753
 2013-11-05 19:03:22 -06:00
Ben Steffensmeier
3273b6fc5f Issue #2485 Remove ncccfp 
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64

Former-commit-id: 1d35086e8d [formerly 5b53cb4c98 [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]
Former-commit-id: 5b53cb4c98
Former-commit-id: 4639cd69f4
 2013-11-05 17:33:41 -06:00
Bryan Kowal
5164a7c0b1 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: c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: feaacd9356
Former-commit-id: 38464427d3
 2013-10-31 15:34:46 -05:00
Steve Harris
cb3b53f205 14.1.1-4 baseline 
Former-commit-id: 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: bd95bb6a4e
Former-commit-id: 82dec19b6a
 2013-10-28 10:55:16 -04:00
Steve Harris
a0ba2e1252 14.1.1-3 baseline 
Former-commit-id: 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 94f24e0d8a
Former-commit-id: 851f9df229
 2013-10-28 10:46:02 -04:00
Benjamin Phillippe
9617e2ee10 Issue #1682 Delta script for ebxml registry query changes 
Change-Id: I84a3007a3c23697c333e5862d8fd4a4aba9f23a2

Former-commit-id: 02dc390b98 [formerly 0c56d5e859 [formerly 9b6a0ce7404017dcd29cd0a14f0dba5d30e480b1]]
Former-commit-id: 0c56d5e859
Former-commit-id: d0c3d9575a
 2013-10-23 10:01:34 -05:00
Ben Steffensmeier
0c0e339894 Issue #2473 Remove unneeded ncgrib functionality. 
Change-Id: If38138650660c75745091a82c231cd0fe8c92e38

Former-commit-id: 51cd71c373 [formerly d25df40634 [formerly 49a3700d37c07f42991f7ca4a65f0fd4c7010f91]]
Former-commit-id: d25df40634
Former-commit-id: 10f74a1812
 2013-10-15 16:30:38 -05:00
Ben Steffensmeier
d5eaefeeed Issue #2473 Remove deprecated grib functionality 
Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23

Former-commit-id: 94560e37c8 [formerly cfc8bb859f [formerly 9d903e94114cacee2a6abec6f83880fa8b978180]]
Former-commit-id: cfc8bb859f
Former-commit-id: c22ccb6c4c
 2013-10-15 10:48:29 -05:00