Commit graph

607 commits

Author SHA1 Message Date
Steve Harris
523cedbb56 Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	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/server/GridParmManager.java

	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]
Former-commit-id: 2616fe04b6
2014-10-03 10:18:34 -05:00
Ron Anderson
b59e41705c Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8

Former-commit-id: ec1530c5e8 [formerly 5db9a6f87fa658f6bc7fdfabdae5b785a7f33e59]
Former-commit-id: f44ac32b1e
2014-09-30 14:09:31 -05:00
dmsys
b884e5e32d Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]
Former-commit-id: 9f4560c480
2014-09-30 13:45:54 -04:00
Steve Harris
6330a62e85 Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]
Former-commit-id: 3b6a8a1447
2014-09-29 12:58:56 -05:00
Brian.Dyke
77e8985bdd Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 0c1b83b644 [formerly 6e79993fbf34ebd832ca07356cbac003efaf6405]
Former-commit-id: 0e0255ce5b
2014-09-29 11:55:16 -04:00
Ben Steffensmeier
107ccbf332 Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: f92d021e96 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]
Former-commit-id: 5b10ac2f36
2014-09-29 10:49:14 -05:00
Brian.Dyke
85676ff532 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 0a497fc015 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]
Former-commit-id: 46af1d0857
2014-09-29 11:20:57 -04:00
Sean.Webb
293f860e93 ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225

Former-commit-id: 02e187a609 [formerly c2af0284e9146dff8431ecd4f6ce88437ea83d9f]
Former-commit-id: 600b75bd9f
2014-09-29 10:24:04 -04:00
Sean.Webb
197908686e ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683

Former-commit-id: 0738a41cbf [formerly 4faea9724adf17d0bec7f013bafc7f8dd2f7499e]
Former-commit-id: 78f83fa594
2014-09-29 08:21:00 -04:00
Sean.Webb
039619264f ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5

Former-commit-id: 628ab54d68 [formerly d59054c870fee17076aec22cd683ef1586a153da]
Former-commit-id: 7d75d994c1
2014-09-26 10:49:37 -04:00
Brian.Dyke
1f09dad9e9 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml

Former-commit-id: 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]
Former-commit-id: 87fa32d2d4
2014-09-24 11:05:37 -04:00
Sean.Webb
df7e6a9ad2 ASM #16761 - Fixed typo on variable character
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37

Former-commit-id: 00479a436d [formerly 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36]
Former-commit-id: a9dddb44ce
2014-09-22 14:10:28 -04:00
Sean.Webb
56b09560ff ASM #16761 - Fixed typo on variable character
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2

Former-commit-id: 47aef24f6f [formerly 721bead655f9a384ea12444617774b7ef404feb0]
Former-commit-id: 4c936b9bc8
2014-09-22 07:18:21 -04:00
Sean.Webb
23ec020b8d ASM #16761 - Fixed typo on variable character
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275

Former-commit-id: 4368f4650b [formerly 5c541f50dcc68a856e8c81bff8577334abf1ff75]
Former-commit-id: e0abd14986
2014-09-19 13:43:45 -04:00
Steve Harris
214b48dcb8 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]
Former-commit-id: 4c56844e29
2014-09-19 10:28:57 -05:00
Sean.Webb
f808f0840d ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b

Former-commit-id: b0b01694f7 [formerly 031c41d4f7801c8a5127cf007358856bf771593a]
Former-commit-id: 6ffb17540e
2014-09-19 09:29:31 -04:00
Sean.Webb
10f14f8032 ASM #16761 - Added retrans code updates from ISG
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c

Former-commit-id: 5c84cadaf6 [formerly 165b9a9b3481b3fa1d31b771eead03180430be59]
Former-commit-id: 51380a2363
2014-09-19 07:25:18 -04:00
Sean.Webb
827386e60d ASM #16761 - Updated ldm spec to add retrans
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229

Former-commit-id: 35bfd8269c [formerly bb9d431a842511b0081660224f3ddefd947f76fd]
Former-commit-id: 4c36280560
2014-09-18 09:33:47 -04:00
Stephen Gilbert
eee81971cc Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 5bf2ed644a [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]
Former-commit-id: 440bddda4b
2014-09-15 13:20:34 -04:00
Sean.Webb
213208cbf2 ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib005b9e9af0979d4aa1463e5555fd7b42c7fcc89

Former-commit-id: c805e132bd [formerly f07bb36b5f5e01000345a37719e43cb2df4ea7d8]
Former-commit-id: 5918cb05c1
2014-09-11 15:13:58 -04:00
Sean.Webb
6fa9e92a8c ASM #16720 - Updated to ldm 6.12.6
Change-Id: I39f4a529c18995e2b400afbaf0b36fbe7d30d001

Former-commit-id: 928c334c03 [formerly fb95ea372530d699c4681cf8ec9e3abce23716c1]
Former-commit-id: a6c15ca070
2014-09-11 14:18:50 -04:00
Sean.Webb
991ea6c13b ASM #16720 - Updated to ldm 6.12.6
Change-Id: Icf050791541832b370f7d8ceb7a423b500a62d51

Former-commit-id: dfc004e1f0 [formerly 8b1b91c79fa7e59610e21f11af3babaf120859e4]
Former-commit-id: 0e72b63663
2014-09-11 13:39:17 -04:00
Stephen Gilbert
a631e61fe5 Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
	cave/build/cave/customTargets.xml
	edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
	ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
	ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
	ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.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/natives/NsharpNative.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
	ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
	ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties

Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6

Former-commit-id: 561b751e58 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]
Former-commit-id: 662436c2d5
2014-09-11 11:14:33 -04:00
Sean.Webb
2683f36e09 ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib4c4689eb32f298b8be8782d878c243689608f6a

Former-commit-id: db156a51de [formerly ded6663441d8b916ad5b45f2668feac431e84bce]
Former-commit-id: 71d128a180
2014-09-10 14:48:19 -04:00
Brian.Dyke
6c4b121752 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: 858b91d677 [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]
Former-commit-id: af477df90e
2014-09-08 14:54:16 -04:00
Steve Harris
d984dd538f Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]
Former-commit-id: 5d58625abc
2014-08-29 10:17:52 -05:00
Brian.Dyke
f7f16ff9eb Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: aa83bf804f
2014-08-27 11:19:19 -04:00
Brian.Dyke
1839b614df Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py

Former-commit-id: 325887e605 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]
Former-commit-id: dd9d7133d9
2014-08-22 14:16:22 -04:00
Richard Peter
ea3ae775c4 Merge "Omaha #3528 - removed unused versions of ldm from the baseline" into omaha_14.4.1
Former-commit-id: 7331754776 [formerly 61a982c8624ab6e433692255109119ab9f74655c]
Former-commit-id: fffa5f5294
2014-08-21 18:10:00 -05:00
Bryan Kowal
2a6af78773 Omaha #3528 - removed unused versions of ldm from the baseline
Former-commit-id: 77fa6fcacb [formerly 6a627c05dfc4960c6ec71c95df308b145ff192c7]
Former-commit-id: 15457162e7
2014-08-21 10:21:15 -05:00
Bryan Kowal
341c09fb76 Omaha #3544 - unpack the Linux 64-bit SWT jar file post-install.
Former-commit-id: c93a830f59 [formerly 75df4503184b6e41eb8075f64552aec30e112d12]
Former-commit-id: 734e4bcc7b
2014-08-21 09:45:16 -05:00
Steve Harris
2ce04bce32 Issue #2875 - re-compile grib2.so with g2clib changes
This reverts commit b7e05d94f9a8d00d081605a63fbe96f098aa35cd [formerly fab7989b69] [formerly 2c7e22f825 [formerly 96094af605a2a303d440f009b25dd9740194a5ca]].


Former-commit-id: 5f6a29c515 [formerly 2b1665a1d9a1314bb6b0012161a6409ca2e6ebf8]
Former-commit-id: cddc961f2c
2014-08-19 08:18:11 -05:00
Ana Rivera
b5e6172652 VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e

Conflicts:
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 9ada9356c5 [formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]
Former-commit-id: 4c585af933
2014-08-15 11:04:23 -05:00
Ana Rivera
eefe73ee51 VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a44d5d91db [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]
Former-commit-id: 9bf2df23be
2014-08-15 11:02:36 -05:00
Bryan Kowal
0894026a79 Omaha #3475 - PostgreSQL Upgrade.
amend: vacuum databases after upgrade due to: http://www.postgresql.org/docs/9.3/static/release-9-3-2.html E.4.2 VACUUM tests
amend: update viz xdat to use the newer PostgreSQL jdbc driver
amend: fix formatting

Change-Id: Icda3348eea3e5edd879acb3a897bc530e73fb7f3

Former-commit-id: f6bc96829e [formerly 426a8c8863ea6be7d6795ace387c214ce3b36790]
Former-commit-id: a2be914331
2014-08-12 15:10:39 -05:00
Brian.Dyke
6043825b4c Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 59183249ed [formerly 84fc55492f7eccf55d3bf8e7e3227c882286a8fb]
Former-commit-id: aefe154e51
2014-08-12 13:24:35 -04:00
Steve Harris
e21a119b8f Issue #3507 - Revert "Issue #2875 - re-compile grib2.so with g2clib changes"
This reverts commit 28eacb64209fc40ec9623cf7868be0c8cd4f90eb [formerly e2a0ffe245] [formerly 428bdf03c8 [formerly 9cab8c4cd5efc7ff30a0c75f3e3cd4459211c157]].


Former-commit-id: 2c7e22f825 [formerly 96094af605a2a303d440f009b25dd9740194a5ca]
Former-commit-id: fab7989b69
2014-08-12 10:14:57 -05:00
Bryan Kowal
4eaf5c9b0e Issue #2875 - re-compile grib2.so with g2clib changes
Former-commit-id: 428bdf03c8 [formerly 9cab8c4cd5efc7ff30a0c75f3e3cd4459211c157]
Former-commit-id: e2a0ffe245
2014-08-12 10:05:08 -05:00
Richard Peter
45b822c7cf Issue #3458 Update ldm-6.11.5 queue size
Change-Id: I6e434d31c9f39c896630b685ee9d86e81cc32afb

Former-commit-id: a9f8b72b6f [formerly c717d54c05cdae71b050eeee6afb06e6c71753a8]
Former-commit-id: 7317d99519
2014-08-11 11:54:59 -05:00
Bryan Kowal
1d6eb95f9f Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.

Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903

Former-commit-id: a9b4b4124a [formerly d11649deb78aa356f27a22f33b38f7238513576c]
Former-commit-id: b568c25e10
2014-08-07 16:27:46 -05:00
Richard Peter
f7e0a6cf11 Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: 477119b739 [formerly e537db61848adeea0cef18e6a769597d746d6620]
Former-commit-id: 96a1821753
2014-08-07 14:01:54 -05:00
Bryan Kowal
8576c55443 Issue #3470 - finished TODO in yajsw ShellScript.java
Former-commit-id: dd00d2fe38 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]
Former-commit-id: 3b080e7c36
2014-08-06 16:34:35 -05:00
Richard Peter
e155de7bbc Issue #3458 Increase ldm to edexBridge shared memory queue.
Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468

Former-commit-id: bd2d97dc46 [formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]
Former-commit-id: 8374869379
2014-08-06 10:57:31 -05:00
Greg Armendariz
3fc7b439f2 Omaha #3327 - update topo rpm to include gmted2010.h5
Former-commit-id: f6842be3ed [formerly 8cef78cfc21dd561ebfd5d1af60da915d2a64961]
Former-commit-id: 7f7c443494
2014-08-06 09:46:45 -05:00
Bryan Kowal
1bef5a39a1 Omaha #2735 - force the unpack of jface during CAVE installation.
Verified that CAVE still starts successfully.


Former-commit-id: a03474e85b [formerly 084146abc21ba1e8764a8c174209b01d86c98e13]
Former-commit-id: 39a4735758
2014-07-23 19:19:14 -05:00
Stephen Gilbert
55ba6aad6b VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
NcText decoder updates and other ingest config changes

Change-Id: I1dca245ff36c565c924a494eae3f1a2b834f43ac

Former-commit-id: c16e83f25a [formerly 9e47362ce407ea03c0ede8884baa7e8129d2d646]
Former-commit-id: f94a3aadf4
2014-07-23 15:51:27 -04:00
Greg Armendariz
4cfa594750 Omaha #3417 - Update Linux Java to v1.7.0_65
Change-Id: Ib6ea40b5ee4e20f419aae32edcc951470a935311

Former-commit-id: 83e2b2c4c4 [formerly 2a8b1ed12d9e1fe7132105bd7cc6cd8405dcd46d]
Former-commit-id: b41ff3e082
2014-07-23 14:17:21 -05:00
Ana Rivera
752bc11851 VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55

Former-commit-id: c10b50d0b2 [formerly 9c3460d34513dd2f54643b87cb8afd122d94ea9c]
Former-commit-id: 088ebd2ca2
2014-07-21 21:41:17 +00:00
Bryan Kowal
0fdfc0fd4a Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
Former-commit-id: 98a310f4a7 [formerly e0bb64fc5112a15d9d991eb8f39de42b541f4e54]
Former-commit-id: 6a197f845d
2014-07-08 09:31:21 -05:00
Sean.Webb
a875ae3f24 ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03

Former-commit-id: c24c2f1e3e [formerly add5d004eca457782f957a95262e880b91dfeeb1]
Former-commit-id: 0b29e66772
2014-06-30 16:06:25 -04:00