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

58 commits

Author SHA1 Message Date
Nate Jensen
3cf27fb414 Omaha #3356 updates for improved level lookup 
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: 1c77f66608 [formerly ae9cffaaea] [formerly 1c77f66608 [formerly ae9cffaaea] [formerly 62b84b2fb3 [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]]
Former-commit-id: 62b84b2fb3
Former-commit-id: d397d4147c [formerly f5ae895143]
Former-commit-id: eec3df9cd5
 2014-09-09 15:38:53 -05:00
Steve Harris
ecf26b3ac5 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: bddf9c0f27 [formerly 793064063b] [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: 5d58625abc
Former-commit-id: 66b485c000 [formerly d984dd538f]
Former-commit-id: e681e0a457
 2014-08-29 10:17:52 -05:00
Brian.Dyke
7e4ab705cc 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: a08db8d73d [formerly e654318431] [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: aa83bf804f
Former-commit-id: f90649d7e7 [formerly f7f16ff9eb]
Former-commit-id: c0dc594eda
 2014-08-27 11:19:19 -04:00
Brian.Dyke
27372f098c Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py

Former-commit-id: 2ddc920a4a [formerly 325887e605] [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]
Former-commit-id: dd9d7133d9
Former-commit-id: c8e9153884 [formerly 1839b614df]
Former-commit-id: cd1b914f50
 2014-08-22 14:16:22 -04:00
Ana Rivera
0ff1ac5357 VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648 
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 1daa44291e [formerly a44d5d91db] [formerly 1daa44291e [formerly a44d5d91db] [formerly 9bf2df23be [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]]]
Former-commit-id: 9bf2df23be
Former-commit-id: c294608c37 [formerly eefe73ee51]
Former-commit-id: 4b42e52ce3
 2014-08-15 11:02:36 -05:00
Nate Jensen
7336692b85 Omaha #3356 cleanup of unnecessary register buddies and buddy policies 
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: 253198b5bc [formerly b3083a663e] [formerly 253198b5bc [formerly b3083a663e] [formerly 9b72a1399d [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]
Former-commit-id: 9b72a1399d
Former-commit-id: 58a4cb95c1 [formerly d67083655a]
Former-commit-id: 951feab33d
 2014-08-14 10:22:37 -05:00
Steve Harris
a0fdc76880 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.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/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py

Former-commit-id: a92dc418c6 [formerly 0fb743ec44] [formerly a92dc418c6 [formerly 0fb743ec44] [formerly bf9a0fa5de [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]
Former-commit-id: bf9a0fa5de
Former-commit-id: b848e05aa1 [formerly 46fe792d83]
Former-commit-id: 5e2f7a9f74
 2014-08-04 22:20:29 -05:00
Brian.Dyke
803ceadaec Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.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
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 301f3094be [formerly 9abb02ea8a] [formerly 301f3094be [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: bbe6ec4d50 [formerly 37aacfcb96]
Former-commit-id: b9daa26f7d
 2014-08-04 13:10:13 -04:00
Kiran.Shrestha
b13496cdbf ASM #97 - Freezing Level Height AGL for all models has units of dam instead of feet 
Change-Id: Ia3d0709a6d3f8ea8d321218159faca7347df91fa

Former-commit-id: dd77c50f33 [formerly fbee424af7] [formerly dd77c50f33 [formerly fbee424af7] [formerly e650909e28 [formerly 24418dba4df50f5e46dd54302835e17db1576fe7]]]
Former-commit-id: e650909e28
Former-commit-id: bec9dcc014 [formerly 4a45669f4e]
Former-commit-id: b82ab79e86
 2014-07-31 10:51:50 -04:00
Nate Jensen
f4dc5f03b6 Omaha #3184 renamed valid identifiers to optional 
Change-Id: I9653f9e00b3c693b46b516bc52ff029cd4fe1a81

Former-commit-id: 77d0661861 [formerly 3c1ae47a76] [formerly 77d0661861 [formerly 3c1ae47a76] [formerly 857179e08d [formerly d0e68c2fa1cc531263622410e4364b87f222139f]]]
Former-commit-id: 857179e08d
Former-commit-id: 79ae128758 [formerly f3ce06c00e]
Former-commit-id: 90e35b4745
 2014-07-31 09:45:01 -05:00
Kiran.Shrestha
fa984fd8a4 ASM #97 - Freezing Level Height AGL for all models has units of dam instead of feet 
Change-Id: Ib92fbb1c153a8a4739371d8148673a5e32ea36f9

Former-commit-id: e9a417f5f8 [formerly a044b44c8b] [formerly e9a417f5f8 [formerly a044b44c8b] [formerly 11bab40785 [formerly 1730a6dea78cfd922b59c6cccc1c6f44d3a56949]]]
Former-commit-id: 11bab40785
Former-commit-id: fe32fc419a [formerly d32c2739cf]
Former-commit-id: 2c2ad03ee5
 2014-07-28 16:18:39 -04:00
Brian Clements
334dd1a466 Omaha #3373 fixed jaxb pooling performance issues 
Change-Id: Icf7949e956f2b21ba156f4f0a19a2c41d0037681

Former-commit-id: 6d2204c33e [formerly 37d97b9e48] [formerly 6d2204c33e [formerly 37d97b9e48] [formerly a20345bf50 [formerly 2ec52d8956b77aad30d46d7b4b2202c868b38a4d]]]
Former-commit-id: a20345bf50
Former-commit-id: 44a19a5df4 [formerly 6f8dc96c3d]
Former-commit-id: 65bda7536e
 2014-07-21 17:05:29 -05:00
Kenneth Sperow
ca67a59e23 Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8

Former-commit-id: a59743ebe0 [formerly c302ef8967] [formerly a59743ebe0 [formerly c302ef8967] [formerly f2a738cc25 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]]
Former-commit-id: f2a738cc25
Former-commit-id: 1ba5f0a3c4 [formerly ca913b6159]
Former-commit-id: 3e94502542
 2014-06-03 20:55:29 -07:00
Steve Harris
172cca39d9 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: 3de24b7b07 [formerly 99bc6f990c] [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: bfa4255eea [formerly 9b98b41cd4]
Former-commit-id: 144354c369
 2014-05-27 14:48:24 -04:00
Kenneth Sperow
386365e3cb Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]] 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f

Former-commit-id: 6f8b069dbe [formerly 8490f7ea33] [formerly 6f8b069dbe [formerly 8490f7ea33] [formerly 9fa9425aea [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]]
Former-commit-id: 9fa9425aea
Former-commit-id: 7302462544 [formerly 846395fd42]
Former-commit-id: 51b0b4e566
 2014-05-22 14:16:49 -07:00
brian.dyke
b2e3c50ec0 Merge branch 'master_14.3.1-4' into asm_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 9626317825 [formerly 011d121e4b] [formerly 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d [formerly bc4649765a]
Former-commit-id: b42011fc76
 2014-05-19 09:45:37 -04:00
Brian.Dyke
1d53f6d304 Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2 
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.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.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
	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
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: f38d0138e6 [formerly 627541512d] [formerly f38d0138e6 [formerly 627541512d] [formerly d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]
Former-commit-id: d3fa10028c
Former-commit-id: b0837b4905 [formerly 68f3a0169e]
Former-commit-id: f87775928f
 2014-05-14 16:08:16 -04:00
Richard Peter
bb580d8e7c Issue #2060: Consolidate grid indexes. 
Change-Id: Ibc77133cd1b016ef85bae61e47e373a30e6e4d23

Former-commit-id: 50fb33488c [formerly 62e215eb89] [formerly 50fb33488c [formerly 62e215eb89] [formerly 6143d43329 [formerly 892c0f28a13d53118141efe14762deebe169d7ba]]]
Former-commit-id: 6143d43329
Former-commit-id: e2954e54db [formerly 32f7bd8735]
Former-commit-id: 28eb882fb6
 2014-05-12 16:59:34 -05:00
Ana Rivera
94ceb3698f VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648 
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Former-commit-id: 7e74e047a0 [formerly 91715e7a3f] [formerly 7e74e047a0 [formerly 91715e7a3f] [formerly 81a9d4fa44 [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]]]
Former-commit-id: 81a9d4fa44
Former-commit-id: e33c6e2d69 [formerly 88520fc206]
Former-commit-id: 8cb1bfc3b8
 2014-05-12 18:55:06 +00:00
Nate Jensen
4f18fe5173 Issue #2060 fix grid updates and performance 
Change-Id: I0937d7360e456f08fb613be547f7b488ebe05b50

Former-commit-id: c71edb2d4c [formerly e39378e5f0] [formerly c71edb2d4c [formerly e39378e5f0] [formerly acfbce58d1 [formerly a430e85f283b3e41b8520d241f675eff3c6c32e3]]]
Former-commit-id: acfbce58d1
Former-commit-id: 81b914ad9f [formerly 5099fd6463]
Former-commit-id: f4bb539ae8
 2014-05-07 15:30:13 -05:00
Nate Jensen
ad7a69f2e3 Issue #2060 fill in units on GridRecords created from URIs 
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 3719c41d2b [formerly 71b4227061] [formerly 3719c41d2b [formerly 71b4227061] [formerly 7cea97ab15 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]
Former-commit-id: 7cea97ab15
Former-commit-id: 5bf1554597 [formerly 6bdbfb7e1a]
Former-commit-id: 66cd43313a
 2014-05-06 12:26:21 -05:00
Melissa Porricel
9b7d84bfc4 ASM #481 - Add Guam GFSDNG to AWIPS 
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca

Former-commit-id: a91a4ed137 [formerly 42c36a5e80] [formerly a91a4ed137 [formerly 42c36a5e80] [formerly 92231e051d [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]]]
Former-commit-id: 92231e051d
Former-commit-id: 6749967b5b [formerly 1e32d583b4]
Former-commit-id: 38539cc805
 2014-05-05 14:56:58 -04:00
Steve Harris
4fe84ba0fd Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22) 
Conflicts:
	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_60.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_70.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_80.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	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/fieldsMenus.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml

Former-commit-id: 9e149df799 [formerly 6ef3b9f1e5] [formerly 9e149df799 [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 927a87b126 [formerly b797b4b1fa]
Former-commit-id: 17318b1870
 2014-05-05 08:21:02 -05:00
Nate Jensen
403f4c3195 Issue #2060 dropping grid dataURI column 
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e

Former-commit-id: 263611f905 [formerly a37a2afe18] [formerly 263611f905 [formerly a37a2afe18] [formerly 5dfb652775 [formerly 1aab87d9572089a09351ebdfb8fbcef884866feb]]]
Former-commit-id: 5dfb652775
Former-commit-id: 3eddbf452d [formerly cdb932cc4d]
Former-commit-id: 9ef0154104
 2014-04-21 17:34:39 -05:00
Richard Peter
a22345ea6b Merge branch 'omaha_14.2.2' (14.2.2-3) into development 
Conflicts:
	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.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.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
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: cd51f3fa87 [formerly 3575d6586f] [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: d65b11d404 [formerly a7ec0bcf66]
Former-commit-id: b6482f2e54
 2014-04-11 16:23:09 -05:00
Ben Steffensmeier
4e84bd90ee Issue #2874 RTOFS temperature unit correction and style enhancements 
Former-commit-id: f2c605f6d3 [formerly a846430a84] [formerly f2c605f6d3 [formerly a846430a84] [formerly 3baaf6543d [formerly 129dff2511c50abe9367e233fb64b5ca923db258]]]
Former-commit-id: 3baaf6543d
Former-commit-id: 92beb626b4 [formerly 6125fee4e8]
Former-commit-id: 5b21c365f2
 2014-04-03 16:42:45 -05:00
Ben Steffensmeier
ad4ce67e85 Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter. 
Former-commit-id: c0b478eb97 [formerly 9122b6da99] [formerly c0b478eb97 [formerly 9122b6da99] [formerly 8650074737 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]
Former-commit-id: 8650074737
Former-commit-id: 5e4c35e93f [formerly d3043fda5a]
Former-commit-id: a1ac082c94
 2014-03-07 18:15:32 -06:00
Kiran.Shrestha
7010235ed1 ASM #97 
Change-Id: I4978b7ddba9ec714c4b2635fcb7e926447a3ff13

Former-commit-id: ba857c54d1 [formerly e467e957d7] [formerly ba857c54d1 [formerly e467e957d7] [formerly d54116125c [formerly f4e1de7a38b8a25d735143fb6ffea710bf024c2a]]]
Former-commit-id: d54116125c
Former-commit-id: 65b79616fb [formerly 496181cf92]
Former-commit-id: ca3ad192c3
 2014-02-10 19:33:57 +00:00
Ben Steffensmeier
1619859812 Issue #2672 Handle envelopes in data access requests of gridded types. 
Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c

Former-commit-id: b84bf8c891 [formerly 9c439866d5] [formerly b84bf8c891 [formerly 9c439866d5] [formerly dc5b5526a3 [formerly f634fe40e6fa7a8a3af575e79cb3d996761db983]]]
Former-commit-id: dc5b5526a3
Former-commit-id: 5b7cf3caec [formerly 02a0874646]
Former-commit-id: 70cbd6c61d
 2014-02-05 15:57:08 -06:00
brian.dyke
ca9263003a merge 14.2.1-3 into asm-14.2.2 
Former-commit-id: 4a62e83835 [formerly 2294c81a57] [formerly 4a62e83835 [formerly 2294c81a57] [formerly f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 621464ac0d [formerly e9e2eb3be0]
Former-commit-id: dcf5f25ed1
 2014-01-27 15:27:49 -05:00
Brian Clements
c934358ccc Issue #2594 disabled LATLON grid interpolation 
Former-commit-id: deac151bc9 [formerly f8820538f4] [formerly deac151bc9 [formerly f8820538f4] [formerly 5a3ed14237 [formerly 4840da51dcb7b9366417129663c0e539716f2335]]]
Former-commit-id: 5a3ed14237
Former-commit-id: 330e961490 [formerly 7efb35be30]
Former-commit-id: 15308ca1b9
 2014-01-13 17:44:49 -06:00
Richard Peter
1c743d4d44 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: e4f59ea119 [formerly 1de516964b] [formerly e4f59ea119 [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 5c0cf804f1 [formerly 62fa535744]
Former-commit-id: 4059813742
 2013-12-17 21:04:53 -06:00
Ben Steffensmeier
ca5fb7e3fa Issue #2574 fix DatabaseQuery conversion of grid coverage objects. 
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309

Former-commit-id: fb1480b30d [formerly 7e5349bbff] [formerly fb1480b30d [formerly 7e5349bbff] [formerly cc5d9edc92 [formerly 33033c354a783ab58d89599eb78355c6b354594f]]]
Former-commit-id: cc5d9edc92
Former-commit-id: 8a3bbbca50 [formerly 23a26f5d4a]
Former-commit-id: 9f30c14fca
 2013-12-16 14:31:44 -06:00
Ben Steffensmeier
5ee4468108 Issue #2574 Add DataURIFieldConverter for GridCoverages. 
Former-commit-id: cf6ef77d78 [formerly 08be03d3fa] [formerly cf6ef77d78 [formerly 08be03d3fa] [formerly bdb0e111ea [formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]]]
Former-commit-id: bdb0e111ea
Former-commit-id: d8f5e957d3 [formerly f7b1015dca]
Former-commit-id: b1de6a34eb
 2013-11-25 12:17:36 -06:00
Nate Jensen
6441290b40 Issue #2361 remove StyleManager's use of SerializationUtil and 
ISerializableObject

Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a

Former-commit-id: a4eb19fc79 [formerly 9acda0b9f2] [formerly a4eb19fc79 [formerly 9acda0b9f2] [formerly c5cf68cc45 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]
Former-commit-id: c5cf68cc45
Former-commit-id: e41f57da67 [formerly a6be904c69]
Former-commit-id: e83a828209
 2013-11-14 13:29:30 -06:00
Richard Peter
94e0faa6c6 Merge branch 'omaha_13.5.3' (13.5.3-5) into development 
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java

Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9

Former-commit-id: 25df870b67 [formerly fa7d77ae97] [formerly 25df870b67 [formerly fa7d77ae97] [formerly 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: c97efbf656 [formerly 520dd57f02]
Former-commit-id: 910464ea6a
 2013-11-07 14:25:45 -06:00
Steve Harris
cfb3194426 14.1.1-7 baseline 
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d] [formerly 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: b694612fe0 [formerly 48df058653]
Former-commit-id: 647b908fed
 2013-11-06 14:16:14 -05:00
Richard Peter
19e860f9a8 Merge "Issue #2390 update grib decoder and vb to handle new storm surge parameters. Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209" into development 
Former-commit-id: f52fdf1916 [formerly 5adf4298ef] [formerly f52fdf1916 [formerly 5adf4298ef] [formerly bc3843dc75 [formerly 3d09c6dedbaaa0db6b2247832a45bde8a1357786]]]
Former-commit-id: bc3843dc75
Former-commit-id: 8694f13766 [formerly f7a7228e09]
Former-commit-id: 2af4638a97
 2013-10-03 16:57:39 -05:00
Ben Steffensmeier
8187fb1fa8 Issue #2390 update grib decoder and vb to handle new storm surge parameters. 
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209

Former-commit-id: 7f7aa20d0a [formerly 236b3fe05f] [formerly 7f7aa20d0a [formerly 236b3fe05f] [formerly 8f94e1434c [formerly 6de5f10b9abf900fc412f2b1e867ce339a15d41e]]]
Former-commit-id: 8f94e1434c
Former-commit-id: 69eec8d4c6 [formerly d4670d19b1]
Former-commit-id: 9a0a15ffd8
 2013-10-03 16:30:13 -05:00
Ben Steffensmeier
ff28df9bbc Issue #2404 move grid reprojection style rules to common. 
Former-commit-id: a95f0dbac4 [formerly a75361ad34] [formerly a95f0dbac4 [formerly a75361ad34] [formerly 32a01070f9 [formerly 2a81f5fe8e38e6e6c6476586b1df09d8ab01d1fa]]]
Former-commit-id: 32a01070f9
Former-commit-id: 95b1c01650 [formerly 59d7c79c20]
Former-commit-id: dc4c07c194
 2013-10-02 10:33:23 -05:00
Nate Jensen
0c92f4eca1 Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager 
Change-Id: I83c36ee235066aa57da88f09090470bce84679f7

Former-commit-id: f529c077c6 [formerly effa4f4f26] [formerly f529c077c6 [formerly effa4f4f26] [formerly 3e7dc7782f [formerly f8d8a0033729878c8c6d94c00fd861ddc81f9d96]]]
Former-commit-id: 3e7dc7782f
Former-commit-id: e1c35952c9 [formerly 4e6f5afc57]
Former-commit-id: 593700bd28
 2013-10-01 11:25:45 -05:00
Brian Clements
6cb6d468fe Issue #2404 Moved colormap parameter factory to common 
moved grid level translator from viz to common
updated references to moved classes
created grid style util for common styling code
updated style manager to look in common for files
moved data plugin style rules to common


Former-commit-id: 4c5d2b051d [formerly 2f25116c10] [formerly 4c5d2b051d [formerly 2f25116c10] [formerly 75448f8a42 [formerly 7cdff04cc4d60b50a2a2c08499ee329586031e0f]]]
Former-commit-id: 75448f8a42
Former-commit-id: fedd0dc781 [formerly e8cc15940c]
Former-commit-id: 0ba625fbe6
 2013-09-27 09:41:51 -05:00
Richard Peter
da668e7cc9 Issue #2298: Make getPluginName abstract 
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: feeddb503f [formerly 41550aaf9f] [formerly feeddb503f [formerly 41550aaf9f] [formerly 80e7b265dd [formerly 0f939c3d1f89bf3463315528c1b47f5f49e2fa05]]]
Former-commit-id: 80e7b265dd
Former-commit-id: 744320a0ff [formerly 917a2d153f]
Former-commit-id: 45f84d6889
 2013-09-12 12:48:36 -05:00
Richard Peter
e154f87cf4 Issue #2298: Make getPluginName abstract 
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: ff660a78c7 [formerly 592218edb8] [formerly ff660a78c7 [formerly 592218edb8] [formerly 7175e78cf7 [formerly 54356ea774bfab26b85aff317fc759de41e259d1]]]
Former-commit-id: 7175e78cf7
Former-commit-id: 9aec8b3f88 [formerly ae956e3b4b]
Former-commit-id: beb492620b
 2013-09-03 11:51:27 -05:00
Dave Hladky
6e302d35d8 Issue #2097 Initial update for OGC services 
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99

Former-commit-id: d3bae9e065 [formerly 83dba7b655] [formerly d3bae9e065 [formerly 83dba7b655] [formerly bef4b3cdbd [formerly 875006e24de0755cdd0dedc7b0afcf221bcbad49]]]
Former-commit-id: bef4b3cdbd
Former-commit-id: 6a1a06e3ee [formerly 37062aac21]
Former-commit-id: 30aa0c93a1
 2013-08-28 08:24:45 -05:00
Nate Jensen
077c619bbf Issue #2210 moved base cave_static colormaps to common_static and updated code 
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: 960dc1e81e [formerly a1a9a4751a] [formerly 960dc1e81e [formerly a1a9a4751a] [formerly 27dd27a73f [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]]
Former-commit-id: 27dd27a73f
Former-commit-id: 04d55ac1c0 [formerly 15006517a2]
Former-commit-id: 22861240c8
 2013-08-06 17:17:53 -05:00
Max Schenkelberg
7f1784e352 Issue #2190 Cleaned up sounding and cloud height dependencies 
Change-Id: If07406f7e618fca0ea001b56a81b8552d9d44546

Former-commit-id: dccc265ab0 [formerly d4c7a0c302] [formerly dccc265ab0 [formerly d4c7a0c302] [formerly 56fef93541 [formerly 767ecfd7f2930de641d532d08120d5023b6e38e4]]]
Former-commit-id: 56fef93541
Former-commit-id: 8ea57bfbac [formerly 8ad1acdbc5]
Former-commit-id: 43344e0340
 2013-07-12 10:12:48 -05:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline 
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
 2013-06-28 09:46:25 -04:00
Steve Harris
859965fc9d 13.5.1-1 baseline 
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
 2013-06-10 15:17:17 -04:00
Nate Jensen
e4bbe70d57 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh 
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 927da5cffb [formerly 99b4a21414] [formerly 927da5cffb [formerly 99b4a21414] [formerly 3f3e0a788d [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: b025262dc1 [formerly a1f314948f]
Former-commit-id: 4eb941dacb
 2013-05-29 14:49:43 -05:00