Commit graph

4325 commits

Author SHA1 Message Date
Brian Clements
9f7e85450d Issue #2539 removed java 7 specific code from exception subclass
Former-commit-id: 4050eb5f3e [formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]
Former-commit-id: 8b0e85f82c
2013-11-12 12:41:50 -06:00
Nate Jensen
b71f2463da Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
Former-commit-id: eed4c8604b [formerly 2279e785ab3e47008afee489c1a4e96972f26b79]
Former-commit-id: 3f86a3735e
2013-11-12 12:13:58 -06:00
Richard Peter
4d82382054 Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
Former-commit-id: 61fc3eba44 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]
Former-commit-id: 8afc87e570
2013-11-12 11:18:56 -06:00
Richard Peter
7ba466f5a6 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: 460a7b8b5d [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]
Former-commit-id: 306bd6fae1
2013-11-12 11:11:36 -06:00
Nate Jensen
6c016a6bb6 Issue #2361 static lazy initialization of SubscriptionOverlapService's
JAXBManager

Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac

Former-commit-id: 2cdc7e5e63 [formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]
Former-commit-id: 1ee5d91af2
2013-11-12 11:03:51 -06:00
Dave Hladky
efa18426a1 Issue #2448 fix scheduling for start/stop of subscription.
Former-commit-id: 976eece1b1 [formerly de110d3747096601a122f64cc5d6037823213e92]
Former-commit-id: b6f1468b7e
2013-11-12 10:58:50 -06:00
Nate Jensen
3480148f14 Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
Former-commit-id: da8a858727 [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]
Former-commit-id: bca5793e3d
2013-11-12 10:55:40 -06:00
Brad Gonzales
cbdb9dfb4f Issue #2506 Added subscription notification service to bandwidth manager.
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92

Former-commit-id: ff5edde334 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]
Former-commit-id: cd221e5263
2013-11-12 10:50:06 -06:00
Nate Jensen
74d7dfd7da Merge "Issue #2377 fixed error handling in QPF config" into development
Former-commit-id: d8f2ffbceb [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]
Former-commit-id: 3054868350
2013-11-12 10:39:51 -06:00
Nate Jensen
cd5b0576b0 Merge "Issue #2539 added GZIP support to WFS REST" into development
Former-commit-id: 8c4608630d [formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]
Former-commit-id: f1b8eecca7
2013-11-12 10:39:44 -06:00
Nate Jensen
2c0c20f01e Issue #2361 remove using SerializationUtil for processing XML colormaps
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: 7a73c65430 [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]
Former-commit-id: b52bdb1cec
2013-11-12 10:37:54 -06:00
Nate Jensen
8ff0d1129a Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
Former-commit-id: 23fe7de462 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]
Former-commit-id: 3ed50ff500
2013-11-12 09:29:46 -06:00
Bryan Kowal
6b5f93117e 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: 75e6914df1 [formerly 315ca002de4045f0d7ae6b298012365a052a7430]
Former-commit-id: 8e1c0fb8eb
2013-11-11 17:00:17 -06:00
Brian Clements
23e9ac6aa8 Issue #2377 fixed error handling in QPF config
Former-commit-id: 684bd4dc50 [formerly 8e8c57301c6167fa161fd55be0e3fae3f974918b]
Former-commit-id: e2ac7ae212
2013-11-11 16:18:16 -06:00
Nate Jensen
bb93c18e7d Issue #2361 undo earlier changes that potentially break uengine based
local apps

Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65

Former-commit-id: a2935193b5 [formerly 110cff66bb2cf847730562570a9415851e0362c2]
Former-commit-id: 8628b7755e
2013-11-11 16:14:35 -06:00
Brian Clements
02ab14579f Issue #2539 added GZIP support to WFS REST
small code cleanup in providers


Former-commit-id: 061515b485 [formerly 943310ed8b34f62d73dee1dff32d5c3b9f424e3c]
Former-commit-id: 36a0be2db1
2013-11-11 16:08:09 -06:00
Steve Harris
51af205d06 Merge branch 'omaha_13.5.3' into development
Former-commit-id: 66f99f3974 [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]
Former-commit-id: 9dabbc7b8e
2013-11-11 15:40:45 -06:00
Steve Harris
00a64f061d Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: e0d2de3a19 [formerly d55e0256167a6b61728d77403805ccc1c3eafdf7]
Former-commit-id: c1dcded2bd
2013-11-11 15:39:27 -06:00
Steve Harris
36af5686bd 13.5.3-7 baseline
Former-commit-id: 47102ee47b [formerly a9ada72dc63cd460499052171c61323b438bb10d]
Former-commit-id: 21bed95fa4
2013-11-11 16:33:51 -05:00
Nate Jensen
a3fd84d9ef 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: 05ee46c4bc [formerly 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec]
Former-commit-id: 7dda17a660
2013-11-11 14:05:11 -06:00
Richard Peter
d55e99dc2d Merge "Issue #2506 Refactored RegistryEvent constructors." into development
Former-commit-id: 51649b56e5 [formerly dd8f83135b04ff4510b1f860846f1a6a3db09f47]
Former-commit-id: 13989d9c6e
2013-11-11 13:09:24 -06:00
Bryan Kowal
fee6a5dc9c Issue #2297 - fix 14.2.1 merge
Former-commit-id: 411e0fa7c4 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]
Former-commit-id: e2a02ca247
2013-11-11 13:04:21 -06:00
Steve Harris
33e02b548d Merge branch 'omaha_13.5.3' (13.5.3-6) into development
Former-commit-id: 8a2e9f1725 [formerly a4c8e9a5fb9d50844da854e453b6146c2a6e75c3]
Former-commit-id: fbfe1a5faf
2013-11-11 11:45:35 -06:00
Steve Harris
9923b2c71a Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 4190ddf39b [formerly 9d433d2ae29831903e8da23a4b96aee29ee8f5bd]
Former-commit-id: b62ab264f0
2013-11-11 11:40:03 -06:00
Steve Harris
11ca17a63c 13.5.3-6 baseline
Former-commit-id: 5fa893d37b [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]
Former-commit-id: 77a45660d5
2013-11-11 12:34:10 -05:00
Max Schenkelberg
2f794486e3 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: bd903f6641 [formerly 58ccc575973ea9a1778659e17daff8577747dec5]
Former-commit-id: e58a5df04b
2013-11-11 11:09:00 -06:00
Nate Jensen
0c25fe98bd Merge "Issue #1314 removed common.spatial plugin" into development
Former-commit-id: 06acf1b8a0 [formerly 823cb0e07793ec5baa1863088634a312364b3d8b]
Former-commit-id: 0dbc31b756
2013-11-11 08:48:44 -06:00
Steve Harris
f2cb2a4664 Issue #2214 - merge fix: Removed duplicate annotation @Override
Former-commit-id: 3a5028a42d [formerly d398883ce95b61d0a1befb3943a636c4c213784d]
Former-commit-id: 766940dedb
2013-11-11 08:15:30 -06:00
Brad Gonzales
adc09b748d Issue #2506 Refactored RegistryEvent constructors.
Amend: Added call to default constructor in Event initialization constructor.

Change-Id: I4c3f105b9782512f6c0b73f2355767e855845454

Former-commit-id: d80183edc1 [formerly f4cb28f209073788a3c329c44283c8c8cf3bf70f]
Former-commit-id: 9e8420b216
2013-11-08 15:46:40 -06:00
Brad Gonzales
80fd8a2ad4 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: e2fb158757 [formerly 0b667fbd94788a8a5b598ae5f5586d4b710518a4]
Former-commit-id: fe15e874f7
2013-11-08 15:29:05 -06:00
Bryan Kowal
3b8ce3fd34 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: f1cd2f2e5a [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]
Former-commit-id: c3eb4e9af9
2013-11-08 14:51:47 -06:00
Nate Jensen
76ccc6f8f7 Merge "Issue #2361 remove SerializationUtil from SoundingPrefs" into development
Former-commit-id: f57cc4ab8f [formerly 2622cf7de4bfa09734e8a0acca402ffb5f8b1fcb]
Former-commit-id: 89a650d94a
2013-11-08 14:45:22 -06:00
Brian Clements
f994d9924d Issue #1314 removed common.spatial plugin
Moved KeyLocker to common.util
Updated query store to use read write lock


Former-commit-id: 04791b7939 [formerly 4f3d7e982a34f17fdf8cd80f025da176f939a3b1]
Former-commit-id: 8142ff770f
2013-11-08 13:43:52 -06:00
Richard Peter
931e583990 Merge "Issue #2361 fix saving hydro table objects" into development
Former-commit-id: cf261df489 [formerly 8a326cda9dd0b801f0bbaf779d6548f42078c0a5]
Former-commit-id: bded464ccf
2013-11-08 13:26:06 -06:00
Nate Jensen
040f022e5d Issue #2361 fix saving hydro table objects
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: 08441efbb7 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]
Former-commit-id: 7a27264094
2013-11-08 12:37:26 -06:00
Nate Jensen
0e4a1d9ced Issue #2361 remove ISerializableObject from persistence path keys
Change-Id: I7ff7e5234c7c88ed475014c755f3df7d1ee23b16

Former-commit-id: 44a6d5b302 [formerly 044f4fd87a83d6b83eef7f46854f1b484536c825]
Former-commit-id: 02d26d0f84
2013-11-08 12:30:39 -06:00
Nate Jensen
b01f5697d3 Issue #2361 remove SerializationUtil from SoundingPrefs
Change-Id: Ia394f825954c0d96e17431589d64af13d8c7f991

Former-commit-id: e9ca44ee64 [formerly eab1cf126b79ec5708facf2b2c9a303fca8a24fe]
Former-commit-id: c3b37bcb7b
2013-11-08 12:13:50 -06:00
Nate Jensen
058c963aa2 Issue #2361 fix map style preferences
Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049

Former-commit-id: 43bbf31347 [formerly 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae]
Former-commit-id: ec319b7dd0
2013-11-08 10:38:11 -06:00
Richard Peter
44818e3dbd Merge "Issue #2361 remove viz.grid ISerializableObjects" into development
Former-commit-id: bb0dcf6d4a [formerly a227c2dcb2598f82756c3f6a9ac7999c06202177]
Former-commit-id: 214a72ac69
2013-11-08 10:35:41 -06:00
Slav Korolev
2d002ccde3 Issue #2291. Fixed Shared Subscription Dialog.
Former-commit-id: 7b7754982c [formerly f04678733c2368ca05b7b8fdbcfeb096940854df]
Former-commit-id: 59d1de165d
2013-11-08 11:09:21 -05:00
Nate Jensen
bfc7c671cc Issue #2361 remove viz.grid ISerializableObjects
Change-Id: I76be90f90dedf5d5d5e3656d23bd1180de9014b8

Former-commit-id: 10548cd1c7 [formerly 6dde4cfe4f7669cd3d3ca15bbb7f4ab2a1a50e92]
Former-commit-id: 88eb0aab5c
2013-11-08 09:42:09 -06:00
Richard Peter
9111484d4f Merge "Issue #1678 Added support for stored query publishing and invocation on the registry" into development
Former-commit-id: 6fd6fd0725 [formerly 003f889e8aa65c4f01287611518f92b7d8ef05dd]
Former-commit-id: 60b567eeae
2013-11-08 09:35:08 -06:00
Benjamin Phillippe
0abf405014 Issue #1678 Added support for stored query publishing and invocation on the registry
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f

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


Former-commit-id: ea6b162369 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]
Former-commit-id: 4f374688c8
2013-11-07 16:56:25 -06:00
Nate Jensen
b9c95aadc0 Merge "Issue #2361 remove ISerializableObject from datadelivery.retrieval" into development
Former-commit-id: 7877229eac [formerly 7c4748fa0348820f0cf65330889253a04b4fab28]
Former-commit-id: f4fcd9e604
2013-11-07 16:39:50 -06:00
Ron Anderson
c611ab48be Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development
Former-commit-id: c1bda09fd9 [formerly c5da4c8a79432aab321d42f94b9cff04866671aa]
Former-commit-id: 12192b633f
2013-11-07 14:39:06 -06:00
Ron Anderson
0bfd9a1c98 Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: 42229b8eee [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]
Former-commit-id: a5bc64473a
2013-11-07 14:38:39 -06:00
Richard Peter
25df870b67 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: 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]
Former-commit-id: fa7d77ae97
2013-11-07 14:25:45 -06:00
Nate Jensen
6c1c3d77be Issue #2361 remove ISerializableObject from datadelivery.retrieval
Change-Id: I9ec15b17760bcb4382898101f10ce1b17f55eb39

Former-commit-id: 6abe031dfe [formerly 0cc1dd3988f7d02d609246dba863552b46127db2]
Former-commit-id: 852751784b
2013-11-07 13:18:21 -06:00