Commit graph

4449 commits

Author SHA1 Message Date
Steve Harris
ec1c09b1f1 Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 0ca3c86388 [formerly 9923b2c71a] [formerly b62ab264f0] [formerly 0ca3c86388 [formerly 9923b2c71a] [formerly b62ab264f0] [formerly 4190ddf39b [formerly b62ab264f0 [formerly 9d433d2ae29831903e8da23a4b96aee29ee8f5bd]]]]
Former-commit-id: 4190ddf39b
Former-commit-id: 73966efbac [formerly 0822dd1682] [formerly 97466112f596932da4595e1e089695d5218ac848 [formerly 590d7de15d]]
Former-commit-id: 15faa0e793049cadddac2fa8f2a95f68cf78ae28 [formerly d4f5c58a4c]
Former-commit-id: d9479c586d
2013-11-11 11:40:03 -06:00
Steve Harris
7f35ae4d24 13.5.3-6 baseline
Former-commit-id: aa30ebfea8 [formerly 11ca17a63c] [formerly 77a45660d5] [formerly aa30ebfea8 [formerly 11ca17a63c] [formerly 77a45660d5] [formerly 5fa893d37b [formerly 77a45660d5 [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]]]]
Former-commit-id: 5fa893d37b
Former-commit-id: 155831d8d2 [formerly 8705c4779b] [formerly 2ec2397f40dee7ff2d4d5b8e509eb1e661a33c78 [formerly f31112871c]]
Former-commit-id: a1911059fdce132548b02193b51b3d69bb6be40c [formerly 49b0919cf0]
Former-commit-id: 32ed33056b
2013-11-11 12:34:10 -05:00
Max Schenkelberg
2dbe54cb4a 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: 752c9574b4 [formerly 2f794486e3] [formerly e58a5df04b] [formerly 752c9574b4 [formerly 2f794486e3] [formerly e58a5df04b] [formerly bd903f6641 [formerly e58a5df04b [formerly 58ccc575973ea9a1778659e17daff8577747dec5]]]]
Former-commit-id: bd903f6641
Former-commit-id: ad9578db6f [formerly 3f3b244b0d] [formerly f684ed2d6192fd370d5f9876f88c4494c40afb31 [formerly c85532a180]]
Former-commit-id: 13938eba0ef04bbdaad219d1622f03eac1794f4a [formerly 60616f7ef0]
Former-commit-id: 7383be61c1
2013-11-11 11:09:00 -06:00
Nate Jensen
2e1d44c1a9 Merge "Issue #1314 removed common.spatial plugin" into development
Former-commit-id: 78ba2b302e [formerly 0c25fe98bd] [formerly 0dbc31b756] [formerly 78ba2b302e [formerly 0c25fe98bd] [formerly 0dbc31b756] [formerly 06acf1b8a0 [formerly 0dbc31b756 [formerly 823cb0e07793ec5baa1863088634a312364b3d8b]]]]
Former-commit-id: 06acf1b8a0
Former-commit-id: 80b165f0f9 [formerly 06c24325c1] [formerly 1196c0ab88a8de7b7a6280832fbc6d81e340a440 [formerly de2623e273]]
Former-commit-id: e81361341b2fb14e66f7bbfa29a0c7051781dd33 [formerly f15ae53437]
Former-commit-id: baca6de835
2013-11-11 08:48:44 -06:00
Steve Harris
0c42c337c9 Issue #2214 - merge fix: Removed duplicate annotation @Override
Former-commit-id: fb65a05f3a [formerly f2cb2a4664] [formerly 766940dedb] [formerly fb65a05f3a [formerly f2cb2a4664] [formerly 766940dedb] [formerly 3a5028a42d [formerly 766940dedb [formerly d398883ce95b61d0a1befb3943a636c4c213784d]]]]
Former-commit-id: 3a5028a42d
Former-commit-id: bdbef4bd6e [formerly 5630f71579] [formerly 2043b461737f52bfbf01ed8009014e15e297d1e6 [formerly ecfc04214c]]
Former-commit-id: 42328ee784e97a2286e428eb75557b94a13fffd9 [formerly cb9e4afe53]
Former-commit-id: 394aacc6ed
2013-11-11 08:15:30 -06:00
Brad Gonzales
b338695637 Issue #2506 Refactored RegistryEvent constructors.
Amend: Added call to default constructor in Event initialization constructor.

Change-Id: I4c3f105b9782512f6c0b73f2355767e855845454

Former-commit-id: 6e7c6c980a [formerly adc09b748d] [formerly 9e8420b216] [formerly 6e7c6c980a [formerly adc09b748d] [formerly 9e8420b216] [formerly d80183edc1 [formerly 9e8420b216 [formerly f4cb28f209073788a3c329c44283c8c8cf3bf70f]]]]
Former-commit-id: d80183edc1
Former-commit-id: 516426e13f [formerly 04c4b2a4cd] [formerly 033425fcb7988c579bf7a0bdbe5c72e806d56c5e [formerly 86f5c2b6ec]]
Former-commit-id: 9a70b85774e7c227d0f41761abe10eaf0f9ad5ac [formerly 0e64d5f7fd]
Former-commit-id: c9ba669d05
2013-11-08 15:46:40 -06:00
Brad Gonzales
afe5db430d 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: 3c24f30ae8 [formerly 80fd8a2ad4] [formerly fe15e874f7] [formerly 3c24f30ae8 [formerly 80fd8a2ad4] [formerly fe15e874f7] [formerly e2fb158757 [formerly fe15e874f7 [formerly 0b667fbd94788a8a5b598ae5f5586d4b710518a4]]]]
Former-commit-id: e2fb158757
Former-commit-id: 458698d0a2 [formerly e802b866dd] [formerly d52ca16c4b5860cf95891f8b6102ecc6f6d96bd1 [formerly 28d8aa5151]]
Former-commit-id: 59d91bce9376593b0a8507fe193efa14b5311c75 [formerly f017bee2f2]
Former-commit-id: 837664eea1
2013-11-08 15:29:05 -06:00
Bryan Kowal
74664b1def 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: f6b8d99e70 [formerly 3b8ce3fd34] [formerly c3eb4e9af9] [formerly f6b8d99e70 [formerly 3b8ce3fd34] [formerly c3eb4e9af9] [formerly f1cd2f2e5a [formerly c3eb4e9af9 [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: b2fb3cc71b [formerly 464a8d1001] [formerly 9832b7353c98edff371d73697564b1585403dd75 [formerly 1909193f0c]]
Former-commit-id: bbe6693bef01b8fb05627cf015f2b987c0a64c90 [formerly dfba50bf2e]
Former-commit-id: 9f749f3079
2013-11-08 14:51:47 -06:00
Nate Jensen
56e0b4c1f7 Merge "Issue #2361 remove SerializationUtil from SoundingPrefs" into development
Former-commit-id: d0d76c8981 [formerly 76ccc6f8f7] [formerly 89a650d94a] [formerly d0d76c8981 [formerly 76ccc6f8f7] [formerly 89a650d94a] [formerly f57cc4ab8f [formerly 89a650d94a [formerly 2622cf7de4bfa09734e8a0acca402ffb5f8b1fcb]]]]
Former-commit-id: f57cc4ab8f
Former-commit-id: f043b92e20 [formerly 6228d02608] [formerly c28ed7e73c017daac9313c88ab918f647433c97a [formerly 24d83fcb9a]]
Former-commit-id: 79ae44755660456dc4218a310ea41e81f27cb8aa [formerly 027b5419b8]
Former-commit-id: 957349e987
2013-11-08 14:45:22 -06:00
Brian Clements
b6fe9ca89e Issue #1314 removed common.spatial plugin
Moved KeyLocker to common.util
Updated query store to use read write lock


Former-commit-id: 4a97229443 [formerly f994d9924d] [formerly 8142ff770f] [formerly 4a97229443 [formerly f994d9924d] [formerly 8142ff770f] [formerly 04791b7939 [formerly 8142ff770f [formerly 4f3d7e982a34f17fdf8cd80f025da176f939a3b1]]]]
Former-commit-id: 04791b7939
Former-commit-id: 715edf805e [formerly 90682b4beb] [formerly e1ff87a68f53adadd668ab79157a662d8a5660e4 [formerly f96f92df0b]]
Former-commit-id: 4fb749ca58143eb0d6b0fb01c9a0614065c26a35 [formerly 9f5209d544]
Former-commit-id: 875af7af9e
2013-11-08 13:43:52 -06:00
Richard Peter
5c0c6819ed Merge "Issue #2361 fix saving hydro table objects" into development
Former-commit-id: 4400d1f8c5 [formerly 931e583990] [formerly bded464ccf] [formerly 4400d1f8c5 [formerly 931e583990] [formerly bded464ccf] [formerly cf261df489 [formerly bded464ccf [formerly 8a326cda9dd0b801f0bbaf779d6548f42078c0a5]]]]
Former-commit-id: cf261df489
Former-commit-id: 24d8b6b5d3 [formerly d54bdf1094] [formerly 99ca53d06fe751276c6ea8d3ec5293ff04488f9e [formerly 9bb4f8dd7f]]
Former-commit-id: dffba5397193f60fd59ce650332d2adf059b9157 [formerly e6544523f3]
Former-commit-id: 976daf8230
2013-11-08 13:26:06 -06:00
Nate Jensen
95bea4e45d Issue #2361 fix saving hydro table objects
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: f5b461908d [formerly 040f022e5d] [formerly 7a27264094] [formerly f5b461908d [formerly 040f022e5d] [formerly 7a27264094] [formerly 08441efbb7 [formerly 7a27264094 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]]]]
Former-commit-id: 08441efbb7
Former-commit-id: 398524b7e2 [formerly 399265e3f8] [formerly 0f1cb8fd2bdb23523f68173edb6fddf6e99b2e4e [formerly 4958732cb2]]
Former-commit-id: 91e834a40e3bb78aab91dc38345b88f581bfa48e [formerly 7a70c5ecce]
Former-commit-id: 82306d6f55
2013-11-08 12:37:26 -06:00
Nate Jensen
6fc3985b78 Issue #2361 remove ISerializableObject from persistence path keys
Change-Id: I7ff7e5234c7c88ed475014c755f3df7d1ee23b16

Former-commit-id: 6c82fc1303 [formerly 0e4a1d9ced] [formerly 02d26d0f84] [formerly 6c82fc1303 [formerly 0e4a1d9ced] [formerly 02d26d0f84] [formerly 44a6d5b302 [formerly 02d26d0f84 [formerly 044f4fd87a83d6b83eef7f46854f1b484536c825]]]]
Former-commit-id: 44a6d5b302
Former-commit-id: 5d97357d55 [formerly b10cc7b9b0] [formerly a61da77e3f2fe75d073103685c78688e9c49adaf [formerly 3ea850b9da]]
Former-commit-id: 1278891d6697df1b9fe69f73ab52ebf7f9ae4249 [formerly 0693e9366e]
Former-commit-id: 7c7fd9d2ea
2013-11-08 12:30:39 -06:00
Nate Jensen
763b6e89e7 Issue #2361 remove SerializationUtil from SoundingPrefs
Change-Id: Ia394f825954c0d96e17431589d64af13d8c7f991

Former-commit-id: ce69843d03 [formerly b01f5697d3] [formerly c3b37bcb7b] [formerly ce69843d03 [formerly b01f5697d3] [formerly c3b37bcb7b] [formerly e9ca44ee64 [formerly c3b37bcb7b [formerly eab1cf126b79ec5708facf2b2c9a303fca8a24fe]]]]
Former-commit-id: e9ca44ee64
Former-commit-id: cb0d280f07 [formerly f58ec24a85] [formerly e0e97718894af1cacca9e7ad90e6c0f06ab94bc9 [formerly 56335703ac]]
Former-commit-id: 46397cb051fc12103f3f8b69b10417fac5d06ea6 [formerly 9a7b2e0246]
Former-commit-id: 93256c992d
2013-11-08 12:13:50 -06:00
Nate Jensen
0e0c59ef3e Issue #2361 fix map style preferences
Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049

Former-commit-id: f4167f3a52 [formerly 058c963aa2] [formerly ec319b7dd0] [formerly f4167f3a52 [formerly 058c963aa2] [formerly ec319b7dd0] [formerly 43bbf31347 [formerly ec319b7dd0 [formerly 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae]]]]
Former-commit-id: 43bbf31347
Former-commit-id: cfce0fd9e2 [formerly 8a27263b0c] [formerly 58a28ee555fbdc72d3afed2a0051022d9f1408dc [formerly 5ecde78b02]]
Former-commit-id: be82051ccc279ddfed81ab769462887cbcc8e51e [formerly f836fe065e]
Former-commit-id: 7ce7a168ec
2013-11-08 10:38:11 -06:00
Richard Peter
3ae3c53795 Merge "Issue #2361 remove viz.grid ISerializableObjects" into development
Former-commit-id: dcb0258a74 [formerly 44818e3dbd] [formerly 214a72ac69] [formerly dcb0258a74 [formerly 44818e3dbd] [formerly 214a72ac69] [formerly bb0dcf6d4a [formerly 214a72ac69 [formerly a227c2dcb2598f82756c3f6a9ac7999c06202177]]]]
Former-commit-id: bb0dcf6d4a
Former-commit-id: a57b316541 [formerly 990053c1fb] [formerly 90c1adbc58241688caf304cfe406e22783c132df [formerly 1909b0d06b]]
Former-commit-id: 3f8472c87316a647d353b02115489a9d4a38d059 [formerly 7725d0ee3e]
Former-commit-id: 103448070d
2013-11-08 10:35:41 -06:00
Slav Korolev
610731cadd Issue #2291. Fixed Shared Subscription Dialog.
Former-commit-id: 4b539632b4 [formerly 2d002ccde3] [formerly 59d1de165d] [formerly 4b539632b4 [formerly 2d002ccde3] [formerly 59d1de165d] [formerly 7b7754982c [formerly 59d1de165d [formerly f04678733c2368ca05b7b8fdbcfeb096940854df]]]]
Former-commit-id: 7b7754982c
Former-commit-id: 703c97394f [formerly 53b6d4aa69] [formerly c443ab7eec2c21f49cfe030af7a19a96edf9fde4 [formerly c4a633acde]]
Former-commit-id: 369d4648747db3fe93efc344fb30b11d4300ed64 [formerly 52807d248b]
Former-commit-id: 976e7eb56c
2013-11-08 11:09:21 -05:00
Nate Jensen
d10f11a69d Issue #2361 remove viz.grid ISerializableObjects
Change-Id: I76be90f90dedf5d5d5e3656d23bd1180de9014b8

Former-commit-id: a2f1b06201 [formerly bfc7c671cc] [formerly 88eb0aab5c] [formerly a2f1b06201 [formerly bfc7c671cc] [formerly 88eb0aab5c] [formerly 10548cd1c7 [formerly 88eb0aab5c [formerly 6dde4cfe4f7669cd3d3ca15bbb7f4ab2a1a50e92]]]]
Former-commit-id: 10548cd1c7
Former-commit-id: ea9e3cfa90 [formerly 13f93cd7cf] [formerly 82d0218a95268393d34492e76581a5826014b7de [formerly 48a479d2dc]]
Former-commit-id: 65285f57a454ddc0822938e99b50a026c2d72020 [formerly fc79c7053d]
Former-commit-id: a1ac54a09c
2013-11-08 09:42:09 -06:00
Richard Peter
1653772120 Merge "Issue #1678 Added support for stored query publishing and invocation on the registry" into development
Former-commit-id: 053df04bed [formerly 9111484d4f] [formerly 60b567eeae] [formerly 053df04bed [formerly 9111484d4f] [formerly 60b567eeae] [formerly 6fd6fd0725 [formerly 60b567eeae [formerly 003f889e8aa65c4f01287611518f92b7d8ef05dd]]]]
Former-commit-id: 6fd6fd0725
Former-commit-id: 319067cf2c [formerly 39a2c98779] [formerly c387f72730aa5a5ced5cd2dc475b078ea6fdcd78 [formerly 65628daf36]]
Former-commit-id: fd4c2f161638b1f0ddf3a7b0721bd50632c4e48e [formerly 7a316f69ef]
Former-commit-id: d12013bf63
2013-11-08 09:35:08 -06:00
Benjamin Phillippe
676b343d51 Issue #1678 Added support for stored query publishing and invocation on the registry
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f

Former-commit-id: 8f30c4f79a [formerly 0abf405014] [formerly b84235a80a] [formerly 8f30c4f79a [formerly 0abf405014] [formerly b84235a80a] [formerly b5db1f38c3 [formerly b84235a80a [formerly d7d985926351d933c0bd10a3a5fd88ef4305853b]]]]
Former-commit-id: b5db1f38c3
Former-commit-id: e5b40456ad [formerly bd3e4778c0] [formerly def1eae12e1318c52624530ccfdebf9fcfcd782b [formerly 1a492a564b]]
Former-commit-id: 0f22c99f4fef009e7f08d7bab6ac6c5ebfaa2cb3 [formerly 093b5eda6f]
Former-commit-id: b7b5787b5b
2013-11-07 18:36:46 -06:00
Nate Jensen
e9ed518a4b Merge "Issue #2515 upgraded camel from 2.11.0 to 2.11.2" into development
Former-commit-id: 29cb7860df [formerly 6ef029fba9] [formerly db5ee537a8] [formerly 29cb7860df [formerly 6ef029fba9] [formerly db5ee537a8] [formerly f677dd6415 [formerly db5ee537a8 [formerly cd816c1507ff5b413b6312fb6d7d83cff29436e1]]]]
Former-commit-id: f677dd6415
Former-commit-id: 978ffe10d2 [formerly 77af220675] [formerly b324fd4364baaa08fa068844e89c9cf48abc7967 [formerly 1b7b698c31]]
Former-commit-id: 6718576962939c98f3cfaaf3ce91678ff39bd3b5 [formerly 526b900d17]
Former-commit-id: f42279eafb
2013-11-07 16:59:35 -06:00
Brian Clements
01b43748e3 Issue #2515 upgraded camel from 2.11.0 to 2.11.2
removed log showBody workaround


Former-commit-id: b21233ec65 [formerly 6f0630aa55] [formerly 4f374688c8] [formerly b21233ec65 [formerly 6f0630aa55] [formerly 4f374688c8] [formerly ea6b162369 [formerly 4f374688c8 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]]]]
Former-commit-id: ea6b162369
Former-commit-id: 8feab3c298 [formerly 83edfb5349] [formerly 82443edd368b60c7bbdfdc3a561f8cc96b1eb818 [formerly a5b61b6d22]]
Former-commit-id: b12cec907353dc39ab55060375f514735f428cb0 [formerly 6772e50e80]
Former-commit-id: 1369b5d57a
2013-11-07 16:56:25 -06:00
Nate Jensen
20c3daaf3f Merge "Issue #2361 remove ISerializableObject from datadelivery.retrieval" into development
Former-commit-id: ceeebbe98a [formerly b9c95aadc0] [formerly f4fcd9e604] [formerly ceeebbe98a [formerly b9c95aadc0] [formerly f4fcd9e604] [formerly 7877229eac [formerly f4fcd9e604 [formerly 7c4748fa0348820f0cf65330889253a04b4fab28]]]]
Former-commit-id: 7877229eac
Former-commit-id: 5ba4e05a2b [formerly 97acbb8426] [formerly 55061da458b20e53d3ea47f041dcdeabeee85811 [formerly 1de52a9ea8]]
Former-commit-id: 5f5a2ae9511a325ea599d21f8125f35eb3ac806c [formerly 90bb5aa285]
Former-commit-id: 43a40d9ab6
2013-11-07 16:39:50 -06:00
Ron Anderson
ac6655c2f6 Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development
Former-commit-id: 0e711414f0 [formerly c611ab48be] [formerly 12192b633f] [formerly 0e711414f0 [formerly c611ab48be] [formerly 12192b633f] [formerly c1bda09fd9 [formerly 12192b633f [formerly c5da4c8a79432aab321d42f94b9cff04866671aa]]]]
Former-commit-id: c1bda09fd9
Former-commit-id: 3c00925d0d [formerly 6636ebeb2d] [formerly 612d699e0836406e0067c8e7bec339b293fcd4b7 [formerly d2cd7c1257]]
Former-commit-id: 400d02ff70cb29da06b7aecd2ae4b2284bb45dfe [formerly 4e8df8ea5b]
Former-commit-id: bc734d5611
2013-11-07 14:39:06 -06:00
Ron Anderson
33c8d2300b Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: 143847e37d [formerly 0bfd9a1c98] [formerly a5bc64473a] [formerly 143847e37d [formerly 0bfd9a1c98] [formerly a5bc64473a] [formerly 42229b8eee [formerly a5bc64473a [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]]]]
Former-commit-id: 42229b8eee
Former-commit-id: 7f62cacd3b [formerly 9d56a36dbe] [formerly bbdfb7b1f3c5e064c379a3b9b24470e4ae2b4b73 [formerly 6442e2e933]]
Former-commit-id: 0dc39943f970c9aa139fc1b7cec8d35b83776fcb [formerly 298f4abbae]
Former-commit-id: cc95af7fa8
2013-11-07 14:38:39 -06:00
Richard Peter
0bcf000a31 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: 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 93c776022a [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]]
Former-commit-id: 93c776022a
Former-commit-id: aec254aac0 [formerly c97efbf656] [formerly 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4 [formerly 520dd57f02]]
Former-commit-id: 8eb1848d92c6225ecf7e4aff08b65f9f7fc71abe [formerly 910464ea6a]
Former-commit-id: 94e0faa6c6
2013-11-07 14:25:45 -06:00
Nate Jensen
c583d38ebe Issue #2361 remove ISerializableObject from datadelivery.retrieval
Change-Id: I9ec15b17760bcb4382898101f10ce1b17f55eb39

Former-commit-id: 576f55bb72 [formerly 6c1c3d77be] [formerly 852751784b] [formerly 576f55bb72 [formerly 6c1c3d77be] [formerly 852751784b] [formerly 6abe031dfe [formerly 852751784b [formerly 0cc1dd3988f7d02d609246dba863552b46127db2]]]]
Former-commit-id: 6abe031dfe
Former-commit-id: a6a21bfcf3 [formerly 0c9d826ab4] [formerly 1162509527d0eb2d7d521c021ae17e289d8b58fa [formerly afcbc9e01a]]
Former-commit-id: c97bab9cc31d168f80729bc1a20fb98781a4b1be [formerly e579b6e75b]
Former-commit-id: 4cc2354b21
2013-11-07 13:18:21 -06:00
Greg Armendariz
bbb5440109 Merge branch 'development' into development_on_RHEL6
Former-commit-id: b9a8dfd99f [formerly 805783d8da] [formerly da16b623e1] [formerly b9a8dfd99f [formerly 805783d8da] [formerly da16b623e1] [formerly 6456b3a17b [formerly da16b623e1 [formerly d12afc98a3fda9c186e87368c53ddc100d4bf2c1]]]]
Former-commit-id: 6456b3a17b
Former-commit-id: 409990c09b [formerly 88ec9027bc] [formerly ece4acb7d4c6e6c8bc0fa11c3b4893ee1529b1dc [formerly 009c5771fd]]
Former-commit-id: e59edb73dcfbdf8ec67c3727427ad1aaf61b7e80 [formerly 390d3b57e1]
Former-commit-id: 35e634b5fa
2013-11-07 12:25:24 -06:00
Nate Jensen
d6a8baf2a9 Issue #2361 speed up map initialization by moving field queries off UI
thread

Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5

Former-commit-id: f1c965dde8 [formerly a52e7b677f] [formerly d4b6ad1eee] [formerly f1c965dde8 [formerly a52e7b677f] [formerly d4b6ad1eee] [formerly cc2998b487 [formerly d4b6ad1eee [formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]]]]
Former-commit-id: cc2998b487
Former-commit-id: 18e78887eb [formerly 286c7a8b1c] [formerly e9d19e83f112f896de07de1942d732fe53f9487d [formerly ce583a88fb]]
Former-commit-id: 82fc251ad0fbe29a980c82772d008c107d18cf35 [formerly 57f237693e]
Former-commit-id: 03911b4ce8
2013-11-07 11:44:07 -06:00
Steve Harris
d77d7b1fd9 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d92a449ab3 [formerly b4a37cc39d] [formerly 51ff88796c] [formerly d92a449ab3 [formerly b4a37cc39d] [formerly 51ff88796c] [formerly 3236374cc0 [formerly 51ff88796c [formerly 2a95ac857fe960ed2147545731acc3c093bb73b5]]]]
Former-commit-id: 3236374cc0
Former-commit-id: 832c44a4e6 [formerly 9141c578ff] [formerly 5d7fccdc69b60104c2941a8a74d13d1bd1961367 [formerly 224d25217b]]
Former-commit-id: e02f80e24423e7e8e2998678d5432edcadfe3e61 [formerly 8f4de4a210]
Former-commit-id: 02311b3b5d
2013-11-07 11:37:25 -06:00
David Gillingham
d918c5e1fa Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: 7c39d4e45b [formerly 3df38a8d41] [formerly e1df69e312] [formerly 7c39d4e45b [formerly 3df38a8d41] [formerly e1df69e312] [formerly 0e74638eb2 [formerly e1df69e312 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]]]
Former-commit-id: 0e74638eb2
Former-commit-id: 2cd30bab98 [formerly 1ed80f471c] [formerly 90a0e1bc7e0ea65d26c6784350bcc46d6a2824c9 [formerly d0b188d577]]
Former-commit-id: 253f6827d6bd7e24ee2c90bede0d9493ee7db128 [formerly 50f9ad420b]
Former-commit-id: be9ed341f5
2013-11-07 11:36:49 -06:00
Steve Harris
0a1446c0ca 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: 0f37de2155 [formerly dbd8615fc6] [formerly b93c4d7cd0] [formerly 0f37de2155 [formerly dbd8615fc6] [formerly b93c4d7cd0] [formerly 47778131b0 [formerly b93c4d7cd0 [formerly 433ccf0db5946e18c81e20ec689c9911868fe4c2]]]]
Former-commit-id: 47778131b0
Former-commit-id: c221d78097 [formerly 687b0848ee] [formerly 73554f8c6995705d78460251d3f25f87c8a32fbf [formerly 079a007217]]
Former-commit-id: d7860f8347a6475cb19459768957483d014d7ac4 [formerly bf0d783e52]
Former-commit-id: 0b0c0e247b
2013-11-07 11:32:42 -06:00
Steve Harris
f1688d58e6 13.5.3-5 baseline
Former-commit-id: 257f69c55c [formerly 5b3cd9befd] [formerly 06b5e0e0ec] [formerly 257f69c55c [formerly 5b3cd9befd] [formerly 06b5e0e0ec] [formerly f175680b89 [formerly 06b5e0e0ec [formerly 427119d391ffb23c0db3fa0dab0a893322a60f8c]]]]
Former-commit-id: f175680b89
Former-commit-id: 3fac0e0b27 [formerly d9efe087e5] [formerly cae6925bd9b5a490e72c32e60a0c8c7f114e2386 [formerly 31b57882cb]]
Former-commit-id: 2004c192e88b30c3491b310a59ba776377cf312a [formerly b816e9e555]
Former-commit-id: e8e1307ee0
2013-11-07 12:22:32 -05:00
Steve Harris
2e232ef98b 14.1.1-7 baseline (addendum 1)
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml


Former-commit-id: 824866bca8 [formerly abbecba957] [formerly 2d36bc2c1f] [formerly 824866bca8 [formerly abbecba957] [formerly 2d36bc2c1f] [formerly b835dad501 [formerly 2d36bc2c1f [formerly 07f7c24804028aed71fc29cdf6f163a9e9d15623]]]]
Former-commit-id: b835dad501
Former-commit-id: 93e9333a2e [formerly a72bb1669f] [formerly 9b114a2ed684d2ac0bd0e804a8a6594626e1cb9e [formerly 155bc487ff]]
Former-commit-id: 737ca6e05fd52830b53be9e17988723ac9e005e6 [formerly fdad37d271]
Former-commit-id: 43b93250c0
2013-11-07 12:09:23 -05:00
Nate Jensen
a92805ee0a Merge "Issue #2514 updated comments and history for OGC classes" into development
Former-commit-id: 5892894c4c [formerly 852dfae29c] [formerly e84d6cf1b5] [formerly 5892894c4c [formerly 852dfae29c] [formerly e84d6cf1b5] [formerly 3c335ed78f [formerly e84d6cf1b5 [formerly 5e5b1b53cf79fd058f65451aee4f255a73252ca1]]]]
Former-commit-id: 3c335ed78f
Former-commit-id: a08adbc1f4 [formerly adde0aee83] [formerly 03b247e2b8fe2314f2bed222badfa9a2365c9429 [formerly 5866e416f6]]
Former-commit-id: ccd5e6f0d53118bc9d42ca863066581f0958cd51 [formerly 0b5cc2920f]
Former-commit-id: 23922309d3
2013-11-07 10:45:03 -06:00
Nate Jensen
6e58455162 Merge "Issue #2530 Fixed ingest JVM crash on startup" into development
Former-commit-id: b6a07f8be2 [formerly a2a43a55a6] [formerly 0797f54a93] [formerly b6a07f8be2 [formerly a2a43a55a6] [formerly 0797f54a93] [formerly 7b18c745d3 [formerly 0797f54a93 [formerly ba63e0d32f333fb2acaee2b15253f7cffb7122d4]]]]
Former-commit-id: 7b18c745d3
Former-commit-id: 83e6f44981 [formerly 1a6dad4c53] [formerly efa348e5306654c1928c7e40e73494185ea63ae4 [formerly f3d235a3f8]]
Former-commit-id: 5361361d84650efe730edf44505bc1bcca7f38ff [formerly ebdd3effe9]
Former-commit-id: 642d4c5147
2013-11-07 10:44:46 -06:00
Benjamin Phillippe
bda2b50c77 Issue #2530 Fixed ingest JVM crash on startup
Change-Id: Ia3256e509d3ecea06e7c1736330987a8db5bafa3

Former-commit-id: b0b0db8997 [formerly 8d47d1bbd4] [formerly 7d605c471e] [formerly b0b0db8997 [formerly 8d47d1bbd4] [formerly 7d605c471e] [formerly 3561293fdd [formerly 7d605c471e [formerly 0cf0136f3cb25328d3a65d15a12cd0a4f4867fcb]]]]
Former-commit-id: 3561293fdd
Former-commit-id: 88ad5b8798 [formerly 1a8d9bf754] [formerly 5916d9463f4f9e78b13a0ca2b1f25ea05c004a76 [formerly a9f8468c0e]]
Former-commit-id: 721839ff39274d6d74267e59536d103416ec4a35 [formerly dc607f89b1]
Former-commit-id: 64efd70b04
2013-11-07 10:38:53 -06:00
Nate Jensen
723a53858c 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: 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 38a5ae5e5f [formerly f5feb9330f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: 794d57fe7b [formerly c27c435cea] [formerly 6bfd1d4e327eb46835ec16594b542ffb4c74bf7e [formerly 1b7ac545f8]]
Former-commit-id: ac8b2a6231c9af1c1a85121d551f6695b476f896 [formerly acec588299]
Former-commit-id: acccf2c827
2013-11-07 10:21:42 -06:00
Dave Hladky
ea9d193ed9 Issue #2529 Move DD edex event plugin from DD feature to DD core feature.
Former-commit-id: 9505706e96 [formerly 1a5ddfbd5e] [formerly f6996f9f5a] [formerly 9505706e96 [formerly 1a5ddfbd5e] [formerly f6996f9f5a] [formerly 5d3023d2f5 [formerly f6996f9f5a [formerly cce7fc47a0a4cdb55712ee3af942e93cb8a7c797]]]]
Former-commit-id: 5d3023d2f5
Former-commit-id: f081565dc7 [formerly f62685926a] [formerly cf4c6bb96f1a6ffce51a7751fd886b822c652e36 [formerly 5891412fb3]]
Former-commit-id: 61deb96b4063ff7d6a82bbc2cf7bd4504f9b42b6 [formerly a70f11148c]
Former-commit-id: 18724a945f
2013-11-07 10:08:01 -06:00
Nate Jensen
39a9444ece Merge "Issue #2511 fix for edex localization adapter to allow filename to appear in path" into development
Former-commit-id: 4c311bb740 [formerly 812f3fefce] [formerly 348a968aed] [formerly 4c311bb740 [formerly 812f3fefce] [formerly 348a968aed] [formerly 68c7d378cf [formerly 348a968aed [formerly c2ca50713aa5e69aecdc6a5a0b04c7261305514c]]]]
Former-commit-id: 68c7d378cf
Former-commit-id: bc622dacd0 [formerly 2f4c4833d3] [formerly e622a77e09362970afb8d20642b1057a2b7d7989 [formerly d1f45128aa]]
Former-commit-id: a1ca2b7306fbb5776d4cd6f317db5ac537431543 [formerly 64f064e15f]
Former-commit-id: 6446dbabbe
2013-11-07 09:15:02 -06:00
Steve Harris
b05c9a6aa2 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 626b91c9c7 [formerly 2a8e926976] [formerly 108a4d908d] [formerly 626b91c9c7 [formerly 2a8e926976] [formerly 108a4d908d] [formerly 1b3d4c8f67 [formerly 108a4d908d [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: b3f0cc869f [formerly a6ae5f9c2f] [formerly 8546b81d3f134c79637c6f5400cc76bdbfb21abe [formerly 50d60d8101]]
Former-commit-id: d0d675db0d0de1c4bbc79b22fb517649fb9235ae [formerly 930b6ddb77]
Former-commit-id: eec64a2dbc
2013-11-06 18:31:05 -06:00
Bryan Kowal
408ea758c0 13.5.3 build "fix"
Former-commit-id: b94071a58b [formerly 503762af19] [formerly 6692b985f3] [formerly b94071a58b [formerly 503762af19] [formerly 6692b985f3] [formerly a28133117c [formerly 6692b985f3 [formerly 084e906e9f85ebd11cabf6e14e94ac75d25a0af2]]]]
Former-commit-id: a28133117c
Former-commit-id: a18f2109cf [formerly cdf643510a] [formerly 120324fb9c6e8815d7af7c3a1fc21863b808696c [formerly ce6d80409d]]
Former-commit-id: 6c29059a60fba8e9efc87bc58e54da72abb857db [formerly b04aa07437]
Former-commit-id: 8fb72374e9
2013-11-06 18:25:10 -06:00
Nate Jensen
dcbee2bb80 Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 1da0e31b88 [formerly 0f4ba6f90e [formerly 2c506552014e60344c5b2014bed32edab2630f47]]]]
Former-commit-id: 1da0e31b88
Former-commit-id: d2bb313a16 [formerly 048d52722f] [formerly 60a2289740b7f6e8da01f653e591eb2ce94a6c58 [formerly aef895c447]]
Former-commit-id: 5e1c394f1e0afad2bb68c0406f91df8e82544280 [formerly 0ae0e070c9]
Former-commit-id: f9be4065ec
2013-11-06 17:07:10 -06:00
Brian Clements
04c8d5df5f Issue #2514 updated comments and history for OGC classes
removed dead and duplicate code from OGC


Former-commit-id: 5bf229d57c [formerly 4a673c2896] [formerly 308b06a47a] [formerly 5bf229d57c [formerly 4a673c2896] [formerly 308b06a47a] [formerly 525da47317 [formerly 308b06a47a [formerly c13d5788a39898ef746b535d959bc845b6acad9c]]]]
Former-commit-id: 525da47317
Former-commit-id: d0b356865a [formerly e74f7e2483] [formerly f48b9c6407a4de20fe768956be592b7bb91c12d1 [formerly d1207aa0b5]]
Former-commit-id: d9f6967d36d9c745131ebf571b5d16cd148cf0a4 [formerly 80b395db55]
Former-commit-id: 1529d9c37b
2013-11-06 16:07:22 -06:00
Richard Peter
4bf67bb135 Merge "Issue #2478: Remove blank lines in debug" into omaha_13.5.3
Former-commit-id: dd7ae670e2 [formerly 436389b782] [formerly aa82fb8c91] [formerly dd7ae670e2 [formerly 436389b782] [formerly aa82fb8c91] [formerly cf7c70beac [formerly aa82fb8c91 [formerly a3130561e8705464873251575f569d6be95ade3d]]]]
Former-commit-id: cf7c70beac
Former-commit-id: 2f88c16e6d [formerly 082a8d0a94] [formerly 1fd2158b2d51bd039d1bacd4bddc1a47f39063ee [formerly 0e48596ca7]]
Former-commit-id: 3576f38bc45eebb766b4fff770f6436e4431fa4b [formerly 28e9ef5821]
Former-commit-id: bc794bccfc
2013-11-06 16:04:20 -06:00
Richard Peter
82710c3224 Issue #2478: Remove blank lines in debug
Former-commit-id: 81279edc30 [formerly f099fb6936] [formerly 357eb79519] [formerly 81279edc30 [formerly f099fb6936] [formerly 357eb79519] [formerly 18eff02d7a [formerly 357eb79519 [formerly 489528b7869254f69ea65391b576e82e67cbfc8f]]]]
Former-commit-id: 18eff02d7a
Former-commit-id: e3ab7a38e4 [formerly b62dd96321] [formerly e63155859c1fd922ae1be9fae52888b1ef1f2982 [formerly 46f19c22ea]]
Former-commit-id: c2f561874f56e0e5fbe1103b750baac7f6ca5f8a [formerly c9f1b21c01]
Former-commit-id: e776e6e03c
2013-11-06 16:03:45 -06:00
Bryan Kowal
4199291c39 Merge branch 'omaha_13.5.3' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_13.5.3
Former-commit-id: 2a73a304b5 [formerly cd3e1d7aa4] [formerly d26d6a396f] [formerly 2a73a304b5 [formerly cd3e1d7aa4] [formerly d26d6a396f] [formerly 100e14439e [formerly d26d6a396f [formerly b171b7e66031ef05d98cb9a0819df6717acf0ba6]]]]
Former-commit-id: 100e14439e
Former-commit-id: ed155b4bc8 [formerly cdf1cb2ac6] [formerly 13425950750b9923f86327c13d4018c797064f14 [formerly 40c3059cc2]]
Former-commit-id: cddda8a79fb5bee0ad55af9b596cc6173e37c721 [formerly 1c7e5b91b7]
Former-commit-id: 017290d6a2
2013-11-06 15:58:06 -06:00
Bryan Kowal
1ba0d971d1 Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 21df98b0bc [formerly 0f104b0365] [formerly 4f1c083032] [formerly 21df98b0bc [formerly 0f104b0365] [formerly 4f1c083032] [formerly bb15605aa2 [formerly 4f1c083032 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]]]
Former-commit-id: bb15605aa2
Former-commit-id: 4d95bba61e [formerly 0b006511dc] [formerly 0befac69bd8c3c5e0fa05e61b8473d5f24fccdaf [formerly 0bc8cdc9be]]
Former-commit-id: edff81ecd29901669108323c8ac182f45413fdbf [formerly 46616c32eb]
Former-commit-id: bdc76d27b2
2013-11-06 15:57:14 -06:00
Richard Peter
0b237469af Issue #2478: Update log message
Former-commit-id: 1e10d9e303 [formerly d4bf633bd2] [formerly f9faa53eb4] [formerly 1e10d9e303 [formerly d4bf633bd2] [formerly f9faa53eb4] [formerly b0746db723 [formerly f9faa53eb4 [formerly ab993718b7e4f2b77461226a49bee76813166dbb]]]]
Former-commit-id: b0746db723
Former-commit-id: 1f5a97c4ab [formerly 6e929c0dee] [formerly 1268ba531f54842268c09b3d7604419aa390dbd3 [formerly f1a67f4dc1]]
Former-commit-id: 1feb0b173ce191c0a6d9d97c8f99c3ac0b997cb1 [formerly 7dcd8afea2]
Former-commit-id: 4b021a422a
2013-11-06 15:45:23 -06:00
Lee Venable
51842a1676 Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 20726d4e7c [formerly 8585080cd1 [formerly 13672783e6a5e452cb4105669a98708329b35541]]]]
Former-commit-id: 20726d4e7c
Former-commit-id: a6557a089e [formerly 9a8a813cf8] [formerly 907b407668322fa5a6d3d3f60d0cc9f6969d6ada [formerly 0c4566c411]]
Former-commit-id: 17cb4eac030cecf14dfda06979b1f5d64d077baf [formerly 5627ef0cc8]
Former-commit-id: 3cc206a34f
2013-11-06 15:42:40 -06:00