Steve Harris
8db5f15d53
Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
rpms/awips2.core/Installer.gfe.climo/component.spec
Former-commit-id: 40225d128a1b83d045ea19527f50bb19527f50bbbd4b324ebe
2014-10-28 13:32:31 -05:00
David Lovely
28639c96c0
Omaha #2991 Initial add of qpid 0.28. Fixed an issue with the x86_64 directory not being created.
...
Change-Id: Iacd5c7d8b41ab3100b7ea9c409ec18691ffe7fdc
Former-commit-id: 3d1fa8e1b82f9c1e8303081ea4a12a081ea4a12a2f02a475a8
2014-10-23 15:55:26 -05:00
Shawn.Hooper
b1426303fa
ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
...
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868
Former-commit-id: 114ff128ed0e372cd13e3b4b9d262a3b4b9d262ad62f27cae6
2014-10-22 14:47:42 -04:00
Steve Harris
879b0608ed
Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
Former-commit-id: e9c9a17f96dc557b2d0cbfade7674dbfade7674d9e7ce04543
2014-10-22 11:45:39 -05:00
Shawn.Hooper
78cd702d20
ASM #16805 - Fix rpms/legal/ directory
...
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3
Former-commit-id: 26054621cad0fba5965ba96693cb70a96693cb70f98e05c9de
2014-10-21 11:17:45 -04:00
Shawn.Hooper
c491bf611e
ASM #16805 - Update master rights and license files for 14.3.1.
...
Change-Id: Ifb5b67010a01dfa9805e64d408f5688d10d7bf82
Former-commit-id: 217f39ee04e24cb3c37e65065f238065065f2380e50becc648
2014-10-20 14:36:31 -04:00
Brian.Dyke
bde528063d
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 498abd3716418894a17b93df82ac9293df82ac928af5c9870e
2014-10-16 12:04:27 -04:00
Sean.Webb
cbdb5b8911
ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log
...
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd
Former-commit-id: b256e04c4536d39be5fd5f6c9bc8375f6c9bc8371cbbc5bd59
2014-10-16 10:38:14 -05:00
Ana Rivera
99974b81bc
VLab Issue #5014 ; Workaround pqact pattern for ESTOFS (RM 295); fixes #5014
...
Change-Id: I77529f91b0d6b59640bda21be909f84fdc049614
Former-commit-id: ee4cdc015ff516cc441d927b2dea69927b2dea69ad412ebf94
2014-10-15 18:41:58 +00:00
Steve Harris
306826aed9
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: f4b771ea72da463c484e2616fe04b62616fe04b6523cedbb56
2014-10-03 10:18:34 -05:00
Ron Anderson
841e270b6f
Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm
...
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8
Former-commit-id: 35657166eaec1530c5e8f44ac32b1ef44ac32b1eb59e41705c
2014-09-30 14:09:31 -05:00
dmsys
07f84c6b26
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: f704781f4f8c3625cfec9f4560c4809f4560c480b884e5e32d
2014-09-30 13:45:54 -04:00
Steve Harris
842abaad49
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: 3598e9b5b690e08b96e13b6a8a14473b6a8a14476330a62e85
2014-09-29 12:58:56 -05:00
Brian.Dyke
3b3e81d4a2
Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: 9661a1d7b10c1b83b6440e0255ce5b0e0255ce5b77e8985bdd
2014-09-29 11:55:16 -04:00
Ben Steffensmeier
0724aa4e71
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
...
Former-commit-id: 6090625040f92d021e965b10ac2f365b10ac2f36107ccbf332
2014-09-29 10:49:14 -05:00
Brian.Dyke
886c1b7e3d
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: fce029653d0a497fc01546af1d085746af1d085785676ff532
2014-09-29 11:20:57 -04:00
Sean.Webb
1538817a38
ASM #16720 - Added pushd and cd prior to patch extraction
...
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225
Former-commit-id: 224cddfe9b02e187a609600b75bd9f600b75bd9f293f860e93
2014-09-29 10:24:04 -04:00
Sean.Webb
d70bc9fd9f
ASM #16720 - Removed extraneous popd which was changing dir when not needed
...
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683
Former-commit-id: 6840d553430738a41cbf78f83fa59478f83fa594197908686e
2014-09-29 08:21:00 -04:00
Sean.Webb
9b63e571a7
ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
...
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5
Former-commit-id: eb959d100a628ab54d687d75d994c17d75d994c1039619264f
2014-09-26 10:49:37 -04:00
Brian.Dyke
cf8f88a5b3
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: b49b13f77e4b418918d487fa32d2d487fa32d2d41f09dad9e9
2014-09-24 11:05:37 -04:00
Sean.Webb
8c2044b91e
ASM #16761 - Fixed typo on variable character
...
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37
Former-commit-id: be3bb99abe00479a436da9dddb44cea9dddb44cedf7e6a9ad2
2014-09-22 14:10:28 -04:00
Sean.Webb
79431d7f1d
ASM #16761 - Fixed typo on variable character
...
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2
Former-commit-id: 07589bbdda47aef24f6f4c936b9bc84c936b9bc856b09560ff
2014-09-22 07:18:21 -04:00
Sean.Webb
ddcc0fa20a
ASM #16761 - Fixed typo on variable character
...
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275
Former-commit-id: 502f7520a74368f4650be0abd14986e0abd1498623ec020b8d
2014-09-19 13:43:45 -04:00
Steve Harris
84a98ec4ca
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: da530db540091555cf104c56844e294c56844e29214b48dcb8
2014-09-19 10:28:57 -05:00
Sean.Webb
f2e207e86e
ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
...
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b
Former-commit-id: c90c45f303b0b01694f76ffb17540e6ffb17540ef808f0840d
2014-09-19 09:29:31 -04:00
Sean.Webb
a651c7ea69
ASM #16761 - Added retrans code updates from ISG
...
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c
Former-commit-id: 7f898635f95c84cadaf651380a236351380a236310f14f8032
2014-09-19 07:25:18 -04:00
Sean.Webb
b625f2067a
ASM #16761 - Updated ldm spec to add retrans
...
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229
Former-commit-id: b95984236135bfd8269c4c362805604c36280560827386e60d
2014-09-18 09:33:47 -04:00
Stephen Gilbert
1ceed41334
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Former-commit-id: e7d21b02935bf2ed644a440bddda4b440bddda4beee81971cc
2014-09-15 13:20:34 -04:00
Sean.Webb
55190a347f
ASM #16720 - Updated to ldm 6.12.6
...
Change-Id: Ib005b9e9af0979d4aa1463e5555fd7b42c7fcc89
Former-commit-id: 268db31231c805e132bd5918cb05c15918cb05c1213208cbf2
2014-09-11 15:13:58 -04:00
Sean.Webb
d1614ae327
ASM #16720 - Updated to ldm 6.12.6
...
Change-Id: I39f4a529c18995e2b400afbaf0b36fbe7d30d001
Former-commit-id: dec97cd06f928c334c03a6c15ca070a6c15ca0706fa9e92a8c
2014-09-11 14:18:50 -04:00
Sean.Webb
e186b2723d
ASM #16720 - Updated to ldm 6.12.6
...
Change-Id: Icf050791541832b370f7d8ceb7a423b500a62d51
Former-commit-id: eb5418a3bbdfc004e1f00e72b636630e72b63663991ea6c13b
2014-09-11 13:39:17 -04:00
Stephen Gilbert
3251e256c6
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: 2406f0786f561b751e58662436c2d5662436c2d5a631e61fe5
2014-09-11 11:14:33 -04:00
Sean.Webb
ce7bae10ea
ASM #16720 - Updated to ldm 6.12.6
...
Change-Id: Ib4c4689eb32f298b8be8782d878c243689608f6a
Former-commit-id: bc6f7cfa3fdb156a51de71d128a18071d128a1802683f36e09
2014-09-10 14:48:19 -04:00
Brian.Dyke
dde3efc567
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: 5415a4939a858b91d677af477df90eaf477df90e6c4b121752
2014-09-08 14:54:16 -04:00
Steve Harris
66b485c000
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: bddf9c0f27793064063b5d58625abc5d58625abcd984dd538f
2014-08-29 10:17:52 -05:00
Brian.Dyke
f90649d7e7
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: a08db8d73de654318431aa83bf804faa83bf804ff7f16ff9eb
2014-08-27 11:19:19 -04:00
Brian.Dyke
c8e9153884
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: 2ddc920a4a325887e605dd9d7133d9dd9d7133d91839b614df
2014-08-22 14:16:22 -04:00
Richard Peter
9bb17c886d
Merge "Omaha #3528 - removed unused versions of ldm from the baseline" into omaha_14.4.1
...
Former-commit-id: 5a35e873ac7331754776fffa5f5294fffa5f5294ea3ae775c4
2014-08-21 18:10:00 -05:00
Bryan Kowal
0ab65e92bd
Omaha #3528 - removed unused versions of ldm from the baseline
...
Former-commit-id: 8cca8ef45577fa6fcacb15457162e715457162e72a6af78773
2014-08-21 10:21:15 -05:00
Bryan Kowal
1ee075dfd0
Omaha #3544 - unpack the Linux 64-bit SWT jar file post-install.
...
Former-commit-id: 6d3611101ec93a830f59734e4bcc7b734e4bcc7b341c09fb76
2014-08-21 09:45:16 -05:00
Steve Harris
eeb928761d
Issue #2875 - re-compile grib2.so with g2clib changes
...
This reverts commit b7e05d94f9a8d00d081605a63fbe96f098aa35cd [formerly fab7989b6968d2d833092c7e22f825fab7989b697fa63152025f6a29c515cddc961f2ccddc961f2c2ce04bce32
2014-08-19 08:18:11 -05:00
Ana Rivera
706336e633
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: 11073fdece9ada9356c54c585af9334c585af933b5e6172652
2014-08-15 11:04:23 -05:00
Ana Rivera
c294608c37
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: 1daa44291ea44d5d91db9bf2df23be9bf2df23beeefe73ee51
2014-08-15 11:02:36 -05:00
Bryan Kowal
c15190b7f6
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: 3d68ae0c78f6bc96829ea2be914331a2be9143310894026a79
2014-08-12 15:10:39 -05:00
Brian.Dyke
ba4ddf9ceb
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 63f000f11d59183249edaefe154e51aefe154e516043825b4c
2014-08-12 13:24:35 -04:00
Steve Harris
ce4a52aa14
Issue #3507 - Revert "Issue #2875 - re-compile grib2.so with g2clib changes"
...
This reverts commit 28eacb64209fc40ec9623cf7868be0c8cd4f90eb [formerly e2a0ffe2455b0b491d11428bdf03c8e2a0ffe24568d2d833092c7e22f825fab7989b69fab7989b69e21a119b8f
2014-08-12 10:14:57 -05:00
Bryan Kowal
3be068262b
Issue #2875 - re-compile grib2.so with g2clib changes
...
Former-commit-id: 5b0b491d11428bdf03c8e2a0ffe245e2a0ffe2454eaf5c9b0e
2014-08-12 10:05:08 -05:00
Richard Peter
17be38c6f8
Issue #3458 Update ldm-6.11.5 queue size
...
Change-Id: I6e434d31c9f39c896630b685ee9d86e81cc32afb
Former-commit-id: 635393cfb5a9f8b72b6f7317d995197317d9951945b822c7cf
2014-08-11 11:54:59 -05:00
Bryan Kowal
b0c94a2d61
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: 09442217cda9b4b4124ab568c25e10b568c25e101d6eb95f9f
2014-08-07 16:27:46 -05:00
Richard Peter
bc7d8bfe6d
Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
...
Former-commit-id: fc6aae3c3c477119b73996a182175396a1821753f7e0a6cf11
2014-08-07 14:01:54 -05:00
