Commit graph

198 commits

Author SHA1 Message Date
Steve Harris
1aab7b1831 Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
15.1.1-2m

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
2015-03-30 11:07:52 -05:00
Fay.Liang
4718a036f1 Merge branch 'ohd_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: 366cd07d35f6e9f842ba72d1164a53fbb5fc6838
2015-03-19 12:42:35 -04:00
Fay.Liang
2eb8777058 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/build.edex/edex/common.properties

Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Fay.Liang
29adda74b3 Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 3496ae3b3063b553e7a891d0a62fa489b1bedb9e
2015-03-18 15:09:16 -04:00
Chip Gobs
28965a0276 VLab Issue #6997 MPE DR 17210 Post Analysis: Post Analysis App Failing with 14.3.1-53 Build ; fixes #6997
Former-commit-id: c8c5c5bce94eba6b1a2f5d5f580f3b6ac8d43a6b
2015-03-18 10:14:46 -04:00
Chip Gobs
33a5c2021b VLab Issue #6996 MPE DR 17209 Draw polygon fails on Substitution when field is blank.; fixes #6996
Former-commit-id: 8b07d138544c4519c4eab52be7b4d6163b8d88ed
2015-03-17 16:28:29 -04:00
Chip Gobs
d09efd7da7 VLab Issue #6995 MPE DR 17208 PostAnalysis: Scale factor too large fixes #6995
Former-commit-id: 8d39d1b1909cfa33dd0f4542258ddacefceef623
2015-03-17 13:30:54 -04:00
steve.naples
b071faf978 ASM #14575 - Fixed issue with exiting CAVE, without closing DailyQC, throwing errors.
Change-Id: I897a00e84ce30e81896cd2d1559d8c39cd74b701

Former-commit-id: 1bd7175c022f8c29a1a19474cfc8b6b3688ee024
2015-03-10 13:34:58 -05:00
steve.naples
ac2b2bc0f0 ASM #14554 - MPE: Best Estimate QPE changes with polygon after saving. - Changed to removed polygon after the save.
Change-Id: Icd4f867e07c6ec1f850cc1e8e73fd31d98dbbb46

Former-commit-id: d369e6f5eeb6463813982784207d234fb48cc3b7
2015-03-10 18:27:05 +00:00
Chip Gobs
79b79d108e VLab Issue #6753 - MPE DR 9554: Add ability to disable Launch Post Analysis button based on token ;fixes #6753
Former-commit-id: 7a433d6a711f3a7ae1072931acc3e76ae7bc2abe
2015-03-10 07:51:54 -04:00
Fay.Liang
059eb032b1 Merge tag 'OB_14.3.2-19m' into master_14.4.1
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
2015-03-09 16:11:13 -04:00
steve.naples
3ecaf0c634 ASM #15660 Fixed issues with saving disagg data.
Change-Id: I6f0e8b02b7035e9d9614c52718026fce81b2e331

Former-commit-id: 4646f7396153651359624f3dd12660810fe2bf6e
2015-03-03 21:02:54 +00:00
David Lovely
56c3135aef Omaha #3300 Fixing merge errors in PointPrecipPlotResource
Change-Id: I6c5b8f0f2e590b0cf0440c1885435c2bf5649df4

Former-commit-id: e7968f03e688e7dbad9a2e87b9de7f0664997a5f
2015-02-12 09:16:30 -06:00
Fay.Liang
59f3f87190 Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
	edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
	rpms/awips2.core/Installer.java/1.7/component.spec

Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
2015-02-09 17:19:41 -05:00
steve.naples
c292ad2b08 ASM #17101 MPE: Bad data not being written to file.
Change-Id: Id1524abf8ae7379f5d8aac31b4d9cfff0469a577

Former-commit-id: fe3d6ffc320ea338d755c6fb19aa4f00c74c4283
2015-02-05 20:21:33 +00:00
Fay.Liang
551098ba35 Merge branch 'ohd_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveBestEstimate.java

Former-commit-id: 2b65d7a2e76d9d07f10fd6068e7c83b2a0b63975
2015-02-04 21:35:40 -05:00
Chip Gobs
2da6f9022d VLab Issue #6312 - RM 17094 - MPE - mapx_field_type too long for RWResult table; fixes #6312
Change-Id: I320c052a7d7a1579a668935e848aa378874c3ad5

Former-commit-id: 9f66b0830de2377da2dc3e5598d264afc631b517
2015-02-04 19:53:24 +00:00
steve.naples
e82d4d40e3 ASM #15059 MPE: Updated Save Best Estimate to use lower case in query of mapx field.
Change-Id: I303064502e2c7eea80577ab937f702c99b2e2065

Former-commit-id: d967cdf333a9c71d4f98402a123e01359dca3bc3
2015-02-03 21:12:21 +00:00
steve.naples
d960e4bba1 ASM #283 - MPE GroupEditPrecipStns updated to fix issue with selecting gages when filtered out with Reverse Point slider.
Change-Id: I9743b37adfb8658d40458c00204ad87c50c10528

Former-commit-id: b10de7db401a9d4199c9eed98e41913a87b4b64a
2015-01-27 18:36:49 +00:00
steve.naples
349ff47f53 ASM #559 - Updated PostAnalysisManager and SummedHourlyMpeDlg to fix issue when opening PostAnalysis.
Change-Id: I9c2dcfd6af891b9ce0b60443a46e5cf9f3c7e99a

Former-commit-id: fe5c51f43047d77202e6d5056d7d8be1736562bd
2015-01-27 18:36:07 +00:00
steve.naples
6488242165 ASM #17051 MPE: Daily QC will not display Points+Grids together.
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a

Former-commit-id: 8db85622ff4d0f7202c4d2c2e6eefeefe2ef39c3
2015-01-23 20:40:48 +00:00
Shawn.Hooper
0bc501bd4c Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: d53c809149da23fcae51138cc45c57aecd641794
2015-01-22 16:05:41 -05:00
Fay.Liang
b7e84f200a Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 1627b2a1d7705ae60f8f18545460d29fed1acf3a
2015-01-13 11:58:33 -05:00
steve.naples
ac7d038488 ASM #16993 - Restored code to DrawPolygonDlg to use Combo box for fields.
Change-Id: I736af4ac43de16c3978c462fca22bb147846d81b

Former-commit-id: 3a8aaf4ab99e8ae93dd9f074c5671cc8f3dc5f8d
2015-01-12 19:08:06 +00:00
Fay.Liang
c6bd5d7675 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: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Loubna.Bousaidi
4a769ef560 ASM #14246 - Implemented MPE Transmit Best Estimate option
Change-Id: If6dc3df81ecfee998ebcc4de8ee47ddc2466868e

Former-commit-id: 212076c520952d0327591b79449ae09ad063adf1
2015-01-08 15:31:58 +00:00
Chip Gobs
4376118942 VLab Issue #5831 - MPE: Fix broken cv_use for DualPol functionality; fixes #5831
Change-Id: I98bb54b48910dbf818daeb0312815dab1a99a4bc

Former-commit-id: 85491d6fc3bf8aa53e62d5cb139918166d48bdde
2015-01-07 12:32:50 -05:00
steve.naples
2757754c9e ASM #16911 - Updated to fix Ending Hydrologic data when time is after 18Z.
Change-Id: Ia3022f07f1ebc54543b6e210d77d95b1458b434b

Former-commit-id: 571f7dde74c6cbf14553edc2fe27a5031e42d6be
2014-12-13 01:55:19 +00:00
Chip Gobs
0532714504 VLab Issue #5616 MPE:Gage Color by Value does not display correctly; fixes #5616
Former-commit-id: 41c962fd89f3b9998599f8a246967cb47888ffe3
2014-12-12 13:24:47 -05:00
Richard Peter
2457d0e6f7 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: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
2014-12-12 10:36:04 -06:00
steve.naples
42d555b6c9 ASM #16911 - Fixed issue where Hydrologic date did not advance to next day after 18Z.
Change-Id: Ie26af265d8a233e4fdf6e9dbc1e4ff6934aae4e4

Former-commit-id: b2c9cd15e1f02c8272c1d9a9d50e877470b05eb3
2014-12-09 19:04:17 +00:00
steve.naples
18b2de3fdf ASM #16889 - Fixed issue with precip station count, also added logging for Snow data file read and station edit.
Change-Id: I1b689b485a152e1c942c021ac0f778b0f299d3e3

Former-commit-id: c836fb0c1f8721f81049af56cb8f7be9960a5cd6
2014-12-08 15:48:28 +00:00
steve.naples
c4fad58bd9 ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4

Former-commit-id: 862cb7c4d789915067558c4508cf5f1e45a2cdf2
2014-12-03 18:35:19 +00:00
Paul.Grell
63ae1fe88c ASM #16911 HydroDate set to next day if hour is 18Z or later
Change-Id: Ied55660cb81e3fdf2e87295fe22eb0915f7b4764

Former-commit-id: 38d9bc8c4e385e339df5bdd010160728730bed8d
2014-12-02 11:35:28 -05:00
steve.naples
ec656123f2 ASM #16889 - Daily QC does not display SNOTEL data.
Change-Id: I42035d5d4d856a395400a1be1d0c6a24bc64b0d8

Former-commit-id: 01735909fffdc9b5ef14ed072253eed6deaecad9
2014-11-26 18:24:53 +00:00
Steve Harris
0322884798 Merge tag 'OB_14.3.1-29m' into omaha_14.4.1
Former-commit-id: e5cd617f80e90dcfba52058b2a439fade1cfe15e
2014-10-29 10:03:20 -05:00
Shawn.Hooper
7a7d877c17 ASM #16871 - Checkin: MPE Gage Table: columns do not sort in descending order
Change-Id: I197c3049e39ad0c5f5edca8926ff1afdaca20e2f

Former-commit-id: ce7ade3d25263f5af09073e4877b018a84f195a3
2014-10-24 09:47:54 -04:00
Steve Harris
90e08b96e1 Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
2014-09-29 12:58:56 -05:00
Steve Harris
7692e3f21d Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java

Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
2014-09-23 11:41:10 -05:00
Brian.Dyke
4db67c581c Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8d5d8cdfd272f8000a6a21a4128998889eb2ab30
2014-09-19 16:56:50 -04:00
Steve Harris
091555cf10 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: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
2014-09-19 10:28:57 -05:00
Brian.Dyke
c6b0adfc53 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: de22db308f36c42d5c7e0989dbd7decfaaf3adbb
2014-09-18 12:43:01 -04:00
Chip Gobs
0d046a56e8 VLab Issue #4611
Adding missing changed file.

Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e

Former-commit-id: e68f56628f035ca2a20848a0e76f6efa8bbe1e8a
2014-09-18 12:12:42 -04:00
Brian.Dyke
cb7a266271 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: dcfe2369455e6b7f27039418b090c9c577400a63
2014-09-17 14:39:56 -04:00
Brian.Dyke
216f34fb25 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 8e4f6e96f7b70d6f2b7517f3f0695350506169c7
2014-09-15 10:46:25 -04:00
Max Schenkelberg
3ea9b1b4be Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb

Former-commit-id: 154c4ac7131ae8f533d4080055d9afe257bf0506
2014-09-10 15:43:19 -05:00
Brian.Dyke
3d9a3de6e4 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: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
2014-09-09 11:44:30 -04:00
Chip Gobs
bbc346e29e Merge "VLab Issue #4612 Fix for Redmine O&M DR 283 concerning the faulty ability of a user to select filtered out stations when performing quality code operations in MPE in GroupEdit Mode." into ohd_14.3.1
Former-commit-id: 3ad2b50520a7a8fdfaa1a99a1f34570e43d0164e
2014-09-08 14:29:28 -04:00
Chip Gobs
780f484a56 Merge "VLab Issue #4602 Fixes MPE Gage Table Data Reading problem introduced in a earlier 14.3.1 build, a.k.a Redmine O&M DR 16699" into ohd_14.3.1
Former-commit-id: 57614e9869d5a36c80b8d988e8fea4136045a982
2014-09-08 14:28:33 -04:00
Chip Gobs
f7624b0609 VLab Issue #4612
Fix for Redmine O&M DR 283 concerning the faulty ability of a user to select filtered out stations when
performing quality code operations in MPE in GroupEdit Mode.

Change-Id: Ib8da13cfa2085aeb6efba96e7a1789912534bddd

Former-commit-id: 7df28e4d5c1d8a03db5500939b0af2905d11a4aa
2014-09-08 12:37:20 -04:00