Commit graph

191 commits

Author SHA1 Message Date
Richard Peter
933960d2bf Omaha #4125 - Fix jaxb performance issue
Change-Id: I7b306098a96b86fb5a9c1262b2fb92f5f24ba0b1

Former-commit-id: f9fa25b783 [formerly 1184d7629c [formerly 9f81dd0ec5e00827f5a9a98376f15c5139908ce1]]
Former-commit-id: 1184d7629c
Former-commit-id: 5f93f3b5d9
2015-02-19 14:25:12 -06:00
Ron Anderson
40d7dbbf9a Omaha #4139 Fix handling of pre-epoch dates in ISC
Change-Id: I116f35c34544319bf9875aaeea82d24751b2cca2

Former-commit-id: 3d100c7bd6 [formerly a3bced0160 [formerly 2718eab540d66cac4ac88f01b840bdf23bc0562b]]
Former-commit-id: a3bced0160
Former-commit-id: 3ec014a0a9
2015-02-18 11:28:34 -06:00
Fay.Liang
19a29da5de ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]
Former-commit-id: c6bd5d7675
Former-commit-id: 6b77894bd0
2015-01-12 13:03:31 -05:00
Zhidong.Hao
b3980efbff ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
Change-Id: I656058629e2982a20312fca7f7024db82a8ad2fb

Former-commit-id: c3b623cb6d [formerly e443ced7f1 [formerly 133d3f229145c8ac84f31a8a6becc98688d189ae]]
Former-commit-id: e443ced7f1
Former-commit-id: 9ab6bab9cf
2014-12-16 10:16:35 -05:00
Richard Peter
20fa07c6d3 Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: 8de1ebcb65 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]
Former-commit-id: 2457d0e6f7
Former-commit-id: 23eafaba3d
2014-12-12 10:36:04 -06:00
Fay.Liang
07316a588b Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 19194e0aa3 [formerly 83a4987188 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]
Former-commit-id: 83a4987188
Former-commit-id: f327b9dd5a
2014-12-04 13:46:31 -05:00
Ron Anderson
fdafc8c3b8 VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: 9104023408 [formerly bb451e58c3 [formerly e8ac81c5850b8565ea1e375857cf9dfe531848a0]]
Former-commit-id: bb451e58c3
Former-commit-id: f88fc45470
2014-11-19 11:31:49 -06:00
Ana Rivera
a469e36107 VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: e54f3305d8 [formerly 061fd0af28 [formerly 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42]]
Former-commit-id: 061fd0af28
Former-commit-id: 499c58a253
2014-11-14 16:58:11 +00:00
Ron Anderson
0bafb89898 VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files.
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30

Former-commit-id: fe531a33e5 [formerly 04b8ffbcd2 [formerly c9d45db2fe6d4693c02b8788d0c7d44b21f5359f]]
Former-commit-id: 04b8ffbcd2
Former-commit-id: 80670c1b7a
2014-11-12 14:50:21 -06:00
Steve Harris
79a5171143 Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/build.edex/esb/conf/logback-ingest.xml
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: 9de825c332 [formerly a16abe1b8b [formerly 565efec2ebe5a3a1a009d213a77617f4a593aa6b]]
Former-commit-id: a16abe1b8b
Former-commit-id: a8a97501ac
2014-11-10 08:42:01 -06:00
Brian.Dyke
5cdd9f4256 Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: acf00264f4 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]
Former-commit-id: aae68215c8
Former-commit-id: 4ac24af0a9
2014-11-06 12:55:21 -05:00
Benjamin Phillippe
af4f8e1c8a Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: fdd16051e8 [formerly 7845e8e40f [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]
Former-commit-id: 7845e8e40f
Former-commit-id: e6deeb6fb5
2014-10-20 12:42:19 -05:00
Ron Anderson
0463c1c7a2 Issue #3684 Fix some issues found after #3684 with certain GFE configurations
Change-Id: I92b45588d9d4fe9169708c07119767017426d468

Former-commit-id: a64a36d182 [formerly 4a1a3aef82 [formerly 6dc55b51414414aa416c9ad0c688d1d34ba08c17]]
Former-commit-id: 4a1a3aef82
Former-commit-id: 8225700629
2014-10-08 18:05:27 -05:00
Ron Anderson
d25fb16e4a Issue #3684 Additional changes to keep IFPServers better synchronized
Change-Id: Ibb1f28d07a5792d4f23eb3232b75099b259a7064

Former-commit-id: bf5225906f [formerly 34eafba2da [formerly 8a8f82e5916d4a71fa639eb16057e2c68276ecff]]
Former-commit-id: 34eafba2da
Former-commit-id: de4015cee6
2014-10-07 11:51:39 -05:00
Steve Harris
53dc9657e2 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 39c5e9c314
Former-commit-id: 06a27b2d3c
2014-10-06 13:57:59 -05:00
Brian.Dyke
5da2026d2b Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 92762f46c7 [formerly f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]
Former-commit-id: f440da9c70
Former-commit-id: 85d83aefe0
2014-10-03 14:04:46 -04:00
Brian.Dyke
d1c62c3542 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 2ac30f6c22 [formerly f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]
Former-commit-id: f47840e4d9
Former-commit-id: d4888adc0f
2014-10-02 10:24:04 -04:00
Ana Rivera
17f629b3b6 VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297

Former-commit-id: 9a0e9b17f4 [formerly 535f254357 [formerly 2c16492202230dcbec93cf390b47f400a77a545e]]
Former-commit-id: 535f254357
Former-commit-id: bb533d9ddd
2014-09-24 20:11:29 +00:00
Steve Harris
e3a7796362 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	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/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 091555cf10
Former-commit-id: da530db540
2014-09-19 10:28:57 -05:00
Ron Anderson
1408a91175 Issue #3592 Significantly reworked SampleSetManager and sample set dialogs to better match A1 behavior.
Change-Id: I8aef618a5091ee7acae470f5729add3c44287f30

Former-commit-id: 19bd85af5e [formerly 5c7290bf7c [formerly bb859073c6ab56141434b84dc104857759a81d82]]
Former-commit-id: 5c7290bf7c
Former-commit-id: 7a5f911ae2
2014-09-16 13:20:40 -05:00
Brian.Dyke
d8271549ff Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]
Former-commit-id: 3d9a3de6e4
Former-commit-id: fe85eb9f70
2014-09-09 11:44:30 -04:00
Ron Anderson
c5a32980d6 Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce

Former-commit-id: 434d412882 [formerly 46c62a1db6 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]
Former-commit-id: 46c62a1db6
Former-commit-id: c7fbca0298
2014-09-02 12:21:42 -05:00
Brian Clements
d3f0f7dea4 Issue #3500 remove locking on osgi internals, rework gfe client startup
fixed error handling in loadConfig.py
added python to path in GfePyIncludeUtil
moved ProcedureXMLManager to overridable method in AbstractCaveComponent

Change-Id: Ie7dff55657ba216c47f7a56b3506cbed3a3f6ab2

Former-commit-id: 9f7905b58d [formerly d62db22874 [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]]
Former-commit-id: d62db22874
Former-commit-id: bcc3e405e5
2014-08-22 08:56:56 -05:00
Nate Jensen
d61c65787b Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: 9b72a1399d [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]
Former-commit-id: b3083a663e
Former-commit-id: 253198b5bc
2014-08-14 10:22:37 -05:00
Brian Clements
81144aa9e2 Omaha #3503 common.serialization changes
moved adapters to new plugins

Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6

Former-commit-id: 415f2dff64 [formerly 90d492c1dc [formerly adba61c3714678ce57f0de5bfd4f9aa860098bd9]]
Former-commit-id: 90d492c1dc
Former-commit-id: 9c09de5779
2014-08-08 12:50:06 -05:00
Nate Jensen
9f0bd349b6 Omaha #3356 remove unnecessary usage of ext and global buddy policies
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d

Former-commit-id: 857f1b70cc [formerly 06a64080e7 [formerly 41306351920aee44bdf2d9648616ddc8a4511632]]
Former-commit-id: 06a64080e7
Former-commit-id: 41eb72aefd
2014-08-04 12:30:55 -05:00
Nate Jensen
3a9c29fa88 Omaha #3184 renamed valid identifiers to optional
Change-Id: I9653f9e00b3c693b46b516bc52ff029cd4fe1a81

Former-commit-id: 857179e08d [formerly 3c1ae47a76 [formerly d0e68c2fa1cc531263622410e4364b87f222139f]]
Former-commit-id: 3c1ae47a76
Former-commit-id: 77d0661861
2014-07-31 09:45:01 -05:00
Ron Anderson
56389537c2 Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc

Former-commit-id: 24faa48233 [formerly 8d50f9d15a [formerly 1e9e5abc477785c5b8cda9dd214da7de83532b9f]]
Former-commit-id: 8d50f9d15a
Former-commit-id: fd16321f82
2014-07-07 09:02:14 -05:00
Richard Peter
ed38bf2372 Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py

Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61

Former-commit-id: 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]
Former-commit-id: 93bbd98cbc
Former-commit-id: 6636b301e5
2014-07-01 15:34:39 -05:00
Steve Harris
741dc31fcb Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]
Former-commit-id: d4dc1723c1
Former-commit-id: 2f2958df37
2014-07-01 11:08:46 -04:00
Steve Harris
869235c02a CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java

Former-commit-id: 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]
Former-commit-id: b84dda5930
Former-commit-id: 16f5ff0979
2014-06-20 14:01:55 -04:00
Brian.Dyke
4766b3f49f CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 81832d97e5 [formerly 346bf852cd [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]
Former-commit-id: 346bf852cd
Former-commit-id: 5064d24e26
2014-06-13 13:21:19 -04:00
Ben Steffensmeier
267212cea6 Omaha #3243 Update AWIPS2 references to remove deprecated lambert conformal creation.
Former-commit-id: 08c5348b84 [formerly 69fb937150 [formerly f347369906eb28f58db75795d49b5513f60f9e37]]
Former-commit-id: 69fb937150
Former-commit-id: f0be972b0a
2014-06-06 15:17:19 -05:00
Steve Harris
4469d87a8f Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
	edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java

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

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 99bc6f990c
Former-commit-id: 3de24b7b07
2014-05-27 14:48:24 -04:00
Steve Harris
f79a449b6b 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: b6af2db9f5 [formerly 518822ed83 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]
Former-commit-id: 518822ed83
Former-commit-id: 376482d3b1
2014-05-22 14:31:06 -05:00
Ben Steffensmeier
f010aa30b4 Omaha #2913 Remove dead code using JAI
Former-commit-id: d48333444c [formerly d5d3f5605a [formerly 767fc083618827ad06beff9f6728ea9dd42528f6]]
Former-commit-id: d5d3f5605a
Former-commit-id: 59a108822e
2014-05-20 13:36:15 -05:00
Ron Anderson
0e02e83629 Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465

Former-commit-id: 809548b283 [formerly 3b404f4083 [formerly b10be8ae235c4528c4ce83088daeccf8a0928933]]
Former-commit-id: 3b404f4083
Former-commit-id: b794dd04e1
2014-05-20 11:10:26 -05:00
Ron Anderson
32a23a5d03 Issue #3118 Fix gridLocation issues with smartInit databases
Change-Id: I4660418234a5c721381c7986b793d9339c81c603

Former-commit-id: ba0c26edf6 [formerly b4815af7f8 [formerly a4a5522abbb439066acfa3567d0036cf044ef9c7]]
Former-commit-id: b4815af7f8
Former-commit-id: 93320d43c9
2014-05-06 15:09:25 -05:00
Richard Peter
8b1a177110 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 44b1782461
Former-commit-id: 67683dd891
2014-04-28 16:27:40 -05:00
Brian.Dyke
362d882b40 Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

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

Former-commit-id: 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: fb1f5aa593
Former-commit-id: f0b8ea5822
2014-04-25 11:06:11 -04:00
Ron Anderson
bf6d35aa0f Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
Fixed Wx parsing for AvnFPS

Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73

Former-commit-id: f3185dd206 [formerly 221a06e467 [formerly e636563052042d2dbfab6a4e476b71004b28c165]]
Former-commit-id: 221a06e467
Former-commit-id: 2f68fb8f2c
2014-04-23 17:04:16 -05:00
Nate Jensen
2561050293 Issue #2984 remove unnecessary dependencies on edex
Change-Id: Iad6ebd93d0ec6cd3823042f8ef2653dac963c746

Former-commit-id: df4171b29d [formerly 2253938ed5 [formerly 39d1f72292414d008c0899dac616e76c8c0f2512]]
Former-commit-id: 2253938ed5
Former-commit-id: ef43b2d325
2014-04-21 11:32:41 -05:00
Ben Steffensmeier
a47df3de42 Issue #2947 Make GridCoverage implement IGridGeometryProvider.
Former-commit-id: e911a4c917 [formerly 037ed878b7 [formerly f2a204c593f65c67c87e16fa513d00383ad568e5]]
Former-commit-id: 037ed878b7
Former-commit-id: 22f068481f
2014-04-11 17:33:55 -05:00
David Gillingham
41393ac5a1 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: da31ab2042 [formerly c8a6dc8769 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]
Former-commit-id: c8a6dc8769
Former-commit-id: 1c7e650e6a
2014-04-10 11:24:40 -05:00
Richard Peter
efd1003a50 Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
2014-04-09 16:00:54 -05:00
Brian.Dyke
2eec862ebb Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: 6a28fcb156
Former-commit-id: 17477e7db1
2014-04-04 12:57:32 -04:00
Ron Anderson
700d2ba37f Issue #2737 Make iscMosaic remove data from ISC when grids are deleted.
Change-Id: Ibf1255244b6e5856b5052e541727d427b331d9fe

Former-commit-id: ea250a253f [formerly 01ab6ce52d [formerly 5db8738783d79e8a48bfffac49910cc46df61ad2]]
Former-commit-id: 01ab6ce52d
Former-commit-id: 51bb7f474d
2014-04-03 16:56:36 -05:00
Ben Steffensmeier
094086b5c2 Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
Former-commit-id: 8650074737 [formerly 9122b6da99 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]
Former-commit-id: 9122b6da99
Former-commit-id: c0b478eb97
2014-03-07 18:15:32 -06:00