3232 commits

Author	SHA1	Message	Date
Steve Harris	0e9d0b2ef5	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: 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]] Former-commit-id: dc74953978 Former-commit-id: 713cfeffc7	2014-05-28 09:01:00 -05:00
Steve Harris	005e5b4ee2	Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1 ... Conflicts: edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java Former-commit-id: a4825f4b27 [formerly 2c49d14c12] [formerly 048d3748b7 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]] Former-commit-id: 048d3748b7 Former-commit-id: 4ed44b6e72	2014-05-28 07:41:42 -05:00
Steve Harris	bfa4255eea	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 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]] Former-commit-id: 3b16bbafb1 Former-commit-id: 9b98b41cd4	2014-05-27 14:48:24 -04:00
Brian Clements	170e3644f2	Omaha #3206 added version to servlet api in cave feature ... without this, the build prefers the javax.servlet in the target platform Change-Id: Ic98a49f8a0dff09d0af42da1e69dd650f4fd9a80 Former-commit-id: f0e8bf76a9 [formerly 6f76a9a328] [formerly 2fd2b5aa16 [formerly d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2]] Former-commit-id: 2fd2b5aa16 Former-commit-id: af8a6806f0	2014-05-23 17:04:49 -05:00
Nate Jensen	76a2766ed4	Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1 ... Former-commit-id: 730831d465 [formerly 8f6dcfaa1b] [formerly b67bf1e492 [formerly 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d]] Former-commit-id: b67bf1e492 Former-commit-id: 935086d60e	2014-05-22 16:46:50 -05:00
Steve Harris	1dfc15a77e	Merge branch 'omaha_14.3.1' into omaha_14.4.1 ... Conflicts: cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java cots/org.geotools/.classpath cots/org.geotools/META-INF/MANIFEST.MF cots/org.geotools/build.properties edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java Former-commit-id: 376482d3b1 [formerly 518822ed83] [formerly b6af2db9f5 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]] Former-commit-id: b6af2db9f5 Former-commit-id: 14b1ea307f	2014-05-22 14:31:06 -05:00
Brian Clements	53de96dd53	Omaha #3206 edex changes related to new javax.serlvet FOSS project ... Former-commit-id: 0a2ddfbc79 [formerly f9de79465a] [formerly c875f17719 [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]] Former-commit-id: c875f17719 Former-commit-id: fd9f98b2ba	2014-05-22 14:09:07 -05:00
Steve Harris	805aae1a70	Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1 ... Former-commit-id: 0a3b23d055 [formerly 4899c4f56a] [formerly 2059fc9c0e [formerly eae5c3e75061566e40194730c2cfb2003d952e62]] Former-commit-id: 2059fc9c0e Former-commit-id: 0df4af413b	2014-05-22 14:05:06 -05:00
Ron Anderson	8f0eb1fd10	Issue #3194 Fix GeoTIFF import ... Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a Former-commit-id: a8ba16fc93 [formerly 52931af5ce] [formerly 2a680b73ea [formerly 8082b27e6e7e0a0be372abb40b62c0a0224ee49c]] Former-commit-id: 2a680b73ea Former-commit-id: b7338080e2	2014-05-22 09:53:47 -05:00
Richard Peter	9faf57cf68	Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1 ... Former-commit-id: dcaedf5d43 [formerly db4c6c8c22] [formerly f19fda01ad [formerly 052144dd9929d852543f4eaf959ca3ccce50c5a2]] Former-commit-id: f19fda01ad Former-commit-id: 02b136759b	2014-05-20 17:14:29 -05:00
Brian Clements	e4bb70cbe9	Omaha #2536 merged edex.textdb into text plugins ... Former-commit-id: c55124bcc7 [formerly 5b5295e5ad] [formerly da7d5888b0 [formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]] Former-commit-id: da7d5888b0 Former-commit-id: 003917f0ed	2014-05-20 16:07:20 -05:00
Richard Peter	3264e7bd93	Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1 ... Former-commit-id: ab3a7a2804 [formerly 13ac6e8337] [formerly 2d4d89b3f0 [formerly 62674d17c73d8fdbbe26916aba7ecac572eca2eb]] Former-commit-id: 2d4d89b3f0 Former-commit-id: 0b8c3e67a1	2014-05-20 14:56:44 -05:00
Nate Jensen	eb086ff461	Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1 ... Former-commit-id: 77c77c6b8f [formerly 1e408e7017] [formerly 966cf1f96f [formerly 62054f8f2552058b0b53b79b077a4d7699cb41e9]] Former-commit-id: 966cf1f96f Former-commit-id: 88aa9471e1	2014-05-20 14:51:05 -05:00
Brad Gonzales	6825727400	Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf. ... Amend: updated manifest. Removed static imports. Refactored String constants to Pattern constants in TafConstants. Refactored com.raytheon.edex.plugin.taf to com.raytheon.uf.edex.taf. Renamed com.raytheon.edex.plugin.taf project to com.raytheon.uf.edex.taf. fixed .project. Updated yet more Patterns. Change-Id: Ia5db9d185c6c32e6ce25748ae4b3b6fb389b2acc Former-commit-id: c4890beb96 [formerly 6b0e578fc1] [formerly e560ce4880 [formerly f73ed1c8ee81f3ae1ffdf44ba4726453e7e0b9d2]] Former-commit-id: e560ce4880 Former-commit-id: e2412ecb43	2014-05-20 14:13:18 -05:00
Ben Steffensmeier	a56f475076	Omaha #2913 Remove dead code using JAI ... Former-commit-id: 59a108822e [formerly d5d3f5605a] [formerly d48333444c [formerly 767fc083618827ad06beff9f6728ea9dd42528f6]] Former-commit-id: d48333444c Former-commit-id: 98ad1b079e	2014-05-20 13:36:15 -05:00
Brian.Dyke	937b9bb9ce	Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2 ... Conflicts: cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java Former-commit-id: 822ad181bf [formerly 2fd18d14d6] [formerly db68b80bbd [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]] Former-commit-id: db68b80bbd Former-commit-id: ebcaebb28d	2014-05-20 14:35:34 -04:00
Ron Anderson	fd6e80dd27	Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update ... Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465 Former-commit-id: b794dd04e1 [formerly 3b404f4083] [formerly 809548b283 [formerly b10be8ae235c4528c4ce83088daeccf8a0928933]] Former-commit-id: 809548b283 Former-commit-id: 029201d4b9	2014-05-20 11:10:26 -05:00
Brian Clements	c4447fc6c4	Omaha #3172 fixed ui filtering for contacts and sessions ... Former-commit-id: 455af3612f [formerly b774503931] [formerly 8dce7e9b85 [formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]] Former-commit-id: 8dce7e9b85 Former-commit-id: 4078bbaa63	2014-05-20 11:04:57 -05:00
Nate Jensen	cc8ba31981	Merge "Omaha #3180 fixed inviting strangers and multiple users in collaboration" into omaha_14.4.1 ... Former-commit-id: f3f64b1e5a [formerly 8d7125544b] [formerly eff69410eb [formerly 3c5d7d4f0cecf0ff0ab17a97a3bff5342bfb9569]] Former-commit-id: eff69410eb Former-commit-id: 7def9ead8e	2014-05-19 16:21:37 -05:00
Richard Peter	c799f78f5d	Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1 ... Former-commit-id: 80a5f2fc1b [formerly 40b7623c87] [formerly 87da8bd952 [formerly 1f786fd25cab2956c2cc3318a7adbabf6e8c306d]] Former-commit-id: 87da8bd952 Former-commit-id: 8baf897297	2014-05-19 16:07:51 -05:00
Brian Clements	6769aff618	Omaha #3180 fixed inviting strangers and multiple users in collaboration ... can now invite users to session from search dialog fixed bug where only first person in selection would be invited Former-commit-id: b5e961d6b4 [formerly 0e18d45bdf] [formerly 573ffcb0bf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]] Former-commit-id: 573ffcb0bf Former-commit-id: e4433c5e10	2014-05-19 15:54:36 -05:00
Ben Steffensmeier	87118964b1	Omaha #3133 remove topo from alertviz feature. ... Former-commit-id: c4f9bab999 [formerly 24b879764f] [formerly 31c323151c [formerly d9ce5c7b78bc3483cd17e8896b9260e2c4f0a807]] Former-commit-id: 31c323151c Former-commit-id: 68aba0cdd5	2014-05-19 14:21:23 -05:00
Nate Jensen	6fb3e37a29	Merge "Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore." into omaha_14.4.1 ... Former-commit-id: 9996d67317 [formerly 76bfba5945] [formerly 94d032dbc4 [formerly 353d0ddca384a33fe529c0b920595a99c0f40548]] Former-commit-id: 94d032dbc4 Former-commit-id: 65ecb7e926	2014-05-19 13:36:26 -05:00
Brian.Dyke	f2885c9996	Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1 ... Former-commit-id: c4b7b8dd74 [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]] Former-commit-id: d5a4669fc4 Former-commit-id: f30bd7d9ae	2014-05-19 14:07:04 -04:00
Brian.Dyke	3558d8f162	CM-MERGE:OB13.5.5-8 into 14.1.2 ... Former-commit-id: 2eae2be646 [formerly b29db01a59] [formerly 06c2478539 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]] Former-commit-id: 06c2478539 Former-commit-id: 9baa09f4bc	2014-05-19 13:26:45 -04:00
Richard Peter	f3e7d16402	Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1 ... Former-commit-id: 1e9c2b27b6 [formerly 0f9015e824] [formerly 0480bfa478 [formerly 4ca4b10fe7331282d32f0a21549f5e6eadc7e16c]] Former-commit-id: 0480bfa478 Former-commit-id: 802a043085	2014-05-19 12:12:05 -05:00
Nate Jensen	c5d944c52f	Merge "Omaha #3163 Add support for reading colored text styles from future versions of collaboration." into omaha_14.4.1 ... Former-commit-id: b93e410f60 [formerly cb6ef0e9a3] [formerly d79ef53ad0 [formerly 6f3d40c96cafe8f0f05d539534607067a2a37776]] Former-commit-id: d79ef53ad0 Former-commit-id: 8a31eaf6e1	2014-05-19 11:46:10 -05:00
Brian Clements	7761b74112	Omaha #2536 merged uf.edex.textdbsrv into text plugins ... split into uf.common.dataplugin.text and uf.edex.plugin.text Former-commit-id: 4d40a98ad7 [formerly a06d332ff4] [formerly 2f5cffbe15 [formerly 5f238c51d856984808dee0d2ba62b6a8fbdbd6a1]] Former-commit-id: 2f5cffbe15 Former-commit-id: 8ddae2fc54	2014-05-19 10:53:37 -05:00
Ben Steffensmeier	9ddc32ee05	Omaha #3164 Disable thin client request compression when it doesn't work. ... Former-commit-id: d697592de2 [formerly ccf53a4c99] [formerly 25f901a102 [formerly ce132a929437f18f531503701bb09e33261ae4c4]] Former-commit-id: 25f901a102 Former-commit-id: 7f46683fb0	2014-05-19 10:40:50 -05:00
Gang.Zhang	ec6053c3f7	ASM #95 - Fix 0.0 for NO DATA Issue caused failed back. ... Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac Former-commit-id: 6e034005e0 [formerly 94fea6748f] [formerly 9c1587b92d [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]] Former-commit-id: 9c1587b92d Former-commit-id: baa1546e39	2014-05-19 15:40:41 +01:00
brian.dyke	2e105c1d5d	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 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]] Former-commit-id: 58683ad040 Former-commit-id: bc4649765a	2014-05-19 09:45:37 -04:00
Brian.Dyke	e563eb3376	CM-MERGE:OB13.5.5-7 into 14.1.2 ... Former-commit-id: 509616ba6a [formerly f8ed9c7944] [formerly e9bd17a21f [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]] Former-commit-id: e9bd17a21f Former-commit-id: 409a48b907	2014-05-19 07:55:42 -04:00
Ben Steffensmeier	5607277ae2	Omaha #3163 Remove all references to WORD_WRAP in A2 plugins. ... Former-commit-id: 6a3d5f869e [formerly 885448b04d] [formerly a52718783a [formerly 8e7fa0cdb864d95c70fe1859d9ef9a1851c0b123]] Former-commit-id: a52718783a Former-commit-id: 68244ce2d7	2014-05-16 14:40:50 -05:00
Ben Steffensmeier	2e88a0b800	Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore. ... Former-commit-id: 01379cd329 [formerly 748ecc5fac] [formerly 8446ace149 [formerly bb8c1130a9da5cdb06590b20d7f5bde9e1d7c812]] Former-commit-id: 8446ace149 Former-commit-id: 82d9c403d2	2014-05-16 13:36:31 -05:00
Ben Steffensmeier	fcbd4cc9ee	Omaha #3163 Add support for reading colored text styles from future versions of collaboration. ... Former-commit-id: 08f7d7b8dd [formerly 67e68732d6] [formerly 79ef4a5301 [formerly 63d4e9f1e2bf95792fa82d101ce59f23e2cbdaf9]] Former-commit-id: 79ef4a5301 Former-commit-id: 126f47f725	2014-05-16 12:50:48 -05:00
Nate Jensen	d0fc6945fd	Omaha #3133 attempt to fix build ... Change-Id: Ib6668229987cb136c16fb57128becb1624e0b212 Former-commit-id: 7cfbc3d06c [formerly 6240667b0f] [formerly 11c580549a [formerly 661a24eafe2374970982a137146c77d9ec1a1406]] Former-commit-id: 11c580549a Former-commit-id: 94c289f944	2014-05-15 17:02:27 -05:00
Nate Jensen	3f73399ab8	Omaha #3133 remove unused dependencies ... Change-Id: I9a0ac7d0b15f266ea8818ac0db82067887e59ec6 Former-commit-id: 63b925e17e [formerly 3db92e6c0b] [formerly 1ae82b82db [formerly 5a00869db4e7467e49e9a632150a8135ea32b569]] Former-commit-id: 1ae82b82db Former-commit-id: 4731b10575	2014-05-15 13:57:55 -05:00
Nate Jensen	e0387c077e	Merge "Omaha #3061 added better checks for when to send invite/session payloads" into omaha_14.4.1 ... Former-commit-id: 7ed74b7242 [formerly 198a63cef8] [formerly 2cd5c8cca9 [formerly b65ddc7f6f3831117ad3c0d517335289cba8ede0]] Former-commit-id: 2cd5c8cca9 Former-commit-id: 01a5b4ba14	2014-05-15 08:36:51 -05:00
Steve Harris	3337f2d6d1	Merge branch 'omaha_14.3.1' into omaha_14.4.1 ... Former-commit-id: 5e6b9943f1 [formerly 1a06d18686] [formerly c83753b4d3 [formerly 5c1f5dbf543c9cd27cf83158308a9ce34d057201]] Former-commit-id: c83753b4d3 Former-commit-id: 1b709fb6c3	2014-05-15 08:31:27 -05:00
Brian Clements	c71459d36e	Omaha #3061 added better checks for when to send invite/session payloads ... Former-commit-id: ee51a84f50 [formerly a698d81571] [formerly 01269cd989 [formerly 073d3c10ac7c5e9cd6f5e34864ec0261219cbfd5]] Former-commit-id: 01269cd989 Former-commit-id: 6bf803303e	2014-05-14 17:00:09 -05:00
Richard Peter	72200f0892	Merge "Omaha #2536 moved WMO Header into new common plugin" into omaha_14.4.1 ... Former-commit-id: 02d94c61fb [formerly 7ae2b1299f] [formerly f6d1e1012e [formerly 1844df3fb769bccb3e5b19722e2fdeaec9c6bbe0]] Former-commit-id: f6d1e1012e Former-commit-id: 56d0cd836f	2014-05-14 16:25:16 -05:00
Brian.Dyke	b0837b4905	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 d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]] Former-commit-id: d3fa10028c Former-commit-id: 68f3a0169e	2014-05-14 16:08:16 -04:00
Qinglu.Lin	bdae3cdfdf	ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM ... Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c Former-commit-id: b7d276d00f [formerly 75c4b15e8e] [formerly c5097660c2 [formerly 763641d787f7f8c79bf28456314dcc16786702ed]] Former-commit-id: c5097660c2 Former-commit-id: 89fa05128e	2014-05-14 15:30:16 -04:00
Ben Steffensmeier	fc54a7f697	Omaha #2697 Collaboration will no longer use local maps. ... Former-commit-id: 270e8805cc [formerly 3e23857dcc] [formerly 1db137a21e [formerly 7e10b6d308a3bb17692abaefd9a8e84cc5016621]] Former-commit-id: 1db137a21e Former-commit-id: 759b1460d4	2014-05-14 13:53:29 -05:00
Brian Clements	abd29bf492	Omaha #2536 moved WMO Header into new common plugin ... moved WMO time parsing code from TimeTools to WMOTimeParser Former-commit-id: 437d9bb781 [formerly 2b1c7eaa37] [formerly 6bd43f79ff [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]] Former-commit-id: 6bd43f79ff Former-commit-id: ee9757ea39	2014-05-14 13:45:09 -05:00
Nate Jensen	e8661182d0	Omaha #3133 remove unused uf.common.cache from alertviz feature ... Change-Id: Ib4a36a727e8b26a708f247e6263518786cc60832 Former-commit-id: bab916f2be [formerly 68c8238275] [formerly 5eaa5d7b0e [formerly e659b393f23e5e999c2b03ddad648f2748ee97e9]] Former-commit-id: 5eaa5d7b0e Former-commit-id: 2a6d25cf41	2014-05-13 17:52:12 -05:00
Bryan Kowal	1c64a47950	Issue #3159 - rebuild with newer gridslice source ... Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc Former-commit-id: a352aadc90 [formerly 3535340136] [formerly 8d5326cc1b [formerly 2b13221d7c644147f6eda1acb8b126667be00926]] Former-commit-id: 8d5326cc1b Former-commit-id: 43eddea171	2014-05-13 14:43:04 -05:00
Nate Jensen	c31080d705	Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt ... Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851 Former-commit-id: e464500dfc [formerly 07426ce408] [formerly 174fae77d1 [formerly b842a78cdfb945767aecf7da3ad55b71c9d09bfb]] Former-commit-id: 174fae77d1 Former-commit-id: ea7b123eef	2014-05-13 13:12:54 -05:00
Brian.Dyke	f9474b087e	Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1 ... Former-commit-id: 5a2e0c7e1b [formerly e95bc87a19] [formerly fb4c7e55b3 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]] Former-commit-id: fb4c7e55b3 Former-commit-id: 0311366ffb	2014-05-13 11:23:55 -04:00
Matthew Howard	c919d3503a	Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1 ... Former-commit-id: 7b087f422d [formerly 5a20085f32] [formerly 576a2d63ec [formerly 2052df4ca5f68165b477994b21357c245ff73546]] Former-commit-id: 576a2d63ec Former-commit-id: 1026f04671	2014-05-13 07:49:18 -05:00