Commit graph

1909 commits

Author SHA1 Message Date
Richard Peter
ff729f46b5 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: 061fa07147 [formerly 7ba466f5a6] [formerly 306bd6fae1] [formerly 061fa07147 [formerly 7ba466f5a6] [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 112816a54c [formerly 3f68fc6eed] [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d [formerly 59671c1e7d]]
Former-commit-id: 8b93a7813019963981a150f64ec44daf5d188cde [formerly c8ef435295]
Former-commit-id: ef23a8f65b
2013-11-12 11:11:36 -06:00
Nate Jensen
2a8ab782d9 Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
Former-commit-id: 178e212c4b [formerly 8ff0d1129a] [formerly 3ed50ff500] [formerly 178e212c4b [formerly 8ff0d1129a] [formerly 3ed50ff500] [formerly 23fe7de462 [formerly 3ed50ff500 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]]]]
Former-commit-id: 23fe7de462
Former-commit-id: d3cadd78d6 [formerly c84ff18213] [formerly bbd9ec0c716072ceca26f944c7f0c8aec819db11 [formerly 90320ab47a]]
Former-commit-id: 045aa7ae34ea554793e18d0e4a7e5292445bcbfa [formerly da95b6f03e]
Former-commit-id: 47e4b7e7e6
2013-11-12 09:29:46 -06:00
Bryan Kowal
25bbbb75b1 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: d369a33bf0 [formerly 6b5f93117e] [formerly 8e1c0fb8eb] [formerly d369a33bf0 [formerly 6b5f93117e] [formerly 8e1c0fb8eb] [formerly 75e6914df1 [formerly 8e1c0fb8eb [formerly 315ca002de4045f0d7ae6b298012365a052a7430]]]]
Former-commit-id: 75e6914df1
Former-commit-id: 5bfc4d4dda [formerly 1a966d8ec2] [formerly 117ea92d58b5f7e0d20d3bd89d1f4e7c6c26b7f1 [formerly 5c38f0bfd6]]
Former-commit-id: 4274b56b364d7382bd0a540b4a1fb3f80b4ad82e [formerly 2565306c95]
Former-commit-id: adf5ac93ae
2013-11-11 17:00:17 -06:00
Nate Jensen
bf6bd95340 Issue #2361 undo earlier changes that potentially break uengine based
local apps

Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65

Former-commit-id: cf88b536e0 [formerly bb93c18e7d] [formerly 8628b7755e] [formerly cf88b536e0 [formerly bb93c18e7d] [formerly 8628b7755e] [formerly a2935193b5 [formerly 8628b7755e [formerly 110cff66bb2cf847730562570a9415851e0362c2]]]]
Former-commit-id: a2935193b5
Former-commit-id: e62a756cbc [formerly e1138809e7] [formerly 32cf218a7d8218d000be9f55fd45198a966abf60 [formerly 9dc69e316f]]
Former-commit-id: 3d8ba4a78981bc94ebb58b70b40e630f9143b086 [formerly 5c30fd5b5c]
Former-commit-id: cad09aed0b
2013-11-11 16:14:35 -06:00
Nate Jensen
46fd118602 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: a349a980d3 [formerly a3fd84d9ef] [formerly 7dda17a660] [formerly a349a980d3 [formerly a3fd84d9ef] [formerly 7dda17a660] [formerly 05ee46c4bc [formerly 7dda17a660 [formerly 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec]]]]
Former-commit-id: 05ee46c4bc
Former-commit-id: bdfe31ca9d [formerly 208cc6a534] [formerly bde810fa0fc654c54b6988c3f5dabe5ab75424e3 [formerly 64df0d8d8f]]
Former-commit-id: f5d0c26157b0203df59e509eceb3715e4f4503f8 [formerly 175cc8dd74]
Former-commit-id: 3ef3e4453d
2013-11-11 14:05:11 -06:00
Richard Peter
2de2d7caf1 Merge "Issue #2506 Refactored RegistryEvent constructors." into development
Former-commit-id: 8a3069e8e3 [formerly d55e99dc2d] [formerly 13989d9c6e] [formerly 8a3069e8e3 [formerly d55e99dc2d] [formerly 13989d9c6e] [formerly 51649b56e5 [formerly 13989d9c6e [formerly dd8f83135b04ff4510b1f860846f1a6a3db09f47]]]]
Former-commit-id: 51649b56e5
Former-commit-id: 9600b1a10e [formerly 0e1ec70a0d] [formerly 01640204f77e3bf9716a94b6d6df69c22e18cadd [formerly 8db2d589e3]]
Former-commit-id: 20ceb44a11e028f3d19c229ae8168e464ecb87fe [formerly a40c837424]
Former-commit-id: a053714acf
2013-11-11 13:09:24 -06:00
Bryan Kowal
f190760123 Issue #2297 - fix 14.2.1 merge
Former-commit-id: 8d412d7aa0 [formerly fee6a5dc9c] [formerly e2a02ca247] [formerly 8d412d7aa0 [formerly fee6a5dc9c] [formerly e2a02ca247] [formerly 411e0fa7c4 [formerly e2a02ca247 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]]]]
Former-commit-id: 411e0fa7c4
Former-commit-id: 608f00417e [formerly b1a6d2d828] [formerly 9608fdc09cce1ba5077a173bab8ffc316408830f [formerly e937ba954b]]
Former-commit-id: 0775c166800f807532941473117b90119faa9398 [formerly 18bb3ef947]
Former-commit-id: f986662369
2013-11-11 13:04:21 -06:00
Steve Harris
8c0239d4e9 Merge branch 'omaha_13.5.3' (13.5.3-6) into development
Former-commit-id: cf9f426faa [formerly 33e02b548d] [formerly fbfe1a5faf] [formerly cf9f426faa [formerly 33e02b548d] [formerly fbfe1a5faf] [formerly 8a2e9f1725 [formerly fbfe1a5faf [formerly a4c8e9a5fb9d50844da854e453b6146c2a6e75c3]]]]
Former-commit-id: 8a2e9f1725
Former-commit-id: ef183dd7af [formerly 4e09ce78c8] [formerly acaa9065d51878d26f0253e193ea63bd14a6d273 [formerly b4fe17406f]]
Former-commit-id: f7cc13eda46ebb68547c95ae89a815a7690440c4 [formerly 76ca0835e7]
Former-commit-id: c9bbd30adf
2013-11-11 11:45:35 -06: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
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
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
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
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
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
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
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
Nate Jensen
2e73b9e045 Merge "Issue #2525 GSD doesn't want "/wfs" appended by the DPA. Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370" into development
Former-commit-id: 428bff44e7 [formerly 53e94b4bdc] [formerly 4309555b45] [formerly 428bff44e7 [formerly 53e94b4bdc] [formerly 4309555b45] [formerly eae6b2526d [formerly 4309555b45 [formerly a6cf090becd6da2c3fba1a2d46297c475be9d610]]]]
Former-commit-id: eae6b2526d
Former-commit-id: bdf7ba948a [formerly e4c3c3a2ad] [formerly 028b9b6ed361721f72c3b96a53739079cd89fd01 [formerly ed9515eea8]]
Former-commit-id: 7609129d8d0477388dfe611d8af9afb8f7b5d232 [formerly 97034141b3]
Former-commit-id: 1a1a280d43
2013-11-06 15:41:29 -06:00
Nate Jensen
9eaf76fa66 Merge "Issue #2522 removing WCS and WMS from baseline" into development
Former-commit-id: 784f6dca81 [formerly 327f44aaff] [formerly 1020b453f2] [formerly 784f6dca81 [formerly 327f44aaff] [formerly 1020b453f2] [formerly f3ea98778e [formerly 1020b453f2 [formerly c4f29baf5ac830404a7e7739626b9a861844ec06]]]]
Former-commit-id: f3ea98778e
Former-commit-id: bc7db2cd24 [formerly 8cacf1c915] [formerly f7629521b564f5f8ff6aae8cc5a34298c12d3144 [formerly 3169c86070]]
Former-commit-id: f0ee16eb2b93bc88adb959652bf0b98159a10d27 [formerly da640f45d9]
Former-commit-id: 7ae88e6a91
2013-11-06 15:40:16 -06:00
Dave Hladky
0f88775389 Issue #2525 GSD doesn't want "/wfs" appended by the DPA.
Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370

Former-commit-id: 305739eb13 [formerly 62cd5b514d] [formerly b0d929231c] [formerly 305739eb13 [formerly 62cd5b514d] [formerly b0d929231c] [formerly b2b44cd1d2 [formerly b0d929231c [formerly 03cfdbd4c8c74da4200781b8b716181eac759195]]]]
Former-commit-id: b2b44cd1d2
Former-commit-id: ac0d00e3d6 [formerly 7ddd6d4c61] [formerly 4dc511c73e193c9587b7cdc0e8b0ac3f2f661db4 [formerly 35bc4378ca]]
Former-commit-id: ad849d66b0caa535fb7690f603fd59b0b3a80bf4 [formerly d3bd916cf4]
Former-commit-id: ffaa5d5480
2013-11-06 15:23:02 -06:00
Max Schenkelberg
fe791cc7f7 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
Amend: Fixed precision issue with float comparison, made factory better synchronized.

Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2

Former-commit-id: 3af5098e1b [formerly d7c8b8f662] [formerly 3369fbec2d] [formerly 3af5098e1b [formerly d7c8b8f662] [formerly 3369fbec2d] [formerly c28fd2b38d [formerly 3369fbec2d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]]]
Former-commit-id: c28fd2b38d
Former-commit-id: f88d913d31 [formerly e4b7f3618c] [formerly aa835a1580556a0e2e44448d20c96e5e1b78baed [formerly d53db3ddb6]]
Former-commit-id: 2e6b0a3f93931cd0f795d381bd6ddbc9268e4f25 [formerly 751b8f2315]
Former-commit-id: 53363b9bf7
2013-11-06 15:07:18 -06:00
Richard Peter
1dcfb3623b Merge "Issue #2494 Updated to use thread logger" into development
Former-commit-id: ff8db01e5f [formerly 3c49575ca0] [formerly 22bd1521be] [formerly ff8db01e5f [formerly 3c49575ca0] [formerly 22bd1521be] [formerly 10160e3783 [formerly 22bd1521be [formerly 8eb668a14e1674b3a67816c26b2baeb7c8f45fba]]]]
Former-commit-id: 10160e3783
Former-commit-id: 17c915ea58 [formerly b10d5952c0] [formerly fcaf2937a71343d6834a55f38f658f6c7fdbaa88 [formerly 88dbe31908]]
Former-commit-id: e8555088e0c72303d6f761ef669d51817d7e2de9 [formerly 28744971c4]
Former-commit-id: 70d5d65f35
2013-11-06 14:03:34 -06:00
Richard Peter
c0a20759e1 Merge "Issue #2450 - Send notifications to Notification Center when subscriptions expire. peer review comments" into development
Former-commit-id: 8ce3319d80 [formerly a699fed28b] [formerly 2e162de539] [formerly 8ce3319d80 [formerly a699fed28b] [formerly 2e162de539] [formerly d9c878bc51 [formerly 2e162de539 [formerly e52828f36303bd39521381149b0f585b6eb38439]]]]
Former-commit-id: d9c878bc51
Former-commit-id: 81b11b8309 [formerly e480cefa56] [formerly 886471047e9c7c9cec1530df34593c4836a27792 [formerly cdc4a81cc5]]
Former-commit-id: ead7424c788d1482ff79182612b8e1f6341946a8 [formerly a76579cf4e]
Former-commit-id: fda9c8fbba
2013-11-06 14:02:51 -06:00
Richard Peter
796bf9ff56 Merge "Issue #2499: Fix build" into omaha_13.5.3
Former-commit-id: 7d6785bd2d [formerly b4a0f11c66] [formerly 27aa0dd6ba] [formerly 7d6785bd2d [formerly b4a0f11c66] [formerly 27aa0dd6ba] [formerly 6ccb444219 [formerly 27aa0dd6ba [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]]]
Former-commit-id: 6ccb444219
Former-commit-id: db1def7540 [formerly 6b8bea4af5] [formerly 4b2de4194c997d5f3e973c7bdd1eeaca08c1345f [formerly f4bdb0caea]]
Former-commit-id: 0636b67d16f31ddc34f0ddaf9f6885cf8474beca [formerly b52c9482ea]
Former-commit-id: f39e0c68c0
2013-11-06 13:44:11 -06:00
Ben Steffensmeier
235cea183a Issue #2493 remove mesowest.
Former-commit-id: c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly 36916fedcd [formerly d0b7966458 [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]]
Former-commit-id: 36916fedcd
Former-commit-id: 726d1728fd [formerly 5d31aad5c2] [formerly 80b4ead107b43174bee5092e0af3bc24e421205f [formerly baebe37ba6]]
Former-commit-id: 855d5e9d4e64a0a70aaec8f5743dc44310b552bb [formerly afe014af99]
Former-commit-id: 925d8bca38
2013-11-06 13:42:38 -06:00
Matt Nash
c545b523bd Issue #2511 fix for edex localization adapter to allow filename to appear in path
Change-Id: I9fea157a67799e1168d4b5f7efaf5ef6cdd64933

Former-commit-id: a8dfdabe2a [formerly 5ab51caf38] [formerly 19bfe014c9] [formerly a8dfdabe2a [formerly 5ab51caf38] [formerly 19bfe014c9] [formerly b3ac4b7a9c [formerly 19bfe014c9 [formerly 8404299627c7d27731910821befc068767c43aa1]]]]
Former-commit-id: b3ac4b7a9c
Former-commit-id: a59609ecd8 [formerly 14e606f17d] [formerly cff015b05c205c6fec43bba94210ba6eaa1072af [formerly 65696b4148]]
Former-commit-id: deaab20a5011b3a3d8e09725b1406337afa02da4 [formerly 3445b9cbb5]
Former-commit-id: b08dedefae
2013-11-06 13:35:11 -06:00