Fay.Liang
92d4e5b370
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: c08dc1a7d558fba175460ef8255fc3b7b1db5c71
2015-02-13 09:29:20 -05:00
Steve Harris
9311e6f440
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
...
14.4.1-10
Former-commit-id: 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2
2015-02-11 15:53:38 -06:00
Michael Gamazaychikov
796871f02f
ASM #17103 - New dx3/4 hardware can drive EDEX OoM.
...
Change-Id: I0e466f39b50661cc0909158611aab2f7fdda06ba
Former-commit-id: e4444751f61adccf1cb62adf0f6cb1abc4ab6384
2015-02-10 10:35:32 -05:00
Greg Armendariz
d3658d0f28
Omaha #3299 - Modify RCM deploy script
...
Change-Id: I420acc08705ebc2f52cd52ab7954b4d8c16fef15
Former-commit-id: 97c6bded155fc58e59beecdb33016e5286e622c1
2015-02-06 11:20:43 -06:00
Shawn.Hooper
915ddd6964
ASM #15311 - Update pgadmin spec file to allow for postgresql version greater than or equal to 8.4.13-1 and customTargets.xml for EDEX to allow for flexible feature files.
...
Change-Id: I9cf47aff9c6fa874ffe3d2e8bbbba2871abacec2
Former-commit-id: f1383bbdbadc54f8f2a0384d319c70160464a3ac
2015-02-04 16:47:26 -05:00
Fay.Liang
de502a310b
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 8f839ec64da04492e6cf109fdf47b95f08db5388
2015-02-03 16:04:56 -05:00
Steve Harris
b684848820
Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
...
14.4.1-6
Former-commit-id: 6873606777f0c7c18928b0b0814050742c256dc2
2015-02-03 11:24:39 -06:00
Roger Ferrel
61ab864445
Omaha #4031 Implement preferrred AFOS first letter.
...
Change-Id: I1c011beaf078d08c79c02863ac8afd01c7318645
Former-commit-id: 776989760fa936913006924efb1e84832ffec31f
2015-01-30 13:01:01 -06:00
Rici.Yu
e9349a6701
ASM #17055 - fix activeTableChange logging
...
Change-Id: I863a43005685b5b73eb96d80f0ffa46d12ecfcbc
Former-commit-id: 777729392f9cdbbcfe3bbdd7ac4c19c714dfb31a
2015-01-30 13:19:40 -05:00
Nate Jensen
c4598baf19
Omaha #3952 remove custom gzip handling since it is by default enabled
...
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: 4f67ebeb092d182ec0a4e5078e668313d8cc6a57
2015-01-26 09:10:36 -06:00
Ana Rivera
1823ed3596
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129 , #5421 , #5345 .
...
Conflicts:
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/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 111ae763e6becb944e34e262e1d87d2d344236e4
2014-12-16 23:39:02 +00:00
Jordan Gerth
e0fd068337
VLab Issue #5345 - Ingest, Load, Display severe probability for a storm cell
...
Change-Id: I032b0db29ed8947df3fe630336bb01083dbfecd0
Former-commit-id: fe7454aac732eae6bd0024be122b819e909f98fa
2014-12-14 15:40:19 -06:00
Jason Burks
325f31f6ef
VLab Issue #5240 - Baseline LMA; fixes #5240
...
Made changes suggested by Ben S.
Made other changes suggested by Ben S.
Made changes suggested by Richard Peter.
Made change from Ben S.
Change-Id: Ic7eb146c30d8024b34782187318e79882fc963bd
Former-commit-id: a941dd68c3c5b42671ad78900d6d8f8231d70810
2014-12-08 21:01:19 +00:00
Bryan Kowal
90f15ff22c
Omaha #3508 - fix deploy-install for yajsw.
...
Former-commit-id: 75cf2b3e03ad446408c3d201e6e36bde5f1095f2
2014-12-05 09:38:47 -06:00
Bryan Kowal
48ec32e595
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
...
Former-commit-id: f6a3317e329728080f8efe8db545e3324161986e
2014-12-05 09:20:23 -06:00
Bryan Kowal
0894efaaa3
Omaha #3508 - purge non-centralized yajsw distributions
...
amend: ensure edex is dependent on yajsw
Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55
Former-commit-id: 9b36754ca610887a17666ceff2a1540b958913b6
2014-12-04 17:33:43 -06:00
Nate Jensen
403e470682
Merge "Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30." into omaha_14.4.1
...
Former-commit-id: 8f7fa6b23c7a20b15c5f9bdfdac5add17aab336e
2014-11-11 09:11:18 -06:00
Steve Harris
9de825c332
Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/build.edex/esb/conf/logback-ingest.xml
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: 565efec2ebe5a3a1a009d213a77617f4a593aa6b
2014-11-10 08:42:01 -06:00
David Lovely
1a191cac55
Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30.
...
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470
Former-commit-id: 3addb3007b0bf7aab88b423bbf700583fc2b3e48
2014-11-10 08:27:28 -06:00
Brian.Dyke
acf00264f4
Merge branch 'master_14.2.4' into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 5c2079dd25181c68f872691e81842aff0f696f8d
2014-11-06 12:55:21 -05:00
Ron Anderson
30d031989e
Merge "Omaha #3685 Fix spell checker to use mixed case. Fix bug in importShapefile" into omaha_14.4.1
...
Former-commit-id: e076201872a69829228a6e78d632287839acf3d8
2014-10-28 15:15:26 -05:00
Benjamin Phillippe
52e3ba5914
Omaha #3454 Configuring Hibernate query plan cache settings
...
Former-commit-id: 0d18e110bf2266400b538d38c4f42078d78a5b41
2014-10-24 10:44:38 -05:00
Ron Anderson
5c1570eafd
Omaha #3685 Fix spell checker to use mixed case.
...
Fix bug in importShapefile
Change-Id: I818bef97b2306cb47e07d4885e77906d1fd5c793
Former-commit-id: 25ded2580ec97f4a966297f0af6dbb5d0e66956a
2014-10-23 09:02:16 -05:00
Richard Peter
2c21e72bf3
Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
...
Former-commit-id: 6b2879d8180a6b6f60a340977e3254ee5eb95213
2014-10-21 10:51:56 -05:00
Benjamin Phillippe
fdd16051e8
Omaha #3454 Upgrading to Hibernate 4.2.15
...
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5
2014-10-20 12:42:19 -05:00
Nate Jensen
73e15036de
Omaha #3299 fix xml attribute name
...
Change-Id: I9f0878d9179be0b633e1635eff4d961359a82eb8
Former-commit-id: fa064accaafc2a4dedd8574eec6faf1960c8bc70
2014-10-16 17:11:26 -05:00
Ron Anderson
bf5225906f
Issue #3684 Additional changes to keep IFPServers better synchronized
...
Change-Id: Ibb1f28d07a5792d4f23eb3232b75099b259a7064
Former-commit-id: 8a8f82e5916d4a71fa639eb16057e2c68276ecff
2014-10-07 11:51:39 -05:00
Brian Clements
81c73519c2
Omaha #3690 added tool to remove empty localization dirs
...
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701
Former-commit-id: a69773742e571a334ef1fd000ff8311805f9c737
2014-10-07 08:37:47 -05:00
Richard Peter
b5f23b8b98
Omaha #3300 Fix merge of 14.3.1-23
...
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9
Former-commit-id: 075f3f69cbf19d298398cb7c481668b97d4dad5d
2014-10-03 14:14:16 -05:00
Ben Steffensmeier
5b10ac2f36
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
...
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
2014-09-29 10:49:14 -05:00
Steve Harris
4c56844e29
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: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
2014-09-19 10:28:57 -05:00
Stephen Gilbert
440bddda4b
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Former-commit-id: 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3
2014-09-15 13:20:34 -04:00
Stephen Gilbert
662436c2d5
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: 3775b0762b9d8529f5aa6630480d82e7ea62c1d8
2014-09-11 11:14:33 -04:00
Brian.Dyke
01dfe503f5
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
2014-09-09 11:44:30 -04:00
Brian Clements
21ded3ea69
Omaha #3570 http client API changes
...
Change-Id: Icb6dc44e7841961da3df383e879acf4ef8f1a14f
Former-commit-id: d4edd51d41a306010a7fec2a7ed2c0cd6186506a
2014-09-09 08:47:32 -05:00
Brian Clements
a0d663530b
Omaha #3518 each JVM gets a unique user prefs folder
...
Change-Id: I3ea2cf98836bb3a5447b307eda4a5ab235b18619
Former-commit-id: 856b223352b99e3f96df6dab84aea313885b3c37
2014-09-08 13:16:13 -05:00
Greg Armendariz
a5359e4547
Omaha #3545 - Add log and fail message when directories are missing
...
Former-commit-id: 05d45b0c005ce7c8cca51c367754e7e6bca6c085
2014-09-04 11:52:13 -05:00
Benjamin Phillippe
2da57d3bc2
Issue #3560 Fix for registry memory issue
...
Former-commit-id: a6e4a2cac4d6f9390c5181439a6c834db56a95c6
2014-09-02 10:00:35 -05:00
Steve Harris
5d58625abc
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: 8793dca41f756ba812206b48391caea6e593a657
2014-08-29 10:17:52 -05:00
Nate Jensen
8f226399f7
Omaha #3356 inject spatial query through spring
...
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d
Former-commit-id: 0b7ea786593f963ad1464c3426bcec7ac59914ae
2014-08-28 11:46:25 -05:00
Brian.Dyke
aa83bf804f
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: 7334d3991903dfe8a62728de33c21e81534fdbb6
2014-08-27 11:19:19 -04:00
Steve Harris
038b284066
Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
Former-commit-id: 03ba5101d6f277b55173f72c2a63869e9dc31c3f
2014-08-26 16:25:21 -05:00
Brian.Dyke
b3767167c7
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 2382e17fb6b947be89649da7c25698dc5baf5bf4
2014-08-26 13:31:34 -04:00
Max Schenkelberg
78b87b7a63
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
...
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: 3aff99e787a7368f40cdd161581ead2d3552118c
2014-08-26 11:32:20 -05:00
Richard Peter
651a10715a
Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
...
Former-commit-id: e2ed1054e382de6e3656fd9335dedc5af3692c17
2014-08-25 20:43:28 -05:00
Nate Jensen
d43f0589f7
Omaha #3368 fix deploy-install for developers without ohd repo
...
Change-Id: Ib1738ed5e11022f5fd154ea85b29019e7c290f65
Former-commit-id: e9d7e258c60d39ab0d043f1e1cdc0ebcaf998ccc
2014-08-25 16:16:34 -05:00
Max Schenkelberg
e90bdb6fce
Omaha #3541 Updated A2 baseline to reflect request service split
...
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93
Former-commit-id: e6b16ea30563c0afdd48822e8efc9faabadef8f0
2014-08-22 13:15:42 -05:00
Bryan Kowal
a2be914331
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: 426a8c8863ea6be7d6795ace387c214ce3b36790
2014-08-12 15:10:39 -05:00
Bryan Kowal
b568c25e10
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: d11649deb78aa356f27a22f33b38f7238513576c
2014-08-07 16:27:46 -05:00
Richard Peter
96a1821753
Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
...
Former-commit-id: e537db61848adeea0cef18e6a769597d746d6620
2014-08-07 14:01:54 -05:00
