xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5339 commits 31 branches 40 tags 3.8 GiB
Commit graph

376 commits

Author SHA1 Message Date
Ron Anderson
77c132f706 Merge branch 'master_14.1.1' into solutions 
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.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/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 0bde38cef3 [formerly ba7a25a88f] [formerly 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: dca7f21f7b [formerly 624375267e]
Former-commit-id: 5076217d8f
 2014-01-13 17:45:20 -06:00
Nate Jensen
d9427f900f Issue #2359 prevent obnoxious ncep decoder null pointer exceptions 
Change-Id: I731614a8a6c9ec38bb6c1b29c4d9f6ca5a7c03d7

Former-commit-id: 52293fd154 [formerly 2c0e3f05ca] [formerly 52293fd154 [formerly 2c0e3f05ca] [formerly e509a2883f [formerly 514d0cfecd3eb8c81a6d2120406225856d964c9e]]]
Former-commit-id: e509a2883f
Former-commit-id: de5d7565e2 [formerly 488956a259]
Former-commit-id: bdf8ff8ad4
 2014-01-07 12:38:49 -06:00
Max Schenkelberg
783391423f Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins. 
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: b3aed99142 [formerly 16046a4dde] [formerly b3aed99142 [formerly 16046a4dde] [formerly cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]
Former-commit-id: cc2080449c
Former-commit-id: 0ceaa43902 [formerly f58795f460]
Former-commit-id: 789a279475
 2014-01-06 17:03:45 -06:00
Ben Steffensmeier
7303bd3b62 Issue #2537 Split modelsounding into common/edex plugins. 
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8

Former-commit-id: f516a684d4 [formerly f520a26fbd] [formerly f516a684d4 [formerly f520a26fbd] [formerly d79f804d4e [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]]
Former-commit-id: d79f804d4e
Former-commit-id: 9913e51429 [formerly fac9fd296f]
Former-commit-id: 4fef47c0a8
 2014-01-06 16:02:59 -06:00
Steve Harris
1ca553385c 14.1.1-15 baseline 
Former-commit-id: f88ff2bde9 [formerly 8bbd803ace] [formerly f88ff2bde9 [formerly 8bbd803ace] [formerly d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]
Former-commit-id: d8e5799328
Former-commit-id: 282d10fe6d [formerly 35d8f5a281]
Former-commit-id: cd4a09623c
 2014-01-06 14:08:08 -05:00
Steve Harris
5862555160 14.1.1-14 baseline 
Former-commit-id: 6df7c67f95 [formerly f2ad9da4eb] [formerly 6df7c67f95 [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 0989c17710 [formerly 43cc501e0d]
Former-commit-id: a2bdee5cc1
 2014-01-06 14:02:30 -05:00
Max Schenkelberg
ede6c2fa1e Issue #2620 Fixed viz base feature dependency issues. 
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: be45102814 [formerly 9d846aa104] [formerly be45102814 [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]
Former-commit-id: 987d4b3a30
Former-commit-id: e86e477165 [formerly eede01921e]
Former-commit-id: 5c2da4c3e3
 2013-12-09 15:14:01 -06:00
Richard Peter
611b721bbf Issue #2551: Update NCEP objects to extend PersistablePluginDataObject. 
Amend: Remove IDecoderGettable.

Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b

Former-commit-id: 796293c036 [formerly 98117b4093] [formerly 796293c036 [formerly 98117b4093] [formerly f8f3ebc6e9 [formerly 0778a7f0123dd150894458fef6958fcdd9da39b6]]]
Former-commit-id: f8f3ebc6e9
Former-commit-id: 00c44b3a08 [formerly 1a554d9632]
Former-commit-id: 0932f3103b
 2013-12-03 17:24:01 -06:00
Steve Harris
bfa9d638cc 14.1.1-11 baseline 
Former-commit-id: 337b138200 [formerly 70a6f1936e] [formerly 337b138200 [formerly 70a6f1936e] [formerly 71ae71c850 [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 8bd818de09 [formerly 5526a8999d]
Former-commit-id: f88a635a58
 2013-12-02 17:10:10 -05:00
Brian Clements
6b8a853240 Issue #2393 removed pypies interpolation 
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code


Former-commit-id: d35fc591d2 [formerly fe58826a1e] [formerly d35fc591d2 [formerly fe58826a1e] [formerly 0f40ae2b99 [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 10e63616ff [formerly b762864f88]
Former-commit-id: 2e4dc2000e
 2013-11-20 08:40:12 -06:00
Steve Harris
ea65181d19 14.1.1-10 baseline 
Former-commit-id: 8251107646 [formerly ca0f65bd9a] [formerly 8251107646 [formerly ca0f65bd9a] [formerly 9248695a1f [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: e35ec60f7e [formerly ef6e0b0304]
Former-commit-id: 36d788890a
 2013-11-19 16:40:25 -05:00
Nate Jensen
2e81364691 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE 
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 757ca42a5f [formerly dd99aa3f47] [formerly 757ca42a5f [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]
Former-commit-id: 78b01f61c4
Former-commit-id: d0d712ec6f [formerly d96cdbe761]
Former-commit-id: f2c777ff48
 2013-11-14 17:41:24 -06:00
Bryan Kowal
97c0dff26a Merge branch 'development' into development_on_RHEL6 
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 178d95e59d [formerly 86dd200844] [formerly 178d95e59d [formerly 86dd200844] [formerly 0544b66f4e [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]
Former-commit-id: 0544b66f4e
Former-commit-id: a2b1211c52 [formerly 01735ca0c4]
Former-commit-id: 1a905e8a3c
 2013-11-13 13:16:55 -06:00
Richard Peter
ef23a8f65b 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: 7ba466f5a6 [formerly 306bd6fae1] [formerly 7ba466f5a6 [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 3f68fc6eed [formerly 59671c1e7d]
Former-commit-id: c8ef435295
 2013-11-12 11:11:36 -06:00
Nate Jensen
273eb805c0 Issue #2361 remove using SerializationUtil for processing XML colormaps 
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: 2c0c20f01e [formerly b52bdb1cec] [formerly 2c0c20f01e [formerly b52bdb1cec] [formerly 7a73c65430 [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]
Former-commit-id: 7a73c65430
Former-commit-id: 9bf83be7e9 [formerly 5427e68fd2]
Former-commit-id: 80c38e1433
 2013-11-12 10:37:54 -06:00
Bryan Kowal
f986662369 Issue #2297 - fix 14.2.1 merge 
Former-commit-id: fee6a5dc9c [formerly e2a02ca247] [formerly fee6a5dc9c [formerly e2a02ca247] [formerly 411e0fa7c4 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]]]
Former-commit-id: 411e0fa7c4
Former-commit-id: b1a6d2d828 [formerly e937ba954b]
Former-commit-id: 18bb3ef947
 2013-11-11 13:04:21 -06:00
Bryan Kowal
9f749f3079 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: 3b8ce3fd34 [formerly c3eb4e9af9] [formerly 3b8ce3fd34 [formerly c3eb4e9af9] [formerly f1cd2f2e5a [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: 464a8d1001 [formerly 1909193f0c]
Former-commit-id: dfba50bf2e
 2013-11-08 14:51:47 -06:00
Richard Peter
94e0faa6c6 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: 25df870b67 [formerly fa7d77ae97] [formerly 25df870b67 [formerly fa7d77ae97] [formerly 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: c97efbf656 [formerly 520dd57f02]
Former-commit-id: 910464ea6a
 2013-11-07 14:25:45 -06:00
Steve Harris
43b93250c0 14.1.1-7 baseline (addendum 1) 
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml


Former-commit-id: abbecba957 [formerly 2d36bc2c1f] [formerly abbecba957 [formerly 2d36bc2c1f] [formerly b835dad501 [formerly 07f7c24804028aed71fc29cdf6f163a9e9d15623]]]
Former-commit-id: b835dad501
Former-commit-id: a72bb1669f [formerly 155bc487ff]
Former-commit-id: fdad37d271
 2013-11-07 12:09:23 -05:00
Steve Harris
cfb3194426 14.1.1-7 baseline 
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d] [formerly 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: b694612fe0 [formerly 48df058653]
Former-commit-id: 647b908fed
 2013-11-06 14:16:14 -05:00
Steve Harris
0aa90a7855 14.1.1-6 baseline 
Former-commit-id: 946a9be17e [formerly 0cb2978c13] [formerly 946a9be17e [formerly 0cb2978c13] [formerly 6067af4252 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]
Former-commit-id: 6067af4252
Former-commit-id: e86a0aa489 [formerly 26da1ce793]
Former-commit-id: 270c5f1a2d
 2013-11-06 14:08:33 -05:00
Bryan Kowal
2c31c6f4ab Merge branch 'development' into development_on_RHEL6 
Conflicts:
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
	rpms/awips2.core/Installer.tools/component.spec
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh

Former-commit-id: d73aaf9753 [formerly 4bad21e6cd] [formerly d73aaf9753 [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]
Former-commit-id: 3255bf3861
Former-commit-id: 400b4a1328 [formerly 76726372e5]
Former-commit-id: 748ab480fb
 2013-11-05 19:03:22 -06:00
Ben Steffensmeier
5cf9a6ed01 Issue #2485 Remove ncccfp 
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64

Former-commit-id: 4639cd69f4 [formerly 5b53cb4c98] [formerly 4639cd69f4 [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]
Former-commit-id: 1d35086e8d
Former-commit-id: b64221f27b [formerly 8aefe5ff02]
Former-commit-id: a97ec9b8e5
 2013-11-05 17:33:41 -06:00
Bryan Kowal
0d8ab84604 Merge branch 'development' into development_on_RHEL6 
Conflicts:
	cots/org.jep.linux64/libjep.so

Former-commit-id: 04bcd7e6dc [formerly 49422aea62] [formerly 04bcd7e6dc [formerly 49422aea62] [formerly d08a652e23 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]
Former-commit-id: d08a652e23
Former-commit-id: d53ec9c750 [formerly adb62df96a]
Former-commit-id: 70d4374ce8
 2013-10-31 15:43:29 -05:00
Bryan Kowal
f5bb76a01e Merge branch 'omaha_14.1.1' into development_on_RHEL6 
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: 38464427d3 [formerly feaacd9356] [formerly 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: f02d4b7a0b [formerly d366e70934]
Former-commit-id: eaaa3d022c
 2013-10-31 15:34:46 -05:00
Steve Harris
3f27e1cc23 Merge branch 'master_13.5.3' into omaha_13.5.3 
Former-commit-id: 7768ee1c36 [formerly 2257eb5ddd] [formerly 7768ee1c36 [formerly 2257eb5ddd] [formerly 855b444073 [formerly ec141b61f8f0558ff18d1d67492a066c837f20b7]]]
Former-commit-id: 855b444073
Former-commit-id: c953a6574d [formerly 83dc6d8e2a]
Former-commit-id: 60a5ddc88f
 2013-10-31 11:58:04 -05:00
Steve Harris
ef72863e6f 13.5.3-3 baseline 
Former-commit-id: 883ad32443 [formerly baa036cd62] [formerly 883ad32443 [formerly baa036cd62] [formerly 1503847a4b [formerly c261e0753eb106a2912314056a1b4903695750c5]]]
Former-commit-id: 1503847a4b
Former-commit-id: a58b825dde [formerly 6b879b2465]
Former-commit-id: 5be6e21405
 2013-10-31 12:52:07 -04:00
Steve Harris
6da47cfbdd Merge branch 'master_13.5.3' into omaha_13.5.3 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 5aac54b9f9 [formerly 0ab03f2796] [formerly 5aac54b9f9 [formerly 0ab03f2796] [formerly 83d2194a5a [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]]
Former-commit-id: 83d2194a5a
Former-commit-id: 771be074c0 [formerly 0efff318b8]
Former-commit-id: f5fc091e48
 2013-10-30 12:36:53 -05:00
Steve Harris
e90722d781 13.5.3-2 baseline 
Former-commit-id: c6d951b390 [formerly 055783655b] [formerly c6d951b390 [formerly 055783655b] [formerly 6d85d944a6 [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]
Former-commit-id: 6d85d944a6
Former-commit-id: 0c17777164 [formerly aef0e828d2]
Former-commit-id: 1cc13c9992
 2013-10-30 12:53:25 -04:00
Ben Steffensmeier
02b9133d50 Issue #2491 Bug fixes and clean up all remaining resource datas. 
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: e15fecc459 [formerly 5b395f7417] [formerly e15fecc459 [formerly 5b395f7417] [formerly 27a392f90e [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]
Former-commit-id: 27a392f90e
Former-commit-id: 78efdb7572 [formerly 418c259567]
Former-commit-id: 9d87eb50e2
 2013-10-29 17:35:55 -05:00
Ben Steffensmeier
ef52238100 Issue #2491 Clean resource datas out of ncep plugins. 
Former-commit-id: b713ae826d [formerly e1180db74b] [formerly b713ae826d [formerly e1180db74b] [formerly 1ac69169fa [formerly e1259eb7fa31d3142ca9ce43bf46c52f00fb098e]]]
Former-commit-id: 1ac69169fa
Former-commit-id: fe29ef1c58 [formerly e1054d923c]
Former-commit-id: bec7eb3d7f
 2013-10-29 16:47:06 -05:00
Ben Steffensmeier
c57dc46dfc Issue #2491 Move ncep bundles off od SerializationUtil. 
Former-commit-id: 9c62c3bae2 [formerly a4174430f7] [formerly 9c62c3bae2 [formerly a4174430f7] [formerly 204b47c67d [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]]
Former-commit-id: 204b47c67d
Former-commit-id: 09347cdd5a [formerly 9540b309b3]
Former-commit-id: fd931a3e64
 2013-10-29 12:28:07 -05:00
Bryan Kowal
819cb0bcb7 Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install. 
Former-commit-id: df575b7be1 [formerly a6d7822698] [formerly df575b7be1 [formerly a6d7822698] [formerly cda8d04831 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]]
Former-commit-id: cda8d04831
Former-commit-id: 27d2e33769 [formerly cc0f6832c9]
Former-commit-id: 2615ad7324
 2013-10-28 14:50:28 -05:00
Richard Peter
0ce889ecf2 Issue #2362: Fix merge issue 
Former-commit-id: 6dba9925c3 [formerly 814b1878b2] [formerly 6dba9925c3 [formerly 814b1878b2] [formerly 51bf66d456 [formerly 03fa4950011aaee4f4d7cfeda68fe8ad3359a138]]]
Former-commit-id: 51bf66d456
Former-commit-id: 4e5cd1b28b [formerly 50bd787f24]
Former-commit-id: 934f346afb
 2013-10-28 12:13:04 -05:00
Steve Harris
da4589ec2b 14.1.1-4 baseline 
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
 2013-10-28 10:55:16 -04:00
Steve Harris
472c0a1a5e 14.1.1-3 baseline 
Former-commit-id: 851f9df229 [formerly 94f24e0d8a] [formerly 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: aa59400b67 [formerly 4a6a209aea]
Former-commit-id: 8d67ffede4
 2013-10-28 10:46:02 -04:00
Steve Harris
2864f20285 Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3 
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java

Former-commit-id: 64062fa355 [formerly 702b66ee52] [formerly 64062fa355 [formerly 702b66ee52] [formerly ca54ffaad1 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 6aab62b7b9 [formerly 38e4e0c572]
Former-commit-id: 3a2a83bc4b
 2013-10-25 10:51:42 -05:00
Steve Harris
d63a07d248 13.5.2-11 baseline 
Former-commit-id: 9215a213a1 [formerly b820a28276] [formerly 9215a213a1 [formerly b820a28276] [formerly cbfde2f52a [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]
Former-commit-id: cbfde2f52a
Former-commit-id: ecad06c80d [formerly c1473d8a72]
Former-commit-id: 49b1168f5e
 2013-10-25 09:45:58 -04:00
Ben Steffensmeier
d1d057ae57 Issue #2491 Use reflections to build Procedure JAXB context. 
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: a935ffadf7 [formerly bfc3faf08f] [formerly a935ffadf7 [formerly bfc3faf08f] [formerly fa0a0619bc [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 09a3276d51 [formerly d927e6b2d7]
Former-commit-id: 5971562d1a
 2013-10-24 11:28:06 -05:00
Max Schenkelberg
df73f86805 Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image. 
Change-Id: I6ec7c0808516cc1ce87e3325b54041366392d191

Former-commit-id: 08cafadf8f [formerly 676493c6e2] [formerly 08cafadf8f [formerly 676493c6e2] [formerly 004720f7a9 [formerly b4249acf8655c2c31e491cf945f2bb4fc00f7fad]]]
Former-commit-id: 004720f7a9
Former-commit-id: df3b18d237 [formerly 872652cab9]
Former-commit-id: d19010b129
 2013-10-17 12:59:23 -05:00
Ben Steffensmeier
5dd3cd6c64 Issue #2473 Clean up grib plugin. 
Former-commit-id: c7cfc6aaf6 [formerly 4a17225301] [formerly c7cfc6aaf6 [formerly 4a17225301] [formerly ae9e1160e8 [formerly 6fda3bf42a0735ecb5ae9f7ef1ae0e08dac22a5b]]]
Former-commit-id: ae9e1160e8
Former-commit-id: 5d12980041 [formerly 297109c181]
Former-commit-id: f4dd1f3983
 2013-10-16 10:47:30 -05:00
Ben Steffensmeier
9ed413f0c2 Issue #2473 Remove unneeded ncgrib functionality. 
Change-Id: If38138650660c75745091a82c231cd0fe8c92e38

Former-commit-id: 10f74a1812 [formerly d25df40634] [formerly 10f74a1812 [formerly d25df40634] [formerly 51cd71c373 [formerly 49a3700d37c07f42991f7ca4a65f0fd4c7010f91]]]
Former-commit-id: 51cd71c373
Former-commit-id: dcae8c6aa2 [formerly 24a6795677]
Former-commit-id: 92828fbaa0
 2013-10-15 16:30:38 -05:00
Nate Jensen
bae5313482 Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections 
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: d7e4576380 [formerly b49a2ceb2f] [formerly d7e4576380 [formerly b49a2ceb2f] [formerly 40847d0edf [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]]
Former-commit-id: 40847d0edf
Former-commit-id: d84f47b609 [formerly 9e4100b0e1]
Former-commit-id: b506ef6a8d
 2013-10-14 15:30:09 -05:00
Nate Jensen
9c2532f01b Issue #2361 remove ISerializableObject for some pointdata and user roles classes 
Change-Id: I8a4a53dd1139a376aaa001bb7fef38444d8db005

Former-commit-id: 5c185a4ec2 [formerly 0cff122d9c] [formerly 5c185a4ec2 [formerly 0cff122d9c] [formerly d635901828 [formerly 3fa7b3de6733842c240959030023e84c844ef760]]]
Former-commit-id: d635901828
Former-commit-id: d6c42a4edd [formerly 25b219c49f]
Former-commit-id: 0821d5dc52
 2013-10-09 18:03:11 -05:00
Richard Peter
bc32641181 Merge branch 'omaha_13.5.3' (13.5.2-8) into development 
Conflicts:
	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.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml

Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371

Former-commit-id: f141fdd5ab [formerly 9adbe25ceb] [formerly f141fdd5ab [formerly 9adbe25ceb] [formerly b6395cc834 [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]
Former-commit-id: b6395cc834
Former-commit-id: 0e7dccd18f [formerly 3abe952ca0]
Former-commit-id: 1895c9f914
 2013-10-08 10:59:50 -05:00
Richard Peter
d321c61259 Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3 
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
	rpms/awips2.qpid/0.18/SOURCES/wrapper.conf

Former-commit-id: f0c05dc6d8 [formerly 31c87ab01e] [formerly f0c05dc6d8 [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]
Former-commit-id: d9eae3ea28
Former-commit-id: 94d0913bd9 [formerly f4b47dda50]
Former-commit-id: 33b4f0c247
 2013-10-08 09:45:27 -05:00
Nate Jensen
83f9e66092 Issue #2361 remove ncep met parameter classes from ISerializableObject file since they're not being transformed to/from XML 
Change-Id: I3f27652ff84147dc2b9ce35112dad2434ce227e1

Former-commit-id: dc909c42ee [formerly b2f0d58379] [formerly dc909c42ee [formerly b2f0d58379] [formerly 2fc0ea395c [formerly bfce20fe8a481e6a9767803cf24da42ac48ae051]]]
Former-commit-id: 2fc0ea395c
Former-commit-id: d1e416ea39 [formerly 6ec616401a]
Former-commit-id: 913cd8d0d1
 2013-10-07 14:30:19 -05:00
Steve Harris
e1f7463a41 13.5.2-8 baseline 
Former-commit-id: 8ba7d392d6 [formerly 94aa71fcd1] [formerly 8ba7d392d6 [formerly 94aa71fcd1] [formerly 18325949fb [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 18325949fb
Former-commit-id: 21b84f0290 [formerly d89fbf73d9]
Former-commit-id: 088eb89ca7
 2013-10-04 11:30:03 -04:00
Max Schenkelberg
6e5873733e Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness 
Amend: Accepted ticket.

Change-Id: Ib8171694869f60b46fb38634e71de61eb0e76830

Former-commit-id: 780ac0129f [formerly e3f6b1ea21] [formerly 780ac0129f [formerly e3f6b1ea21] [formerly 866c851b47 [formerly 384b8e6a02d4fffa0688993b2a2b53e974ecf493]]]
Former-commit-id: 866c851b47
Former-commit-id: 43b7cb3107 [formerly ba25f56dbe]
Former-commit-id: 80efdbb2b4
 2013-10-03 11:43:26 -05:00
Brian Clements
6cb6d468fe Issue #2404 Moved colormap parameter factory to common 
moved grid level translator from viz to common
updated references to moved classes
created grid style util for common styling code
updated style manager to look in common for files
moved data plugin style rules to common


Former-commit-id: 4c5d2b051d [formerly 2f25116c10] [formerly 4c5d2b051d [formerly 2f25116c10] [formerly 75448f8a42 [formerly 7cdff04cc4d60b50a2a2c08499ee329586031e0f]]]
Former-commit-id: 75448f8a42
Former-commit-id: fedd0dc781 [formerly e8cc15940c]
Former-commit-id: 0ba625fbe6
 2013-09-27 09:41:51 -05:00