Commit graph

281 commits

Author SHA1 Message Date
Brian.Dyke
2f94480121 Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]
Former-commit-id: 6414bdab57
2014-03-07 08:57:07 -05:00
Brian.Dyke
c6dae5a81f ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
Former-commit-id: 1778d20745 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]
Former-commit-id: 010b7a1df5
2014-03-06 11:04:34 -05:00
Steve Harris
96658d8ce0 Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.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.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]
Former-commit-id: ffcc34f8d4
2014-03-06 08:39:43 -06:00
Brian.Dyke
227131e5f1 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]
Former-commit-id: 1a8a0b703e
2014-02-24 14:51:00 -05:00
Brian.Dyke
64044e7ce5 OB_14.1.1-19 baseline
Former-commit-id: cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]
Former-commit-id: 10b723647b
2014-02-21 06:50:59 -05:00
Brian.Dyke
e36ae1dd7f ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
Former-commit-id: 2f79cc486e [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]
Former-commit-id: 916f657e04
2014-02-20 15:50:50 -05:00
Ron Anderson
d4ba9eba94 Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]
Former-commit-id: 14a082a4e9
2014-02-18 10:45:20 -06:00
Ron Anderson
2d7c87ac84 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]
Former-commit-id: 2f067699f2
2014-02-13 10:10:34 -06:00
Brian.Dyke
c5857c30f2 14.1.1-18 baseline
Former-commit-id: 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]
Former-commit-id: 1d6a9456b7
2014-02-11 15:52:50 -05:00
Brian.Dyke
947ec5fd96 14.1.1-17 baseline
Former-commit-id: 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]
Former-commit-id: 23280af290
2014-02-04 12:33:46 -05:00
Greg Armendariz
fad73466a7 Issue #2182 - Change release number
Former-commit-id: 85703b9919 [formerly f9b49df162e36376f96897db77e0504cba87f28a]
Former-commit-id: e994e19877
2013-12-17 08:46:15 -06:00
Bryan Kowal
fac9d72cc8 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]
Former-commit-id: 120ebd045a
2013-12-16 16:39:10 -06:00
Greg Armendariz
f5f21141a4 Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change
Change-Id: I831681915d2e214cf8111faeaabb3176eb3fc3c3

Former-commit-id: cb952cdb13 [formerly 584c543fbab59889769570330e7d83529a6b733f]
Former-commit-id: 2d2641ea7e
2013-12-11 13:46:27 -06:00
Bryan Kowal
eceffc3880 Issue #2509 - re-compile grib2.so for RHEL6 64-bit
Former-commit-id: 187759698b [formerly 90958e13e98147130848aad26d077e7a040ddb51]
Former-commit-id: 5b8a8ddbeb
2013-12-05 15:53:51 -06:00
Richard Peter
da027298d4 Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	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/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]
Former-commit-id: a0b6ea8bb2
2013-12-05 12:12:27 -06:00
Steve Harris
7611759aaa Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/gridslice.so (took the master_14.1.1 version)

Former-commit-id: cc79281795 [formerly bf9379caa6a1f156997e21a271f27b86d7689ef0]
Former-commit-id: ce7808a309
2013-12-04 16:48:47 -06:00
Steve Harris
14421048af 14.1.1-12 baseline
Former-commit-id: b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]
Former-commit-id: a3ec45a99f
2013-12-04 16:47:59 -05:00
Steve Harris
6539b80ded Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]
Former-commit-id: b98eb9ffa4
2013-12-02 16:17:38 -06:00
Steve Harris
5526a8999d 14.1.1-11 baseline
Former-commit-id: 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]
Former-commit-id: 71ae71c850
2013-12-02 17:10:10 -05:00
Bryan Kowal
f7438d4fa6 Increment python release for gridslice update.
Former-commit-id: 5f634773fe [formerly 5c5a81739c64ff1ab7f8812be8ac9390e8d85588]
Former-commit-id: c48a946923
2013-11-20 17:40:18 -06:00
Brian Clements
05b2a015cb Issue #2495 changed gridslice to use correct dimension datatype
Former-commit-id: aa24bc6fce [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]
Former-commit-id: 5e7f2f0bdf
2013-11-19 17:53:39 -06:00
Steve Harris
869b505f80 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 42b0235982d6d03e6e14057a1072842fcadc4b85]
Former-commit-id: 6d9efac6ef
2013-11-15 13:15:25 -06:00
Steve Harris
d97edb20d1 Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)

Former-commit-id: 1015e180f1 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]
Former-commit-id: 2f0d53c9b2
2013-11-15 13:05:40 -06:00
Steve Harris
8c136f202d 14.1.1-9 baseline
Former-commit-id: f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]
Former-commit-id: 5a0a40e67c
2013-11-15 12:47:49 -05:00
Richard Peter
59671c1e7d 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 333073fc97c9d454d0e41f8fbe01be3a19b18184]
Former-commit-id: 460a7b8b5d
2013-11-12 11:11:36 -06:00
Bryan Kowal
1909193f0c 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 c56c91c7b000b4302ad5e2bac391fd627673cc97]
Former-commit-id: f1cd2f2e5a
2013-11-08 14:51:47 -06:00
Richard Peter
520dd57f02 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 d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]
Former-commit-id: 93c776022a
2013-11-07 14:25:45 -06:00
Steve Harris
7c71117a50 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: c218866826 [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]
Former-commit-id: d8afc4c58c
2013-11-06 13:22:12 -06:00
Steve Harris
48df058653 14.1.1-7 baseline
Former-commit-id: 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]
Former-commit-id: 4fff87723f
2013-11-06 14:16:14 -05:00
Steve Harris
26da1ce793 14.1.1-6 baseline
Former-commit-id: 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]
Former-commit-id: 6067af4252
2013-11-06 14:08:33 -05:00
Bryan Kowal
76726372e5 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: 4bad21e6cd [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]
Former-commit-id: 3255bf3861
2013-11-05 19:03:22 -06:00
Greg Armendariz
f125f963b3 Issue #2520 - Update rpm query calls
Change-Id: I2fc1ac0fa8b9e199149fd2db3ab25bac9ba90024

Former-commit-id: 62324b5194 [formerly 95c604d179e14d110e0782a5a911f8b6d5104941]
Former-commit-id: b078f57dc7
2013-11-05 13:30:01 -06:00
Bryan Kowal
d366e70934 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: feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]
Former-commit-id: c8d7a32e2e
2013-10-31 15:34:46 -05:00
Bryan Kowal
0954490a5a Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	nativeLib/files.native/files.native.ecl
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.cots.g2clib/.project
	nativeLib/rary.cots.g2clib/g2_unpack3.c
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1

Former-commit-id: 665911b033 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]
Former-commit-id: c76c856340
2013-10-31 15:23:08 -05:00
Greg Armendariz
4fb0e0bd2f Merge branch 'development' into development_on_RHEL6
Former-commit-id: f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]
Former-commit-id: 64dd62005b
2013-10-30 14:52:16 -05:00
Bryan Kowal
a34d7b254f Issue #2268 - fix CAVE installation error
Former-commit-id: 7772aca092 [formerly b36df9f89f1c58b1d1a14d05796d656bdeb2d20d]
Former-commit-id: 5bc115c56c
2013-10-29 11:44:48 -05:00
Steve Harris
af2707389c 14.1.1-5 baseline
Former-commit-id: 877776a04c [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]
Former-commit-id: f4c53b02fa
2013-10-28 12:14:27 -04:00
Steve Harris
7590a56e0e 14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: 99e3707c5b
2013-10-28 10:55:16 -04:00
Steve Harris
4a6a209aea 14.1.1-3 baseline
Former-commit-id: 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]
Former-commit-id: 5739b4f832
2013-10-28 10:46:02 -04:00
Steve Harris
c1473d8a72 13.5.2-11 baseline
Former-commit-id: b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]
Former-commit-id: cbfde2f52a
2013-10-25 09:45:58 -04:00
Bryan Kowal
f892849313 Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: b7b11dc747 [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]
Former-commit-id: 9a472e1bbe
2013-10-16 12:54:58 -05:00
Bryan Kowal
0a06af1fdd Merge branch 'development' into development_on_RHEL6
Former-commit-id: a929dec887 [formerly b3e74019d1a8550c1c7cbebe219dee3ba7e603b3]
Former-commit-id: c13018301e
2013-10-14 17:58:22 -05:00
Bryan Kowal
c7381d7ce2 Issue #2402 - re-compile 32-bit grib2.so
Former-commit-id: 05954f89b8 [formerly e70561d259082645390f95df823ad4583aea8bbe]
Former-commit-id: 3eee9edb58
2013-10-10 12:49:49 -05:00
Bryan Kowal
9d57206173 Issue #2422 - recompile updated grib2.so for RHEL6
Former-commit-id: 9c3c123631 [formerly ae2923791512c7488805c19a773390ef1de5150b]
Former-commit-id: bb9b1e4279
2013-10-09 18:38:58 -05:00
Bryan Kowal
daeb4b7ecb Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: 37d1dd492b [formerly 2e6b76af19b308392e90dfee4c950200ec5c2560]
Former-commit-id: 2b26c4c242
2013-10-09 17:07:10 -05:00
Ben Steffensmeier
633a075052 Issue #2402 Modify grib decoder to work on file extents.
Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9

Former-commit-id: 7d2b48de48 [formerly 1525772d1b42348f0eca78fc966d2c7878496ea7]
Former-commit-id: 2b089b0848
2013-10-09 12:50:02 -05:00
Steve Harris
05ac206277 Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/awips2.core/Installer.java/1.6/component.spec

Former-commit-id: 8622cc6efa [formerly d1246136b73673acd22df53fee02adbd51022b4b]
Former-commit-id: df206f83bb
2013-10-03 16:04:21 -05:00
Bryan Kowal
429c534da0 Issue #2423 - Java 7 Revision 40 for Linux
Former-commit-id: 3b1f089cbd [formerly 665399b4e10d7d001edc2533b29324da48b78aa9]
Former-commit-id: 26f787ac83
2013-10-03 11:54:23 -05:00
Bryan Kowal
fe4e9ca3f8 Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: 61527c0b80 [formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]
Former-commit-id: 87087a5ea4
2013-10-02 18:41:11 -05:00
Bryan Kowal
ef789bf912 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: c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]
Former-commit-id: 9829477ced
2013-09-30 18:00:31 -05:00