Commit graph

2467 commits

Author SHA1 Message Date
Mike Duff
d254f954c4 Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2

Former-commit-id: c908647259 [formerly c908647259 [formerly cacc7a8560c589b24ea98191f152c31479c5631e]]
Former-commit-id: 665d9e7651
Former-commit-id: 5afa90b967
2013-11-19 08:55:27 -06:00
Nate Jensen
a5abd4dad0 Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
Former-commit-id: edf51dffc9 [formerly edf51dffc9 [formerly b6420738e49d37840789c88089ecc8bab1103284]]
Former-commit-id: 3d51d80170
Former-commit-id: f07f543cd3
2013-11-18 12:50:38 -06:00
Nate Jensen
b6fe32de06 Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
Former-commit-id: 0dbe79344a [formerly 0dbe79344a [formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]
Former-commit-id: 827b7f5a93
Former-commit-id: 6900d4e47f
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
9bd35b793d Issue #2543 fix gl buffer formating problems
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc

Former-commit-id: 105e3e359a [formerly 105e3e359a [formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]
Former-commit-id: e7a068e595
Former-commit-id: e605758e57
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
55f26e277f Issue #2544 Fix recycling issues with Satellite resources.
Former-commit-id: e392185d78 [formerly e392185d78 [formerly 166957a22c3447fa2407b13362eece24943675c9]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 1875f56695
2013-11-18 11:44:56 -06:00
Nate Jensen
951c1ff2f3 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
Former-commit-id: 4f47800cae [formerly 4f47800cae [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]
Former-commit-id: 0146ae59df
Former-commit-id: a238ba2ba3
2013-11-18 11:39:12 -06:00
Steve Harris
c26818afe6 Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: 0a36987a01 [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 869b505f80
2013-11-15 13:15:25 -06:00
Steve Harris
ea382798b5 14.1.1-9 baseline
Former-commit-id: f8f995b697 [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 8c136f202d
2013-11-15 12:47:49 -05:00
Nate Jensen
f2c777ff48 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: dd99aa3f47 [formerly dd99aa3f47 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]
Former-commit-id: 78b01f61c4
Former-commit-id: d96cdbe761
2013-11-14 17:41:24 -06:00
Mike Duff
0f2626f79f Issue #2548 - fix malformed comment
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034

Former-commit-id: 414cb1cf68 [formerly 414cb1cf68 [formerly 52462f299735aacee3db09faa6db9f28ba91f552]]
Former-commit-id: 95fda38cc5
Former-commit-id: 7be43c4a52
2013-11-14 17:30:55 -06:00
Richard Peter
38d2c6564a Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
Former-commit-id: 14b1e924a1 [formerly 14b1e924a1 [formerly dba301df2f593baa951c14b684e7ce4794e32019]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 1a7dd7723b
2013-11-14 17:21:48 -06:00
Brian Clements
e7c355df52 Issue #2361 fixed ncwf hibernate pickup
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names


Former-commit-id: cacdf313c5 [formerly cacdf313c5 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]
Former-commit-id: 00490c2db2
Former-commit-id: ab24330f23
2013-11-14 17:12:02 -06:00
Mike Duff
5fdf101af6 Issue #2548 - Add a subscription type slot for uniqueness.
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 47011a70db [formerly 47011a70db [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]
Former-commit-id: 47a0477587
Former-commit-id: b929b7aa02
2013-11-14 17:07:54 -06:00
Nate Jensen
7ec18ba0b1 Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
Former-commit-id: b4bcd14a85 [formerly b4bcd14a85 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]
Former-commit-id: c2aacfc437
Former-commit-id: a8a1e396fe
2013-11-14 16:34:28 -06:00
Richard Peter
e7d8e5e560 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 8fb79e7b73 [formerly 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]]
Former-commit-id: c42f931118
Former-commit-id: 2b95bcfb31
2013-11-14 14:56:59 -06:00
Mike Duff
cf077ed7f9 Issue #2538 - Check for existing adhoc queries in registry.
Peer review comments

Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0

Former-commit-id: 87a4b1bec4 [formerly 87a4b1bec4 [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]
Former-commit-id: a80964bc7c
Former-commit-id: 4557a06f42
2013-11-14 14:40:33 -06:00
Richard Peter
e2a16fd876 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	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.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 79bdd34f4f [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]
Former-commit-id: 0074b774f0
Former-commit-id: 96b4944b41
2013-11-14 14:40:23 -06:00
Nate Jensen
e83a828209 Issue #2361 remove StyleManager's use of SerializationUtil and
ISerializableObject

Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a

Former-commit-id: 9acda0b9f2 [formerly 9acda0b9f2 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]
Former-commit-id: c5cf68cc45
Former-commit-id: a6be904c69
2013-11-14 13:29:30 -06:00
Bryan Kowal
1a905e8a3c Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 86dd200844 [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]
Former-commit-id: 0544b66f4e
Former-commit-id: 01735ca0c4
2013-11-13 13:16:55 -06:00
Steve Harris
42ece4fb6a 14.1.1-8 baseline
Former-commit-id: aa6c977e7b [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 0123596fd9
2013-11-13 12:32:17 -05:00
Nate Jensen
983afa0eea Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
Former-commit-id: 8cf1b752e0 [formerly 8cf1b752e0 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]
Former-commit-id: b1d376e238
Former-commit-id: 645e816d5d
2013-11-12 16:48:32 -06:00
Nate Jensen
5c7be238a0 Issue #2361 better logging of viz spring initialization of bundles
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b

Former-commit-id: 692ea76d75 [formerly 692ea76d75 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]
Former-commit-id: a4ece1d116
Former-commit-id: 2e86520b53
2013-11-12 13:02:49 -06:00
Brad Gonzales
bad9b3242a Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
Amend: Separate update from create notifications in LifecycleManagerImpl.
       Refactored notification sending in EdexBandwidthManager.
       Fixed error in LifecycleManagerImpl refactor.
       Added comment to isRecurringSubscription.

Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77

Former-commit-id: 8f70fb1d0c [formerly 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]
Former-commit-id: aea0e847aa
Former-commit-id: 866a11a9f0
2013-11-12 12:42:16 -06:00
Richard Peter
c8ef435295 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: 306bd6fae1 [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 59671c1e7d
2013-11-12 11:11:36 -06:00
Nate Jensen
80c38e1433 Issue #2361 remove using SerializationUtil for processing XML colormaps
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: b52bdb1cec [formerly b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]
Former-commit-id: 7a73c65430
Former-commit-id: 5427e68fd2
2013-11-12 10:37:54 -06:00
Steve Harris
92cf79a7cc Merge branch 'omaha_13.5.3' into development
Former-commit-id: 9dabbc7b8e [formerly 9dabbc7b8e [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]]
Former-commit-id: 66f99f3974
Former-commit-id: 9f1d93a2cf
2013-11-11 15:40:45 -06:00
Steve Harris
0c54c50443 13.5.3-7 baseline
Former-commit-id: 21bed95fa4 [formerly 21bed95fa4 [formerly a9ada72dc63cd460499052171c61323b438bb10d]]
Former-commit-id: 47102ee47b
Former-commit-id: 3599d7f09b
2013-11-11 16:33:51 -05:00
Bryan Kowal
18bb3ef947 Issue #2297 - fix 14.2.1 merge
Former-commit-id: e2a02ca247 [formerly e2a02ca247 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]]
Former-commit-id: 411e0fa7c4
Former-commit-id: e937ba954b
2013-11-11 13:04:21 -06:00
Steve Harris
49b0919cf0 13.5.3-6 baseline
Former-commit-id: 77a45660d5 [formerly 77a45660d5 [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]]
Former-commit-id: 5fa893d37b
Former-commit-id: f31112871c
2013-11-11 12:34:10 -05:00
Max Schenkelberg
60616f7ef0 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: e58a5df04b [formerly e58a5df04b [formerly 58ccc575973ea9a1778659e17daff8577747dec5]]
Former-commit-id: bd903f6641
Former-commit-id: c85532a180
2013-11-11 11:09:00 -06:00
Bryan Kowal
dfba50bf2e 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: c3eb4e9af9 [formerly c3eb4e9af9 [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: 1909193f0c
2013-11-08 14:51:47 -06:00
Nate Jensen
7a70c5ecce Issue #2361 fix saving hydro table objects
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: 7a27264094 [formerly 7a27264094 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]]
Former-commit-id: 08441efbb7
Former-commit-id: 4958732cb2
2013-11-08 12:37:26 -06:00
Nate Jensen
f836fe065e Issue #2361 fix map style preferences
Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049

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

Former-commit-id: 88eb0aab5c [formerly 88eb0aab5c [formerly 6dde4cfe4f7669cd3d3ca15bbb7f4ab2a1a50e92]]
Former-commit-id: 10548cd1c7
Former-commit-id: 48a479d2dc
2013-11-08 09:42:09 -06:00
Ron Anderson
4e8df8ea5b Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development
Former-commit-id: 12192b633f [formerly 12192b633f [formerly c5da4c8a79432aab321d42f94b9cff04866671aa]]
Former-commit-id: c1bda09fd9
Former-commit-id: d2cd7c1257
2013-11-07 14:39:06 -06:00
Ron Anderson
298f4abbae Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: a5bc64473a [formerly a5bc64473a [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]]
Former-commit-id: 42229b8eee
Former-commit-id: 6442e2e933
2013-11-07 14:38:39 -06:00
Richard Peter
910464ea6a 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: fa7d77ae97 [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]
Former-commit-id: 93c776022a
Former-commit-id: 520dd57f02
2013-11-07 14:25:45 -06:00
Greg Armendariz
390d3b57e1 Merge branch 'development' into development_on_RHEL6
Former-commit-id: da16b623e1 [formerly da16b623e1 [formerly d12afc98a3fda9c186e87368c53ddc100d4bf2c1]]
Former-commit-id: 6456b3a17b
Former-commit-id: 009c5771fd
2013-11-07 12:25:24 -06:00
Nate Jensen
57f237693e Issue #2361 speed up map initialization by moving field queries off UI
thread

Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5

Former-commit-id: d4b6ad1eee [formerly d4b6ad1eee [formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]]
Former-commit-id: cc2998b487
Former-commit-id: ce583a88fb
2013-11-07 11:44:07 -06:00
David Gillingham
50f9ad420b Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: e1df69e312 [formerly e1df69e312 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]
Former-commit-id: 0e74638eb2
Former-commit-id: d0b188d577
2013-11-07 11:36:49 -06:00
Nate Jensen
acec588299 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: f5feb9330f [formerly f5feb9330f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: 1b7ac545f8
2013-11-07 10:21:42 -06:00
Steve Harris
930b6ddb77 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 108a4d908d [formerly 108a4d908d [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: 50d60d8101
2013-11-06 18:31:05 -06:00
Bryan Kowal
b04aa07437 13.5.3 build "fix"
Former-commit-id: 6692b985f3 [formerly 6692b985f3 [formerly 084e906e9f85ebd11cabf6e14e94ac75d25a0af2]]
Former-commit-id: a28133117c
Former-commit-id: ce6d80409d
2013-11-06 18:25:10 -06:00
Nate Jensen
0ae0e070c9 Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 0f4ba6f90e [formerly 0f4ba6f90e [formerly 2c506552014e60344c5b2014bed32edab2630f47]]
Former-commit-id: 1da0e31b88
Former-commit-id: aef895c447
2013-11-06 17:07:10 -06:00
Bryan Kowal
46616c32eb Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 4f1c083032 [formerly 4f1c083032 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]
Former-commit-id: bb15605aa2
Former-commit-id: 0bc8cdc9be
2013-11-06 15:57:14 -06:00
Lee Venable
5627ef0cc8 Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 8585080cd1 [formerly 8585080cd1 [formerly 13672783e6a5e452cb4105669a98708329b35541]]
Former-commit-id: 20726d4e7c
Former-commit-id: 0c4566c411
2013-11-06 15:42:40 -06:00
Max Schenkelberg
751b8f2315 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: 3369fbec2d [formerly 3369fbec2d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]
Former-commit-id: c28fd2b38d
Former-commit-id: d53db3ddb6
2013-11-06 15:07:18 -06:00
Richard Peter
b52c9482ea Merge "Issue #2499: Fix build" into omaha_13.5.3
Former-commit-id: 27aa0dd6ba [formerly 27aa0dd6ba [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]
Former-commit-id: 6ccb444219
Former-commit-id: f4bdb0caea
2013-11-06 13:44:11 -06:00