Commit graph

76 commits

Author SHA1 Message Date
Michael James
199a7d184c Merge remote-tracking branch 'origin/unidata_16.2.2' into unidata_16.1.5-osx-merge
Conflicts:
	.gitignore
	build/deploy.edex.awips2/esb/etc/ingestGrib.sh
	build/deploy.edex.awips2/esb/etc/request.sh
	cave/build/build.sh
	cave/build/cave/customTargets.xml
	cave/build/p2-build.xml
	cave/build/static/linux/cave/caveUtil.sh
	cave/build/static/linux/cave/run.sh
	cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisualization.java
	cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/dataprovider/rsc/DataProviderRsc.java
	cave/com.raytheon.uf.viz.collaboration.ui/localization/collaboration/config.xml
	cave/com.raytheon.uf.viz.d2d.nsharp/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpPaletteWindow.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpObservedSoundingDialogContents.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/map/D2DNsharpMapResourceData.java
	cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml
	cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/ClearAction.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/TwoPanelLayoutMenuAction.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2DPerspectiveManager.java
	cave/com.raytheon.uf.viz.dat.feature/feature.xml
	cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
	cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/handler/ExportImageHandler.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
	cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/DispatchGraphicsTarget.java
	cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/strings/DrawStringEvent.java
	cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfileMap.xml
	cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml
	cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java
	cave/com.raytheon.uf.viz.truecolor.gl/src/com/raytheon/uf/viz/truecolor/gl/extension/GLTrueColorImagingExtension.java
	cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/help/SmartInit.html
	cave/com.raytheon.viz.gfe/help/localConfig.html
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGustFromAlgorithm.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementBrowserDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ZoneDbResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.pointdata/localization/bundles/SurfaceColorTemp.xml
	cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
	cave/com.raytheon.viz.product.awips/awips.product
	cave/com.raytheon.viz.product.awips/developer.product
	cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
	cave/com.raytheon.viz.redbook/localization/bundles/Redbook.xml
	cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
	cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductsImagery.xml
	cave/com.raytheon.viz.satellite/localization/menus/satellite/regionalSatellite.xml
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/edex/developer.properties
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.bufrua/utility/common_static/base/purge/bufruaPurgeRules.xml
	edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties
	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/RAP13GribPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/RAP40GribPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid1440721.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.10.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.11.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.3.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.7.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.8.table
	edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radar/radarsInUse.txt
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/dao/SatelliteDao.java
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkyIFR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkyLIFR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkySymVFR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentMaritimeSky.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentSkySym.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentSkySym2.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.ohd/utility/edex_static/base/distribution/dhr.xml
	edexOsgi/com.raytheon.uf.edex.ohd/utility/edex_static/base/distribution/dpa.xml
	edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java
	edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/areaNames.xml
	edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/creatingEntities.xml
	edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductRetriever.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductStorer.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/storeActivity.py
	installCAVE.sh
	installEDEX.sh
	javaUtilities/build.wes2bridge.utility/ant/setup.xml
	javaUtilities/build.wes2bridge.utility/build.xml
	localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml
	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.cave/deploy.builder/build.sh
	rpms/awips2.core/Installer.common-base/component.spec
	rpms/awips2.core/Installer.database/component.spec
	rpms/awips2.core/Installer.edex-environment/edex/component.spec
	rpms/awips2.core/Installer.edex-environment/wes2bridge.files/build/build.sh
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.localization/component.spec
	rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/WFO.xml
	rpms/awips2.core/Installer.maps-database/component.spec
	rpms/awips2.core/Installer.ncep-database/component.spec
	rpms/awips2.core/Installer.pgadmin/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/awips2.core/Installer.topo/component.spec
	rpms/awips2.core/Installer.version/component.spec
	rpms/awips2.core/deploy.builder/build.sh
	rpms/awips2.edex/Installer.edex-shapefiles/component.spec
	rpms/awips2.edex/Installer.edex/component.spec
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/awips2.shapefiles/Installer.edex-shapefiles/component.spec
	rpms/awips2.shapefiles/deploy.builder/build.sh
	rpms/awips2.upc/Installer.edex-upc/programs/edex
	rpms/awips2.upc/Installer.ldm/component.spec
	rpms/awips2.upc/Installer.ldm/patch/cron/awips
	rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
	rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
	rpms/build/common/lookupRPM.sh
	rpms/build/common/usage.sh
	rpms/build/i386/build.sh
	rpms/build/i386/buildEnvironment.sh
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/buildEnvironment.sh
	rpms/python.site-packages/Installer.cherrypy/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pmw/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.python-awips/component.spec
	rpms/python.site-packages/Installer.thrift/component.spec
	rpms/python.site-packages/Installer.tpg/component.spec
	rpms/python.site-packages/Installer.werkzeug/component.spec
	rpms/unidata/build.sh
	rpms/unidata/buildEnvironment.sh
	rpms/unidata/rsync.dirs
2016-09-13 10:44:13 -06:00
mjames-upc
20f9282351 ufpy->python-awips; runso binary; distribution file regex additions for thredds files; Hydro app defaults; purge rules for UCAR build
Former-commit-id: 18dfe4698dcffb0d9e625699581eb9f7d6c9fac6
2016-06-27 15:44:11 -05:00
mjames-upc
cbda80f565 remove files large than 50M
Former-commit-id: e53afad3cc2e60d9845b5b6b4471ef138d1b24b0
2016-06-27 15:35:21 -05:00
mjames-upc
41e328f176 more build updates for 16.1.4-15 from moe 2016-05-18 09:33:18 -06:00
Steve Harris
ec8b83dd67 Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2
16.2.1-lx-29

 Conflicts:
	cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/total/TotalLightningDecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm


Former-commit-id: 17c68986a20e9a589d40407800dd52678fcda68b
2016-05-12 09:28:49 -05:00
mjames-upc
a1b90f1b19 massive grid renaming incl. GFE 2016-05-03 16:14:14 -06:00
steve.naples
73cc70b791 ASM #18893 - Hydro: Remove ip address from config file and change it to template.
Change-Id: I5a4c278d4510d4dd3d7aa01439b3646c7d8766a6

Former-commit-id: 76a0b8a049adc075b3f5d69acb59f93b80b0587a
2016-04-21 18:24:47 +00:00
Shawn.Hooper
b1bdc885f7 ASM #17806 - Rebuilt library.ohd.pproc.so
Change-Id: Iadcb445947f4e9ca83d53be228ca3ecbfd4abe81

Former-commit-id: 694dd21950b19aecbc62a2e04791592882bb74e0
2016-04-14 16:43:44 -04:00
mjames-upc
601b470fb6 16.1.4 build; don't blackout hydro/dat in Groovy deploy; formatting updates to edex service manager. 2016-04-08 14:44:16 -05:00
mjames-upc
cb3bc94953 don't need set_hydro_env printing file names to edex logs 2016-04-08 11:15:45 -05:00
mjames-upc
14b2672f05 more hydroapps copied from awips2-static 2016-04-07 22:20:40 -05:00
mjames-upc
9103732588 remove files +50M
Former-commit-id: 0e0c12045d4dfcd1e3d8d701baa758b5643132fa
2016-04-01 22:17:48 -05:00
Shawn.Hooper
850ec358bf ASM #18528 - "Merge tag 'OB_16.2.2-1' into DCS-18528"
16.2.2-1

Change-Id: I7ac65cae4efe4e38b2c059aec6d4808f97f1bf77

Former-commit-id: 8173420a5e472738d4c9255d2ed32e55927c8d07
2016-03-28 15:47:44 -04:00
Keith.Steinfeld
7bd9a1a770 ASM #14539 - Fix the DPA decoder log files not being purged
Change-Id: I610e81b809bf5b495fd3c8c50f30931f660200ec

Former-commit-id: fcfb98a368901559fdd462917eca69399cc2e948
2016-03-18 12:25:39 -04:00
Steve Harris
11a5db155d Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java


Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
2016-01-20 15:23:43 -06:00
Steve Harris
25cee1be8c Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 58b1a82b5cf59525bf266416bc8c3ca6c0dea4ad
2016-01-13 09:20:51 -06:00
Shawn.Hooper
bd27f40c6d Merge tag 'OB_16.1.2-9' into master_16.2.1
16.1.2-9

Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
	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/db/dao/GFED2DDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c

Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
Richard Peter
3126e76d03 Omaha #4837 - Upgrade jasper to security patch 2
Change-Id: I29110bc4d8c8d762eb19b57899d2520e99d8b7f6

Former-commit-id: 646a336252f5f931ace17c43b6a14e2c54abcdfb
2015-12-08 17:16:36 -06:00
Shawn.Hooper
898858eba6 ASM #17806 - Update shared object for ohd pproc
Change-Id: I970c1808872db6e0803ef7b79cdea8231fdd74f1

Former-commit-id: 265e1d7159db467d867f00e4d65b9ec21000d49a
2015-12-03 17:03:30 -05:00
steve.naples
c154fe6ba7 ASM #15045 MPE: - Fix decode DPA script to use gather directory and decode all files.
Change-Id: Iec9f19c7be94a52a965217e278bf1e925c827af0

Former-commit-id: 996c06d957b43017e25e1d938ce0a2c1754e376b
2015-11-05 19:28:18 +00:00
steve.naples
8dce16d886 ASM #15002 Fixed issue with apps_dir token in set_hydro_env not being set at RFCs properly.
Change-Id: I28a96953acf2ae5e3355d933627309e06312ab9a

Former-commit-id: db5a86e09418f642b7e69382f51e4b4bb95ae6f1
2015-07-01 18:48:16 +00:00
Fay.Liang
499a7c7e80 ASM #17024 - Check-in library.ohd.pproc.so after merge/build from 14.4.1-21 to 15.1.1
Former-commit-id: ef3c93c82e72b9c574c2bbba8536e568e2a078ac
2015-04-01 14:56:17 -04:00
Fay.Liang
133a603566 Merge tag 'OB_14.4.1-20m' into master_15.1.1
14.4.1-20m

Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	edexOsgi/build.edex/esb/conf/logback.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4
2015-03-30 14:28:30 -04:00
Fay.Liang
3546b8901d Merge branch 'ohd_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: 366cd07d35f6e9f842ba72d1164a53fbb5fc6838
2015-03-19 12:42:35 -04:00
Chip Gobs
872547c9f5 VLab Issue #6752 - MPE DR 9561: Update purge_mpe_files - CHPS support ;fixes #6752
Former-commit-id: fb950b47809a2c9d03a55ccfc24cd7d41560172b
2015-03-10 10:05:43 -04:00
Fay.Liang
0e475cb704 Merge tag 'OB_14.3.2-19m' into master_14.4.1
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.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.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
2015-03-09 16:11:13 -04:00
Fay.Liang
66dd6987a1 Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: c1bcd2a0db42c30d447a54ed185fc33d875628b3
2015-02-24 14:58:28 -05:00
Shawn.Hooper
3c3b69809d ASM #14246 - Check-in updated transmit_rfc_qpe script
Change-Id: I26751d39d2b31a345276da722c7a25a9ff8f9508

Former-commit-id: 72dd2f411e10e1eb6a934adf05d7df179b570ded
2015-02-11 13:55:20 -05:00
Shawn.Hooper
ca8b043aed ASM #16804 - Check in the required library files
Change-Id: Ib84d554ef4723072f8272327b7d00a737ba1405a

Former-commit-id: 22fc7ef208aaef87d2ef366f9ae8c0840379139c
2015-02-11 12:40:33 -05:00
Shawn.Hooper
da357f98ee ASM #17069 - Checkin rebuilt library.ohd.pproc.so
Change-Id: Iacff8a6237f75a5d98fbd1b5c8a6f606b4be04de

Former-commit-id: 73e910edadfc33b19701ae5e80089e6ac7acf6cb
2015-02-04 21:12:44 -05:00
steve.naples
bdbdc68b2a ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions.
Change-Id: I23a4dae2aef9bdf71848c1e9a3338e1bddc39205

Former-commit-id: 28f92f6b49d286f7c470bda6184d12b7882bb768
2015-01-06 19:49:03 +00:00
Steve Harris
6cf62253a8 Omaha #3300 - Added another compiled nativeLib binary to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Former-commit-id: 230f4413d69d25ca4e8cafc23ec80b3bb79fea63
2014-09-23 15:30:55 -05:00
Steve Harris
c8bee38fc7 Omaha #3300 - Added compiled nativeLib binaries to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Former-commit-id: 785a6cb7ef5856e0bc0beb3fcf5657f74934111b
2014-09-23 12:02:08 -05:00
Steve Harris
b979960b7b Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java

Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
2014-09-23 11:41:10 -05:00
Brian.Dyke
05145d2f0d VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so
Former-commit-id: 0448deecda7c53ac65bc66bc9751ec0e7f83eee1
2014-09-17 15:39:57 -04:00
Benjamin Phillippe
4e1d93abf8 Omaha #3379 Removing DWR
Former-commit-id: a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e
2014-07-11 11:56:44 -05:00
Steve Harris
e1c8ad2611 Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: 48a7eabebb78db9b97201c44ff5c71af3ee78de7
2014-06-16 08:19:12 -05:00
Bryan Kowal
8896dc8a75 Omaha #3189 - ensure the PostgreSQL libpq libraries are included in the hydroapps native directory
Former-commit-id: 1da5e7cb5f6d8a6b8e915a8ecb238a0825991afe
2014-06-09 16:20:01 -05:00
Chip Gobs
036d1c4d31 VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse.
Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d

Former-commit-id: 6944361d04e7462f768bb74f00780dc8b8a51225
2014-06-05 13:37:02 -04:00
Steve Harris
455eb8b39d Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so

Former-commit-id: 45250149681f057cf168f4d3cb27276279f62c05
2014-06-02 11:21:46 -05:00
Brian.Dyke
3f1e12effc Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: 9d7a819489480e119b65cb5643520818adeb1ebf
2014-05-30 10:46:25 -04:00
Bryan Kowal
c711ab9195 Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version.
Rebased on re-compiled on the latest version of the nativeLib code.


Former-commit-id: b96b174d5b4b082dc692e3a14ef1cc7b58f06b5a
2014-05-27 13:16:37 -05:00
Steve Harris
b6af2db9f5 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
	edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
	edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java

Former-commit-id: f8cb49d46f88b801a682a34a3b7056bde1ab2569
2014-05-22 14:31:06 -05:00
Bryan Kowal
76cd1c2ac8 Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version.
amend: remove debug code

Change-Id: I16d16576af71ad02821c8e65c10081bda5d061e3

Former-commit-id: 9ad4422eb9911f8fbf0c5db40103ee8a1d925570
2014-05-20 11:02:31 -05:00
brian.dyke
58683ad040 Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
2014-05-19 09:45:37 -04:00
Mike Duff
6a67638a94 Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13

Former-commit-id: 57755db0d6d77f32d64b4b569bb0af88002a23da
2014-05-08 14:36:54 -05:00
Chip Gobs
e42bef2a33 VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734
2014-05-06 10:48:35 -04:00
Loubna.Bousaidi
6d526cb1ff ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: a6033a982c80e822d9f4cb62a70b9722d79432c6
2014-04-29 21:09:34 +00:00
Brian.Dyke
a0e7cb624a Fixed comment merge conflicts added .gitignore
Former-commit-id: 6093428342170b9fd8deb741a5721375e80bc955
2014-03-25 15:41:58 -04:00
Shawn.Hooper
85db05e819 ASM #377 - Baseline National River Location Database fails
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae

Former-commit-id: 5dcb5b019f389e64435b0283d95fe477032d88cc
2014-03-07 13:12:11 -05:00