Bryan Kowal
f6b8d99e70
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 c3eb4e9af9
[formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]
Former-commit-id: c3eb4e9af9
Former-commit-id: 3b8ce3fd34
2013-11-08 14:51:47 -06:00
Steve Harris
21ff310620
14.1.1-7 baseline
...
Former-commit-id: 4fff87723f
[formerly 3328e2dd1d
[formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 3328e2dd1d
Former-commit-id: 80614c0e52
2013-11-06 14:16:14 -05:00
Steve Harris
f44bae4383
14.1.1-6 baseline
...
Former-commit-id: 6067af4252
[formerly 0cb2978c13
[formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]
Former-commit-id: 0cb2978c13
Former-commit-id: 946a9be17e
2013-11-06 14:08:33 -05:00
Bryan Kowal
5164a7c0b1
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: c8d7a32e2e
[formerly feaacd9356
[formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: feaacd9356
Former-commit-id: 38464427d3
2013-10-31 15:34:46 -05:00
Steve Harris
31eefc21cd
14.1.1-5 baseline
...
Former-commit-id: f4c53b02fa
[formerly 877776a04c
[formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]
Former-commit-id: 877776a04c
Former-commit-id: 933e7395ac
2013-10-28 12:14:27 -04:00
Steve Harris
cb3b53f205
14.1.1-4 baseline
...
Former-commit-id: 99e3707c5b
[formerly bd95bb6a4e
[formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: bd95bb6a4e
Former-commit-id: 82dec19b6a
2013-10-28 10:55:16 -04:00
Steve Harris
a0ba2e1252
14.1.1-3 baseline
...
Former-commit-id: 5739b4f832
[formerly 94f24e0d8a
[formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 94f24e0d8a
Former-commit-id: 851f9df229
2013-10-28 10:46:02 -04:00
Bryan Kowal
8514f712fe
Issue #2297 - fix 14.2.1 CAVE build.
...
Former-commit-id: de09a30a4d
[formerly 8b3f402dd8
[formerly d71631f5cabae72a1ceb30f36ce574b2559c235d]]
Former-commit-id: 8b3f402dd8
Former-commit-id: 476c19464d
2013-10-15 16:07:23 -05:00
Bryan Kowal
ab10c1dd5b
Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.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/config/GFESiteActivation.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/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
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
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
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.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: 542f5f2349
[formerly aa4ea792c1
[formerly 606030384b5fe1eb9411d4b35d3282b15b1398b4]]
Former-commit-id: aa4ea792c1
Former-commit-id: bb5ef114d1
2013-10-08 14:44:38 -05:00
Bryan Kowal
80c2ccd547
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: 8f14318bc7
[formerly 5eba3290c8
[formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]
Former-commit-id: 5eba3290c8
Former-commit-id: 96c800f3f4
2013-10-08 10:35:03 -05:00
Steve Harris
553238dca4
13.5.2-8 baseline
...
Former-commit-id: 18325949fb
[formerly 94aa71fcd1
[formerly 6effdd3f5ce46910c89236306fa33499eada174f]]
Former-commit-id: 94aa71fcd1
Former-commit-id: 8ba7d392d6
2013-10-04 11:30:03 -04:00
Bryan Kowal
f092ee3d76
Issue #2422 - fix 14.2.1 RHEL6 build
...
Former-commit-id: 87087a5ea4
[formerly 61527c0b80
[formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]
Former-commit-id: 61527c0b80
Former-commit-id: efd377f12f
2013-10-02 18:41:11 -05:00
Steve Harris
42cf95b398
Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1
...
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/python.site-packages/Installer.qpid/component.spec
kept the omaha_14.1.1 versions of the .so files
Former-commit-id: 84ad96f2e0
[formerly fc0cdf4996
[formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]
Former-commit-id: fc0cdf4996
Former-commit-id: 59f753ee0d
2013-10-01 15:34:01 -05:00
Bryan Kowal
3b7573154c
Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/alertviz/customTargets.xml
cave/build/p2-build.xml
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
edexOsgi/meteolib.jni.linux64/libmeteoLib.so
javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.meteorological/.cproject
nativeLib/rary.meteorological/src/dcapeFunc.c
rpms/awips2.cave/Installer.cave-etc/component.spec
rpms/awips2.cave/Installer.cave-feature/component.spec
rpms/awips2.core/Installer.aviation/component.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: 9829477ced
[formerly c125b5b053
[formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]
Former-commit-id: c125b5b053
Former-commit-id: bb5acf7c11
2013-09-30 18:00:31 -05:00
Richard Peter
fb9a34e22a
Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.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/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
Former-commit-id: 271a8d753e
[formerly 92a45d77bb
[formerly 14284eb34f246c2d283ecf4040996957d7117cd3]]
Former-commit-id: 92a45d77bb
Former-commit-id: 4b934caa41
2013-09-24 12:29:16 -05:00
Steve Harris
3cb4574635
13.5.2-6 baseline
...
Former-commit-id: 3837fbe670
[formerly 3821475d4e
[formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]
Former-commit-id: 3821475d4e
Former-commit-id: 059549438a
2013-09-23 10:03:15 -04:00
Steve Harris
3d0b711ccf
13.5.2-4 baseline
...
Former-commit-id: 58c6821427
[formerly e3c935d48b
[formerly da631849bc9eaaa5c83c2393520b6099413107a5]]
Former-commit-id: e3c935d48b
Former-commit-id: 595e7bc0d9
2013-09-12 11:13:59 -04:00
Bryan Kowal
a58482866f
Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
...
Former-commit-id: 79e88c19aa
[formerly 1adf764747
[formerly 4503735d3a05071878683f4a523d0dbd37e47ea3]]
Former-commit-id: 1adf764747
Former-commit-id: 6578b9a7de
2013-09-06 12:30:01 -05:00
Bryan Kowal
2374999571
Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
...
Former-commit-id: 03cadc5aa9
[formerly a02d910023
[formerly 422e9b611535e9c20338041e0e1af62d38aab047]]
Former-commit-id: a02d910023
Former-commit-id: 41ab242c2d
2013-09-04 13:48:08 -05:00
Steve Harris
fec8541795
Merge branch 'master_13.5.2' (13.5.2-2) into omaha_14.1.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
nativeLib/edexBridge/.cproject
nativeLib/edexBridge/edexBridge.cpp
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/ld.so.conf.d/awips2-ldm-i386.conf
rpms/awips2.qpid/0.18/SOURCES/awips.patch
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/build/common/rpms.sh
Former-commit-id: 7fe19d898c
[formerly 18ee1d0092
[formerly b2674e0f626c643f0f81f865ea56351af2531c6a]]
Former-commit-id: 18ee1d0092
Former-commit-id: 433cc78081
2013-09-03 16:05:44 -05:00
Bryan Kowal
861a887084
Issue #2163 - RHEL6 14.1.1 build updates
...
Former-commit-id: ab3485a3ed
[formerly 9415560b38
[formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]
Former-commit-id: 9415560b38
Former-commit-id: 17d652a8dd
2013-09-03 13:46:19 -05:00
Steve Harris
12f85e6c92
13.5.1-19 baseline
...
Former-commit-id: 3b296a33b0
[formerly 5b643065e9
[formerly f3acac4ea9a285e64104a55db5b76593147c15e4]]
Former-commit-id: 5b643065e9
Former-commit-id: d50a0f64c9
2013-09-03 09:48:08 -04:00
Steve Harris
8dcd159377
13.5.2-2 baseline
...
Former-commit-id: 9e4bf0cf2e
[formerly 4a47fb97c5
[formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]
Former-commit-id: 4a47fb97c5
Former-commit-id: 8cde3b2b54
2013-08-29 15:01:29 -04:00
Steve Harris
3cd0b2dfc6
13.5.2-1 baseline
...
Former-commit-id: 542b2c3d18
[formerly 73dd0f166c
[formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]
Former-commit-id: 73dd0f166c
Former-commit-id: 894d2425b2
2013-08-28 09:43:48 -04:00
Steve Harris
80d8236464
13.5.1-18 baseline
...
Former-commit-id: 0a7acf96c7
[formerly afb34814dd
[formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]
Former-commit-id: afb34814dd
Former-commit-id: d931b80e70
2013-08-22 09:12:43 -04:00
Bryan Kowal
fa69d98320
Issue #2163 - build the java and awips2-common-base rpms
...
Former-commit-id: 7f8226d319
[formerly a3a5c799fc
[formerly dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43]]
Former-commit-id: a3a5c799fc
Former-commit-id: dd55894802
2013-08-15 15:40:18 -05:00
Bryan Kowal
18a3f63616
Issue #2163 - copy additional httpd source to the rpm SOURCES directory
...
Former-commit-id: 382cb87fa3
[formerly 32f3e63bd5
[formerly b22a36d559ba6db6d1bd3d3c6785984353449a92]]
Former-commit-id: 32f3e63bd5
Former-commit-id: 4e3c577c56
2013-08-15 15:40:05 -05:00
Bryan Kowal
23fb13a41c
Issue #2163 - remaining RHEL6 RPM changes
...
- Amend: update build.sh to build the full set of rpms
Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f
Conflicts:
rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
Former-commit-id: c0458d512d
[formerly 19d80d96c3
[formerly 45adc2b64e9037273e1013631ba7a8fbef400c35]]
Former-commit-id: 19d80d96c3
Former-commit-id: 7d7511af9b
2013-08-15 15:39:37 -05:00
Bryan Kowal
fb1feea107
Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
...
Conflicts:
RadarServer/build.rcm/build.xml
cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
Former-commit-id: 94eacfc460
[formerly c1dab22fdb
[formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]
Former-commit-id: c1dab22fdb
Former-commit-id: 683d7e5b19
2013-08-15 15:30:05 -05:00
Bryan Kowal
6e76fc6624
Issue #2163 - additional RHEL6 changes
...
- updated edexBridge to use the QPID 0.18 API
- awips2-ldm is now ready for RHEL 6
- the QPID 0.18 rpms now build for RHEL 6
- disabled the build of QPID 0.7
- awips2-qpid-lib (new to RHEL 6) is now ready
Former-commit-id: 36eca9bbfb
[formerly bbca63a8b8
[formerly d0f73c3852e45ec7b2363b46c77a94d7b3a47143]]
Former-commit-id: bbca63a8b8
Former-commit-id: 5feab7c0be
2013-08-15 15:25:52 -05:00
Bryan Kowal
3074681a82
Issue #2163 - updates to PostgreSQL, psql, httpd-pypies, and httpd-collaboration rpms
...
- httpd has been updated for compatibility
Former-commit-id: c0614bc7d4
[formerly 91a84e57b5
[formerly 8298c43aba3850753b67ff002f71e02e70b12fb0]]
Former-commit-id: 91a84e57b5
Former-commit-id: d3f5a8ecfd
2013-08-15 15:25:02 -05:00
Greg Armendariz
429898edc6
13.5.1-13 baseline
...
Former-commit-id: 5577e686c1
[formerly 29b823fee4
[formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]
Former-commit-id: 29b823fee4
Former-commit-id: f0b62a22bf
2013-08-08 17:00:36 -04:00
Steve Harris
52da6c54db
13.5.1-8 baseline
...
Former-commit-id: dfbf9a5afe
[formerly 3bece5e5d0
[formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]
Former-commit-id: 3bece5e5d0
Former-commit-id: 392faf86e7
2013-07-26 09:02:34 -04:00
Steve Harris
67299457b1
13.5.1-7 baseline
...
Former-commit-id: 86ce1248c2
[formerly bf58a81b38
[formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]
Former-commit-id: bf58a81b38
Former-commit-id: 630705aa3f
2013-07-18 12:07:22 -04:00
Steve Harris
2487a8b435
13.5.1-4 baseline
...
Former-commit-id: e197f23ce3
[formerly 70e4ff30a6
[formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: 70e4ff30a6
Former-commit-id: c56be8a332
2013-06-28 09:46:25 -04:00
Steve Harris
a0ff6c20ea
13.5.1-3 baseline
...
Former-commit-id: 72d22a30c9
[formerly 63803c1424
[formerly cc90f0c02410fef504ec9de389c07dfa41164247]]
Former-commit-id: 63803c1424
Former-commit-id: d8176d4a4c
2013-06-24 09:29:43 -04:00
Steve Harris
5d99df9969
13.5.1-1 baseline
...
Former-commit-id: fe872355a7
[formerly 998961612c
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: 998961612c
Former-commit-id: 6384018950
2013-06-10 15:17:17 -04:00
Steve Harris
ffcce90f3f
13.4.1-14 baseline
...
Former-commit-id: 18b90226a2
[formerly c749e122eb
[formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]
Former-commit-id: c749e122eb
Former-commit-id: be236eb722
2013-06-06 15:15:27 -04:00
Steve Harris
65d8f51034
13.4.1-11 baseline
...
Former-commit-id: c0376ce9ed
[formerly 2edee36158
[formerly e414ae01ab52b3940647e46e22bba3b89790c142]]
Former-commit-id: 2edee36158
Former-commit-id: d6319a2ca6
2013-05-21 09:19:25 -04:00
Steve Harris
81bc07bff4
13.4.1-7 baseline
...
Former-commit-id: 8347bed50e
[formerly 4c6ff79e71
[formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 4c6ff79e71
Former-commit-id: 8072752c77
2013-05-13 12:58:10 -04:00
Steve Harris
5544c4a072
13.4.1-6 baseline
...
Former-commit-id: 16fe8cc5a2
[formerly 8379977673
[formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]]
Former-commit-id: 8379977673
Former-commit-id: 6fcbb5ae6b
2013-05-07 08:47:39 -04:00
Steve Harris
ef5893b279
13.4.1-4 baseline
...
Former-commit-id: 7a78f8ac6e
[formerly d33e5861aa
[formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]
Former-commit-id: d33e5861aa
Former-commit-id: 99f4569650
2013-05-02 10:00:38 -05:00
Steve Harris
79567aac51
13.4.1-1 baseline
...
Former-commit-id: 00332e6305
[formerly 2f517b7713
[formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 2f517b7713
Former-commit-id: f95e0ad10b
2013-04-24 17:15:55 -05:00
Steve Harris
196767d525
13.3.1-19 baseline
...
Former-commit-id: abaf9f12f9
[formerly 9be238bcc4
[formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: 9be238bcc4
Former-commit-id: dc9fef33a9
2013-04-09 08:37:12 -05:00
Steve Harris
e621424fcb
13.3.1-18 baseline
...
Former-commit-id: ce6a06a7e3
[formerly a2b098d86d
[formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: a2b098d86d
Former-commit-id: f3e79bcc9d
2013-04-03 14:58:29 -05:00
Steve Harris
1b8e623c9b
13.3.1-17 baseline
...
Former-commit-id: a3fe998f8f
[formerly 7bf9966dcb
[formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: 7bf9966dcb
Former-commit-id: f28b85d42f
2013-04-01 12:04:56 -05:00
Steve Harris
f9b3430485
13.3.1-14 baseline
...
Former-commit-id: 9fba973fd0
[formerly 9022c500ce
[formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9022c500ce
Former-commit-id: 91a5e4578e
2013-03-27 17:59:34 -05:00
Steve Harris
0f2ebb8f10
13.3.1-13 baseline
...
Former-commit-id: c65f3e68e5
[formerly c77a452f5a
[formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c77a452f5a
Former-commit-id: 792171756f
2013-03-26 12:43:07 -05:00
Steve Harris
6f374b35d0
13.3.1-12 baseline
...
Former-commit-id: aaac0b51e5
[formerly 0be473728a
[formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: 0be473728a
Former-commit-id: be96282207
2013-03-25 13:27:13 -05:00
Steve Harris
76ea9120d8
13.3.1-10 baseline
...
Former-commit-id: 7078eec1b1
[formerly 073687d9a9
[formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 073687d9a9
Former-commit-id: 57f4676b6c
2013-03-20 15:53:01 -05:00