Fay.Liang
7f546a3e77
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 1adbe5f79d3aa9f1745507c742044d1adbe5f79d3aa9f1745507c742044dde502a310b07c742044dde502a310b99a4b44c8af075116f657517728c42a3c39c1a8d267fb768d9
2015-02-03 16:04:56 -05:00
Rici.Yu
cd6f5a943c
ASM #17055 - fix activeTableChange logging
...
Change-Id: I863a43005685b5b73eb96d80f0ffa46d12ecfcbc
Former-commit-id: 15e5ddee152fd2028490969e5ca72b15e5ddee152fd2028490969e5ca72be9349a6701969e5ca72be9349a67011308325fd5c23113db5e36bdc2befb90e6e9656d93c9041e3e
2015-01-30 13:19:40 -05:00
Ana Rivera
769df60be8
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: 1f5dd0c92b214be0a93b043bc3a8b71f5dd0c92b214be0a93b043bc3a8b71823ed3596043bc3a8b71823ed359690efb445f0ef35771bfad2d8127363f7c0319ee440df82b005
2014-12-16 23:39:02 +00:00
Jordan Gerth
f35069c29d
VLab Issue #5345 - Ingest, Load, Display severe probability for a storm cell
...
Change-Id: I032b0db29ed8947df3fe630336bb01083dbfecd0
Former-commit-id: 39f9c87fa34003c09e47784c43ee3339f9c87fa34003c09e47784c43ee33e0fd068337784c43ee33e0fd0683371023596fc1e730a2d3811ac7dcdc149896e639bbe925d559e2
2014-12-14 15:40:19 -06:00
Jason Burks
7abf19fc2a
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: 384cd711db7457631795044b18a356384cd711db7457631795044b18a356325f31f6ef044b18a356325f31f6ef93246f19156c9e4cc7a7e391a0b41b17aa893fc3578273d4b6
2014-12-08 21:01:19 +00:00
Bryan Kowal
4b233d615c
Omaha #3508 - fix deploy-install for yajsw.
...
Former-commit-id: 4b1e4c46044827d5b8fc0d773ebd424b1e4c46044827d5b8fc0d773ebd4290f15ff22c0d773ebd4290f15ff22c5558bd0d97f649b34f069779219edb8d0938726602cd2719af
2014-12-05 09:38:47 -06:00
Bryan Kowal
4b83570666
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
...
Former-commit-id: 4aaf636e18289689e77419f6551c884aaf636e18289689e77419f6551c8848ec32e59519f6551c8848ec32e5950e79d9e7a8aba4679eb69f5297504dec8371db52258f7a93ca
2014-12-05 09:20:23 -06:00
Bryan Kowal
0c1ec8e447
Omaha #3508 - purge non-centralized yajsw distributions
...
amend: ensure edex is dependent on yajsw
Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55
Former-commit-id: 2d7a7eff76cf5353e36871cf3136662d7a7eff76cf5353e36871cf3136660894efaaa371cf3136660894efaaa377df8dc2553c95967633ccb7cead64d55f5e0c638ac5284fff
2014-12-04 17:33:43 -06:00
Nate Jensen
a26d6d4f5b
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: 2248d834423445c780cfa3366c94172248d834423445c780cfa3366c9417403e470682a3366c9417403e4706823a37759209f272fe312bd48008929d4e66eb66d6a92219b5e2
2014-11-11 09:11:18 -06:00
Steve Harris
82204ef840
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: 79a5171143a8a97501aca16abe1b8b79a5171143a8a97501aca16abe1b8b9de825c332a16abe1b8b9de825c3322955b2190c548f32e0675e6aa150382695a061f4399b05ad5e
2014-11-10 08:42:01 -06:00
David Lovely
1401310851
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: dca2a23b04b32d54c7f9625e83c445dca2a23b04b32d54c7f9625e83c4451a191cac55625e83c4451a191cac557c2eea2dd13b7d20e623b9451471ac1b3334a1830b76e0a9b6
2014-11-10 08:27:28 -06:00
Brian.Dyke
7110577c6d
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: 5cdd9f42564ac24af0a9aae68215c85cdd9f42564ac24af0a9aae68215c8acf00264f4aae68215c8acf00264f42e2d7c817227437183232b470ad1a154f82d7f6ff25f4ecb2c
2014-11-06 12:55:21 -05:00
Ron Anderson
6ed68ac422
Merge "Omaha #3685 Fix spell checker to use mixed case. Fix bug in importShapefile" into omaha_14.4.1
...
Former-commit-id: caf058fb94ca7c91e795ee12f5dc65caf058fb94ca7c91e795ee12f5dc6530d031989eee12f5dc6530d031989e0776442d1893301efdcbd20a38f031d5537d06a12f3ef2ec36
2014-10-28 15:15:26 -05:00
Benjamin Phillippe
6aa6971c9b
Omaha #3454 Configuring Hibernate query plan cache settings
...
Former-commit-id: 84f46b4488db289266458095f8e21a84f46b4488db289266458095f8e21a52e3ba59148095f8e21a52e3ba5914e4b1de9a6fce9ce1f4f4676d77920d781d6fe06e18c31c5857
2014-10-24 10:44:38 -05:00
Ron Anderson
5ec703b74b
Omaha #3685 Fix spell checker to use mixed case.
...
Fix bug in importShapefile
Change-Id: I818bef97b2306cb47e07d4885e77906d1fd5c793
Former-commit-id: 70cab6c52eea43af0c3a6ab8c36e8370cab6c52eea43af0c3a6ab8c36e835c1570eafd6ab8c36e835c1570eafd6657f45bd42cee0f2bb9c8042a4ee231553de13383ff68647a
2014-10-23 09:02:16 -05:00
Richard Peter
5ad1a159c5
Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
...
Former-commit-id: 74250ca424d2f0ab621f05784292b774250ca424d2f0ab621f05784292b72c21e72bf305784292b72c21e72bf3b88375532b168854e0787b9653cdadb77d5b33aa3a80d5c801
2014-10-21 10:51:56 -05:00
Benjamin Phillippe
b4acac2eaa
Omaha #3454 Upgrading to Hibernate 4.2.15
...
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: af4f8e1c8ae6deeb6fb57845e8e40faf4f8e1c8ae6deeb6fb57845e8e40ffdd16051e87845e8e40ffdd16051e8c77edf49f8a8ef4770425eec33b0783808c125b9008b23be1e
2014-10-20 12:42:19 -05:00
Nate Jensen
1f850070c5
Omaha #3299 fix xml attribute name
...
Change-Id: I9f0878d9179be0b633e1635eff4d961359a82eb8
Former-commit-id: b60c67c62c306485851fcd5e4b9a08b60c67c62c306485851fcd5e4b9a0873e15036decd5e4b9a0873e15036de3a804174902b6bd2cb0c714d812e171caa1c9b7ae657d347e8
2014-10-16 17:11:26 -05:00
Ron Anderson
df478771a9
Issue #3684 Additional changes to keep IFPServers better synchronized
...
Change-Id: Ibb1f28d07a5792d4f23eb3232b75099b259a7064
Former-commit-id: d25fb16e4ade4015cee634eafba2dad25fb16e4ade4015cee634eafba2dabf5225906f34eafba2dabf5225906f778b886f618fa69324f2e9eff24acf2b9dfaacf9c891135cbe
2014-10-07 11:51:39 -05:00
Brian Clements
1fc61f30c4
Omaha #3690 added tool to remove empty localization dirs
...
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701
Former-commit-id: c0544fa109090a787f8df39ffcc63fc0544fa109090a787f8df39ffcc63f81c73519c2f39ffcc63f81c73519c26dab387f3c260b3bab88c3d7cd6e7f639b2c251049bb8437f6
2014-10-07 08:37:47 -05:00
Richard Peter
4571a8ab14
Omaha #3300 Fix merge of 14.3.1-23
...
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9
Former-commit-id: 1958d9fe382422c00fbd5a0dc204801958d9fe382422c00fbd5a0dc20480b5f23b8b985a0dc20480b5f23b8b988b763c729d84a1b71e234ada2c1c77c6171b84c8f07a0470ee
2014-10-03 14:14:16 -05:00
Ben Steffensmeier
f91216c747
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
...
Former-commit-id: a0d9cbede46090625040f92d021e96a0d9cbede46090625040f92d021e965b10ac2f36f92d021e965b10ac2f367af0ea9a670724aa4e71107ccbf332fc49d0bd55a69ec7c7af
2014-09-29 10:49:14 -05:00
Steve Harris
b316e73f24
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: e3a7796362da530db540091555cf10e3a7796362da530db540091555cf104c56844e29091555cf104c56844e29a1bf8ecdb184a98ec4ca214b48dcb8fdc523a026f4ea796cea
2014-09-19 10:28:57 -05:00
Stephen Gilbert
9d6570b9f5
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Former-commit-id: aa11ac6e09e7d21b02935bf2ed644aaa11ac6e09e7d21b02935bf2ed644a440bddda4b5bf2ed644a440bddda4bd9a222f1ef1ceed41334eee81971cc3106a4006c99796454d2
2014-09-15 13:20:34 -04:00
Stephen Gilbert
630efbf2f9
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: d98c1adc912406f0786f561b751e58d98c1adc912406f0786f561b751e58662436c2d5561b751e58662436c2d5c3e1eebd6d3251e256c6a631e61fe5bbabe5d0872679b9ef8d
2014-09-11 11:14:33 -04:00
Brian.Dyke
74f3dd287f
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: d8271549fffe85eb9f703d9a3de6e4d8271549fffe85eb9f703d9a3de6e401dfe503f53d9a3de6e401dfe503f5331985388629364e2b9fc42733eb39a31d3d702e0f9fe8301a
2014-09-09 11:44:30 -04:00
Brian Clements
f7ed4ff2f5
Omaha #3570 http client API changes
...
Change-Id: Icb6dc44e7841961da3df383e879acf4ef8f1a14f
Former-commit-id: 1ca70785dc06e4c1e6448489ce12141ca70785dc06e4c1e6448489ce121421ded3ea698489ce121421ded3ea698f27a5e4f684634e99871186014784e9efd4e501d6baeddbb1
2014-09-09 08:47:32 -05:00
Brian Clements
8836fb9e7c
Omaha #3518 each JVM gets a unique user prefs folder
...
Change-Id: I3ea2cf98836bb3a5447b307eda4a5ab235b18619
Former-commit-id: 90c3561949e95a1399002c1cd559b690c3561949e95a1399002c1cd559b6a0d663530b2c1cd559b6a0d663530b81239a9ce37938c547e8b3d6dbad767397b4c453cb37ddfd9d
2014-09-08 13:16:13 -05:00
Greg Armendariz
a29dfd6937
Omaha #3545 - Add log and fail message when directories are missing
...
Former-commit-id: 764e29316be8a75882ee0a988d64e4764e29316be8a75882ee0a988d64e4a5359e45470a988d64e4a5359e4547f493685a94b7535cb9ace65827854508b504065098c50cb61e
2014-09-04 11:52:13 -05:00
Benjamin Phillippe
bca70fb7fa
Issue #3560 Fix for registry memory issue
...
Former-commit-id: c00e99fa3312914fb1e5ab8b2ef473c00e99fa3312914fb1e5ab8b2ef4732da57d3bc2ab8b2ef4732da57d3bc2f8eac1c5ddc180ce2758393c67dbe9565c858c3e94ffd5d5f0
2014-09-02 10:00:35 -05:00
Steve Harris
3c8bfc8160
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: 3619a11a8abddf9c0f27793064063b3619a11a8abddf9c0f27793064063b5d58625abc793064063b5d58625abc10070d276266b485c000d984dd538fe681e0a457ecf26b3ac5
2014-08-29 10:17:52 -05:00
Nate Jensen
f6b45f075d
Omaha #3356 inject spatial query through spring
...
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d
Former-commit-id: c383a50c2cbaece22d7958c85c76efc383a50c2cbaece22d7958c85c76ef8f226399f758c85c76ef8f226399f7fcc794c395244395af6998438652542b829dc66bfe0cd768ad
2014-08-28 11:46:25 -05:00
Brian.Dyke
2da6c7b93b
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: 0a5ddf7457a08db8d73de6543184310a5ddf7457a08db8d73de654318431aa83bf804fe654318431aa83bf804f4a56b6f6e1f90649d7e7f7f16ff9ebc0dc594eda7e4ab705cc
2014-08-27 11:19:19 -04:00
Steve Harris
146dc3aec7
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: 33b4901c098c5026314c99ae9bdc1033b4901c098c5026314c99ae9bdc10038b28406699ae9bdc10038b28406600b3ad8eb61da31a86dcc8ba2b1ae684edac842e9d263bc542
2014-08-26 16:25:21 -05:00
Brian.Dyke
bcdb3d4c19
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: acc3321457489fec4b2586f0ed23c1acc3321457489fec4b2586f0ed23c1b3767167c786f0ed23c1b3767167c7ef2afe4f881b9a28cc62f2b9203001677ce2fb9416dc3b41de
2014-08-26 13:31:34 -04:00
Max Schenkelberg
8d3657ed54
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
...
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: d9536b7161dacc10bcbc63967fbc78d9536b7161dacc10bcbc63967fbc7878b87b7a6363967fbc7878b87b7a638b2b1013da0a7a2fadec7cfc26d1d790480647410368097265
2014-08-26 11:32:20 -05:00
Richard Peter
028aac838f
Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
...
Former-commit-id: c1f0cfdcc064848acf9d5cce505b7fc1f0cfdcc064848acf9d5cce505b7f651a10715a5cce505b7f651a10715a8156239a5d0992358153eafe010aa1ac192a5d86147856f43d
2014-08-25 20:43:28 -05:00
Nate Jensen
8e1b968959
Omaha #3368 fix deploy-install for developers without ohd repo
...
Change-Id: Ib1738ed5e11022f5fd154ea85b29019e7c290f65
Former-commit-id: e3244ce993db84f25bfd86f64337ffe3244ce993db84f25bfd86f64337ffd43f0589f786f64337ffd43f0589f71be8735d1bd4f3d09f11aed159a1e2abec6e86d9cbd7d00d1f
2014-08-25 16:16:34 -05:00
Max Schenkelberg
3fe9b3a357
Omaha #3541 Updated A2 baseline to reflect request service split
...
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93
Former-commit-id: 0419aeea5288ea402947896e3539500419aeea5288ea402947896e353950e90bdb6fce896e353950e90bdb6fce9da9d7fe27ee4d9a965c68221174c4e864d8a275395dcaa255
2014-08-22 13:15:42 -05:00
Bryan Kowal
f295c59dc4
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: b805f1db0d3d68ae0c78f6bc96829eb805f1db0d3d68ae0c78f6bc96829ea2be914331f6bc96829ea2be91433169a0dce7cbc15190b7f60894026a790b5fc6aa0ea60ab0de0c
2014-08-12 15:10:39 -05:00
Bryan Kowal
8ba34e138a
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: 632e49333209442217cda9b4b4124a632e49333209442217cda9b4b4124ab568c25e10a9b4b4124ab568c25e10fbc1786ab1b0c94a2d611d6eb95f9f25fd6f379f0a3fcc0c91
2014-08-07 16:27:46 -05:00
Richard Peter
9f90398239
Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
...
Former-commit-id: d3ba2f19bffc6aae3c3c477119b739d3ba2f19bffc6aae3c3c477119b73996a1821753477119b73996a18217536bb571bc37bc7d8bfe6df7e0a6cf11fd18b7a13483c71feeff
2014-08-07 14:01:54 -05:00
Bryan Kowal
abbdc04cb3
Omaha #3481 - match additional FOSS patterns in p2-build.xml. Make it possible to specify features that should not be
...
built into an RPM for Work Assignments.
Former-commit-id: 0999a2c4315ec6da9f312687b16d490999a2c4315ec6da9f312687b16d491ad9e310752687b16d491ad9e3107577f8af81bf623ae93747782b92e376657c028e4e13cd362f8a
2014-08-06 17:46:39 -05:00
Bryan Kowal
5e18599cf4
Issue #3470 - finished TODO in yajsw ShellScript.java
...
Former-commit-id: 51cf294761dd7ae1f7d3dd00d2fe3851cf294761dd7ae1f7d3dd00d2fe383b080e7c36dd00d2fe383b080e7c366a9bfbd79be1e6244b578576c5544312be1442f1ab26a99200
2014-08-06 16:34:35 -05:00
Greg Armendariz
7dca1f9e19
Omaha #3428 - Add timestamp to end of main
...
Change-Id: Ice8da4828c52d89bc447e57f6a044cc660708215
Former-commit-id: f1605aac1b2e88e3efece7bacb1320f1605aac1b2e88e3efece7bacb13203552579f37e7bacb13203552579f37671c450743bfe98928394effb2ce2192a14a99d226392eb946
2014-07-24 14:32:02 -05:00
Benjamin Phillippe
064672b932
Omaha #3255 Fixing dependencies to fix the DPA
...
Change-Id: If2625cda7b73b52b6e79f3a6b8ac580dbcf1ecc9
Former-commit-id: 8aa8f261cd29c5dbe30aa19c9c12438aa8f261cd29c5dbe30aa19c9c124381997a24cca19c9c124381997a24cc5ba335b20f85ad8d5e7dc609d4fd88ea6353ff2eeeefc62bf1
2014-07-24 11:27:27 -05:00
Stephen Gilbert
c5e96fc84b
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: 8e7955851622649088f1c16e83f25a8e7955851622649088f1c16e83f25af94a3aadf4c16e83f25af94a3aadf4fd21da0260fb15dd0e6f55ba6aad6b6c028cf3e594388db0e5
2014-07-23 15:51:27 -04:00
Greg Armendariz
61f127cdc7
Merge branch 'omaha_15.1.1' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java
Former-commit-id: 0afcd724ece5919e105bf12b1a10980afcd724ece5919e105bf12b1a10988773e17083f12b1a10988773e17083d7e590226249bd932339a6133db8d2ec12c703fee1180e770a
2014-07-21 12:12:32 -05:00
Greg Armendariz
c09b36924e
Omaha #2914 - Remove calls to PropertiesFactory
...
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be
Former-commit-id: 22ede9935de3f927e52cb34486973e22ede9935de3f927e52cb34486973e09f6bd471cb34486973e09f6bd471ca1b39cf6a9d51ab07c0efcf1b5ee8a5c5ab0f36c88fe72c588
2014-07-17 15:41:38 -05:00
Richard Peter
bc5f3e40df
Merge "Omaha #3389 : Add ability for deploy-install.xml to run WA-specific deploy script for standalone components." into omaha_14.4.1
...
Former-commit-id: 20a0fd564337151ec8794d9c25c63e20a0fd564337151ec8794d9c25c63e74b806cbb74d9c25c63e74b806cbb791ce39225179e3db1c47b02c52e887e575132d519627c94733
2014-07-16 15:05:45 -05:00
