Commit graph

4264 commits

Author SHA1 Message Date
Greg Armendariz
70c9a36826 Issue #2512 - Remove dead code
Former-commit-id: c07118fed79b6e50694281e40b3fb3755484d911
2013-11-12 14:20:21 -06:00
Richard Peter
460a7b8b5d Merge branch 'development' into development_on_RHEL6
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.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
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.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.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: 333073fc97c9d454d0e41f8fbe01be3a19b18184
2013-11-12 11:11:36 -06:00
Nate Jensen
23fe7de462 Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
Former-commit-id: 7a8934c9005f25a16874be26e06625d56df5c024
2013-11-12 09:29:46 -06:00
Bryan Kowal
75e6914df1 Issue #2540 - finish implementing the python override capability. The pure-python solution will be checked in later.
Amend: addressed review comments
Amend: update DR number

Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0

Former-commit-id: 315ca002de4045f0d7ae6b298012365a052a7430
2013-11-11 17:00:17 -06:00
Nate Jensen
a2935193b5 Issue #2361 undo earlier changes that potentially break uengine based
local apps

Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65

Former-commit-id: 110cff66bb2cf847730562570a9415851e0362c2
2013-11-11 16:14:35 -06:00
Steve Harris
66f99f3974 Merge branch 'omaha_13.5.3' into development
Former-commit-id: 65d3e37b287dd2f429aba4d70c24bde3f1bc6470
2013-11-11 15:40:45 -06:00
Steve Harris
e0d2de3a19 Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: d55e0256167a6b61728d77403805ccc1c3eafdf7
2013-11-11 15:39:27 -06:00
Steve Harris
47102ee47b 13.5.3-7 baseline
Former-commit-id: a9ada72dc63cd460499052171c61323b438bb10d
2013-11-11 16:33:51 -05:00
Nate Jensen
05ee46c4bc Merge "Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing." into development
Former-commit-id: 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec
2013-11-11 14:05:11 -06:00
Richard Peter
51649b56e5 Merge "Issue #2506 Refactored RegistryEvent constructors." into development
Former-commit-id: dd8f83135b04ff4510b1f860846f1a6a3db09f47
2013-11-11 13:09:24 -06:00
Bryan Kowal
411e0fa7c4 Issue #2297 - fix 14.2.1 merge
Former-commit-id: e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b
2013-11-11 13:04:21 -06:00
Steve Harris
8a2e9f1725 Merge branch 'omaha_13.5.3' (13.5.3-6) into development
Former-commit-id: a4c8e9a5fb9d50844da854e453b6146c2a6e75c3
2013-11-11 11:45:35 -06:00
Steve Harris
4190ddf39b Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 9d433d2ae29831903e8da23a4b96aee29ee8f5bd
2013-11-11 11:40:03 -06:00
Steve Harris
5fa893d37b 13.5.3-6 baseline
Former-commit-id: 1324512098c1b95d023de932c6fbe872cfeb68f8
2013-11-11 12:34:10 -05:00
Max Schenkelberg
bd903f6641 Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing.
Change-Id: Ic82f45447113425a08909be4c5229502882db022

Former-commit-id: 58ccc575973ea9a1778659e17daff8577747dec5
2013-11-11 11:09:00 -06:00
Nate Jensen
06acf1b8a0 Merge "Issue #1314 removed common.spatial plugin" into development
Former-commit-id: 823cb0e07793ec5baa1863088634a312364b3d8b
2013-11-11 08:48:44 -06:00
Steve Harris
3a5028a42d Issue #2214 - merge fix: Removed duplicate annotation @Override
Former-commit-id: d398883ce95b61d0a1befb3943a636c4c213784d
2013-11-11 08:15:30 -06:00
Brad Gonzales
d80183edc1 Issue #2506 Refactored RegistryEvent constructors.
Amend: Added call to default constructor in Event initialization constructor.

Change-Id: I4c3f105b9782512f6c0b73f2355767e855845454

Former-commit-id: f4cb28f209073788a3c329c44283c8c8cf3bf70f
2013-11-08 15:46:40 -06:00
Brad Gonzales
e2fb158757 Issue #2506 fixed issues with shared distributed ingest.
Amend: Updated comment in StoreRetrievedData.
       Removed separate messageing to clear BandwidthSubscriptions.
       Add fix and test case for SBN deserialization with content following the ending xml tag.
       Removed unneeded changes.
       Added XmlWMOMessage class.

Change-Id: Iadef7070a42a10661ba9316a4900a071820296fd

Former-commit-id: 0b667fbd94788a8a5b598ae5f5586d4b710518a4
2013-11-08 15:29:05 -06:00
Bryan Kowal
f1cd2f2e5a Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	cots/edu.uci.ics.crawler4j/.classpath
	cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
	cots/edu.uci.ics.crawler4j/build.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
	edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GridToGribConverter.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/CPCoutlookGribPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/Nam80PostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/SixHrPrecipGridProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/ThreeHrPrecipGridProcessor.java
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
	edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/MESOWestDecoder.java
	edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java
	edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoder.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/src/gov/noaa/nws/ncep/edex/plugin/ncccfp/decoder/NcccfpDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgridAssembler.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
	rpms/awips2.ade/Installer.eclipse/component.spec.3.6.1

Former-commit-id: c56c91c7b000b4302ad5e2bac391fd627673cc97
2013-11-08 14:51:47 -06:00
Nate Jensen
f57cc4ab8f Merge "Issue #2361 remove SerializationUtil from SoundingPrefs" into development
Former-commit-id: 2622cf7de4bfa09734e8a0acca402ffb5f8b1fcb
2013-11-08 14:45:22 -06:00
Brian Clements
04791b7939 Issue #1314 removed common.spatial plugin
Moved KeyLocker to common.util
Updated query store to use read write lock


Former-commit-id: 4f3d7e982a34f17fdf8cd80f025da176f939a3b1
2013-11-08 13:43:52 -06:00
Richard Peter
cf261df489 Merge "Issue #2361 fix saving hydro table objects" into development
Former-commit-id: 8a326cda9dd0b801f0bbaf779d6548f42078c0a5
2013-11-08 13:26:06 -06:00
Nate Jensen
08441efbb7 Issue #2361 fix saving hydro table objects
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: 0f406375b030a87d3fa12e46255897bfa469119d
2013-11-08 12:37:26 -06:00
Nate Jensen
44a6d5b302 Issue #2361 remove ISerializableObject from persistence path keys
Change-Id: I7ff7e5234c7c88ed475014c755f3df7d1ee23b16

Former-commit-id: 044f4fd87a83d6b83eef7f46854f1b484536c825
2013-11-08 12:30:39 -06:00
Nate Jensen
e9ca44ee64 Issue #2361 remove SerializationUtil from SoundingPrefs
Change-Id: Ia394f825954c0d96e17431589d64af13d8c7f991

Former-commit-id: eab1cf126b79ec5708facf2b2c9a303fca8a24fe
2013-11-08 12:13:50 -06:00
Nate Jensen
43bbf31347 Issue #2361 fix map style preferences
Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049

Former-commit-id: 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae
2013-11-08 10:38:11 -06:00
Richard Peter
bb0dcf6d4a Merge "Issue #2361 remove viz.grid ISerializableObjects" into development
Former-commit-id: a227c2dcb2598f82756c3f6a9ac7999c06202177
2013-11-08 10:35:41 -06:00
Slav Korolev
7b7754982c Issue #2291. Fixed Shared Subscription Dialog.
Former-commit-id: f04678733c2368ca05b7b8fdbcfeb096940854df
2013-11-08 11:09:21 -05:00
Nate Jensen
10548cd1c7 Issue #2361 remove viz.grid ISerializableObjects
Change-Id: I76be90f90dedf5d5d5e3656d23bd1180de9014b8

Former-commit-id: 6dde4cfe4f7669cd3d3ca15bbb7f4ab2a1a50e92
2013-11-08 09:42:09 -06:00
Richard Peter
6fd6fd0725 Merge "Issue #1678 Added support for stored query publishing and invocation on the registry" into development
Former-commit-id: 003f889e8aa65c4f01287611518f92b7d8ef05dd
2013-11-08 09:35:08 -06:00
Benjamin Phillippe
b5db1f38c3 Issue #1678 Added support for stored query publishing and invocation on the registry
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f

Former-commit-id: d7d985926351d933c0bd10a3a5fd88ef4305853b
2013-11-07 18:36:46 -06:00
Nate Jensen
f677dd6415 Merge "Issue #2515 upgraded camel from 2.11.0 to 2.11.2" into development
Former-commit-id: cd816c1507ff5b413b6312fb6d7d83cff29436e1
2013-11-07 16:59:35 -06:00
Brian Clements
ea6b162369 Issue #2515 upgraded camel from 2.11.0 to 2.11.2
removed log showBody workaround


Former-commit-id: afee27c0b6b574b7d664f47ca0f9369f2b920426
2013-11-07 16:56:25 -06:00
Nate Jensen
7877229eac Merge "Issue #2361 remove ISerializableObject from datadelivery.retrieval" into development
Former-commit-id: 7c4748fa0348820f0cf65330889253a04b4fab28
2013-11-07 16:39:50 -06:00
Ron Anderson
c1bda09fd9 Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development
Former-commit-id: c5da4c8a79432aab321d42f94b9cff04866671aa
2013-11-07 14:39:06 -06:00
Ron Anderson
42229b8eee Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b
2013-11-07 14:38:39 -06:00
Richard Peter
93c776022a Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java

Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9

Former-commit-id: d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30
2013-11-07 14:25:45 -06:00
Nate Jensen
6abe031dfe Issue #2361 remove ISerializableObject from datadelivery.retrieval
Change-Id: I9ec15b17760bcb4382898101f10ce1b17f55eb39

Former-commit-id: 0cc1dd3988f7d02d609246dba863552b46127db2
2013-11-07 13:18:21 -06:00
Greg Armendariz
6456b3a17b Merge branch 'development' into development_on_RHEL6
Former-commit-id: d12afc98a3fda9c186e87368c53ddc100d4bf2c1
2013-11-07 12:25:24 -06:00
Nate Jensen
cc2998b487 Issue #2361 speed up map initialization by moving field queries off UI
thread

Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5

Former-commit-id: 75c1037145b0aec9cd5e0c0707f0904f4b703bc3
2013-11-07 11:44:07 -06:00
Steve Harris
3236374cc0 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 2a95ac857fe960ed2147545731acc3c093bb73b5
2013-11-07 11:37:25 -06:00
David Gillingham
0e74638eb2 Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: 9e190cf63a11fa641a60f13f8f93baec649d4893
2013-11-07 11:36:49 -06:00
Steve Harris
47778131b0 Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 433ccf0db5946e18c81e20ec689c9911868fe4c2
2013-11-07 11:32:42 -06:00
Steve Harris
f175680b89 13.5.3-5 baseline
Former-commit-id: 427119d391ffb23c0db3fa0dab0a893322a60f8c
2013-11-07 12:22:32 -05:00
Steve Harris
b835dad501 14.1.1-7 baseline (addendum 1)
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml


Former-commit-id: 07f7c24804028aed71fc29cdf6f163a9e9d15623
2013-11-07 12:09:23 -05:00
Nate Jensen
3c335ed78f Merge "Issue #2514 updated comments and history for OGC classes" into development
Former-commit-id: 5e5b1b53cf79fd058f65451aee4f255a73252ca1
2013-11-07 10:45:03 -06:00
Nate Jensen
7b18c745d3 Merge "Issue #2530 Fixed ingest JVM crash on startup" into development
Former-commit-id: ba63e0d32f333fb2acaee2b15253f7cffb7122d4
2013-11-07 10:44:46 -06:00
Benjamin Phillippe
3561293fdd Issue #2530 Fixed ingest JVM crash on startup
Change-Id: Ia3256e509d3ecea06e7c1736330987a8db5bafa3

Former-commit-id: 0cf0136f3cb25328d3a65d15a12cd0a4f4867fcb
2013-11-07 10:38:53 -06:00
Nate Jensen
38a5ae5e5f Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development
Former-commit-id: 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1
2013-11-07 10:21:42 -06:00