Commit graph

2953 commits

Author SHA1 Message Date
Richard Peter
8ba13f812e Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289

Former-commit-id: 558699a370 [formerly 558699a370 [formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]
Former-commit-id: e2288769d3
Former-commit-id: 220f7aa97a
2014-05-29 15:50:59 -05:00
Nate Jensen
a834abb826 Omaha #3211 changes to support improved authentication/authorization
Change-Id: If793dcbe3bed741f1b75ce338b152eb69d845172

Former-commit-id: 4fdb6df9a1 [formerly 4fdb6df9a1 [formerly c4eeb1730778f7f18aa4d74587ebcddb3932c6e6]]
Former-commit-id: 1e362625e5
Former-commit-id: 5a484063ac
2014-05-29 15:28:53 -05:00
Richard Peter
9aa0ecec3f Merge "Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository" into omaha_14.4.1
Former-commit-id: 9cd8710876 [formerly 9cd8710876 [formerly df4e87624ad0bc6db759677435e7c276f500d3da]]
Former-commit-id: 1c04a15ec7
Former-commit-id: bd5bb6daaa
2014-05-29 14:13:54 -05:00
Nate Jensen
b4b684876a Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
Former-commit-id: 5cfbcb7e98 [formerly 5cfbcb7e98 [formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]
Former-commit-id: c43a2bf217
Former-commit-id: c1d092a55d
2014-05-29 13:51:09 -05:00
Steve Harris
77e18c2e9a Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository
Change-Id: Ib313d71006c3d23a76c1589fded47102fea80b9a

Former-commit-id: 79d5592fdf [formerly 79d5592fdf [formerly c944b3b98f68b8f65b853fb244002e3382dc38a2]]
Former-commit-id: 5bc251beaa
Former-commit-id: c830097b13
2014-05-29 13:42:09 -05:00
Brian Clements
1a9aeb2ebd Omaha #3179 moved ebxml ecludes from datadelivery to registry modes
Change-Id: Id95a5b7ca307a52a2ae271becfc73c4fccef12de

Former-commit-id: fb71fae2d1 [formerly fb71fae2d1 [formerly f3baedf6187a70e9c98d73b6819fa46e9c00c702]]
Former-commit-id: 5abe7ea99d
Former-commit-id: 14a50e4c3d
2014-05-29 11:58:10 -05:00
Brian Clements
0778629505 Omaha #3179 added modes directory to custom targets
Change-Id: I43587e7d33cddd8dcd4b8056c90cc88bd78df1fe

Former-commit-id: a1da843e2a [formerly a1da843e2a [formerly 3d324c5b62a1f960099a5515cbd7c588ce7c5d7f]]
Former-commit-id: 77276d6efb
Former-commit-id: 95088ed28d
2014-05-29 09:08:53 -05:00
Brian Clements
7d841b655c Omaha #2536 merge autobldsrv into text plugins
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52

Former-commit-id: 5d0eaf02ab [formerly 5d0eaf02ab [formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]
Former-commit-id: 542d36f107
Former-commit-id: fcadd3dae9
2014-05-29 08:19:47 -05:00
Ben Steffensmeier
5ffb664f27 Omaha #2990 Fix radar mesocyclone regex.
Former-commit-id: c7c6c1b7ec [formerly c7c6c1b7ec [formerly 8e03f08f2d01f8b47101c09f950a0830cf8f0bb6]]
Former-commit-id: cd6ba70787
Former-commit-id: f669f3e22a
2014-05-28 16:40:35 -05:00
Brian.Dyke
551def9f1a Merge remote-tracking branch 'remotes/origin/master_14.2.1' into master_14.2.2 CM-MERGE:14.2.1-30 into 14.2.2
Former-commit-id: b7ef9420e1 [formerly b7ef9420e1 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]
Former-commit-id: 574246b6d4
Former-commit-id: 2c1fabb0f8
2014-05-28 16:25:33 -04:00
Nate Jensen
c3e036884b Merge "Omaha #3179 split modes.xml into plugin modes files" into omaha_14.4.1
Former-commit-id: 942aa72b01 [formerly 942aa72b01 [formerly eec07fb20d6566b1e1d361ef971e50e5a019fcbf]]
Former-commit-id: 6beda0c45b
Former-commit-id: cff4bfc6f4
2014-05-28 13:42:07 -05:00
Brian Clements
2dcbd33a4e Omaha #3179 split modes.xml into plugin modes files
Change-Id: I31e59b28fca166aff0cbd9ca13bf81aa67d6b46a

Former-commit-id: 5e39a68498 [formerly 5e39a68498 [formerly e626f47c9bb8900af2f4734513b2c94b83f082c8]]
Former-commit-id: 334bb53dea
Former-commit-id: d79c63a429
2014-05-28 13:32:18 -05:00
Nate Jensen
fda484c9ff Merge "Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager." into omaha_14.4.1
Former-commit-id: 3e174fe39c [formerly 3e174fe39c [formerly db3ff4b3bf81cbea49169369be01ce5c919157fd]]
Former-commit-id: 8cc13d8334
Former-commit-id: a921570418
2014-05-28 12:43:12 -05:00
Roger Ferrel
02ad70e080 Omaha #3137 - Add checks to prevent NullPointerException.
Former-commit-id: 3331d58e1c [formerly 3331d58e1c [formerly 42dcb85d536485f3ae244e69a315e88169d04c97]]
Former-commit-id: b235e56e28
Former-commit-id: 009f4b8d21
2014-05-28 09:54:37 -05:00
Steve Harris
3aef3934a3 Omaha #3132 - new TPCSurgeProb files should have gone to core in the merge
Former-commit-id: 63020bd766 [formerly 63020bd766 [formerly 80da354c8bacab21dc0675f280989c2d8e15acd4]]
Former-commit-id: 66e157489e
Former-commit-id: 71d69e5d25
2014-05-28 09:32:43 -05:00
Steve Harris
6412cc1427 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: be80bd01f3 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]
Former-commit-id: dc74953978
Former-commit-id: 713cfeffc7
2014-05-28 09:01:00 -05:00
Brian.Dyke
f5bc17ef24 Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: 4c010cf27a [formerly 4c010cf27a [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]
Former-commit-id: ce81b44f32
Former-commit-id: 73ec45c5b2
2014-05-28 09:36:15 -04:00
Steve Harris
95462b4f80 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: 2c49d14c12 [formerly 2c49d14c12 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]
Former-commit-id: 048d3748b7
Former-commit-id: 4ed44b6e72
2014-05-28 07:41:42 -05:00
Brian.Dyke
21112face5 CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: e95ee60224 [formerly e95ee60224 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]
Former-commit-id: e852623f48
Former-commit-id: b745ac5926
2014-05-28 08:40:56 -04:00
Ben Steffensmeier
f22960be7b Omaha #2668 add support for data access framework to bufrua.
Former-commit-id: 2c9de12c6f [formerly 2c9de12c6f [formerly 8ef33409df31f8ab9d69828b2d13e1bd8e979685]]
Former-commit-id: 0138296c13
Former-commit-id: 79410db3d8
2014-05-27 15:16:08 -05:00
Fay.Liang
247f3817be ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a

Former-commit-id: 0b9a011c58 [formerly 0b9a011c58 [formerly 445239c00cbe2147c014e180570085be6224da79]]
Former-commit-id: f56d9511b8
Former-commit-id: b77277b80e
2014-05-27 16:04:22 -04:00
Steve Harris
144354c369 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: 99bc6f990c [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9b98b41cd4
2014-05-27 14:48:24 -04:00
Brian.Dyke
09f2d8b8b1 Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: 575cebda84 [formerly 575cebda84 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]
Former-commit-id: 638acc2c06
Former-commit-id: 290b85b556
2014-05-27 13:42:09 -04:00
Brian.Dyke
1a69aaf89a CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: 89a8caddbb [formerly 89a8caddbb [formerly d57f7989982a59a546116b63a406294573844039]]
Former-commit-id: ba8d7dbbb7
Former-commit-id: ebdd53742c
2014-05-27 13:30:35 -04:00
Slav Korolev
ced313a7f1 Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager.
Former-commit-id: e3fe3c9736 [formerly e3fe3c9736 [formerly 14ff7a84235ed8cc95aca488910e7f975a5bd41e]]
Former-commit-id: 81033087ea
Former-commit-id: 4a8e7fc38e
2014-05-27 12:24:50 -04:00
Brian Clements
161a6b1624 Omaha #3199 new edex.soap plugin
new plugin for soap utilities


Former-commit-id: 4b984b2d70 [formerly 4b984b2d70 [formerly 7c7f7f4f4a821a80d0bf6dcb7e59e3880a7bf4e2]]
Former-commit-id: 09fba26a56
Former-commit-id: f934e868ec
2014-05-23 14:51:20 -05:00
Fay.Liang
605c976986 ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192

Former-commit-id: c007420e22 [formerly c007420e22 [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]]
Former-commit-id: 4fa60f159a
Former-commit-id: 5d763a0f3d
2014-05-23 15:47:50 -04:00
Steve Harris
0b84c2ea74 Merge branch 'omaha_14.3.1' (14.3.1-6) into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml

Former-commit-id: 211e5f8197 [formerly 211e5f8197 [formerly c678b56c81cb5ff798b5fcea75e00473c39fd53e]]
Former-commit-id: 7da3d7461f
Former-commit-id: 51f8c81f33
2014-05-23 08:16:43 -05:00
Steve Harris
af2f9d8a72 Merge branch 'master_14.3.1' (14.3.1-6) into omaha_14.3.1
Former-commit-id: 7dc84f4c74 [formerly 7dc84f4c74 [formerly 36b00a413b977ef5e11a46cf6f3d575e39ee4b57]]
Former-commit-id: b059918699
Former-commit-id: 440d6b16cf
2014-05-23 08:09:39 -05:00
Nate Jensen
aa9238ac35 Merge "Omaha #2913 remove some more unused uengine code." into omaha_14.4.1
Former-commit-id: add26fa7e9 [formerly add26fa7e9 [formerly 3562300cb46d196f754c37516dd39e9bb81ea254]]
Former-commit-id: 349123ba05
Former-commit-id: 1369010ca0
2014-05-22 18:10:10 -05:00
Ben Steffensmeier
0d22a5d8c9 Omaha #2913 remove some more unused uengine code.
Former-commit-id: be301d1dc3 [formerly be301d1dc3 [formerly 9b72d2a1ddd7db5e06abee5bd172f700ad4c1277]]
Former-commit-id: 05e8d862c2
Former-commit-id: ba3867af55
2014-05-22 17:50:16 -05:00
Kenneth Sperow
fd53b08211 Merge remote branch 'origin/master_14.3.1' into mdl_14.3.1
Former-commit-id: 07881695e9 [formerly 07881695e9 [formerly ae21d53409ab3c839774f8621d706f1bea5456de]]
Former-commit-id: dae982a2be
Former-commit-id: 44bbe7733e
2014-05-22 14:58:37 -07:00
Nate Jensen
dcfd7a07eb Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1
Former-commit-id: 8f6dcfaa1b [formerly 8f6dcfaa1b [formerly 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d]]
Former-commit-id: b67bf1e492
Former-commit-id: 935086d60e
2014-05-22 16:46:50 -05:00
Kenneth Sperow
51b0b4e566 Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 189e3cc1f2 [formerly 189e3cc1f2 [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: 8490f7ea33 [formerly 8490f7ea33 [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]
Former-commit-id: 9fa9425aea
Former-commit-id: 846395fd42
2014-05-22 14:16:49 -07:00
Steve Harris
d226dfb021 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: 518822ed83 [formerly 518822ed83 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]
Former-commit-id: b6af2db9f5
Former-commit-id: 14b1ea307f
2014-05-22 14:31:06 -05:00
Brian Clements
e7730e2219 Omaha #3206 edex changes related to new javax.serlvet FOSS project
Former-commit-id: f9de79465a [formerly f9de79465a [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]]
Former-commit-id: c875f17719
Former-commit-id: fd9f98b2ba
2014-05-22 14:09:07 -05:00
Steve Harris
e7e48b2abb Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
Former-commit-id: 4899c4f56a [formerly 4899c4f56a [formerly eae5c3e75061566e40194730c2cfb2003d952e62]]
Former-commit-id: 2059fc9c0e
Former-commit-id: 0df4af413b
2014-05-22 14:05:06 -05:00
Stephen Gilbert
98c83bf2d8 Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 8a3ab16e46 [formerly 8a3ab16e46 [formerly d2d54ee2bfbbe6fef44df58d2edc3b5858ffbe22]]
Former-commit-id: e73836f3b5
Former-commit-id: 571cc69cf3
2014-05-22 13:31:12 -04:00
Nate Jensen
78c8a8f367 Merge "Omaha #3179 added modes file deployment, moved modes.xml to new folder" into omaha_14.4.1
Former-commit-id: 341170eb05 [formerly 341170eb05 [formerly 77b58c5ba59c1a45f8ef3edb9fcc8cc5e1f063f7]]
Former-commit-id: cc233ddcf7
Former-commit-id: 4fd1f27ddf
2014-05-22 12:25:26 -05:00
Stephen Gilbert
adf872f445 Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml

Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0

Former-commit-id: 91d469eb90 [formerly 91d469eb90 [formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]]
Former-commit-id: 7992a6b15b
Former-commit-id: 7aaf3f44bc
2014-05-22 12:39:09 -04:00
Roger Ferrel
b923a09ded Issue #3181 Add check for valid array index.
Change-Id: I8e0a37bdd094b341da2ce42922a16d840d1ab468

Former-commit-id: a1f25b8748 [formerly a1f25b8748 [formerly ca01934f9e9d355dd4159fd472e2aa9bc0918898]]
Former-commit-id: adf6d95c01
Former-commit-id: 060d9e5003
2014-05-22 11:20:26 -05:00
Ben Steffensmeier
287f283dec Omaha #2913 Fix grib manifest depenency version.
Former-commit-id: 99bbb52689 [formerly 99bbb52689 [formerly 5481dea7c31ee65ea5515be2a9f88c1977a3dc59]]
Former-commit-id: f4d1e77301
Former-commit-id: 7974c63671
2014-05-22 11:12:52 -05:00
Nate Jensen
4a97c8c53b Merge "Omaha #2913 Remove ability to create images from uengine." into omaha_14.4.1
Former-commit-id: 74443038fc [formerly 74443038fc [formerly feb218207bc20ba7cab026379e2ef0d2c0efb58c]]
Former-commit-id: 02108895f0
Former-commit-id: 86d8f9cabb
2014-05-22 08:45:16 -05:00
Brian Clements
d3aec6899d Omaha #3179 added modes file deployment, moved modes.xml to new folder
Former-commit-id: 952901624f [formerly 952901624f [formerly fd8a4b49641aaf70c49608215d15209330dee669]]
Former-commit-id: e291a20abf
Former-commit-id: de05d7c313
2014-05-21 15:20:40 -05:00
Ben Steffensmeier
d894a852e9 Omaha #2913 Remove ability to create images from uengine.
Former-commit-id: ab739befec [formerly ab739befec [formerly f843fb4cdd78f4f847f0a2d45fe78106af88b3b4]]
Former-commit-id: b7d15aac22
Former-commit-id: 0ebab2abb5
2014-05-21 14:40:00 -05:00
Benjamin Phillippe
ec9042bb70 Omaha #3192 Fix broken build after CXF upgrade
Former-commit-id: 1ee8ceef1b [formerly 1ee8ceef1b [formerly 8a1b9ed7d11aebed7c76b9701f236eaa150d0562]]
Former-commit-id: 930b5b9621
Former-commit-id: 6c15b2c81e
2014-05-21 10:36:39 -05:00
Richard Peter
79a88d24ef Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1
Former-commit-id: db4c6c8c22 [formerly db4c6c8c22 [formerly 052144dd9929d852543f4eaf959ca3ccce50c5a2]]
Former-commit-id: f19fda01ad
Former-commit-id: 02b136759b
2014-05-20 17:14:29 -05:00
Brian Clements
30fb567666 Omaha #2536 merged edex.textdb into text plugins
Former-commit-id: 5b5295e5ad [formerly 5b5295e5ad [formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]]
Former-commit-id: da7d5888b0
Former-commit-id: 003917f0ed
2014-05-20 16:07:20 -05:00
Richard Peter
580dd1ed1d Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1
Former-commit-id: 13ac6e8337 [formerly 13ac6e8337 [formerly 62674d17c73d8fdbbe26916aba7ecac572eca2eb]]
Former-commit-id: 2d4d89b3f0
Former-commit-id: 0b8c3e67a1
2014-05-20 14:56:44 -05:00
Nate Jensen
5e095e0cde Merge "Omaha #2913 Remove dead code using JAI" into omaha_14.4.1
Former-commit-id: 4fe2982f39 [formerly 4fe2982f39 [formerly dce3936281178cbb211441edd23feef1cb321be5]]
Former-commit-id: 27560965ac
Former-commit-id: 019864ca32
2014-05-20 14:49:35 -05:00